ey-deploy 1.0.2 → 1.1.0

data/lib/ey-deploy.rb

@@ -16,6 +16,7 @@ require 'server'
 require 'deploy'
 require 'deploy_hook'
 require 'lockfile_parser'
+require 'bundle_installer'
 require 'cli'
 require 'configuration'
 

data/lib/ey-deploy/bundle_installer.rb

@@ -0,0 +1,4 @@
+module EY
+  class BundleInstaller < Struct.new(:version, :options)
+  end
+end

data/lib/ey-deploy/deploy.rb

@@ -122,16 +122,16 @@ module EY
         info "~> Gemfile detected, bundling gems"
         lockfile = File.join(c.release_path, "Gemfile.lock")
 
-        bundler_version = if File.exist?(lockfile)
-                            get_bundler_version(lockfile)
-                          else
-                            warn_about_missing_lockfile
-                            DEFAULT_09_BUNDLER
-                          end
+        bundler_installer = if File.exist?(lockfile)
+                              get_bundler_installer(lockfile)
+                            else
+                              warn_about_missing_lockfile
+                              DEFAULT_09_BUNDLER
+                            end
 
-        sudo "#{$0} _#{VERSION}_ install_bundler #{bundler_version}"
+        sudo "#{$0} _#{VERSION}_ install_bundler #{bundler_installer.version}"
 
-        run "cd #{c.release_path} && bundle _#{bundler_version}_ install --without=development --without=test"
+        run "cd #{c.release_path} && bundle _#{bundler_installer.version}_ install #{bundler_installer.options}"
       end
     end
 
@@ -269,7 +269,7 @@ module EY
     end
 
     DEFAULT_09_BUNDLER = '0.9.26'
-    DEFAULT_10_BUNDLER = '1.0.0.rc.1'
+    DEFAULT_10_BUNDLER = '1.0.0.rc.3'
 
     def warn_about_missing_lockfile
       info "!>"
@@ -285,19 +285,23 @@ module EY
       info "!>"
     end
 
-    def get_bundler_version(lockfile)
+    def get_bundler_installer(lockfile)
       parser = LockfileParser.new(File.read(lockfile))
-      return parser.bundler_version if parser.bundler_version
       case parser.lockfile_version
       when :bundler09
-        DEFAULT_09_BUNDLER
+        BundleInstaller.new(
+          parser.bundler_version || DEFAULT_09_BUNDLER,
+          "--without=development --without=test")
       when :bundler10
-        DEFAULT_10_BUNDLER
+        BundleInstaller.new(
+          parser.bundler_version || DEFAULT_10_BUNDLER,
+          "--deployment --path #{c.shared_path}/bundled_gems"
+          )
       else
         raise "Unknown lockfile version #{parser.lockfile_version}"
       end
     end
-    public :get_bundler_version
+    public :get_bundler_installer
 
   end   # DeployBase
 

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/spec/lockfile_parser_spec.rb

@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "the bundler version retrieved from the lockfile" do
   def get_version(file)
     full_path = File.expand_path("../support/lockfiles/#{file}", __FILE__)
-    EY::DeployBase.new({}).get_bundler_version(full_path)
+    config = EY::Deploy::Configuration.new('deploy_to' => 'dontcare')
+    EY::DeployBase.new(config).get_bundler_installer(full_path).version
   end
 
   it "returns the default version for an 0.9 lockfile without a bundler dependency" do

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -07:00
+date: 2010-08-04 00:00:00 -07:00
 default_executable: ey-deploy
 dependencies: []
 
@@ -29,6 +29,7 @@ extra_rdoc_files: []
 
 files: 
 - bin/ey-deploy
+- lib/ey-deploy/bundle_installer.rb
 - lib/ey-deploy/cli.rb
 - lib/ey-deploy/configuration.rb
 - lib/ey-deploy/default_maintenance_page.html
@@ -234,7 +235,6 @@ files:
 - LICENSE
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -284,7 +284,6 @@ summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb