engineyard-serverside 2.2.0.pre2 → 2.2.0.pre3

data/lib/engineyard-serverside/dependency_manager.rb

@@ -1,18 +1,82 @@
-require 'engineyard-serverside/dependency_manager/base'
 require 'engineyard-serverside/dependency_manager/bundler'
-require 'engineyard-serverside/dependency_manager/bundler_lock'
 require 'engineyard-serverside/dependency_manager/npm'
 require 'engineyard-serverside/dependency_manager/composer'
 
 module EY
   module Serverside
-    module DependencyManager
-      def self.detect(servers, config, shell, runner)
-        Bundler.detect(servers, config, shell, runner) ||
-        BundlerLock.detect(servers, config, shell, runner) ||
-          Npm.detect(servers, config, shell, runner) ||
-          Composer.detect(servers, config, shell, runner) ||
-          Base.new(servers, config, shell, runner)
+    # DependencyManager encapsulates any number of dependency manager objects.
+    #
+    # If a dependency manager indicates that it has detected the required
+    # file or state in order to run, it will be included in this set.
+    #
+    # Methods called on an instance of DependencyManager are forwarded to
+    # any or all of the detected dependency managers.
+    #
+    # Some actions, like check and install, are forwarded to all of the
+    # dependency managers. Other methods will take the first dependency manager
+    # that returns a value.
+    #
+    class DependencyManager
+      # 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]
+
+      include Enumerable
+
+      # Initialize detected dependency managers
+      def initialize(*args)
+        @detected = AVAILABLE_MANAGERS.map { |klass| klass.new(*args) }.select { |manager| manager.detected? }
+      end
+
+      def each(&block)
+        @detected.each(&block)
+      end
+
+      def to_a
+        @detected
+      end
+
+      # Did we find any dependency managers?
+      def detected?
+        any?
+      end
+
+      # Verify application state with respect to dependency management.
+      # Warn if there is anything wrong with the dependency manager.
+      def check
+        each { |m| m.check }
+      end
+
+      # Install dependencies for each of the dependency managers.
+      def install
+        each { |m| m.install }
+      end
+
+      # Assume application is not using sqlite3 unless a dependency manager
+      # says that sqlite is loaded and likely to be the only manager.
+      #
+      # This may have problems in the future if one manager detects sqlite
+      # but another has the primary database manager.
+      #
+      # Hopefully this method can be removed in the future and sqlite loading
+      # can be done without interfering with other systems.
+      def uses_sqlite3?
+        any? { |m| m.respond_to?(:uses_sqlite3?) && m.uses_sqlite3? }
+      end
+
+      # Use the response from the first dependency manager that returns
+      # a rails version.
+      def rails_version
+        version = nil
+        find { |m| version = m.respond_to?(:rails_version) && m.rails_version }
+        version
+      end
+
+      # If services are installed, print intructions for using ey_config if
+      # the dependency manager has a compatible version.
+      def show_ey_config_instructions
+        each { |m| m.respond_to?(:show_ey_config_instructions) && m.show_ey_config_instructions }
       end
     end
   end

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

@@ -1,42 +1,21 @@
 module EY
   module Serverside
-    module DependencyManager
+    class DependencyManager
       class Base
-        def self.detect(servers, config, shell, runner)
-          manager = new(servers, config, shell, runner)
-          manager.detected? && manager
-        end
-
         attr_reader :servers, :config, :shell, :runner
 
         def initialize(servers, config, shell, runner)
-          @servers, @config, @shell = servers, config, shell
-          @runner = runner
+          @servers, @config, @shell, @runner = servers, config, shell, runner
         end
 
         # Public interface
         #
-
-        def detected?() true end
+        def detected?() false end
         def check() end
         def install() end
-
-        # assume not using sqlite3 unless a dependency system says so
-        def uses_sqlite3?() false end
+        def uses_sqlite3?() end
         def rails_version() end
-        def check_ey_config() end
-
-        # Legacy methods, this should not be public API to this class
-        # With proper warning, cut these methods off
-        def gemfile?() end
-        def bundler_config
-          raise "This method has been removed. Use bundle_options in ey.yml"
-        end
-        def lockfile() end
-        def check_ruby_bundler() end
-        def check_node_npm() end
-        def clean_bundle_on_system_version_change() end
-        def write_system_version() end
+        def show_ey_config_instructions() end
 
         protected
 

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

@@ -1,6 +1,8 @@
+require 'engineyard-serverside/dependency_manager/base'
+
 module EY
   module Serverside
-    module DependencyManager
+    class DependencyManager
       class Bundler < Base
         DEFAULT_VERSION = "1.3.4"
 
@@ -9,51 +11,64 @@ module EY
         end
 
         def detected?
-          gemfile? && !lockfile?
+          gemfile?
         end
 
         def gemfile?
           paths.gemfile.exist?
         end
 
-        def lockfile?
-          lockfile_path.exist?
-        end
-
         def check
-          shell.warning <<-WARN
+          if lockfile
+            shell.status "Gemfile and Gemfile.lock found"
+
+            if config.check_database_adapter? && !lockfile.any_database_adapter?
+              shell.warning <<-WARN
+Gemfile.lock does not contain a recognized database adapter.
+A database-adapter gem such as pg, mysql2, mysql, or do_mysql was expected.
+This can prevent applications that use PostgreSQL or MySQL from booting.
+
+To fix, add any needed adapter to your Gemfile, bundle, commit, and redeploy.
+Applications not using PostgreSQL or MySQL can safely ignore this warning by
+adding ignore_database_adapter_warning: true to the application's ey.yml file
+under the defaults: top level key and committing the file to the repository.
+              WARN
+            end
+          else
+            shell.warning <<-WARN
 Gemfile found but Gemfile.lock is missing!
 You can get different versions of gems in production than what you tested with.
 You can get different versions of gems on every deployment even if your Gemfile hasn't changed.
 Deploying will take longer and some deploy options will be limited.
 
 To fix this problem, commit your Gemfile.lock to your repository and redeploy.
-          WARN
+            WARN
+          end
         end
 
         def install
-          check_ruby_bundler
+          shell.status "Bundling gems..."
+          clean_bundle_on_system_version_change
+          install_bundler_gem
+          run "#{clean_environment} && cd #{paths.active_release} && #{bundle_install_command}"
+          write_system_version
         end
 
-        # Without Gemfile.lock, don't do anything with sqlite3
         def uses_sqlite3?
-          false
+          lockfile && lockfile.uses_sqlite3?
         end
 
-        # Without Gemfile.lock, don't do anything about ey_config
-        def check_ey_config
+        def show_ey_config_instructions
+          if lockfile && !lockfile.has_ey_config?
+            shell.warning "Gemfile.lock does not contain ey_config. Add gem 'ey_config' to your Gemfile to access service configurations through EY::Config."
+          end
         end
 
-        # Without Gemfile.lock, there is no determining the rails version.
         def rails_version
-          nil
+          lockfile && lockfile.rails_version
         end
 
-        private
-
-        def lockfile_path
-          paths.gemfile_lock
-        end
+        protected
 
         def write_system_version
           store_ruby_version   = "#{config.ruby_version_command} > #{paths.ruby_version}"
@@ -63,14 +78,6 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
           run "#{store_ruby_version} && #{store_system_version}"
         end
 
-        def check_ruby_bundler
-          shell.status "Bundling gems..."
-          clean_bundle_on_system_version_change
-          install_bundler_gem
-          run "#{clean_environment} && cd #{paths.active_release} && #{bundle_install_command}"
-          write_system_version
-        end
-
         # Install bundler in the system ruby
         def install_bundler_gem
           egrep_escaped_version = bundler_version.gsub(/\./, '\.')
@@ -96,6 +103,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
             "--path",     "#{paths.bundled_gems}",
             "--binstubs", "#{paths.binstubs}",
           ]
+          options += ["--deployment"] if lockfile
           options += config.extra_bundle_install_options
           options
         end
@@ -115,7 +123,108 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
         end
 
         def bundler_version
-          self.class.default_version
+          @bundler_version ||= lockfile && lockfile.bundler_version || self.class.default_version
+        end
+
+        def lockfile
+          return @lockfile if defined? @lockfile
+
+          lockfile_path = paths.gemfile_lock
+          if lockfile_path.exist?
+            @lockfile = Lockfile.new(lockfile_path.read, self.class.default_version)
+          end
+        end
+
+        class Lockfile
+          attr_reader :bundler_version
+
+          def initialize(lockfile_contents, default = EY::Serverside::DependencyManager::Bundler.default_version)
+            @contents = lockfile_contents
+            @default = default
+            @default_gem_version = Gem::Version.new(@default)
+            parse
+          end
+
+          def has_ey_config?
+            !!@contents.index(/^\s+ey_config\s\([^\)]+\)$/)
+          end
+
+          def rails_version
+            section = dependencies_section
+            if section.empty?
+              return nil
+            end
+            result = scan_gem('rails', section)
+            result ? result.last : nil
+          end
+
+          def any_database_adapter?
+            any_ruby_adapter = %w[mysql2 mysql do_mysql pg do_postgres].any? do |type|
+              @contents.index(/^\s+#{type}\s\([^\)]+\)$/)
+            end
+
+            any_jruby_adapter = %w[mysql postgresql postgres].any? do |type|
+              @contents.index(/^\s+jdbc-#{type}\s\([^\)]+\)$/) || @contents.index(/^\s+activerecord-jdbc#{type}-adapter\s\([^\)]+\)$/)
+            end
+
+            any_ruby_adapter || any_jruby_adapter
+          end
+
+          def uses_sqlite3?
+            !any_database_adapter? && @contents.index(/^\s+sqlite3\s\([^\)]+\)$/)
+          end
+
+          def parse
+            parse_from_metadata ||
+              parse_from_dependencies ||
+              raise("Malformed or pre bundler-1.0.0 Gemfile.lock: #{@contents[0,50]}...")
+          end
+
+          def slice_section(header)
+            if start = @contents.index(/^#{header}/)
+              finish = @contents.index(/(^\S|\Z)/, start + header.length)
+              @contents.slice(start..finish)
+            else
+              ""
+            end
+          end
+
+          def parse_from_metadata
+            section = slice_section('METADATA')
+
+            if section.empty?
+              return nil
+            end
+
+            result = section.scan(/^\s*version:\s*(.*)$/).first
+            @bundler_version = result ? result.first : @default
+          end
+
+          def dependencies_section
+            @dependencies_section ||= slice_section('DEPENDENCIES')
+          end
+
+          def parse_from_dependencies
+            section = dependencies_section
+            if section.empty?
+              return nil
+            end
+
+            result = scan_gem('bundler', section)
+            bundler_version = result ? result.last : nil
+            version_qualifier = result ? result.first : nil
+            @bundler_version = fetch_version(version_qualifier, bundler_version)
+          end
+
+          def fetch_version(operator, version)
+            return version || @default unless operator && version
+            req = Gem::Requirement.new(["#{operator} #{version}"])
+            req.satisfied_by?(@default_gem_version) ? @default : version
+          end
+
+          def scan_gem(gem, dep_section)
+            dep_section.scan(/^\s*#{Regexp.escape(gem)}\s*\((>?=|~>)\s*([^,\)]+)/).first
+          end
         end
       end
     end

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

@@ -1,6 +1,8 @@
+require 'engineyard-serverside/dependency_manager/base'
+
 module EY
   module Serverside
-    module DependencyManager
+    class DependencyManager
       class Composer < Base
         def detected?
           composer_lock? || composer_json?

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

@@ -1,6 +1,6 @@
 module EY
   module Serverside
-    module DependencyManager
+    class DependencyManager
       module LegacyHelpers
         [
           :gemfile?,
@@ -13,9 +13,7 @@ module EY
           :clean_environment,
         ].each do |meth|
           define_method(meth) do |*a|
-            if dependency_manager.respond_to?(meth)
-              dependency_manager.send(meth)
-            end
+            raise "The method '#{meth}' has been removed to better support future dependency management systems.\nAlthough using these methods directly is discouraged, please see the DependencyManager class and related subclasses if you need access to this information."
           end
         end
       end

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

@@ -1,6 +1,8 @@
+require 'engineyard-serverside/dependency_manager/base'
+
 module EY
   module Serverside
-    module DependencyManager
+    class DependencyManager
       class Npm < Base
         def detected?
           paths.package_json.exist?

data/lib/engineyard-serverside/deploy.rb

@@ -81,6 +81,18 @@ module EY
         dependency_manager.check
       end
 
+      def rails_application?
+        dependency_manager.rails_version
+      end
+
+      def bundle
+        install_dependencies
+      end
+
+      def install_dependencies
+        dependency_manager.install
+      end
+
       def restart_with_maintenance_page
         load_ey_yml
         require_custom_tasks
@@ -157,14 +169,6 @@ chmod 0700 #{path}
         SCRIPT
       end
 
-      def bundle
-        install_dependencies
-      end
-
-      def install_dependencies
-        dependency_manager.install
-      end
-
       # task
       def cleanup_old_releases
         clean_release_directory(paths.releases)
@@ -257,7 +261,7 @@ Deploy again if your services configuration appears incomplete or out of date.
 
         if services = config.configured_services
           shell.status "Services configured: #{services.join(', ')}"
-          dependency_manager.check_ey_config
+          dependency_manager.show_ey_config_instructions
         end
       end
 
@@ -431,9 +435,8 @@ YML
 
       def dependency_manager
         ensure_git_ssh_wrapper
-        @dependency_manager ||= DependencyManager.detect(servers, config, shell, self)
+        @dependency_manager ||= DependencyManager.new(servers, config, shell, self)
       end
-      public :dependency_manager # FIXME
 
       def compile_assets
         RailsAssets.detect_and_compile(config, shell, self)

data/lib/engineyard-serverside/deprecation.rb

@@ -18,8 +18,8 @@ module EY
         EY::Serverside.deprecation_warning("EY::Serverside::LoggedOutput has been deprecated. Use EY::Serverside::Shell::Helpers instead.")
         EY::Serverside::Shell::Helpers
       when :LockfileParser
-        EY::Serverside.deprecation_warning("EY::Serverside::LockfileParser has been deprecated. Use EY::Serverside::DependencyManager::BundlerLock::Lockfile instead.")
-        EY::Serverside::DependencyManager::BundlerLock::Lockfile
+        EY::Serverside.deprecation_warning("EY::Serverside::LockfileParser has been deprecated. Use EY::Serverside::DependencyManager::Bundler::Lockfile instead.")
+        EY::Serverside::DependencyManager::Bundler::Lockfile
       else
         super
       end

data/lib/engineyard-serverside/rails_assets.rb

@@ -79,7 +79,7 @@ module EY
 
       def precompile_detected_assets
         shell.status "Precompiling assets. ('#{app_assets}' exists, 'public/assets' not found, not disabled in config.)"
-        if !runner.dependency_manager.rails_version
+        if !runner.rails_application?
           shell.warning "Precompiling assets even though Rails was not bundled."
         end
 

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.2.0.pre2'
+    VERSION = '2.2.0.pre3'
   end
 end

data/spec/fixtures/repos/multi_dep_manager/README

@@ -0,0 +1 @@
+Merger of simple composer app and simple node npm app

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

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

data/spec/fixtures/repos/multi_dep_manager/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/multi_dep_manager/package.json

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

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

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

data/spec/lockfile_parser_spec.rb

@@ -6,7 +6,7 @@ describe "the bundler version retrieved from the lockfile" do
   end
 
   def get_parser(file)
-    EY::Serverside::DependencyManager::BundlerLock::Lockfile.new(load_lockfile(file))
+    EY::Serverside::DependencyManager::Bundler::Lockfile.new(load_lockfile(file))
   end
 
   def get_version(file)

data/spec/multi_dependency_manager_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "Deploying an application that uses Node.js and NPM" do
+  with_composer_mocked do |composer_mocked|
+    with_npm_mocked do |npm_mocked|
+
+      before(:all) do
+        mock_composer if composer_mocked
+        mock_npm if npm_mocked
+        deploy_test_application('multi_dep_manager')
+      end
+
+      it "runs 'npm install' and 'composer install'" do
+        npm_cmd = @deployer.commands.grep(/npm install/).first
+        npm_cmd.should_not be_nil
+
+        update_cmd = @deployer.commands.grep(/composer self-update/).first
+        update_cmd.should_not be_nil
+
+        composer_cmd = @deployer.commands.grep(/composer install/).first
+        composer_cmd.should_not be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre2
+  version: 2.2.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -154,7 +154,6 @@ files:
 - lib/engineyard-serverside/default_maintenance_page.html
 - lib/engineyard-serverside/dependency_manager/base.rb
 - lib/engineyard-serverside/dependency_manager/bundler.rb
-- lib/engineyard-serverside/dependency_manager/bundler_lock.rb
 - lib/engineyard-serverside/dependency_manager/composer.rb
 - lib/engineyard-serverside/dependency_manager/legacy_helpers.rb
 - lib/engineyard-serverside/dependency_manager/npm.rb
@@ -342,6 +341,11 @@ files:
 - spec/fixtures/repos/hooks/deploy/before_restart.rb
 - spec/fixtures/repos/hooks/deploy/before_symlink.rb
 - spec/fixtures/repos/hooks/README
+- spec/fixtures/repos/multi_dep_manager/composer.json
+- spec/fixtures/repos/multi_dep_manager/composer.lock
+- spec/fixtures/repos/multi_dep_manager/package.json
+- spec/fixtures/repos/multi_dep_manager/public/index.php
+- spec/fixtures/repos/multi_dep_manager/README
 - spec/fixtures/repos/no_ey_config/ey.yml
 - spec/fixtures/repos/no_ey_config/Gemfile
 - spec/fixtures/repos/no_ey_config/Gemfile.lock
@@ -365,6 +369,7 @@ files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/multi_dependency_manager_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/php_deploy_spec.rb
 - spec/rails31_deploy_spec.rb
@@ -504,6 +509,11 @@ test_files:
 - spec/fixtures/repos/hooks/deploy/before_restart.rb
 - spec/fixtures/repos/hooks/deploy/before_symlink.rb
 - spec/fixtures/repos/hooks/README
+- spec/fixtures/repos/multi_dep_manager/composer.json
+- spec/fixtures/repos/multi_dep_manager/composer.lock
+- spec/fixtures/repos/multi_dep_manager/package.json
+- spec/fixtures/repos/multi_dep_manager/public/index.php
+- spec/fixtures/repos/multi_dep_manager/README
 - spec/fixtures/repos/no_ey_config/ey.yml
 - spec/fixtures/repos/no_ey_config/Gemfile
 - spec/fixtures/repos/no_ey_config/Gemfile.lock
@@ -527,6 +537,7 @@ test_files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/multi_dependency_manager_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/php_deploy_spec.rb
 - spec/rails31_deploy_spec.rb

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

@@ -1,155 +0,0 @@
-require 'engineyard-serverside/dependency_manager/bundler'
-
-module EY
-  module Serverside
-    module DependencyManager
-      class BundlerLock < Bundler
-        def detected?
-          gemfile? && lockfile?
-        end
-
-        def check
-          shell.status "Gemfile and Gemfile.lock found"
-
-          if config.check_database_adapter? && !lockfile.any_database_adapter?
-            shell.warning <<-WARN
-Gemfile.lock does not contain a recognized database adapter.
-A database-adapter gem such as pg, mysql2, mysql, or do_mysql was expected.
-This can prevent applications that use PostgreSQL or MySQL from booting.
-
-To fix, add any needed adapter to your Gemfile, bundle, commit, and redeploy.
-Applications not using PostgreSQL or MySQL can safely ignore this warning by
-adding ignore_database_adapter_warning: true to the application's ey.yml file
-under this environment's name and adding the file to your repository.
-            WARN
-          end
-        end
-
-        def uses_sqlite3?
-          lockfile.uses_sqlite3?
-        end
-
-        def check_ey_config
-          unless lockfile.has_ey_config?
-            shell.warning "Gemfile.lock does not contain ey_config.\nAdd gem 'ey_config' to get access to service configuration through EY::Config."
-          end
-        end
-
-        def rails_version
-          lockfile.rails_version
-        end
-
-        private
-
-        def lockfile_path
-          paths.gemfile_lock
-        end
-
-        def lockfile
-          @lockfile ||= Lockfile.new(lockfile_path.read, self.class.default_version)
-        end
-
-        # deployment mode is not supported without a Gemfile.lock
-        def bundle_install_options
-          super + ["--deployment"]
-        end
-
-        def bundler_version
-          @bundler_version ||= lockfile.bundler_version || super
-        end
-
-        class Lockfile
-          attr_reader :bundler_version
-
-          def initialize(lockfile_contents, default = EY::Serverside::DependencyManager::Bundler.default_version)
-            @contents = lockfile_contents
-            @default = default
-            @default_gem_version = Gem::Version.new(@default)
-            parse
-          end
-
-          def has_ey_config?
-            !!@contents.index(/^\s+ey_config\s\([^\)]+\)$/)
-          end
-
-          def rails_version
-            section = dependencies_section
-            if section.empty?
-              return nil
-            end
-            result = scan_gem('rails', section)
-            result ? result.last : nil
-          end
-
-          def any_database_adapter?
-            any_ruby_adapter = %w[mysql2 mysql do_mysql pg do_postgres].any? do |type|
-              @contents.index(/^\s+#{type}\s\([^\)]+\)$/)
-            end
-
-            any_jruby_adapter = %w[mysql postgresql postgres].any? do |type|
-              @contents.index(/^\s+jdbc-#{type}\s\([^\)]+\)$/) || @contents.index(/^\s+activerecord-jdbc#{type}-adapter\s\([^\)]+\)$/)
-            end
-
-            any_ruby_adapter || any_jruby_adapter
-          end
-
-          def uses_sqlite3?
-            !any_database_adapter? && @contents.index(/^\s+sqlite3\s\([^\)]+\)$/)
-          end
-
-          def parse
-            parse_from_metadata ||
-              parse_from_dependencies ||
-              raise("Malformed or pre bundler-1.0.0 Gemfile.lock: #{@contents[0,50]}...")
-          end
-
-          def slice_section(header)
-            if start = @contents.index(/^#{header}/)
-              finish = @contents.index(/(^\S|\Z)/, start + header.length)
-              @contents.slice(start..finish)
-            else
-              ""
-            end
-          end
-
-          def parse_from_metadata
-            section = slice_section('METADATA')
-
-            if section.empty?
-              return nil
-            end
-
-            result = section.scan(/^\s*version:\s*(.*)$/).first
-            @bundler_version = result ? result.first : @default
-          end
-
-          def dependencies_section
-            @dependencies_section ||= slice_section('DEPENDENCIES')
-          end
-
-          def parse_from_dependencies
-            section = dependencies_section
-            if section.empty?
-              return nil
-            end
-
-            result = scan_gem('bundler', section)
-            bundler_version = result ? result.last : nil
-            version_qualifier = result ? result.first : nil
-            @bundler_version = fetch_version(version_qualifier, bundler_version)
-          end
-
-          def fetch_version(operator, version)
-            return version || @default unless operator && version
-            req = Gem::Requirement.new(["#{operator} #{version}"])
-            req.satisfied_by?(@default_gem_version) ? @default : version
-          end
-
-          def scan_gem(gem, dep_section)
-            dep_section.scan(/^\s*#{Regexp.escape(gem)}\s*\((>?=|~>)\s*([^,\)]+)/).first
-          end
-        end
-      end
-    end
-  end
-end