Merge remote-tracking branch 'origin/master' into feature/dynamic-con…

…currency

Conflicts:
	CHANGELOG.md
	example/Gruntconfig.json
	test/test_assets/Gruntconfig.json

CHANGELOG.md

@@ -7,7 +7,20 @@
 
 ### Upgrade Notes
 
-- Remove --concurrency flag from your Gruntconfig. It will no logner be respected.
+- Remove `--concurrency` flag from your Gruntconfig. It will no longer be respected.
+- Ruby (bundler) will now install dependencies into `vendor/bundle`.
+- Ruby and PHP upstream binaries are placed or symlinked from `vendor/bin`.
+  This frees up `bin/` for custom project scripts.
+- Moving more default Gruntconfig.json into code for a slimmer project Gruntconfig.
+
+### Upgrade Notes
+
+- If you are using the default `Gruntconfig.json` example for bin paths on PHP
+  scripts, you should be fine.
+- You may need to run `rm -Rf .bundle` to clear bundler configuration to make
+  way for the new install location.
+- Gruntconfig.json no longer needs the `buildPaths` config key. Elements of
+  `buildPaths` added to your project Gruntconfig will override default behavior.
 
 ## v0.5.2 [2015/01/24]
 

CONFIG.md

@@ -10,7 +10,7 @@ Drupal project. To download this template, you can use the following two
 commands:
 
 1. In an empty directory, run:
-   `npm install grunt grunt-drupal-tasks`
+   `npm install grunt-drupal-tasks`
 
 2. Copy the contents of node_modules/grunt-drupal-tasks/example to your starting
    directory, by running:
@@ -276,6 +276,22 @@ directly to
 [grunt-contrib-compass](https://github.com/gruntjs/grunt-contrib-compass)
 for this theme.
 
+#### Setting Up Gem Dependencies
+
+In order for compass compilation to work, you will need to create a Gemfile
+at your project root. The presence of this Gemfile will activate the `grunt
+bundle-install` task and automatically add it to the build process.
+
+A typical Gemfile focused on SASS support might look like the following:
+
+```ruby
+source 'https://rubygems.org'
+
+gem 'sass', '~>3.3.0'
+gem 'compass', '~> 1.0.1'
+gem 'json', '~>1.8.2'
+```
+
 ### Validate Settings
 
 This is an example of the settings for the validate tasks:

README.md

@@ -3,6 +3,7 @@
 Code Status (master branch):
 [![Travis CI status](https://travis-ci.org/phase2/grunt-drupal-tasks.svg?branch=master)](https://travis-ci.org/phase2/grunt-drupal-tasks)
 [![Dependency Status](https://david-dm.org/phase2/grunt-drupal-tasks.svg)](https://david-dm.org/phase2/grunt-drupal-tasks)
+[![Peer Dependency Status](https://david-dm.org/phase2/grunt-drupal-tasks/peer-status.svg)](https://david-dm.org/phase2/grunt-drupal-tasks#peer-badge-embed)
 [![npm version](https://badge.fury.io/js/grunt-drupal-tasks.svg)](https://www.npmjs.com/package/grunt-drupal-tasks)
 
 ## Requirements

bootstrap.js

@@ -1,3 +1,5 @@
+var _ = require('lodash');
+
 module.exports = function(grunt) {
   // Initialize global configuration variables.
   var config = grunt.file.readJSON('Gruntconfig.json');
@@ -11,6 +13,17 @@ module.exports = function(grunt) {
     grunt.config('help', config.help);
   }
 
+  // Set implicit global configuration.
+  var buildPaths = grunt.config('config.buildPaths');
+  buildPaths = _.extend({
+    build: 'build',
+    html: 'build/html',
+    package: 'build/packages',
+    reports: 'build/reports',
+    temp: 'build/temp'
+  });
+  grunt.config('config.buildPaths', buildPaths);
+
   // Wrap Grunt's loadNpmTasks() function to change the current directory to
   // grunt-drupal-tasks, so that module dependencies of it are found.
   grunt._loadNpmTasks = grunt.loadNpmTasks;

example/.gitignore

@@ -1 +1,3 @@
 node_modules
+vendor
+

example/Gruntconfig.json

@@ -3,13 +3,6 @@
     "make": "src/project.make",
     "drupal": "src"
   },
-  "buildPaths": {
-    "build": "build",
-    "html": "build/html",
-    "package": "build/packages",
-    "reports": "build/reports",
-    "temp": "build/temp"
-  },
   "siteUrls": {
     "default": "http://project.local"
   },
@@ -18,13 +11,13 @@
     "projFiles": ["README*", "bin/**"]
   },
   "phpcs": {
-    "path": "bin/phpcs"
+    "path": "vendor/bin/phpcs"
   },
   "phpmd": {
-    "path": "bin/phpmd"
+    "path": "vendor/bin/phpmd"
   },
   "drush": {
-    "cmd": "bin/drush"
+    "cmd": "vendor/bin/drush"
   },
   "behat": {
     "flags": "--tags ~@wip"

example/composer.json

@@ -1,9 +1,6 @@
 {
     "name": "client/project",
     "description": "{Project} drupal codebase for {client}.",
-    "config": {
-        "bin-dir": "bin"
-    },
     "require-dev": {
         "behat/mink-zombie-driver": "~1.2",
         "drupal/drupal-extension": "~3.0",

package.json

@@ -21,9 +21,9 @@
     "grunt-phpcs": "git+https://github.com/grayside/grunt-phpcs.git#0.3.0",
     "grunt-phplint": "0.0.5",
     "grunt-phpmd": "0.1.1",
-    "grunt-shell": "1.1.1",
+    "grunt-shell": "1.1.2",
     "lodash": "2.4.1",
-    "time-grunt": "1.0.0"
+    "time-grunt": "1.1.0"
   },
   "peerDependencies": {
     "grunt": ">= 0.4.5 < 0.5"

tasks/behat.js

@@ -56,7 +56,7 @@ module.exports = function(grunt) {
             options: _.extend({
               config: './test/behat.yml',
               maxProcesses: 5,
-              bin: './bin/behat',
+              bin: 'vendor/bin/behat',
               debug: true,
               env: {
                 "BEHAT_PARAMS": "{\"extensions\": {\"Drupal\\\\DrupalExtension\": {\"drupal\": {\"drupal_root\": \"./" + config.buildPaths.html + "\"}}, \"Behat\\\\MinkExtension\": {\"base_url\": \"" + config.siteUrls[key] + "\", \"zombie\": {\"node_modules_path\": \"" + process.cwd() + "/node_modules/\"}}}}"

tasks/bundler.js

@@ -10,7 +10,7 @@ module.exports = function(grunt) {
 
   if (grunt.file.exists('Gemfile')) {
     grunt.config(['shell', 'bundle-install'], {
-      command: "bundle install --binstubs=gems/bin"
+      command: "bundle install --binstubs=vendor/bin --path=vendor/bundle"
     });
     grunt.registerTask('bundleInstall', ['shell:bundle-install']);
     grunt.registerTask('bundle-install', ['shell:bundle-install']);

tasks/quality.js

@@ -123,7 +123,8 @@ module.exports = function(grunt) {
         logConcurrentOutput: true
       }
     });
-    grunt.registerTask('analyze', ['concurrent:analyze']);
+
+    grunt.registerTask('analyze', ['mkdir:init', 'concurrent:analyze']);
   }
 
   grunt.config('help.validate', {

test/test_assets/Gruntconfig.json

@@ -3,13 +3,6 @@
     "make": "src/project.make",
     "drupal": "src"
   },
-  "buildPaths": {
-    "build": "build",
-    "html": "build/html",
-    "package": "build/packages",
-    "reports": "build/reports",
-    "temp": "build/temp"
-  },
   "siteUrls": {
     "default": "http://project.local"
   },
@@ -18,13 +11,13 @@
     "projFiles": ["README*", "bin/**"]
   },
   "phpcs": {
-    "path": "bin/phpcs"
+    "path": "vendor/bin/phpcs"
   },
   "phpmd": {
-    "path": "bin/phpmd"
+    "path": "vendor/bin/phpmd"
   },
   "drush": {
-    "cmd": "bin/drush"
+    "cmd": "vendor/bin/drush"
   },
   "behat": {
     "flags": "--tags ~@wip"