engineyard-serverside 1.4.16 → 1.5.0

data/lib/engineyard-serverside/deploy.rb

@@ -14,6 +14,7 @@ module EY
       def deploy
         debug "Starting deploy at #{Time.now.asctime}"
         update_repository_cache
+        check_repository
         cached_deploy
       end
 
@@ -50,6 +51,16 @@ module EY
         raise
       end
 
+      def check_repository
+        if gemfile? && lockfile
+          unless lockfile.any_database_adapter?
+            info "!> WARNING: Gemfile.lock does not contain any recognized database adapter!"
+            info "!> We expected to find mysql2, mysql or other database adapter gem."
+            info "!> This could prevent booting of applications that use MySQL or Postgres."
+          end
+        end
+      end
+
       def restart_with_maintenance_page
         require_custom_tasks
         conditionally_enable_maintenance_page
@@ -138,50 +149,8 @@ module EY
 
       # task
       def bundle
-        if File.exist?("#{c.release_path}/Gemfile")
-          info "~> Gemfile detected, bundling gems"
-          lockfile = File.join(c.release_path, "Gemfile.lock")
-
-          bundler_installer = if File.exist?(lockfile)
-                                get_bundler_installer(lockfile)
-                              else
-                                warn_about_missing_lockfile
-                                get_default_bundler_installer
-                              end
-
-          sudo "#{clean_environment} #{serverside_bin} install_bundler #{bundler_installer.version}"
-
-          bundled_gems_path = File.join(c.shared_path, "bundled_gems")
-          ruby_version_file = File.join(bundled_gems_path, "RUBY_VERSION")
-          system_version_file = File.join(bundled_gems_path, "SYSTEM_VERSION")
-          ruby_version = `ruby -v`
-          system_version = `uname -m`
-
-          if File.directory?(bundled_gems_path)
-            rebundle = false
-
-            rebundle = true if File.exist?(ruby_version_file) && File.read(ruby_version_file) != ruby_version
-            rebundle = true if File.exist?(system_version_file) && File.read(system_version_file) != system_version
-
-            if rebundle
-              info "~> Ruby version change detected, cleaning bundled gems"
-              run "rm -Rf #{bundled_gems_path}"
-            end
-          end
-
-          run "cd #{c.release_path} && #{clean_environment} ruby -S bundle _#{bundler_installer.version}_ install #{bundler_installer.options}"
-
-          run "mkdir -p #{bundled_gems_path} && ruby -v > #{ruby_version_file} && uname -m > #{system_version_file}"
-        end
-
-        if File.exist?("#{c.release_path}/package.json")
-          unless run("which npm")
-            abort "*** [Error] package.json detected, but npm was not installed"
-          else
-            info "~> package.json detected, installing npm packages"
-            run "cd #{c.release_path} && npm install"
-          end
-        end
+        check_ruby_bundler
+        check_node_npm
       end
 
       # task
@@ -291,6 +260,10 @@ module EY
 
       protected
 
+      def gemfile?
+        File.exist?("#{c.release_path}/Gemfile")
+      end
+
       def base_callback_command_for(what)
         [serverside_bin, 'hook', what.to_s,
           '--app', config.app.to_s,
@@ -341,35 +314,31 @@ module EY
         info "!> You can get different gems in production than what you tested with."
         info "!> You can get different gems on every deployment even if your Gemfile hasn't changed."
         info "!> Deploying may take a long time."
+        info "!> There is a slight, but very serious chance of a Zerg rush overtaking your base."
         info "!>"
         info "!> Fix this by running \"git add Gemfile.lock; git commit\" and deploying again."
-        info "!> If you don't have a Gemfile.lock, run \"bundle lock\" to create one."
         info "!>"
         info "!> This deployment will use bundler #{LockfileParser.default_version} to run 'bundle install'."
         info "!>"
       end
 
-      def get_bundler_installer(lockfile)
-        parser = LockfileParser.new(File.read(lockfile))
-        case parser.lockfile_version
-        when :bundler09
-          bundler_09_installer(parser.bundler_version)
-        when :bundler10
-          bundler_10_installer(parser.bundler_version)
+      def get_bundler_installer
+        if lockfile
+          bundler_10_installer(lockfile.bundler_version)
         else
-          raise "Unknown lockfile version #{parser.lockfile_version}"
+          warn_about_missing_lockfile
+          # deployment mode is not supported without a Gemfile.lock, so we turn that off.
+          bundler_10_installer(LockfileParser.default_version, deployment_mode = false)
         end
       end
-      public :get_bundler_installer
 
-      def get_default_bundler_installer
-        # deployment mode is not supported without a Gemfile.lock, so we turn that off.
-        bundler_10_installer(LockfileParser.default_version, deployment_mode = false)
-      end
-      public :get_default_bundler_installer
-
-      def bundler_09_installer(version)
-        BundleInstaller.new(version, '--without=development --without=test')
+      def lockfile
+        lockfile_path = File.join(c.release_path, "Gemfile.lock")
+        if File.exist?(lockfile_path)
+          @lockfile_parser ||= LockfileParser.new(File.read(lockfile_path))
+        else
+          nil
+        end
       end
 
       # Set +deploymemt_mode+ to false to avoid passing the --deployment flag.
@@ -380,6 +349,49 @@ module EY
         options.unshift('--deployment') if deployment_mode
         BundleInstaller.new(version, options.join(' '))
       end
+
+      def check_ruby_bundler
+        if gemfile?
+          info "~> Gemfile detected, bundling gems"
+
+          bundler_installer = get_bundler_installer
+
+          sudo "#{clean_environment} #{serverside_bin} install_bundler #{bundler_installer.version}"
+
+          bundled_gems_path = File.join(c.shared_path, "bundled_gems")
+          ruby_version_file = File.join(bundled_gems_path, "RUBY_VERSION")
+          system_version_file = File.join(bundled_gems_path, "SYSTEM_VERSION")
+          ruby_version = `ruby -v`
+          system_version = `uname -m`
+
+          if File.directory?(bundled_gems_path)
+            rebundle = false
+
+            rebundle = true if File.exist?(ruby_version_file) && File.read(ruby_version_file) != ruby_version
+            rebundle = true if File.exist?(system_version_file) && File.read(system_version_file) != system_version
+
+            if rebundle
+              info "~> Ruby version change detected, cleaning bundled gems"
+              run "rm -Rf #{bundled_gems_path}"
+            end
+          end
+
+          run "cd #{c.release_path} && #{clean_environment} ruby -S bundle _#{bundler_installer.version}_ install #{bundler_installer.options}"
+
+          run "mkdir -p #{bundled_gems_path} && ruby -v > #{ruby_version_file} && uname -m > #{system_version_file}"
+        end
+      end
+
+      def check_node_npm
+        if File.exist?("#{c.release_path}/package.json")
+          unless run("which npm")
+            abort "*** [Error] package.json detected, but npm was not installed"
+          else
+            info "~> package.json detected, installing npm packages"
+            run "cd #{c.release_path} && npm install"
+          end
+        end
+      end
     end   # DeployBase
 
     class Deploy < DeployBase

data/lib/engineyard-serverside/deploy_hook.rb

@@ -55,6 +55,14 @@ module EY
           system(Escape.shell_command(["sudo", "sh", "-l", "-c", cmd]))
         end
 
+        def info(*args)
+          $stderr.puts *args
+        end
+
+        def debug(*args)
+          $stdout.puts *args
+        end
+
         # convenience functions for running on certain instance types
         def on_app_master(&blk)                 on_roles(%w[solo app_master],          &blk) end
         def on_app_servers(&blk)                on_roles(%w[solo app_master app],      &blk) end

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -2,129 +2,86 @@ require 'yaml'
 module EY
   module Serverside
     class LockfileParser
+      DEFAULT = "1.0.10"
+
       def self.default_version
-        Parse10::DEFAULT
+        DEFAULT
       end
 
       attr_reader :bundler_version, :lockfile_version
 
       def initialize(lockfile_contents)
-        @lockfile_version, @bundler_version = Parse106.new(lockfile_contents).parse
+        @contents = lockfile_contents
+        parse
       end
 
-      class BaseParser
-        def initialize(contents)
-          @contents = contents
-        end
-        def parse
-          raise "Unknown lockfile format #{@contents[0,50]}..."
+      def any_database_adapter?
+        %w[mysql2 mysql do_mysql pg do_postgres].any? do |gem|
+          @contents.index(/^\s+#{gem}\s\([^\)]+\)$/)
         end
       end
 
-      class Parse09 < BaseParser
-        DEFAULT = "0.9.26"
+      def parse
+        parse_from_metadata ||
+          parse_from_dependencies ||
+          raise("Malformed or pre bundler-1.0.0 Gemfile.lock: #{@contents[0,50]}...")
+      end
 
-        def parse
-          from_yaml = safe_yaml_load(@contents)
-          unless from_yaml.is_a?(Hash)
-            return super
-          end
-          bundler_version = from_yaml['specs'].map do |spec|
-            # spec is a one-element hash: the key is the gem name, and
-            # the value is {"version" => the-version}.
-            if spec.keys.first == "bundler"
-              spec.values.first["version"]
-            end
-          end.compact.first
-          [:bundler09, bundler_version || DEFAULT]
-        end
-        def safe_yaml_load(loadable)
-          YAML.load(loadable) #won't always raise... soemtimes parses the contents as 1 big string
-        rescue ArgumentError, SyntaxError # not yaml
-          nil
+      def slice_section(header)
+        if start = @contents.index(/^#{header}/)
+          finish = @contents.index(/(^\S|\Z)/, start + header.length)
+          @contents.slice(start..finish)
+        else
+          ""
         end
       end
 
-      class Parse10 < Parse09
-        DEFAULT = "1.0.10"
-
-        def parse
-          unless @contents.index(/^DEPENDENCIES/)
-            return super
-          end
-          dep_section = ""
-          in_dependencies_section = false
-          @contents.each_line do |line|
-            if line =~ /^DEPENDENCIES/
-              in_dependencies_section = true
-            elsif line =~ /^\S/
-              in_dependencies_section = false
-            elsif in_dependencies_section
-              dep_section << line
-            end
-          end
-
-          unless dep_section.length > 0
-            raise "Couldn't parse #{@contents}; exiting"
-            exit(1)
-          end
+      def parse_from_metadata
+        section = slice_section('METADATA')
 
-          result = scan_bundler(dep_section)
-          bundler_version = result ? result.last : nil
-          version_qualifier = result ? result.first : nil
-          [:bundler10, fetch_version(bundler_version, version_qualifier)]
+        if section.empty?
+          return nil
         end
 
-        def fetch_version(bundler_version, version_qualifier)
-          return bundler_version || DEFAULT unless version_qualifier
+        result = section.scan(/^\s*version:\s*(.*)$/).first
+        @lockfile_version = :bundler10
+        @bundler_version = result ? result.first : DEFAULT
+      end
 
-          case version_qualifier
-          when '='
-            bundler_version
-          when '>='
-            Gem::Version.new(bundler_version) > Gem::Version.new(DEFAULT) ? bundler_version : DEFAULT
-          when '~>'
-            bundler_gem_version = Gem::Version.new(bundler_version)
-            recommendation = bundler_gem_version.spermy_recommendation.gsub(/~>\s*(.+)$/, '\1.')
-            recommends_default = DEFAULT.index(recommendation) == 0
-            default_newer_than_requested = Gem::Version.new(DEFAULT) > bundler_gem_version
-            (recommends_default && default_newer_than_requested) ? DEFAULT : bundler_version
-          end
-        end
+      def parse_from_dependencies
+        section = slice_section('DEPENDENCIES')
 
-        def scan_bundler(dep_section)
-          dep_section.scan(/^\s*bundler\s*\((>?=|~>)\s*([^,\)]+)/).first
+        if section.empty?
+          return nil
         end
-      end
 
-      class Parse106 < Parse10
-        def parse
-          unless @contents.index(/^METADATA/)
-            return super
-          end
-          meta_section = ""
-          in_meta_section = false
-          @contents.each_line do |line|
-            if line =~ /^METADATA/
-              in_meta_section = true
-            elsif line =~ /^\S/
-              in_meta_section = false
-            elsif in_meta_section
-              meta_section << line
-            end
-          end
-
-          unless meta_section.length > 0
-            raise "Couldn't parse #{@contents}; exiting"
-            exit(1)
-          end
+        result = scan_bundler(section)
+        bundler_version = result ? result.last : nil
+        version_qualifier = result ? result.first : nil
+        @lockfile_version = :bundler10
+        @bundler_version = fetch_version(bundler_version, version_qualifier)
+      end
 
-          result = meta_section.scan(/^\s*version:\s*(.*)$/).first
-          bundler_version = result ? result.first : DEFAULT
-          [:bundler10, bundler_version]
+      def fetch_version(bundler_version, version_qualifier)
+        return bundler_version || DEFAULT unless version_qualifier
+
+        case version_qualifier
+        when '='
+          bundler_version
+        when '>='
+          Gem::Version.new(bundler_version) > Gem::Version.new(DEFAULT) ? bundler_version : DEFAULT
+        when '~>'
+          bundler_gem_version = Gem::Version.new(bundler_version)
+          recommendation = bundler_gem_version.spermy_recommendation.gsub(/~>\s*(.+)$/, '\1.')
+          recommends_default = DEFAULT.index(recommendation) == 0
+          default_newer_than_requested = Gem::Version.new(DEFAULT) > bundler_gem_version
+          (recommends_default && default_newer_than_requested) ? DEFAULT : bundler_version
         end
       end
 
+      def scan_bundler(dep_section)
+        dep_section.scan(/^\s*bundler\s*\((>?=|~>)\s*([^,\)]+)/).first
+      end
     end
   end
 end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.4.16'
+    VERSION = '1.5.0'
   end
 end

data/spec/custom_deploy_spec.rb

@@ -6,6 +6,7 @@ describe "the EY::Serverside::Deploy API" do
       # This happens before require_custom_tasks, so it's not
       # overrideable. That's why it's not in @call_order.
       def update_repository_cache() end
+      def check_repository() end
 
       # cheat a bit; we don't actually want to do these things
       def require_custom_tasks() end

data/spec/lockfile_parser_spec.rb

@@ -1,59 +1,78 @@
 require 'spec_helper'
 
 describe "the bundler version retrieved from the lockfile" do
-  def get_full_path(file)
-    File.expand_path("../support/lockfiles/#{file}", __FILE__)
+  def load_lockfile(file)
+    File.read(File.expand_path("../support/lockfiles/#{file}", __FILE__))
   end
-  def get_version(file)
-    @config = EY::Serverside::Deploy::Configuration.new('deploy_to' => 'dontcare')
-    EY::Serverside::DeployBase.new(@config).get_bundler_installer(get_full_path(file)).version
+
+  def get_parser(file)
+    EY::Serverside::LockfileParser.new(load_lockfile(file))
   end
 
-  it "returns the default version for an 0.9 lockfile without a bundler dependency" do
-    get_version('0.9-no-bundler').should == EY::Serverside::LockfileParser::Parse09::DEFAULT
+  def get_version(file)
+    get_parser(file).bundler_version
   end
 
-  it "gets the version from an 0.9 lockfile with a bundler dependency" do
-    get_version('0.9-with-bundler').should == '0.9.24'
+  it "raises an error with pre 0.9 bundler lockfiles" do
+    lambda { get_version('0.9-no-bundler')   }.should raise_error(RuntimeError, /Malformed or pre bundler-1.0.0 Gemfile.lock/)
+    lambda { get_version('0.9-with-bundler') }.should raise_error(RuntimeError, /Malformed or pre bundler-1.0.0 Gemfile.lock/)
   end
 
   it "returns the default version for a 1.0 lockfile without a bundler dependency" do
-    get_version('1.0-no-bundler').should == EY::Serverside::LockfileParser::Parse10::DEFAULT
+    get_version('1.0-no-bundler').should == EY::Serverside::LockfileParser::DEFAULT
   end
 
   it "gets the version from a 1.0.0.rc.1 lockfile w/dependency on 1.0.0.rc.1" do
-    # This is a real, customer-generated lockfile
     get_version('1.0.0.rc.1-with-bundler').should == '1.0.0.rc.1'
   end
 
   it "gets the version from a 1.0.6 lockfile w/dependency on 1.0.6" do
-    # This is a real, customer-generated lockfile
     get_version('1.0.6-with-bundler').should == '1.0.6'
   end
 
   it "gets the version from a 1.0.6 lockfile w/dependency on 1.0.6 (bundled ~> 1.0.0)" do
-    # This is a real, customer-generated lockfile
     get_version('1.0.6-with-any-bundler').should == '1.0.6'
   end
 
   it "gets the version from a 1.0.6 lockfile w/o dependency" do
-    # This is a real, customer-generated lockfile
     get_version('1.0.6-no-bundler').should == '1.0.6'
   end
 
   it "raises an error if it can't parse the file" do
-    lambda { get_version('not-a-lockfile') }.should raise_error(RuntimeError, /Unknown lockfile format/)
+    lambda { get_version('not-a-lockfile') }.should raise_error(RuntimeError, /Malformed or pre bundler-1.0.0 Gemfile.lock/)
   end
 
-  it "raises an error if it can't parse evil yaml" do
-    lambda { get_version('evil-yaml') }.should raise_error(RuntimeError, /Unknown lockfile format/)
+  context "checking for gems in the dependencies" do
+    it "does not have any database adapters in a gemfile lock without them" do
+      get_parser('1.0.6-no-bundler').any_database_adapter?.should be_false
+    end
+
+    it "has a database adapter in a Gemfile.lock with do_mysql" do
+      get_parser('1.0.18-do_mysql').any_database_adapter?.should be_true
+    end
+
+    it "has a database adapter in a Gemfile.lock with mysql" do
+      get_parser('1.0.18-mysql').any_database_adapter?.should be_true
+    end
+
+    it "has a database adapter in a Gemfile.lock with mysql2" do
+      get_parser('1.0.18-mysql2').any_database_adapter?.should be_true
+    end
+
+    it "has a database adapter in a Gemfile.lock with pg" do
+      get_parser('1.0.18-pg').any_database_adapter?.should be_true
+    end
+
+    it "has a database adapter in a Gemfile.lock with do_postgres" do
+      get_parser('1.0.18-do_postgres').any_database_adapter?.should be_true
+    end
   end
 
   context "fetching the right version number" do
-    subject { EY::Serverside::LockfileParser::Parse10.new(get_full_path('1.0.6-no-bundler')) }
+    subject { get_parser('1.0.6-no-bundler') }
 
     it "uses the default version when there is no bundler version" do
-      subject.fetch_version(nil, nil).should == EY::Serverside::LockfileParser::Parse10::DEFAULT
+      subject.fetch_version(nil, nil).should == EY::Serverside::LockfileParser::DEFAULT
     end
 
     it "uses the given version when the qualifier is `='" do
@@ -73,7 +92,7 @@ describe "the bundler version retrieved from the lockfile" do
     end
 
     it "uses the default version when the given version is lower" do
-      subject.fetch_version('1.0.1', '>=').should == EY::Serverside::LockfileParser::Parse10::DEFAULT
+      subject.fetch_version('1.0.1', '>=').should == EY::Serverside::LockfileParser::DEFAULT
     end
 
     it "selects only the first version expression" do

data/spec/support/integration.rb

@@ -63,7 +63,7 @@ class FullTestDeploy < EY::Serverside::Deploy
     result
   end
 
-  def get_bundler_installer(lockfile)
+  def get_bundler_installer
     installer = super
     installer.options << ' --quiet'   # stfu already!
     installer

data/spec/support/lockfiles/1.0.18-do_mysql

@@ -0,0 +1,88 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    bcrypt-ruby (2.1.4)
+    data_objects (0.10.6)
+      addressable (~> 2.1)
+    datamapper (1.1.0)
+      dm-aggregates (= 1.1.0)
+      dm-constraints (= 1.1.0)
+      dm-core (= 1.1.0)
+      dm-migrations (= 1.1.0)
+      dm-serializer (= 1.1.0)
+      dm-timestamps (= 1.1.0)
+      dm-transactions (= 1.1.0)
+      dm-types (= 1.1.0)
+      dm-validations (= 1.1.0)
+    diff-lcs (1.1.3)
+    dm-aggregates (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-constraints (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-core (1.1.0)
+      addressable (~> 2.2.4)
+    dm-do-adapter (1.1.0)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.1.0)
+    dm-migrations (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-mysql-adapter (1.1.0)
+      dm-do-adapter (~> 1.1.0)
+      do_mysql (~> 0.10.2)
+    dm-serializer (1.1.0)
+      dm-core (~> 1.1.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+    dm-sqlite-adapter (1.1.0)
+      dm-do-adapter (~> 1.1.0)
+      do_sqlite3 (~> 0.10.2)
+    dm-timestamps (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-transactions (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-types (1.1.0)
+      bcrypt-ruby (~> 2.1.4)
+      dm-core (~> 1.1.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+      stringex (~> 1.2.0)
+      uuidtools (~> 2.1.2)
+    dm-validations (1.1.0)
+      dm-core (~> 1.1.0)
+    do_mysql (0.10.6)
+      data_objects (= 0.10.6)
+    do_sqlite3 (0.10.6)
+      data_objects (= 0.10.6)
+    fastercsv (1.5.4)
+    json (1.4.6)
+    rack (1.3.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    shotgun (0.9)
+      rack (>= 1.0)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    stringex (1.2.2)
+    tilt (1.3.3)
+    uuidtools (2.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  datamapper (~> 1.1.0)
+  dm-mysql-adapter
+  dm-sqlite-adapter
+  rake
+  rspec (~> 2.0)
+  shotgun
+  sinatra

data/spec/support/lockfiles/1.0.18-do_postgres

@@ -0,0 +1,79 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    bcrypt-ruby (2.1.4)
+    data_objects (0.10.5)
+      addressable (~> 2.1)
+    datamapper (1.1.0)
+      dm-aggregates (= 1.1.0)
+      dm-constraints (= 1.1.0)
+      dm-core (= 1.1.0)
+      dm-migrations (= 1.1.0)
+      dm-serializer (= 1.1.0)
+      dm-timestamps (= 1.1.0)
+      dm-transactions (= 1.1.0)
+      dm-types (= 1.1.0)
+      dm-validations (= 1.1.0)
+    diff-lcs (1.1.3)
+    dm-aggregates (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-constraints (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-core (1.1.0)
+      addressable (~> 2.2.4)
+    dm-do-adapter (1.1.0)
+      data_objects (~> 0.10.2)
+      dm-core (~> 1.1.0)
+    dm-migrations (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-postgres-adapter (1.1.0)
+      dm-do-adapter (~> 1.1.0)
+      do_postgres (~> 0.10.2)
+    dm-serializer (1.1.0)
+      dm-core (~> 1.1.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+    dm-timestamps (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-transactions (1.1.0)
+      dm-core (~> 1.1.0)
+    dm-types (1.1.0)
+      bcrypt-ruby (~> 2.1.4)
+      dm-core (~> 1.1.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+      stringex (~> 1.2.0)
+      uuidtools (~> 2.1.2)
+    dm-validations (1.1.0)
+      dm-core (~> 1.1.0)
+    do_postgres (0.10.5)
+      data_objects (= 0.10.5)
+    fastercsv (1.5.4)
+    json (1.4.6)
+    rack (1.3.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    stringex (1.2.2)
+    tilt (1.3.3)
+    uuidtools (2.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  datamapper (>= 1.1)
+  dm-postgres-adapter
+  rake
+  rspec (~> 2.0)
+  sinatra

data/spec/support/lockfiles/1.0.18-mysql

@@ -0,0 +1,43 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    i18n (0.5.0)
+    mysql (2.8.1)
+    rack (1.3.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.3.3)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 3.0)
+  mysql
+  rake
+  rspec (~> 2.0)
+  sinatra

data/spec/support/lockfiles/1.0.18-mysql2

@@ -0,0 +1,43 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    i18n (0.5.0)
+    mysql2 (0.2.7)
+    rack (1.3.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.3.3)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 3.0)
+  mysql2
+  rake
+  rspec (~> 2.0)
+  sinatra

data/spec/support/lockfiles/1.0.18-pg

@@ -0,0 +1,43 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    i18n (0.5.0)
+    pg (0.11.0)
+    rack (1.3.3)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sinatra (1.2.6)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.3.3)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 3.0)
+  pg
+  rake
+  rspec (~> 2.0)
+  sinatra

data/spec/support/lockfiles/not-a-lockfile

@@ -1,10 +1 @@
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-task :default => :spec
-
-require 'rake/rdoctask'
-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+THIS IS NOT A LOCKFILE

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 16
-  version: 1.4.16
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -04:00
+date: 2011-10-06 00:00:00 -07:00
 default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
   type: :development
-  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,9 +35,9 @@ dependencies:
         version: 1.3.2
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
   type: :development
-  name: rake
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -285,10 +285,14 @@ files:
 - spec/support/lockfiles/0.9-with-bundler
 - spec/support/lockfiles/1.0-no-bundler
 - spec/support/lockfiles/1.0.0.rc.1-with-bundler
+- spec/support/lockfiles/1.0.18-do_mysql
+- spec/support/lockfiles/1.0.18-do_postgres
+- spec/support/lockfiles/1.0.18-mysql
+- spec/support/lockfiles/1.0.18-mysql2
+- spec/support/lockfiles/1.0.18-pg
 - spec/support/lockfiles/1.0.6-no-bundler
 - spec/support/lockfiles/1.0.6-with-any-bundler
 - spec/support/lockfiles/1.0.6-with-bundler
-- spec/support/lockfiles/evil-yaml
 - spec/support/lockfiles/not-a-lockfile
 has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-serverside
@@ -320,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -346,8 +350,12 @@ test_files:
 - spec/support/lockfiles/0.9-with-bundler
 - spec/support/lockfiles/1.0-no-bundler
 - spec/support/lockfiles/1.0.0.rc.1-with-bundler
+- spec/support/lockfiles/1.0.18-do_mysql
+- spec/support/lockfiles/1.0.18-do_postgres
+- spec/support/lockfiles/1.0.18-mysql
+- spec/support/lockfiles/1.0.18-mysql2
+- spec/support/lockfiles/1.0.18-pg
 - spec/support/lockfiles/1.0.6-no-bundler
 - spec/support/lockfiles/1.0.6-with-any-bundler
 - spec/support/lockfiles/1.0.6-with-bundler
-- spec/support/lockfiles/evil-yaml
 - spec/support/lockfiles/not-a-lockfile

data/spec/support/lockfiles/evil-yaml

@@ -1,5 +0,0 @@
---- 
-x: |-
-  
-   x
-  x