doo 0.6.0 → 0.6.1

data/lib/doo/stock/common.rb

@@ -6,22 +6,28 @@ Doo::Base.class_eval do
   
   def replace(file, src, replace, opts = {})
     sep = SEPARATORS.detect { |x| !src.include?(x) && !replace.include?(x) }
-    run "sed -i -e 's#{sep}#{src}#{sep}#{replace}#{sep}g' #{file}", opts
+    run "sed -i -e 's#{sep}#{src.escape_for_shell}#{sep}#{replace.escape_for_shell}#{sep}g' #{file}", opts
   end
   
   def append(file, text, opts = {})
-    run "grep '#{text}' #{file} || echo '#{text}' >> #{file}", opts
+    run "grep '#{text.escape_for_shell}' #{file} || echo '#{text.escape_for_shell}' >> #{file}", opts
   end
   
   def sudo(cmd, opts = {})
     run(cmd, opts.merge(:sudo => true))
   end
   
-  private
-  def sudoize(cmd)
-    "sudo sh -c \"#{cmd.gsub(/\"/, "\\\"")}\""
+  class String
+    def sudoize!
+      replace "sudo sh -c \"#{escape_for_shell}\""
+    end
+
+    def escape_for_shell
+      gsub "\"", "\\\""
+    end
   end
   
+  private
   def run!(cmd, opts = {})
     with_clone(opts) do
       if confirm

data/lib/doo/stock/run_locally.rb

@@ -2,7 +2,7 @@ Doo::Base.class_eval do
   def run_locally(variables = {}, &block)
     with_clone(variables) do
       def run(cmd, opts = {})
-        cmd = sudoize(cmd) if opts[:sudo]
+        cmd.sudoize! if opts[:sudo]
         run! cmd, opts
       end
       

data/lib/doo/stock/run_on_server.rb

@@ -6,8 +6,8 @@ Doo::Base.class_eval do
           cmdopts = ["-S \"~/.ssh/master-%l-%r@%h:%p\""]
           cmdopts << "-t" if !opts.include? :pty || opts[:pty]
           cmdopts << "-p#{ssh_port}" if defined? ssh_port
-          remote_cmd = sudoize(remote_cmd) if opts[:sudo]
-          run! "ssh #{cmdopts.join(' ')} #{user}@#{host} \"#{remote_cmd.gsub(/\"/, "\\\"")}\"", opts
+          remote_cmd.sudoize! if opts[:sudo]
+          run! "ssh #{cmdopts.join(' ')} #{user}@#{host} \"#{remote_cmd.escape_for_shell}\"", opts
         end
 
         def put(local, remote, opts = {})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Mat Trudel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -05:00
+date: 2010-12-17 00:00:00 -05:00
 default_executable: doo
 dependencies: 
 - !ruby/object:Gem::Dependency