engineyard-serverside 1.5.28.pre10 → 1.5.28.pre11

data/lib/engineyard-serverside/cli.rb

@@ -1,6 +1,5 @@
 require 'thor'
 require 'pathname'
-require 'tmpdir'
 
 module EY
   module Serverside
@@ -57,7 +56,7 @@ module EY
         EY::Serverside::LoggedOutput.verbose = options[:verbose]
         EY::Serverside::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-deploy.log")
 
-        propagate
+        invoke :propagate
 
         EY::Serverside::Deploy.new(config).send(default_task)
       end
@@ -138,7 +137,7 @@ module EY
 
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        propagate
+        invoke :propagate
 
         EY::Serverside::Server.all.each do |server|
           server.sync_directory app_dir
@@ -184,7 +183,7 @@ module EY
         config = EY::Serverside::Deploy::Configuration.new(options)
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        propagate
+        invoke :propagate
 
         EY::Serverside::Deploy.new(config).restart_with_maintenance_page
       end
@@ -210,17 +209,27 @@ module EY
         gem_filename    = "engineyard-serverside-#{EY::Serverside::VERSION}.gem"
         local_gem_file  = File.join(Gem.dir, 'cache', gem_filename)
         remote_gem_file = File.join(Dir.tmpdir, gem_filename)
+        gem_binary      = File.join(Gem.default_bindir, 'gem')
 
         servers = EY::Serverside::Server.all.find_all { |server| !server.local? }
 
         futures = EY::Serverside::Future.call(servers) do |server|
-          installed = server.gem?('engineyard-serverside', EY::Serverside::VERSION)
-          unless installed  # doesn't have this exact version
+          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
             puts "~> Installing engineyard-serverside on #{server.hostname}"
 
-            installed = server.install_gem(local_gem_file, remote_gem_file)
+            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}'")
           end
-          installed
         end
 
         EY::Serverside::Future.success?(futures)

data/lib/engineyard-serverside/server.rb

@@ -83,43 +83,12 @@ 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 #{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 = %Q{#{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
-
-      def gem_binary
-        File.join(Gem.default_bindir, 'gem')
+        "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
       end
 
     end

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.28.pre10'
+    VERSION = '1.5.28.pre11'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 1.5.28.pre10
+  version: 1.5.28.pre11
   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: &2159950880 !ruby/object:Gem::Requirement
+  requirement: &2154041000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2159950880
+  version_requirements: *2154041000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2159950220 !ruby/object:Gem::Requirement
+  requirement: &2154040380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2159950220
+  version_requirements: *2154040380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2159949640 !ruby/object:Gem::Requirement
+  requirement: &2154040000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159949640
+  version_requirements: *2154040000
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2159949180 !ruby/object:Gem::Requirement
+  requirement: &2154039380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159949180
+  version_requirements: *2154039380
 description: 
 email: cloud@engineyard.com
 executables: