engineyard-serverside 2.3.0 → 2.3.1.pre.archivefix

data/lib/engineyard-serverside/configuration.rb

@@ -71,27 +71,36 @@ module EY
       def_required_option :instance_roles
       def_required_option :instance_names
 
-      def_option(:git)               { fetch(:repo, nil) } # repo is deprecated
-      def_option :archive,           nil
-      def_option :migrate,           nil
-      def_option :precompile_assets, 'detect'
+      def_option(:git)                    { fetch(:repo, nil) } # repo is deprecated
+      def_option :archive,                nil
+      def_option :migrate,                nil
+
+      def_option :precompile_assets,      'detect'
       def_option :precompile_assets_task, 'assets:precompile'
-      def_option :asset_strategy,    'shifting'
-      def_option :asset_dependencies, %w[app/assets lib/assets vendor/assets Gemfile.lock config/routes.rb config/application.rb]
-      def_option :stack,             nil
-      def_option(:source_class)      { fetch_deprecated(:strategy, :source_class, nil) } # strategy is deprecated
-      def_option :branch,            'master'
-      def_option :current_roles,     []
-      def_option :current_name,      nil
-      def_option :asset_roles,       [:app_master, :app, :solo]
-      def_option :copy_exclude,      []
-      def_option :bundle_options,    nil
-      def_option(:bundle_without)    { %w[test development] - [framework_env] }
-      def_option(:user)              { ENV['USER'] }
-      def_option(:group)             { user }
+      def_option :asset_strategy,         'shifting'
+      def_option :asset_dependencies,     %w[app/assets lib/assets vendor/assets Gemfile.lock config/routes.rb config/application.rb]
+      def_option :asset_roles,            [:app_master, :app, :solo]
+
+      def_option :stack,                  nil
+      def_option(:source_class)           { fetch_deprecated(:strategy, :source_class, nil) } # strategy is deprecated
+      def_option :branch,                 'master'
+      def_option :current_roles,          []
+      def_option :current_name,           nil
+      def_option :copy_exclude,           []
+
+      def_option :bundler,                'detect'
+      def_option :composer,               'detect'
+      def_option :npm,                    'detect'
+      def_option :bundle_options,         nil
+      def_option(:bundle_without)         { %w[test development] - [framework_env] }
+
+      def_option(:user)                   { ENV['USER'] }
+      def_option(:group)                  { user }
       def_option :services_check_command, "which /usr/local/ey_resin/ruby/bin/ey-services-setup >/dev/null 2>&1"
       def_option(:services_setup_command) { "/usr/local/ey_resin/ruby/bin/ey-services-setup #{app}" }
 
+      def_option :restart_groups,         1
+
       def_boolean_option :verbose,                         false
       def_boolean_option :precompile_unchanged_assets,     false
       def_boolean_option :ignore_database_adapter_warning, false

data/lib/engineyard-serverside/dependency_manager.rb

@@ -20,13 +20,32 @@ module EY
       # Registry pattern be damned. Hard code it and fix it when we want to
       # support dynamic loading. Right now we have no way to load dependency
       # managers dynamically, so why support it?
-      AVAILABLE_MANAGERS = [Bundler, Composer, Npm]
+      AVAILABLE_MANAGERS = {
+        'bundler'  => Bundler,
+        'composer' => Composer,
+        'npm'      => Npm
+      }
 
       include Enumerable
 
       # Initialize detected dependency managers
-      def initialize(*args)
-        @detected = AVAILABLE_MANAGERS.map { |klass| klass.new(*args) }.select { |manager| manager.detected? }
+      def initialize(servers, config, shell, runner)
+        @config = config
+        @detected = select_managers(servers, config, shell, runner)
+      end
+
+      def select_managers(servers, config, shell, runner)
+        managers = AVAILABLE_MANAGERS.map do |name, klass|
+          enabled = config[name]
+          case enabled
+          when 'false', false then nil
+          when 'true',  true  then klass.new(servers, config, shell, runner)
+          when 'detect'       then klass.detect(servers, config, shell, runner)
+          else
+            raise "Unknown value #{enabled.inspect} for option #{name.inspect}. Expected [true, false, detect]"
+          end
+        end
+        managers.compact
       end
 
       def each(&block)

data/lib/engineyard-serverside/dependency_manager/base.rb

@@ -4,6 +4,11 @@ module EY
       class Base
         attr_reader :servers, :config, :shell, :runner
 
+        def self.detect(*args)
+          manager = new(*args)
+          manager.detected? ? manager : nil
+        end
+
         def initialize(servers, config, shell, runner)
           @servers, @config, @shell, @runner = servers, config, shell, runner
         end

data/lib/engineyard-serverside/dependency_manager/composer.rb

@@ -44,7 +44,7 @@ To fix this problem, commit your composer.lock to the repository and redeploy.
         end
 
         def composer_install
-          run "composer install --no-interaction --working-dir #{paths.active_release}"
+          run "composer install --no-interaction --no-dev --optimize-autoloader --working-dir #{paths.active_release}"
         end
 
         def composer_selfupdate

data/lib/engineyard-serverside/deploy.rb

@@ -130,10 +130,18 @@ module EY
       # task
       def restart
         @restart_failed = true
-        shell.status "Restarting app servers"
-        roles :app_master, :app, :solo do
-          run(restart_command)
+        if config.restart_groups.to_i > 1
+          shell.status "Restarting app servers in #{config.restart_groups.to_i} groups"
+        else
+          shell.status "Restarting app servers"
+        end
+
+        servers.roles(:app_master, :app, :solo).in_groups(config.restart_groups.to_i) do |group|
+          shell.substatus "Restarting #{group.size} server#{group.size == 1 ? '' : 's'}"
+          group.run(restart_command)
         end
+
+        shell.status "Finished restarting app servers"
         @restart_failed = false
       end
 

data/lib/engineyard-serverside/servers.rb

@@ -47,6 +47,16 @@ module EY
         reject { |server| server.local? }
       end
 
+      def in_groups(number)
+        div, mod = size.divmod number
+        start = 0
+        number.times do |index|
+          length = div + (mod > 0 && mod > index ? 1 : 0)
+          yield self.class.new(@servers.slice(start, length), @shell)
+          start += length
+        end
+      end
+
       # We look up the same set of servers over and over.
       # Cache them so we don't have to find them every time
       # Accepts a block (because it's confusing when you send a block to this

data/lib/engineyard-serverside/source.rb

@@ -23,7 +23,7 @@ class EY::Serverside::Source
         "Internal error: Missing keys #{missing.join(',')}. Required: #{self.class.required_opts.join(', ')}"
     end
 
-    @ref = @opts[:ref]
+    @ref = @opts[:ref].to_s.strip
     @uri = @opts[:uri].to_s if @opts[:uri]
     @source_cache = Pathname.new(@opts[:repository_cache]) if @opts[:repository_cache]
   end

data/lib/engineyard-serverside/source/archive.rb

@@ -23,7 +23,15 @@ class EY::Serverside::Source::Archive < EY::Serverside::Source
   def update_repository_cache
     clean_cache
     in_source_cache do
-      fetch && checksum && unarchive
+      unless fetch && checksum
+        shell.fatal "archive fetch from #{URI.parse(uri).hostname} failed."
+        raise "archive fetch from #{URI.parse(uri).hostname} failed."
+      end
+
+      unless unarchive
+        shell.fatal "unarchive of #{filename} failed."
+        raise "unarchive of #{filename} failed."
+      end
     end
   end
 
@@ -38,7 +46,7 @@ class EY::Serverside::Source::Archive < EY::Serverside::Source
   end
 
   def fetch_command
-    "curl --location --silent --show-error -O --user-agent #{escape("EngineYardDeploy/#{EY::Serverside::VERSION}")} #{escape(uri)}"
+    "curl --location --silent --show-error --fail -o #{escape(filename)} --user-agent #{escape("EngineYardDeploy/#{EY::Serverside::VERSION}")} #{escape(uri)}"
   end
 
   def fetch
@@ -49,10 +57,8 @@ class EY::Serverside::Source::Archive < EY::Serverside::Source
     @filename ||= File.basename(URI.parse(uri).path)
   end
 
+  # TODO: configurable via flag
   def unarchive
-    case File.extname(filename)
-    when '.zip', '.war'
-      run "unzip #{filename} && rm #{filename}"
-    end
+    run_and_success? "unzip #{filename} && rm #{filename}"
   end
 end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.3.0'
+    VERSION = '2.3.1.pre.archivefix'
   end
 end

data/spec/bundler_deploy_spec.rb

@@ -44,6 +44,22 @@ describe "Deploying an application that uses Bundler" do
     end
   end
 
+  context "with bundler disabled in ey.yml" do
+    before(:all) do
+      deploy_test_application('bundler_disabled')
+    end
+
+    it "does not run bundler commands" do
+      @deployer.commands.grep(/gem install bundler/).should be_empty
+      @deployer.commands.grep(/bundle _.*_ install/).should be_empty
+    end
+
+    it "still runs the hooks" do
+      deploy_dir.join('current', 'before_bundle.ran' ).should exist
+      deploy_dir.join('current', 'after_bundle.ran' ).should exist
+    end
+  end
+
   context "without a Gemfile.lock" do
     before(:all) do
       deploy_test_application('no_gemfile_lock')

data/spec/fixtures/repos/bundler_disabled/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'ey_config'

data/spec/fixtures/repos/bundler_disabled/Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ey_config (0.0.5)
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ey_config
+  rake

data/spec/fixtures/repos/bundler_disabled/README

@@ -0,0 +1 @@
+This repo looks like it should be bundled, but bundler is disabled.

data/spec/fixtures/repos/bundler_disabled/config/ey.yml

@@ -0,0 +1,2 @@
+defaults:
+  bundler: false

data/spec/fixtures/repos/bundler_disabled/deploy/after_bundle.rb

@@ -0,0 +1 @@
+run 'touch after_bundle.ran'

data/spec/fixtures/repos/bundler_disabled/deploy/before_bundle.rb

@@ -0,0 +1 @@
+run 'touch before_bundle.ran'

data/spec/fixtures/repos/ey_yml/config/ey.yml

@@ -7,6 +7,7 @@ defaults:
   bundle_without: only test development
   maintenance_on_migrate: false
   maintenance_on_restart: false
+  bundler: true
 environments:
   env:
     branch: branch_from_ey_yml

data/spec/fixtures/repos/npm_disabled/README

@@ -0,0 +1 @@
+Node.js app where npm is disabled in ey.yml

data/spec/fixtures/repos/npm_disabled/config/ey.yml

@@ -0,0 +1,2 @@
+defaults:
+  npm: false

data/spec/fixtures/repos/npm_disabled/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "node-example",
+  "version": "0.0.1",
+  "dependencies": {
+    "express": "2.5.8"
+  }
+}

data/spec/fixtures/repos/php_composer_disabled/README

@@ -0,0 +1 @@
+PHP Composer app where composer is disabled in ey.yml

data/spec/fixtures/repos/php_composer_disabled/composer.json

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "monolog/monolog": "1.2.*"
+    }
+}

data/spec/fixtures/repos/php_composer_disabled/composer.lock

@@ -0,0 +1,462 @@
+{
+    "hash": "6481f6a258c344122ba0157d5eadc0fd",
+    "packages": [
+        {
+            "name": "bjyoungblood/bjy-authorize",
+            "version": "1.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bjyoungblood/BjyAuthorize.git",
+                "reference": "1.2.6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bjyoungblood/BjyAuthorize/zipball/1.2.6",
+                "reference": "1.2.6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "zendframework/zend-permissions-acl": ">=2.1,<3.0",
+                "zendframework/zend-mvc": ">=2.1,<3.0",
+                "zendframework/zend-eventmanager": ">=2.1,<3.0",
+                "zendframework/zend-servicemanager": ">=2.1,<3.0",
+                "zendframework/zend-view": ">=2.1,<3.0"
+            },
+            "require-dev": {
+                "doctrine/common": ">=2.3,<2.5-dev",
+                "zendframework/zend-developer-tools": "0.*",
+                "zf-commons/zfc-user": "0.*"
+            },
+            "time": "2013-05-12 16:07:25",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-0": {
+                    "BjyAuthorize\\": "src/"
+                }
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Ben Youngblood",
+                    "email": "bx.youngblood@gmail.com",
+                    "homepage": "http://bjyoungblood.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Zend\\Acl based firewall system for ZF2 dispatch protection",
+            "homepage": "https://github.com/bjyoungblood/BjyAuthorize",
+            "keywords": [
+                "zf2",
+                "acl",
+                "zfc-user"
+            ]
+        },
+        {
+            "name": "bjyoungblood/bjy-profiler",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bjyoungblood/BjyProfiler.git",
+                "reference": "1ca31611b6960bcd744dced95764e3627e8d807a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bjyoungblood/BjyProfiler/zipball/1ca31611b6960bcd744dced95764e3627e8d807a",
+                "reference": "1ca31611b6960bcd744dced95764e3627e8d807a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "zendframework/zendframework": ">=2.1.0"
+            },
+            "time": "1364225067",
+            "type": "library",
+            "installation-source": "source",
+            "autoload": {
+                "psr-0": {
+                    "BjyProfiler": "src/"
+                },
+                "classmap": [
+                    "./Module.php"
+                ]
+            },
+            "authors": [
+                {
+                    "name": "Ben Youngblood",
+                    "email": "bx.youngblood@gmail.com",
+                    "homepage": "http://bjyoungblood.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Database profiler for Zend\\Db (also plugin for ZendDeveloperTools)",
+            "homepage": "https://github.com/bjyoungblood/BjyProfiler",
+            "keywords": [
+                "db",
+                "zf2",
+                "profiler",
+                "zdt"
+            ]
+        },
+        {
+            "name": "darkmatus/roleuserbridge",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dshafik/roleuserbridge",
+                "reference": "9f70ef6f24e75c6592f769bd0cd598f135108f48"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/dshafik/roleuserbridge/zipball/9f70ef6f24e75c6592f769bd0cd598f135108f48",
+                "reference": "9f70ef6f24e75c6592f769bd0cd598f135108f48",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "zendframework/zendframework": "2.*",
+                "zf-commons/zfc-base": "0.1.*",
+                "zf-commons/zfc-user": "0.1.*",
+                "bjyoungblood/bjy-authorize": "1.2.*"
+            },
+            "time": "1365313580",
+            "type": "library",
+            "installation-source": "source",
+            "autoload": {
+                "psr-0": {
+                    "RoleUserBridge": "src/"
+                },
+                "classmap": [
+                    "./"
+                ]
+            },
+            "authors": [
+                {
+                    "name": "Darkmatus",
+                    "email": "mueller@s-p-it.de",
+                    "homepage": "https://github.com/darkmatus/"
+                }
+            ],
+            "description": "ZfcUser/BjyAuthorize Bridge for auto-adding User to the user_role_table from BjyAuthorize.",
+            "homepage": "https://github.com/darkmatus/roleuserbridge",
+            "keywords": [
+                "zf2"
+            ],
+            "support": {
+                "source": "https://github.com/dshafik/roleuserbridge/tree/master"
+            }
+        },
+        {
+            "name": "zendframework/zend-developer-tools",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/ZendDeveloperTools",
+                "reference": "9e2cf51ffbd3778f07be4a245e6b7a84a6a18a1c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/zendframework/ZendDeveloperTools/zipball/9e2cf51ffbd3778f07be4a245e6b7a84a6a18a1c",
+                "reference": "9e2cf51ffbd3778f07be4a245e6b7a84a6a18a1c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "zendframework/zend-mvc": "2.*",
+                "zendframework/zend-eventmanager": "2.*",
+                "zendframework/zend-stdlib": "2.*",
+                "zendframework/zend-servicemanager": "2.*",
+                "zendframework/zend-version": "2.*"
+            },
+            "suggest": {
+                "bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector."
+            },
+            "time": "1368974025",
+            "type": "zf-module",
+            "installation-source": "source",
+            "autoload": {
+                "psr-0": {
+                    "ZendDeveloperTools": "src/"
+                },
+                "classmap": [
+                    "./Module.php"
+                ]
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evan Coury",
+                    "email": "me@evancoury.com",
+                    "homepage": "http://blog.evan.pro/"
+                },
+                {
+                    "name": "Eric Boh",
+                    "email": "cossish@gmail.com"
+                }
+            ],
+            "description": "Module for developer and debug tools for working with the ZF2 MVC layer.",
+            "homepage": "https://github.com/zendframework/ZendDeveloperTools",
+            "keywords": [
+                "debug",
+                "developer",
+                "zf2",
+                "module"
+            ],
+            "support": {
+                "source": "https://github.com/zendframework/ZendDeveloperTools/tree/master",
+                "issues": "https://github.com/zendframework/ZendDeveloperTools/issues"
+            }
+        },
+        {
+            "name": "zendframework/zendframework",
+            "version": "2.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zf2.git",
+                "reference": "release-2.1.5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zf2/zipball/release-2.1.5",
+                "reference": "release-2.1.5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "replace": {
+                "zendframework/zend-authentication": "self.version",
+                "zendframework/zend-barcode": "self.version",
+                "zendframework/zend-cache": "self.version",
+                "zendframework/zend-captcha": "self.version",
+                "zendframework/zend-code": "self.version",
+                "zendframework/zend-config": "self.version",
+                "zendframework/zend-console": "self.version",
+                "zendframework/zend-crypt": "self.version",
+                "zendframework/zend-db": "self.version",
+                "zendframework/zend-debug": "self.version",
+                "zendframework/zend-di": "self.version",
+                "zendframework/zend-dom": "self.version",
+                "zendframework/zend-escaper": "self.version",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-feed": "self.version",
+                "zendframework/zend-file": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-form": "self.version",
+                "zendframework/zend-http": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-inputfilter": "self.version",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-ldap": "self.version",
+                "zendframework/zend-loader": "self.version",
+                "zendframework/zend-log": "self.version",
+                "zendframework/zend-mail": "self.version",
+                "zendframework/zend-math": "self.version",
+                "zendframework/zend-memory": "self.version",
+                "zendframework/zend-mime": "self.version",
+                "zendframework/zend-modulemanager": "self.version",
+                "zendframework/zend-mvc": "self.version",
+                "zendframework/zend-navigation": "self.version",
+                "zendframework/zend-paginator": "self.version",
+                "zendframework/zend-permissions-acl": "self.version",
+                "zendframework/zend-permissions-rbac": "self.version",
+                "zendframework/zend-progressbar": "self.version",
+                "zendframework/zend-serializer": "self.version",
+                "zendframework/zend-server": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-session": "self.version",
+                "zendframework/zend-soap": "self.version",
+                "zendframework/zend-stdlib": "self.version",
+                "zendframework/zend-tag": "self.version",
+                "zendframework/zend-test": "self.version",
+                "zendframework/zend-text": "self.version",
+                "zendframework/zend-uri": "self.version",
+                "zendframework/zend-validator": "self.version",
+                "zendframework/zend-version": "self.version",
+                "zendframework/zend-view": "self.version",
+                "zendframework/zend-xmlrpc": "self.version"
+            },
+            "require-dev": {
+                "doctrine/common": ">=2.1",
+                "ircmaxell/random-lib": "dev-master",
+                "ircmaxell/security-lib": "dev-master",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "suggest": {
+                "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
+                "ext-intl": "ext/intl for i18n features",
+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+                "pecl-weakref": "Implementation of weak references for Zend\\Stdlib\\CallbackHandler",
+                "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
+                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
+            },
+            "time": "2013-04-17 15:15:58",
+            "bin": [
+                "bin/classmap_generator.php"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev",
+                    "dev-develop": "2.2-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-0": {
+                    "Zend\\": "library/",
+                    "ZendTest\\": "tests/"
+                }
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework 2",
+            "homepage": "http://framework.zend.com/",
+            "keywords": [
+                "framework",
+                "zf2"
+            ]
+        },
+        {
+            "name": "zf-commons/zfc-base",
+            "version": "v0.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ZF-Commons/ZfcBase.git",
+                "reference": "v0.1.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ZF-Commons/ZfcBase/zipball/v0.1.2",
+                "reference": "v0.1.2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "zendframework/zend-db": ">=2.1,<3.0",
+                "zendframework/zend-eventmanager": ">=2.1,<3.0",
+                "zendframework/zend-loader": ">=2.1,<3.0",
+                "zendframework/zend-modulemanager": ">=2.1,<3.0",
+                "zendframework/zend-mvc": ">=2.1,<3.0",
+                "zendframework/zend-servicemanager": ">=2.1,<3.0",
+                "zendframework/zend-stdlib": ">=2.1,<3.0"
+            },
+            "time": "2013-05-02 12:33:49",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-0": {
+                    "ZfcBase": "src/"
+                },
+                "classmap": [
+                    "./Module.php"
+                ]
+            },
+            "authors": [
+                {
+                    "name": "Kyle Spraggs",
+                    "email": "theman@spiffyjr.me",
+                    "homepage": "http://www.spiffyjr.me/"
+                },
+                {
+                    "name": "Evan Coury",
+                    "email": "me@evancoury.com",
+                    "homepage": "http://blog.evan.pro/"
+                }
+            ],
+            "description": "A set of genetic (abstract) classes which are commonly used across multiple modules.",
+            "homepage": "https://github.com/ZF-Commons/ZfcBase",
+            "keywords": [
+                "zf2"
+            ]
+        },
+        {
+            "name": "zf-commons/zfc-user",
+            "version": "0.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ZF-Commons/ZfcUser.git",
+                "reference": "0.1.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ZF-Commons/ZfcUser/zipball/0.1.2",
+                "reference": "0.1.2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "zendframework/zend-authentication": ">=2.1,<3.0",
+                "zendframework/zend-crypt": ">=2.1,<3.0",
+                "zendframework/zend-form": ">=2.1,<3.0",
+                "zendframework/zend-inputfilter": ">=2.1,<3.0",
+                "zendframework/zend-loader": ">=2.1,<3.0",
+                "zendframework/zend-modulemanager": ">=2.1,<3.0",
+                "zendframework/zend-mvc": ">=2.1,<3.0",
+                "zendframework/zend-servicemanager": ">=2.1,<3.0",
+                "zendframework/zend-stdlib": ">=2.1,<3.0",
+                "zendframework/zend-validator": ">=2.1,<3.0",
+                "zendframework/zend-view": ">=2.1,<3.0",
+                "zf-commons/zfc-base": "0.*"
+            },
+            "suggest": {
+                "zendframework/zend-session": "To use the default authentication adapter."
+            },
+            "time": "2013-05-02 12:33:31",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "psr-0": {
+                    "ZfcUser": "src/"
+                },
+                "classmap": [
+                    "./Module.php"
+                ]
+            },
+            "authors": [
+                {
+                    "name": "Kyle Spraggs",
+                    "email": "theman@spiffyjr.me",
+                    "homepage": "http://www.spiffyjr.me/"
+                },
+                {
+                    "name": "Evan Coury",
+                    "email": "me@evancoury.com",
+                    "homepage": "http://blog.evan.pro/"
+                }
+            ],
+            "description": "A generic user registration and authentication module for ZF2. Supports Zend\\Db and Doctrine2.",
+            "homepage": "https://github.com/ZF-Commons/ZfcUser",
+            "keywords": [
+                "zf2"
+            ]
+        }
+    ],
+    "packages-dev": null,
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "zendframework/zend-developer-tools": 20,
+        "bjyoungblood/bjy-profiler": 20,
+        "darkmatus/roleuserbridge": 20
+    }
+}

data/spec/fixtures/repos/php_composer_disabled/config/ey.yml

@@ -0,0 +1,2 @@
+defaults:
+  composer: false

data/spec/fixtures/repos/php_composer_disabled/public/index.php

@@ -0,0 +1,4 @@
+<?php
+
+echo "Hello, world!";
+

data/spec/nodejs_deploy_spec.rb

@@ -4,12 +4,27 @@ describe "Deploying an application that uses Node.js and NPM" do
   with_npm_mocked do |mocked|
     before(:all) do
       mock_npm if mocked
-      deploy_test_application('nodejs')
     end
 
-    it "runs 'npm install'" do
-      install_cmd = @deployer.commands.grep(/npm install/).first
-      install_cmd.should_not be_nil
+    context "npm in detect mode" do
+      before do
+        deploy_test_application('nodejs')
+      end
+
+      it "runs 'npm install'" do
+        install_cmd = @deployer.commands.grep(/npm install/).first
+        install_cmd.should_not be_nil
+      end
+    end
+
+    context "npm disabled" do
+      before do
+        deploy_test_application('npm_disabled')
+      end
+
+      it "does not run 'npm install'" do
+        @deployer.commands.grep(/npm/).should be_empty
+      end
     end
   end
 end

data/spec/php_deploy_spec.rb

@@ -5,6 +5,7 @@ describe "Deploying an application that uses PHP and Composer" do
   with_composer_mocked do |mocked|
     context "with composer available" do
       before(:all) { mock_composer if mocked }
+
       context "with a composer.lock" do
         before(:all) do
           deploy_test_application('php_composer_lock')
@@ -26,6 +27,16 @@ describe "Deploying an application that uses PHP and Composer" do
         end
       end
 
+      context "with composer disabled in ey.yml" do
+        before(:all) do
+          deploy_test_application('php_composer_disabled')
+        end
+
+        it "does not run composer" do
+          @deployer.commands.grep(/composer/).should be_empty
+        end
+      end
+
       context "WITHOUT a composer.lock but with composer.json" do
         before(:all) do
           deploy_test_application('php_no_composer_lock')

data/spec/source/archive_spec.rb

@@ -26,8 +26,7 @@ describe EY::Serverside::Source::Archive do
     end
 
     it "updates the cache" do
-      last_output = subject.update_repository_cache.output
-      expect(last_output).to eq("unzip app.war && rm app.war")
+      subject.update_repository_cache
     end
 
   end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1.pre.archivefix
+  prerelease: 6
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,20 +94,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.0.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.0.14
 - !ruby/object:Gem::Dependency
   name: engineyard-serverside-adapter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -231,8 +248,6 @@ files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/ey_yml_customized_deploy_spec.rb
-- spec/fixtures/gitrepo/bar
-- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/lockfiles/0.9-no-bundler
@@ -307,6 +322,12 @@ files:
 - spec/fixtures/repos/bundle_fails/deploy/after_bundle.rb
 - spec/fixtures/repos/bundle_fails/Gemfile
 - spec/fixtures/repos/bundle_fails/README
+- spec/fixtures/repos/bundler_disabled/config/ey.yml
+- spec/fixtures/repos/bundler_disabled/deploy/after_bundle.rb
+- spec/fixtures/repos/bundler_disabled/deploy/before_bundle.rb
+- spec/fixtures/repos/bundler_disabled/Gemfile
+- spec/fixtures/repos/bundler_disabled/Gemfile.lock
+- spec/fixtures/repos/bundler_disabled/README
 - spec/fixtures/repos/default/ey.yml
 - spec/fixtures/repos/default/Gemfile
 - spec/fixtures/repos/default/Gemfile.lock
@@ -349,6 +370,14 @@ files:
 - spec/fixtures/repos/nodejs/package.json
 - spec/fixtures/repos/nodejs/README
 - spec/fixtures/repos/not_bundled/README
+- spec/fixtures/repos/npm_disabled/config/ey.yml
+- spec/fixtures/repos/npm_disabled/package.json
+- spec/fixtures/repos/npm_disabled/README
+- spec/fixtures/repos/php_composer_disabled/composer.json
+- spec/fixtures/repos/php_composer_disabled/composer.lock
+- spec/fixtures/repos/php_composer_disabled/config/ey.yml
+- spec/fixtures/repos/php_composer_disabled/public/index.php
+- spec/fixtures/repos/php_composer_disabled/README
 - spec/fixtures/repos/php_composer_lock/composer.json
 - spec/fixtures/repos/php_composer_lock/composer.lock
 - spec/fixtures/repos/php_composer_lock/public/index.php
@@ -381,26 +410,27 @@ files:
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
 test_files:
 - spec/archive_deploy_spec.rb
@@ -411,8 +441,6 @@ test_files:
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
 - spec/ey_yml_customized_deploy_spec.rb
-- spec/fixtures/gitrepo/bar
-- spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/lockfiles/0.9-no-bundler
@@ -487,6 +515,12 @@ test_files:
 - spec/fixtures/repos/bundle_fails/deploy/after_bundle.rb
 - spec/fixtures/repos/bundle_fails/Gemfile
 - spec/fixtures/repos/bundle_fails/README
+- spec/fixtures/repos/bundler_disabled/config/ey.yml
+- spec/fixtures/repos/bundler_disabled/deploy/after_bundle.rb
+- spec/fixtures/repos/bundler_disabled/deploy/before_bundle.rb
+- spec/fixtures/repos/bundler_disabled/Gemfile
+- spec/fixtures/repos/bundler_disabled/Gemfile.lock
+- spec/fixtures/repos/bundler_disabled/README
 - spec/fixtures/repos/default/ey.yml
 - spec/fixtures/repos/default/Gemfile
 - spec/fixtures/repos/default/Gemfile.lock
@@ -529,6 +563,14 @@ test_files:
 - spec/fixtures/repos/nodejs/package.json
 - spec/fixtures/repos/nodejs/README
 - spec/fixtures/repos/not_bundled/README
+- spec/fixtures/repos/npm_disabled/config/ey.yml
+- spec/fixtures/repos/npm_disabled/package.json
+- spec/fixtures/repos/npm_disabled/README
+- spec/fixtures/repos/php_composer_disabled/composer.json
+- spec/fixtures/repos/php_composer_disabled/composer.lock
+- spec/fixtures/repos/php_composer_disabled/config/ey.yml
+- spec/fixtures/repos/php_composer_disabled/public/index.php
+- spec/fixtures/repos/php_composer_disabled/README
 - spec/fixtures/repos/php_composer_lock/composer.json
 - spec/fixtures/repos/php_composer_lock/composer.lock
 - spec/fixtures/repos/php_composer_lock/public/index.php
@@ -558,3 +600,4 @@ test_files:
 - spec/sqlite3_deploy_spec.rb
 - spec/support/integration.rb
 - spec/support/source_doubles.rb
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTMyNDZmY2M5YmMyN2RjN2I3OWM1MGRlNjlhN2NjY2FkODExYjVmMg==
-  data.tar.gz: !binary |-
-    M2ZmMWQ0Y2E5MDE5NTkzNjQ0ODFmYTJkZGJlYjlhMDc0NDMyMWQxYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzA1YWVmMDUxMjhjNjdkNzhhN2FhOWU3NTJmZjYzNTJmNjk0MDUxYmJiYTY4
-    ZWQ0YTg0OGEyYTg5M2Y5MmRkMmM1YzIwNzhhZmY5NjhiYTMwY2RkMWFhMWFk
-    MmIzNmY3ZjU1YjQxNzU4NTE4MDg4YzUzMGQxYjY5MDk2MDAyYTM=
-  data.tar.gz: !binary |-
-    YzQyZTQzZGEyNGQ0MmU2MWZkOTJmNTdjNzM0MmJhOWYxZjllMGE1NWE3OWRi
-    ZTFiNDMxZDJlNTJhZjU2OTdiNjU4MzIxOTIyNDYwZjNjMzVjODc4NzQzNDBh
-    YmExMzE0NzA0N2QxMDNjMDE3Yjk1NDc1NzI3ZWI0MTNjZjJhNTU=