engineyard-serverside 1.5.13 → 1.5.15

data/lib/engineyard-serverside/configuration.rb

@@ -147,10 +147,18 @@ module EY
         File.join(bundled_gems_path, "RUBY_VERSION")
       end
 
+      def ruby_version_command
+        "ruby -v"
+      end
+
       def system_version_file
         File.join(bundled_gems_path, "SYSTEM_VERSION")
       end
 
+      def system_version_command
+        "uname -m"
+      end
+
       def release_dir
         File.join(deploy_to, "releases")
       end

data/lib/engineyard-serverside/deploy.rb

@@ -419,29 +419,31 @@ Deploy again if your services configuration appears incomplete or out of date.
         if gemfile?
           info "~> Bundling gems..."
 
-          bundler_version, install_switches = bundler_config
+          clean_bundle_on_system_version_change
 
+          bundler_version, install_switches = bundler_config
           sudo "#{clean_environment} && #{serverside_bin} install_bundler #{bundler_version}"
+          run  "#{clean_environment} && cd #{c.release_path} && ruby -S bundle _#{bundler_version}_ install #{install_switches}"
 
-          ruby_version   = `ruby -v`
-          system_version = `uname -m`
-
-          if File.directory?(c.bundled_gems_path)
-            rebundle = false
+          write_system_version
+        end
+      end
 
-            rebundle = true if !File.exist?(c.ruby_version_file)   || File.read(c.ruby_version_file)   != ruby_version
-            rebundle = true if !File.exist?(c.system_version_file) || File.read(c.system_version_file) != system_version
+      def clean_bundle_on_system_version_change
+        # diff exits with 0 for same and 1/2 for different/file not found.
+        check_ruby   = "#{c.ruby_version_command} | diff - #{c.ruby_version_file} >/dev/null 2>&1"
+        check_system = "#{c.system_version_command} | diff - #{c.system_version_file} >/dev/null 2>&1"
+        say_cleaning = "echo 'System version change detected, cleaning bundled gems.'"
+        clean_bundle = "rm -Rf #{c.bundled_gems_path}"
 
-            if rebundle
-              info "~> Ruby version change detected, cleaning bundled gems"
-              run "rm -Rf #{c.bundled_gems_path}"
-            end
-          end
+        run "#{check_ruby} && #{check_system} || #{say_cleaning} && #{clean_bundle}"
+      end
 
-          run "#{clean_environment} && cd #{c.release_path} && ruby -S bundle _#{bundler_version}_ install #{install_switches}"
+      def write_system_version
+        store_ruby_version   = "#{c.ruby_version_command} > #{c.ruby_version_file}"
+        store_system_version = "#{c.system_version_command} > #{c.system_version_file}"
 
-          run "mkdir -p #{c.bundled_gems_path} && ruby -v > #{c.ruby_version_file} && uname -m > #{c.system_version_file}"
-        end
+        run "mkdir -p #{c.bundled_gems_path} && #{store_ruby_version} && #{store_system_version}"
       end
 
       def check_node_npm

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.13'
+    VERSION = '1.5.15'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 5
-  - 13
-  version: 1.5.13
+  - 15
+  segments_generated: true
+  version: 1.5.15
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,38 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 Z
+date: 2011-11-10 00:00:00 -08:00
+default_executable: engineyard-serverside
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 3
         - 2
+        segments_generated: true
         version: 1.3.2
   requirement: *id001
-  type: :development
-  prerelease: false
   name: rspec
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
   requirement: *id002
-  type: :development
-  prerelease: false
   name: rake
+  prerelease: false
+  type: :development
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -262,38 +261,7 @@ files:
 - lib/vendor/thor/thor.gemspec
 - lib/vendor/thor/Thorfile
 - LICENSE
-- spec/basic_deploy_spec.rb
-- spec/bundler_deploy_spec.rb
-- spec/custom_deploy_spec.rb
-- spec/deploy_hook_spec.rb
-- spec/deprecation_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
-- spec/fixtures/lockfiles/0.9-with-bundler
-- spec/fixtures/lockfiles/1.0-no-bundler
-- spec/fixtures/lockfiles/1.0.0.rc.1-with-bundler
-- spec/fixtures/lockfiles/1.0.18-do_mysql
-- spec/fixtures/lockfiles/1.0.18-do_postgres
-- spec/fixtures/lockfiles/1.0.18-mysql
-- spec/fixtures/lockfiles/1.0.18-mysql2
-- spec/fixtures/lockfiles/1.0.18-pg
-- spec/fixtures/lockfiles/1.0.6-no-bundler
-- spec/fixtures/lockfiles/1.0.6-with-any-bundler
-- spec/fixtures/lockfiles/1.0.6-with-bundler
-- spec/fixtures/lockfiles/not-a-lockfile
-- spec/fixtures/valid_hook.rb
-- spec/git_strategy_spec.rb
-- spec/lockfile_parser_spec.rb
-- spec/nodejs_deploy_spec.rb
-- spec/rails31_deploy_spec.rb
-- spec/restart_spec.rb
-- spec/server_spec.rb
-- spec/services_deploy_spec.rb
-- spec/spec_helper.rb
-- spec/support/integration.rb
+has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
 
@@ -303,27 +271,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -333,7 +299,6 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb