engineyard-serverside 1.5.28.pre1 → 1.5.28.pre2

data/lib/engineyard-serverside/cli.rb

@@ -215,21 +215,10 @@ module EY
         servers = EY::Serverside::Server.all.find_all { |server| !server.local? }
 
         futures = EY::Serverside::Future.call(servers) do |server|
-          egrep_escaped_version = EY::Serverside::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 engineyard-serverside | grep \"engineyard-serverside\" | egrep -q '#{egrep_escaped_version}[,)]'"
-
-          if !server.run(has_gem_cmd)  # doesn't have this exact version
+          if !server.gem?('engineyard-serverside', EY::Serverside::VERSION)  # doesn't have this exact version
             puts "~> Installing engineyard-serverside on #{server.hostname}"
 
-            system(Escape.shell_command([
-              'scp', '-i', "#{ENV['HOME']}/.ssh/internal",
-              "-o", "StrictHostKeyChecking=no",
-              local_gem_file,
-             "#{config.user}@#{server.hostname}:#{remote_gem_file}",
-            ]))
-            server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
+            server.install_gem(local_gem_file, remote_gem_file)
           end
         end
 

data/lib/engineyard-serverside/server.rb

@@ -83,12 +83,39 @@ module EY
         if local?
           logged_system(command)
         else
-          logged_system(ssh_command + " " + Escape.shell_command(["#{user}@#{hostname}", command]))
+          logged_system(ssh_command + Escape.shell_command(["#{user}@#{hostname}", command]))
         end
       end
 
       def ssh_command
-        "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+        "ssh #{ssh_options} "
+      end
+
+      def scp_command
+        "scp #{ssh_options} "
+      end
+
+      def ssh_options
+        "-i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+      end
+
+      #
+      # check whether a gem is installed in the server
+      #
+      def gem?(name, version)
+        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}[,)]'"
+        run(has_gem_cmd)
+      end
+
+      #
+      # copy a local gem to the remove server and install it
+      #
+      def install_gem(local_gem_file, remote_gem_file)
+        logged_system(scp_command + Escape.shell_command([local_gem_file, "#{user}@#{hostname}:#{remote_gem_file}"]))
+        run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
       end
 
     end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.28.pre1'
+    VERSION = '1.5.28.pre2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 1.5.28.pre1
+  version: 1.5.28.pre2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161682860 !ruby/object:Gem::Requirement
+  requirement: &2157318860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2161682860
+  version_requirements: *2157318860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161682300 !ruby/object:Gem::Requirement
+  requirement: &2157318360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2161682300
+  version_requirements: *2157318360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2161681900 !ruby/object:Gem::Requirement
+  requirement: &2157317980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161681900
+  version_requirements: *2157317980
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2161681360 !ruby/object:Gem::Requirement
+  requirement: &2157317520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161681360
+  version_requirements: *2157317520
 description: 
 email: cloud@engineyard.com
 executables: