engineyard-serverside 1.5.28.pre6 → 1.5.28.pre7

data/lib/engineyard-serverside/cli.rb

@@ -57,7 +57,7 @@ module EY
         EY::Serverside::LoggedOutput.verbose = options[:verbose]
         EY::Serverside::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-deploy.log")
 
-        invoke :propagate
+        propagate
 
         EY::Serverside::Deploy.new(config).send(default_task)
       end
@@ -138,7 +138,7 @@ module EY
 
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        invoke :propagate
+        propagate
 
         EY::Serverside::Server.all.each do |server|
           server.sync_directory app_dir
@@ -184,7 +184,7 @@ module EY
         config = EY::Serverside::Deploy::Configuration.new(options)
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        invoke :propagate
+        propagate
 
         EY::Serverside::Deploy.new(config).restart_with_maintenance_page
       end
@@ -214,19 +214,13 @@ module EY
         servers = EY::Serverside::Server.all.find_all { |server| !server.local? }
 
         futures = EY::Serverside::Future.call(servers) do |server|
-          begin
-            installed = server.gem?('engineyard-serverside', EY::Serverside::VERSION)
-            unless installed  # doesn't have this exact version
-              puts "~> Installing engineyard-serverside on #{server.hostname}"
-
-              installed = server.install_gem(local_gem_file, remote_gem_file)
-            end
-            return installed
-          rescue
-            puts $!.message
-            puts $!.backtrace.join("\n")
-            return false
+          installed = server.gem?('engineyard-serverside', EY::Serverside::VERSION)
+          unless installed  # doesn't have this exact version
+            puts "~> Installing engineyard-serverside on #{server.hostname}"
+
+            installed = server.install_gem(local_gem_file, remote_gem_file)
           end
+          installed
         end
 
         EY::Serverside::Future.success?(futures)

data/lib/engineyard-serverside/server.rb

@@ -106,7 +106,7 @@ module EY
         egrep_escaped_version = version.gsub(/\./, '\.')
         # the [,)] is to stop us from looking for e.g. 0.5.1, seeing
         # 0.5.11, and mistakenly thinking 0.5.1 is there
-        has_gem_cmd = "#{gem_binary} list #{name} | grep \"#{name}\" | egrep -q '#{egrep_escaped_version}[,)]'"
+        has_gem_cmd = %Q{#{gem_binary} list #{name} | grep "#{name}" | egrep -q "#{egrep_escaped_version}[,)]"}
         run(has_gem_cmd)
       end
 
@@ -119,7 +119,7 @@ module EY
       end
 
       def gem_binary
-        File.expand_path('gem', Gem.default_bindir)
+        File.join(Gem.default_bindir, 'gem')
       end
 
     end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.28.pre6'
+    VERSION = '1.5.28.pre7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 1.5.28.pre6
+  version: 1.5.28.pre7
   prerelease: 7
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153282560 !ruby/object:Gem::Requirement
+  requirement: &2154483520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2153282560
+  version_requirements: *2154483520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153282060 !ruby/object:Gem::Requirement
+  requirement: &2154508560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2153282060
+  version_requirements: *2154508560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153281680 !ruby/object:Gem::Requirement
+  requirement: &2154508180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153281680
+  version_requirements: *2154508180
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2153281220 !ruby/object:Gem::Requirement
+  requirement: &2154507720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153281220
+  version_requirements: *2154507720
 description: 
 email: cloud@engineyard.com
 executables: