engineyard-serverside 1.5.27.pre2 → 1.5.27.pre3

data/lib/engineyard-serverside/cli.rb

@@ -56,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
@@ -137,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
@@ -183,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
@@ -205,22 +205,31 @@ module EY
 
       desc "propagate", "Propagate the engineyard-serverside gem to the other instances in the cluster. This will install exactly version #{EY::Serverside::VERSION}."
       def propagate
-        name            = "engineyard-serverside"
-        version         = EY::Serverside::VERSION
-        gem_filename    = "#{name}-#{version}.gem"
+        config          = EY::Serverside::Deploy::Configuration.new
+        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?(name, version)
-          unless installed
-            info "~> Installing #{name} on #{server.hostname}"
-            server.copy(local_gem_file, remote_gem_file)
-            installed = server.install_gem(remote_gem_file)
+          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}"
+
+            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,37 +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 copy(local_file, remote_file)
-        logged_system(scp_command + Escape.shell_command([local_file, "#{user}@#{hostname}:#{remote_file}"]))
-      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
-
-      def gem?(name, version)
-        run("#{gem_command} list -i #{name} -v '#{version}'")
-      end
-
-      def install_gem(path)
-        # resin + ruby 1.8.6 need sudo privileges to install gems
-        run("sudo #{gem_command} install -q --no-ri --no-rdoc #{path}")
-      end
-
-      def gem_command
-        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.27.pre2'
+    VERSION = '1.5.27.pre3'
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 2339881699
+  hash: 2511085049
   prerelease: 7
   segments: 
   - 1
   - 5
   - 27
   - pre
-  - 2
-  version: 1.5.27.pre2
+  - 3
+  version: 1.5.27.pre3
 platform: ruby
 authors: 
 - EY Cloud Team