From 03e1179db15eafe671e20acb2c9e3eac18eaf649 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Thu, 16 Jun 2016 12:52:08 -0400
Subject: [PATCH 1/5] Defining custom docroot for Drupal VM in
 project.local.yml.

---
 template/.gitignore                       |  3 ++-
 template/build/core/phing/tasks/setup.xml |  5 +++--
 template/build/core/phing/tasks/vm.xml    |  2 +-
 template/example.project.local.yml        | 18 +++++++++---------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/template/.gitignore b/template/.gitignore
index 4a0974a9b..08e96eb66 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -1,6 +1,7 @@
 # Ignore configuration files that may contain sensitive information.
 local.*
-*.local.*
+*.local
+project.local.yml
 
 # Ignore drupal core.
 docroot/core
diff --git a/template/build/core/phing/tasks/setup.xml b/template/build/core/phing/tasks/setup.xml
index d77e14833..5f9f8b4d2 100644
--- a/template/build/core/phing/tasks/setup.xml
+++ b/template/build/core/phing/tasks/setup.xml
@@ -55,8 +55,9 @@
 
   <target name="setup:drupal:settings" description="Create local settings files using default settings files.">
     <chmod mode="0755" file="${docroot}/sites/default" failonerror="false" verbose="true"/>
-    <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${docroot}/sites/${multisite.name}/settings/local.settings.php"/>
-    <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php">
+    <copy file="${repo.root}/example.project.local.yml" tofile="${repo.root}/project.local.yml" overwrite="false"/>
+    <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${docroot}/sites/${multisite.name}/settings/local.settings.php" overwrite="false"/>
+    <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php" overwrite="false">
       <filterchain>
         <expandproperties />
       </filterchain>
diff --git a/template/build/core/phing/tasks/vm.xml b/template/build/core/phing/tasks/vm.xml
index b846365a9..a19400c8f 100644
--- a/template/build/core/phing/tasks/vm.xml
+++ b/template/build/core/phing/tasks/vm.xml
@@ -19,7 +19,7 @@
     <!-- Sadly this wipes out comments in the file. -->
     <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/project.yml drush.default_alias '${project.machine_name}.local'" logoutput="true" checkreturn="true"/>
     <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/project.yml drush.aliases.local '${project.machine_name}.local'" logoutput="true" checkreturn="true"/>
-    <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/build/custom/phing/build.yml drush.root ''" logoutput="true" checkreturn="true"/>
+    <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/example.project.local.yml drush.root ''" logoutput="true" checkreturn="true"/>
 
     <echo></echo>
     <echo>A new "box" directory and a Vagrantfile have been added to ${repo.root}</echo>
diff --git a/template/example.project.local.yml b/template/example.project.local.yml
index 65518c596..71aed6531 100644
--- a/template/example.project.local.yml
+++ b/template/example.project.local.yml
@@ -1,11 +1,11 @@
 # Override any settings as necessary by copying to project.local.yml
-project:
-  local:
-    protocol: http
-    hostname: mysite.dev
+#project:
+#  local:
+#    protocol: http
+#    hostname: mysite.dev
 
-drush:
-  # You can set custom project aliases in drush/site-aliases/aliases.drushrc.php.
-  aliases:
-    # The local environment against which all local drush commands are run.
-    local: local.mysite.dev
+# You can set custom project aliases in drush/site-aliases/aliases.drushrc.php.
+# All local:* targets are run against drush.aliases.local.
+#drush:
+#  aliases:
+#    local: local.mysite.dev

From e36fd7d60539f57bb0c845b4a854ce13755325e7 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Thu, 16 Jun 2016 12:53:16 -0400
Subject: [PATCH 2/5] Fixing local:sync target.

---
 template/build/core/phing/tasks/local-sync.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/build/core/phing/tasks/local-sync.xml b/template/build/core/phing/tasks/local-sync.xml
index a0fefeb69..71b25a5f0 100644
--- a/template/build/core/phing/tasks/local-sync.xml
+++ b/template/build/core/phing/tasks/local-sync.xml
@@ -17,7 +17,8 @@
   <target name="local:sync" description="Synchronize remote environment with local environment."
           depends="setup:drupal:settings">
     <exec dir="${docroot}" command="${drush.cmd} sql-drop -y" logoutput="true" checkreturn="true"/>
-    <exec dir="${docroot}" command="${drush.cmd} sql-sync @${drush.aliases.remote} @${drush.aliases.local} --create-db --structure-tables-key=lightweight -y" logoutput="true" checkreturn="true"/>
+    <!--We cannot use drush.cmd here because it incorrectly assigns an alias to the command. -->
+    <exec dir="${docroot}" command="${drush.bin} -r ${docroot} -l ${multisite.name} sql-sync @${drush.aliases.remote} @${drush.aliases.local} --create-db --structure-tables-key=lightweight -y" logoutput="true" checkreturn="true"/>
     <exec dir="${docroot}" command="${drush.cmd} cc drush" logoutput="true" checkreturn="true"/>
     <exec dir="${docroot}" command="${drush.cmd} cr" logoutput="true" checkreturn="true"/>
   </target>

From 11b7f7e59dfcad88aeb93a93af3c121f4db22e23 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Thu, 16 Jun 2016 12:56:24 -0400
Subject: [PATCH 3/5] Improving vm:init modification of project.local.yml.

---
 template/build/core/phing/tasks/vm.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/template/build/core/phing/tasks/vm.xml b/template/build/core/phing/tasks/vm.xml
index a19400c8f..4e57be1ed 100644
--- a/template/build/core/phing/tasks/vm.xml
+++ b/template/build/core/phing/tasks/vm.xml
@@ -19,7 +19,13 @@
     <!-- Sadly this wipes out comments in the file. -->
     <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/project.yml drush.default_alias '${project.machine_name}.local'" logoutput="true" checkreturn="true"/>
     <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/project.yml drush.aliases.local '${project.machine_name}.local'" logoutput="true" checkreturn="true"/>
+
+    <!--Add drush.root to example.project.local.yml for those who have not yet generated project.local.yml from it.-->
     <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/example.project.local.yml drush.root ''" logoutput="true" checkreturn="true"/>
+    <!-- Attempt to generate project.local.yml. This will not overwrite an existing file. -->
+    <phingcall target="setup:drupal:settings"/>
+    <!--Add drush.root to project.local.yml for those who had already generated it.-->
+    <exec dir="${repo.root}" command="${composer.bin}/drupal yaml:update:value ${repo.root}/project.local.yml drush.root ''" logoutput="true" checkreturn="true"/>
 
     <echo></echo>
     <echo>A new "box" directory and a Vagrantfile have been added to ${repo.root}</echo>

From 50d52b3f2f9a1e9a3c221d4b5e284966dcfc3d39 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Thu, 16 Jun 2016 12:57:15 -0400
Subject: [PATCH 4/5] Fixing tests for vm:init.

---
 tests/phpunit/DrupalVmTest.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/DrupalVmTest.php b/tests/phpunit/DrupalVmTest.php
index a44ba76fc..a78b55675 100644
--- a/tests/phpunit/DrupalVmTest.php
+++ b/tests/phpunit/DrupalVmTest.php
@@ -38,11 +38,19 @@ public function testVmInit() {
     );
     $this->assertContains(
       'drush:',
-      file_get_contents($this->new_project_dir . '/build/custom/phing/build.yml')
+      file_get_contents($this->new_project_dir . '/example.project.local.yml')
     );
     $this->assertContains(
       'root:',
-      file_get_contents($this->new_project_dir . '/build/custom/phing/build.yml')
+      file_get_contents($this->new_project_dir . '/example.project.local.yml')
+    );
+    $this->assertContains(
+      'drush:',
+      file_get_contents($this->new_project_dir . '/project.local.yml')
+    );
+    $this->assertContains(
+      'root:',
+      file_get_contents($this->new_project_dir . '/project.local.yml')
     );
   }
 

From 2471520e64c9245feb1854ede7624db0d17f7d99 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Thu, 16 Jun 2016 13:53:17 -0400
Subject: [PATCH 5/5] Adding placeholder value to example.project.local.yml.

---
 template/build/core/phing/tasks/properties.xml | 1 +
 template/example.project.local.yml             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/template/build/core/phing/tasks/properties.xml b/template/build/core/phing/tasks/properties.xml
index a81c8953f..565588336 100644
--- a/template/build/core/phing/tasks/properties.xml
+++ b/template/build/core/phing/tasks/properties.xml
@@ -8,6 +8,7 @@
   <property file="${repo.root}/project.yml" override="true"/>
 
   <!-- Load the local project.local.yml file for this project. -->
+  <!--@todo Change this so that it is only loaded for local:* targets. -->
   <if>
     <available file="${repo.root}/project.local.yml" type="file" property="local.properties"/>
     <then>
diff --git a/template/example.project.local.yml b/template/example.project.local.yml
index 71aed6531..5efed2ffb 100644
--- a/template/example.project.local.yml
+++ b/template/example.project.local.yml
@@ -9,3 +9,4 @@
 #drush:
 #  aliases:
 #    local: local.mysite.dev
+example: value