Generating local settings files only via local:setup.

Author: grasmash

phing/tasks/local-sync.xml

@@ -8,12 +8,51 @@
 
   <target name="local:refresh" description="Refreshes local environment from upstream testing database." depends="setup:build, local:sync, local:update"/>
 
-  <target name="local:setup" description="Install dependencies, builds docroot, installs Drupal; uses local drush alias.">
+  <target name="local:setup" description="Install dependencies, builds docroot, installs Drupal; uses local drush alias." depends="local:settings">
     <phingcall target="setup">
       <property name="drush.alias" value="${drush.aliases.local}" />
     </phingcall>
   </target>
 
+  <target name="local:settings">
+    <echo>Generating local settings files.</echo>
+
+    <if>
+      <not>
+        <available file="${repo.root}/project.local.yml" type="file" />
+      </not>
+      <then>
+        <copy file="${repo.root}/example.project.local.yml" tofile="${repo.root}/project.local.yml" />
+      </then>
+    </if>
+
+    <if>
+      <not>
+        <available file="${docroot}/sites/${multisite.name}/settings/local.settings.php" type="file" />
+      </not>
+      <then>
+        <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${docroot}/sites/${multisite.name}/settings/local.settings.php" />
+      </then>
+    </if>
+
+    <if>
+      <not>
+        <available file="${docroot}/sites/${multisite.name}/local.drushrc.php" type="file" />
+      </not>
+      <then>
+        <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php"/>
+      </then>
+    </if>
+
+    <echo>Expanding Phing variables in ${docroot}/sites/${multisite.name}/local.drushrc.php.</echo>
+
+    <reflexive file="${docroot}/sites/${multisite.name}/local.drushrc.php">
+      <filterchain>
+        <expandproperties />
+      </filterchain>
+    </reflexive>
+  </target>
+
   <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"/>

phing/tasks/setup.xml

@@ -62,47 +62,6 @@
     <chmod mode="0755" failonerror="false" file="${docroot}/sites/default/settings.php"/>
     <echo>Ensuring that blt.settings.php is required by settings.php</echo>
     <exec dir="${docroot}/sites/default" command="grep blt.settings.php settings.php || echo 'require DRUPAL_ROOT . &quot;/sites/default/settings/blt.settings.php&quot;;' >> settings.php " logoutput="false" checkreturn="true"/>
-
-    <echo>Generating local settings files.</echo>
-
-    <if>
-      <not>
-        <available file="${repo.root}/project.local.yml" type="file" />
-      </not>
-      <then>
-        <copy file="${repo.root}/example.project.local.yml" tofile="${repo.root}/project.local.yml" />
-      </then>
-    </if>
-
-    <if>
-      <not>
-        <available file="${docroot}/sites/${multisite.name}/settings/local.settings.php" type="file" />
-      </not>
-      <then>
-        <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${docroot}/sites/${multisite.name}/settings/local.settings.php" />
-      </then>
-    </if>
-
-    <if>
-      <not>
-        <available file="${docroot}/sites/${multisite.name}/local.drushrc.php" type="file" />
-      </not>
-      <then>
-        <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php"/>
-      </then>
-    </if>
-
-    <echo>Expanding Phing variables in ${docroot}/sites/${multisite.name}/local.drushrc.php.</echo>
-
-    <reflexive file="${docroot}/sites/${multisite.name}/local.drushrc.php">
-      <filterchain>
-        <expandproperties />
-      </filterchain>
-    </reflexive>
-
-    <!-- Re-extract value of $options['uri'] in case it was not yet set. -->
-    <!-- @todo Add multisite support. -->
-    <phpVariable file="${repo.root}/drush/drushrc.php" variable="options[uri]" outputProperty="local_url" />
   </target>
 
   <target name="setup:drupal:install"

scripts/blt/alias

@@ -10,5 +10,6 @@ function blt() {
     $GIT_ROOT/vendor/bin/blt "$@"
   else
     echo "You must run this command from within a BLT-generated project repository."
+    echo "If you are in a BLT-generated repository, try running 'composer install'."
   fi
 }

template/tests/phpunit/Bolt/BehatTest.php

@@ -17,7 +17,7 @@ public function testSetupBehat() {
     // Assert that a local.yml file was created in the new project.
     $this->assertFileExists($this->projectDirectory . '/tests/behat/local.yml');
     $this->assertNotContains(
-          '${local_url}',
+          '${local.uri}',
           file_get_contents("{$this->projectDirectory}/tests/behat/local.yml")
       );
   }