From b1b64f815d3363925876932eb92d9e0b2c9c7d6d Mon Sep 17 00:00:00 2001 From: John Ouellet Date: Sat, 21 Nov 2015 10:42:32 -0500 Subject: [PATCH 1/2] Change drush 8 into 8.0.0 branch / tag --- app/dockerfiles/pantheon-appserver/Dockerfile | 2 +- app/dockerfiles/pantheon-appserver/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dockerfiles/pantheon-appserver/Dockerfile b/app/dockerfiles/pantheon-appserver/Dockerfile index b46330c..10b6859 100644 --- a/app/dockerfiles/pantheon-appserver/Dockerfile +++ b/app/dockerfiles/pantheon-appserver/Dockerfile @@ -11,7 +11,7 @@ RUN \ curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ ln -s /usr/local/bin/composer /usr/bin/composer && \ - git clone --depth 1 --branch 8.0.0-rc3 https://github.com/drush-ops/drush.git /usr/local/src/drush8 && \ + git clone --depth 1 --branch 8.0.0 https://github.com/drush-ops/drush.git /usr/local/src/drush8 && \ cd /tmp && \ curl -L -O https://github.com/phpbrew/phpbrew/raw/master/phpbrew && \ chmod +x /tmp/phpbrew && \ diff --git a/app/dockerfiles/pantheon-appserver/README.md b/app/dockerfiles/pantheon-appserver/README.md index bc9e211..5806f0b 100644 --- a/app/dockerfiles/pantheon-appserver/README.md +++ b/app/dockerfiles/pantheon-appserver/README.md @@ -18,7 +18,7 @@ RUN \ curl -sS https://getcomposer.org/installer | php && \ mv composer.phar /usr/local/bin/composer && \ ln -s /usr/local/bin/composer /usr/bin/composer && \ - git clone --depth 1 --branch 8.0.0-rc2 https://github.com/drush-ops/drush.git /usr/local/src/drush8 && \ + git clone --depth 1 --branch 8.0.0 https://github.com/drush-ops/drush.git /usr/local/src/drush8 && \ cd /tmp && \ curl -L -O https://github.com/phpbrew/phpbrew/raw/master/phpbrew && \ chmod +x /tmp/phpbrew && \ From c4c9a956049811fc7485118ed5eb701adcaa0376 Mon Sep 17 00:00:00 2001 From: "Kala C. Bot" Date: Sat, 21 Nov 2015 15:43:54 +0000 Subject: [PATCH 2/2] BUILT OUT APP DEPS [ci skip] --- app/node_modules/once/package.json | 25 ++++++++++++++----------- app/node_modules/once/test/once.js | 23 ----------------------- app/node_modules/rimraf/README.md | 9 +++++++-- app/node_modules/rimraf/package.json | 20 ++++++++++---------- 4 files changed, 31 insertions(+), 46 deletions(-) delete mode 100644 app/node_modules/once/test/once.js diff --git a/app/node_modules/once/package.json b/app/node_modules/once/package.json index 9f58c4e..7463577 100644 --- a/app/node_modules/once/package.json +++ b/app/node_modules/once/package.json @@ -6,16 +6,16 @@ ] ], "_from": "once@>=1.3.0 <2.0.0", - "_id": "once@1.3.2", + "_id": "once@1.3.3", "_inCache": true, "_installable": true, "_location": "/once", - "_nodeVersion": "2.0.0", + "_nodeVersion": "4.0.0", "_npmUser": { - "email": "isaacs@npmjs.com", + "email": "i@izs.me", "name": "isaacs" }, - "_npmVersion": "2.9.1", + "_npmVersion": "3.3.2", "_phantomChildren": {}, "_requested": { "name": "once", @@ -30,8 +30,8 @@ "/inflight", "/run-async" ], - "_resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz", - "_shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b", + "_resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "_shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", "_shrinkwrap": null, "_spec": "once@^1.3.0", "_where": "/home/travis/build/kalabox/kalabox-app-pantheon/app/node_modules/glob", @@ -48,16 +48,19 @@ }, "description": "Run a function exactly one time", "devDependencies": { - "tap": "~0.3.0" + "tap": "^1.2.0" }, "directories": { "test": "test" }, "dist": { - "shasum": "d8feeca93b039ec1dcdee7741c92bdac5e28081b", - "tarball": "http://registry.npmjs.org/once/-/once-1.3.2.tgz" + "shasum": "b2e261557ce4c314ec8304f3fa82663e4297ca20", + "tarball": "http://registry.npmjs.org/once/-/once-1.3.3.tgz" }, - "gitHead": "e35eed5a7867574e2bf2260a1ba23970958b22f2", + "files": [ + "once.js" + ], + "gitHead": "2ad558657e17fafd24803217ba854762842e4178", "homepage": "https://github.com/isaacs/once#readme", "keywords": [ "function", @@ -83,5 +86,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "1.3.2" + "version": "1.3.3" } diff --git a/app/node_modules/once/test/once.js b/app/node_modules/once/test/once.js deleted file mode 100644 index c618360..0000000 --- a/app/node_modules/once/test/once.js +++ /dev/null @@ -1,23 +0,0 @@ -var test = require('tap').test -var once = require('../once.js') - -test('once', function (t) { - var f = 0 - function fn (g) { - t.equal(f, 0) - f ++ - return f + g + this - } - fn.ownProperty = {} - var foo = once(fn) - t.equal(fn.ownProperty, foo.ownProperty) - t.notOk(foo.called) - for (var i = 0; i < 1E3; i++) { - t.same(f, i === 0 ? 0 : 1) - var g = foo.call(1, 1) - t.ok(foo.called) - t.same(g, 3) - t.same(f, 1) - } - t.end() -}) diff --git a/app/node_modules/rimraf/README.md b/app/node_modules/rimraf/README.md index 18659f6..de7c4bb 100644 --- a/app/node_modules/rimraf/README.md +++ b/app/node_modules/rimraf/README.md @@ -1,12 +1,17 @@ [![Build Status](https://travis-ci.org/isaacs/rimraf.svg?branch=master)](https://travis-ci.org/isaacs/rimraf) [![Dependency Status](https://david-dm.org/isaacs/rimraf.svg)](https://david-dm.org/isaacs/rimraf) [![devDependency Status](https://david-dm.org/isaacs/rimraf/dev-status.svg)](https://david-dm.org/isaacs/rimraf#info=devDependencies) -The [UNIX command](http://en.wikipedia.org/wiki/Rm_(Unix)) `rm -rf` for node. +The [UNIX command](http://en.wikipedia.org/wiki/Rm_(Unix)) `rm -rf` for node. Install with `npm install rimraf`, or just drop rimraf.js somewhere. ## API -`rimraf(f, callback)` +`rimraf(f, [opts], callback)` + +The first parameter will be interpreted as a globbing pattern for files. If you +want to disable globbing you can do so with `opts.disableGlob` (defaults to +`false`). This might be handy, for instance, if you have filenames that contain +globbing wildcard characters. The callback will be called with an error if there is one. Certain errors are handled for you: diff --git a/app/node_modules/rimraf/package.json b/app/node_modules/rimraf/package.json index 2f47bd7..a0af431 100644 --- a/app/node_modules/rimraf/package.json +++ b/app/node_modules/rimraf/package.json @@ -6,16 +6,16 @@ ] ], "_from": "rimraf@>=2.2.8 <3.0.0", - "_id": "rimraf@2.4.3", + "_id": "rimraf@2.4.4", "_inCache": true, "_installable": true, "_location": "/rimraf", - "_nodeVersion": "2.2.1", + "_nodeVersion": "4.0.0", "_npmUser": { - "email": "isaacs@npmjs.com", + "email": "i@izs.me", "name": "isaacs" }, - "_npmVersion": "3.2.2", + "_npmVersion": "3.3.2", "_phantomChildren": {}, "_requested": { "name": "rimraf", @@ -28,8 +28,8 @@ "_requiredBy": [ "/fs-extra" ], - "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz", - "_shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af", + "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz", + "_shasum": "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82", "_shrinkwrap": null, "_spec": "rimraf@^2.2.8", "_where": "/home/travis/build/kalabox/kalabox-app-pantheon/app/node_modules/fs-extra", @@ -54,8 +54,8 @@ }, "directories": {}, "dist": { - "shasum": "e5b51c9437a4c582adb955e9f28cf8d945e272af", - "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz" + "shasum": "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82", + "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz" }, "files": [ "LICENSE", @@ -63,7 +63,7 @@ "bin.js", "rimraf.js" ], - "gitHead": "ec7050f8ca14c931b847414f18466e601ca7c02e", + "gitHead": "62ae8a4037e7190691eeab35265aed1c768d23e3", "homepage": "https://github.com/isaacs/rimraf#readme", "license": "ISC", "main": "rimraf.js", @@ -83,5 +83,5 @@ "scripts": { "test": "tap test/*.js" }, - "version": "2.4.3" + "version": "2.4.4" }