engineyard-serverside 1.6.4.pre5 → 1.6.4.pre6

data/lib/engineyard-serverside/server.rb

@@ -83,7 +83,7 @@ module EY
         if local?
           logged_system(command)
         else
-          logged_system("#{ssh_command} #{Escape.shell_command ["#{user}@#{hostname}", Escape.shell_command(%w["sh -l -c"] + [command])]}")
+          logged_system(ssh_command + " " + Escape.shell_command(["#{user}@#{hostname}", command]))
         end
       end
 

data/lib/engineyard-serverside/task.rb

@@ -45,18 +45,16 @@ module EY
       end
 
       def sudo(cmd, &blk)
-        sudo_cmd = "sudo sh -c #{Escape.shell_command [cmd]}"
-
-        run_on_roles(sudo_cmd, &blk)
+        run_on_roles(cmd, %w[sudo sh -l -c], &blk)
       end
 
       private
 
-      def run_on_roles(cmd, &block)
+      def run_on_roles(cmd, wrapper=%w[sh -l -c], &block)
         servers = EY::Serverside::Server.from_roles(@roles)
         futures = EY::Serverside::Future.call(servers, block_given?) do |server, exec_block|
           to_run = exec_block ? block.call(server, cmd.dup) : cmd
-          server.run(to_run)
+          server.run(Escape.shell_command(wrapper + [to_run]))
         end
 
         unless EY::Serverside::Future.success?(futures)

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.6.4.pre5'
+    VERSION = '1.6.4.pre6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 1.6.4.pre5
+  version: 1.6.4.pre6
   prerelease: 6
 platform: ruby
 authors: