Merge pull request #125 from palantirnet/tasks-to-targets

Rename 'tasks' directory to 'targets'

CHANGELOG.md

@@ -17,7 +17,7 @@ Additional changes include:
 
 * Rewritten install process. This code is now all in one location, and configuration prompts for values that are not generally changed from the defaults have been removed. Templates for Behat and CircleCI are more dynamic, and templates for configuring Pantheon and Platform.sh hosting have been added.
 * Rewritten artifact build process. This code should now be more readable, reliable, and adaptable. Artifacts are available from the default `build.xml` file, and are suitable for deployment on Acquia, Pantheon, or generic hosting environments.
-* Rewritten Acquia tasks, including downloading a recent database backup.
+* Rewritten Acquia targets, including downloading a recent database backup.
 
 [Here's the list of issues associated with the 2.0 milestone.](https://github.com/palantirnet/the-build/issues?utf8=%E2%9C%93&q=milestone%3A2.0)
 

bin/the-build-installer

@@ -2,7 +2,7 @@
 #
 # Wrapper for our install command; at least this way it's somewhat discoverable.
 # Previously:
-#   vendor/bin/phing -f vendor/palantirnet/the-build/tasks/install.xml
+#   vendor/bin/phing -f vendor/palantirnet/the-build/targets/install.xml
 
 # Relative path to this script.
 SCRIPT=$(readlink "$0")
@@ -14,7 +14,7 @@ REPOPATH=$(cd `dirname $SCRIPTPATH` && cd ../../../ && pwd)
 
 if [ "$REPOPATH" = `pwd` ]; then
   # Run our install task.
-  $SCRIPTPATH/../../../bin/phing -f $SCRIPTPATH/../tasks/install.xml
+  $SCRIPTPATH/../../../bin/phing -f $SCRIPTPATH/../targets/install.xml
 else
   echo "Please run this command from your project root."
 fi

defaults.yml

@@ -16,7 +16,7 @@ build:
   # currently only used when setting up the settings.php file for a Drupal site.
   host: other
 
-# Drupal configuration used by tasks/drupal.xml
+# Drupal configuration used by targets/drupal.xml
 drupal:
   # Relative path to the Drupal web root. This is co-dependent with the composer installer
   # configuration in your `composer.json`. Use caution when changing this value.
@@ -39,7 +39,7 @@ drupal:
     # Configuration values for a Drupal site build. The values in this section
     # must be customized for each Drupal multisite installation that you add.
     #
-    # This site configuration is partial; it will be completed in tasks/the-build.xml by
+    # This site configuration is partial; it will be completed in targets/the-build.xml by
     # loading any missing values from drupal.sites._defaults.
     #
     # To add a Drupal multisite installation, copy these default values into
@@ -138,7 +138,7 @@ drupal:
         #file:
 
 
-# Configuration for tasks/artifact.xml
+# Configuration for targets/artifact.xml
 artifact:
   # The path of the working directory where the artifact should be built.
   directory: artifacts/build
@@ -175,7 +175,7 @@ artifact:
     remote_name: origin
 
 
-# Configuration for tasks/acquia.xml
+# Configuration for targets/acquia.xml
 acquia:
   # Directory for storing downloaded database backups.
   backups: artifacts/backups

defaults/install/build.xml

@@ -12,18 +12,18 @@
 
 <project name="@projectname@" default="build">
 
-    <!-- Add property loading and tasks from palantirnet/the-build. -->
-    <import file="vendor/palantirnet/the-build/tasks/the-build.xml" />
+    <!-- Add property loading and targets from palantirnet/the-build. -->
+    <import file="vendor/palantirnet/the-build/targets/the-build.xml" />
 
 
     <!-- Make these additional targets available by default. -->
-    <import file="vendor/palantirnet/the-build/tasks/drupal.xml" />
+    <import file="vendor/palantirnet/the-build/targets/drupal.xml" />
 
 
     <!-- Additional optional targets. -->
-    <import file="vendor/palantirnet/the-build/tasks/artifact.xml" />
-    <import file="vendor/palantirnet/the-build/tasks/acquia.xml" />
-    <import file="vendor/palantirnet/the-build/tasks/styleguide.xml" />
+    <import file="vendor/palantirnet/the-build/targets/artifact.xml" />
+    <import file="vendor/palantirnet/the-build/targets/acquia.xml" />
+    <import file="vendor/palantirnet/the-build/targets/styleguide.xml" />
 
 
     <!-- Default target: build -->

docs/artifacts.md

@@ -68,7 +68,7 @@ Alternatively, you may chose to not set the `artifact.git.remote_branch` propert
 
 ## Concepts
 
-This section describes a generalized artifact build process. This is the process implemented in [tasks/artifact.xml](../tasks/artifact.xml), and usage is described above.
+This section describes a generalized artifact build process. This is the process implemented in [targets/artifact.xml](../targets/artifact.xml), and usage is described above.
 
 ### Definitions
 

docs/configuration.md

@@ -36,7 +36,7 @@ Cool! This phing-ism is what allows us to do environment-specific property layer
   ```
   phing build -Dbuild.env=circleci
   ```
-1. Set the `build.dir`, `projectname`, `build.thebuild.dir`, and `build.env` core properties in `tasks/the-build.xml`
+1. Set the `build.dir`, `projectname`, `build.thebuild.dir`, and `build.env` core properties in `targets/the-build.xml`
 1. Load properties from the project's `.the-build/build.[environment].yml`
 1. Load properties from the project's `.the-build/build.yml`
 1. Load default property values from the-build's own `defaults.yml` file

docs/drupal_multisite.md

@@ -2,7 +2,7 @@
 
 Multisite builds are supported under `the-build`. When you have multiple sites configured in your `.the-build/build.yml` file, and you run targets like `build` and `install` that act on a specific site, you will be prompted to select a site.
 
-These site-specific targets declare a dependency on the `set-site` target in [tasks/the-build.xml](../tasks/the-build.xml), which sets up the site properties in `drupal.site.*`. This allows targets to reference the same properties (e.g. `${drupal.site.uri}`) for each site, rather than needing to reference a site-specific property (e.g. `${drupal.sites.default.uri}`, `${drupal.sites.intranet.uri}`).
+These site-specific targets declare a dependency on the `set-site` target in [targets/the-build.xml](../targets/the-build.xml), which sets up the site properties in `drupal.site.*`. This allows targets to reference the same properties (e.g. `${drupal.site.uri}`) for each site, rather than needing to reference a site-specific property (e.g. `${drupal.sites.default.uri}`, `${drupal.sites.intranet.uri}`).
 
 Default values for all sites are set in the `drupal.sites._defaults.*` properties, but individual sites can override them.
 

docs/tasks.md

@@ -1,4 +1,4 @@
-# Custom Tasks
+# Custom Phing Tasks
 
 ## IncludeResourceTask [🔗](../src/TheBuild/IncludeResourceTask.php)
 

tasks/acquia.xml → targets/acquia.xml

@@ -5,7 +5,7 @@
   Targets for working with Acquia.
 
   Include this file in your build.xml with:
-  <import file="vendor/palantirnet/the-build/tasks/acquia.xml" />
+  <import file="vendor/palantirnet/the-build/targets/acquia.xml" />
 
   @see defaults.yml
 

tasks/drupal.xml → targets/drupal.xml

@@ -5,7 +5,7 @@
   Targets for managing Drupal.
 
   Include this file in your build.xml with:
-    <import file="vendor/palantirnet/the-build/tasks/drupal.xml" />
+    <import file="vendor/palantirnet/the-build/targets/drupal.xml" />
 
   @see defaults.yml
 
@@ -326,7 +326,7 @@ Or, you can specify the export file directly:
         <!--
             Set up the Drupal site directory.
              -->
-        <phing buildfile="${build.thebuild.dir}/tasks/install.xml" target="drupal-sites-directory">
+        <phing buildfile="${build.thebuild.dir}/targets/install.xml" target="drupal-sites-directory">
             <property name="drupal.site.dir" value="${_multisite.dir}" override="true" />
             <property name="drupal.site.uri" value="${_multisite.uri}" override="true" />
         </phing>

tasks/styleguide.xml → targets/styleguide.xml

@@ -5,7 +5,7 @@
   Targets for managing the style guide.
 
   Include this file in your build.xml with:
-    <import file="vendor/palantirnet/the-build/tasks/styleguide.xml" />
+    <import file="vendor/palantirnet/the-build/targets/styleguide.xml" />
 
   @see defaults.properties.yml
 

tasks/the-build.xml → targets/the-build.xml

@@ -5,7 +5,7 @@
   Contains the-build's environment-specific property loading.
 
   This file is included in the build.dist.xml template with:
-    <import file="vendor/palantirnet/the-build/tasks/the-build.xml" />
+    <import file="vendor/palantirnet/the-build/targets/the-build.xml" />
 
   Copyright 2016, 2017, 2018 Palantir.net, Inc.
   -->
@@ -130,8 +130,8 @@
         <copyproperties fromPrefix="drupal.sites.${build.site}" toPrefix="drupal.site" override="true" />
 
         <!-- Validate that required Drupal site properties are present. -->
-        <fail unless="drupal.site.dir" msg="The 'drupal.sites.${build.site}.dir' property must be set in order to run build tasks." />
-        <fail unless="drupal.site.uri" msg="The 'drupal.sites.${build.site}.uri' property must be set in order to run build tasks." />
+        <fail unless="drupal.site.dir" msg="The 'drupal.sites.${build.site}.dir' property must be set in order to run build targets." />
+        <fail unless="drupal.site.uri" msg="The 'drupal.sites.${build.site}.uri' property must be set in order to run build targets." />
 
         <!-- Fill in defaults for Drupal site properties. -->
         <property name="drupal.site.config_sync_directory" value="../config/sites/${drupal.site.dir}" />