Add multisite support for setup tasks

.travis.yml

@@ -96,6 +96,24 @@ script:
   - blt ci:build:validate:test -Dcreate_alias=false -Dbehat.run-server=true -Dbehat.launch-phantom=true -Dblt.verbose=true
   # Run 'blt-project' tests.
   - phpunit ../blt/tests/phpunit --group blt-project
+  # Run 'blt-multisite' tests against the single site.
+  - phpunit ../blt/tests/phpunit --group blt-multisite --bootstrap ../blt/tests/phpunit/bootstrap/site.php
+  # Create a site-specific settings file and give it some values.
+  - mkdir -p blt/sites
+  # Create initial keys.
+  - echo "drush:" >> blt/sites/project.subsite.yml
+  - echo "uri:" >> blt/sites/project.subsite.yml
+  # Update values.
+  - yaml-cli update:value blt/sites/project.subsite.yml drush.aliases.ci 'subsite.ci.local'
+  - yaml-cli update:value blt/sites/project.subsite.yml uri.ci '127.0.0.1:3000'
+  - cat blt/sites/project.subsite.yml
+  # Run settings setup with the new file in place.
+  - blt setup:settings
+  # Run 'blt-project' tests again with new file in place.
+  - phpunit ../blt/tests/phpunit --group blt-project
+  # Run 'blt-multisite' tests,
+  # ensuring we are able use the properties in blt/sites/project.subsite.yml (created above).
+  - phpunit ../blt/tests/phpunit --group blt-multisite --bootstrap ../blt/tests/phpunit/bootstrap/multisite.php
   # Initialize ACSF config.
   - blt acsf:init
   # Ensure that the doctor doesn't report any problems at this point.

phing/build.yml

@@ -32,6 +32,8 @@ blt:
     local: ${repo.root}/blt/project.local.yml
     example-local: ${repo.root}/blt/example.project.local.yml
     schema-version: ${repo.root}/blt/.schema_version
+  config-dirs:
+    sites: ${repo.root}/blt/sites
 
 composer:
   bin: ${repo.root}/${bin.path}
@@ -59,9 +61,9 @@ drupal:
 
 drush:
   bin: ${composer.bin}/drush
-  cmd: ${drush.bin} @${drush.alias} -l ${multisite.name}
+  cmd: ${drush.bin} @${drush.alias} -r ${docroot} -l ${site.uri.${environment}}
   dir: ${docroot}
-  uri: ${multisite.name}
+  uri: ${site.uri.${environment}}
   assume: yes
   passthru: yes
   logoutput: yes
@@ -95,3 +97,5 @@ phpcs:
 project:
   local:
     uri: ${project.local.protocol}://${project.local.hostname}
+  ci:
+    uri: 127.0.0.1:8888

phing/tasks/local-sync.xml

@@ -16,7 +16,7 @@
   </target>
 
   <target name="local:sync" description="Synchronize local environment from remote (remote --> local)."
-          depends="setup:drupal:settings">
+          depends="setup:settings">
     <drush command="cc drush"/>
     <drush command="sql-drop"/>
     <if>

phing/tasks/properties.xml

@@ -56,7 +56,60 @@
     </then>
   </if>
 
-  <echo level="verbose">Executing commands against multisite "${multisite.name}"</echo>
+  <!-- Set the default site to operate against. -->
+  <property name="multisite.default" value="default" override="false" />
+  <property name="site.name" value="${multisite.default}" override="false" />
+
+  <!-- Build the site list from project.[site-name].yml files in the blt/sites directory. -->
+  <if>
+    <available file="${blt.config-dirs.sites}"/>
+    <then>
+      <exec dir="${blt.config-dirs.sites}"
+            command="ls -1 | grep -E 'project\.\w+\.yml' | sed -E s/project.\|.yml//g | tr '\n' ','"
+            outputProperty="multisite.names"/>
+    </then>
+  </if>
+
+  <!-- Ensure the site list has, at minimum, the default site. -->
+  <if>
+    <not><isset property="multisite.names"/></not>
+    <then>
+      <property name="multisite.names" value="${multisite.default}"/>
+    </then>
+    <else>
+      <!-- There are sites in the list, ensure the default site appears as well. -->
+      <if>
+        <not><contains string="${multisite.names}" substring="${multisite.default}"/></not>
+        <then>
+          <property name="multisite.names" value="${multisite.default},${multisite.names}" override="true"/>
+        </then>
+      </if>
+      <!-- Strip out the trailing comma from site list. -->
+      <propertyregex subject="${multisite.names}" pattern=",$" replace="" property="multisite.names" override="true"/>
+    </else>
+  </if>
+
+  <!-- Load default site properties if overrides are provided. -->
+  <if>
+    <available filepath="${blt.config-dirs.sites}" file="project.${site.name}.yml" />
+    <then>
+      <property file="${blt.config-dirs.sites}/project.${site.name}.yml" prefix="site" logoutput="false"/>
+    </then>
+  </if>
+
+  <!-- Set site aliases if not already set by project.${site.name}.yml. -->
+  <property name="site.drush.aliases.local" value="${drush.aliases.local}" override="false"/>
+  <property name="site.drush.aliases.remote" value="${drush.aliases.remote}" override="false"/>
+  <property name="site.drush.aliases.ci" value="${drush.aliases.ci}" override="false"/>
+
+  <!-- Set site uris if not already set by project.${site.name}.yml. -->
+  <property name="site.uri.local" value="${project.local.uri}" override="false"/>
+  <property name="site.uri.ci" value="${project.ci.uri}" override="false"/>
+
+  <echo level="verbose">Executing commands against multisite "${site.name}"</echo>
+
+  <!-- If no environment is set, assume we're working locally. -->
+  <property name="environment" value="local" override="false" logoutput="false"/>
 
   <!-- Default drush alias. -->
   <property name="drush.alias" value="${drush.default_alias}" override="false" logoutput="false"/>