doo 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/doo/stock/run_on_server.rb

@@ -4,22 +4,25 @@ Doo::Base.class_eval do
       with_clone(variables.merge({:host => host}).merge(params || {})) do
         def run(cmd, opt = {})
           cmdopts = ["-S \"~/.ssh/master-%l-%r@%h:%p\""]
-          cmdopts << "-t" if opt.include? :pty || opt[:pty]
+          cmdopts << "-t" if !opt.include? :pty || opt[:pty]
           command = "ssh #{cmdopts.join(' ')} #{user}@#{host} #{cmd}"
           puts "Running #{command}" if verbose
           system(command) || raise("SSH Error") unless dry_run
           $?
         end
 
-        def put(local, remote)
-          puts "scp -r \"#{local}\" \"#{host}:#{remote}\"" if verbose
-          system("scp -r \"#{local}\" \"#{host}:#{remote}\"") || raise("SSH Error") unless dry_run
+        def put(local, remote, opt = {})
+          cmdopts = ["-r"]
+          cmdopts << "-oProxyCommand=\"ssh #{gateway} exec nc %h %p\"" if defined?(gateway) && gateway
+          command = "scp #{cmdopts.join(' ')} #{local} #{user}@#{host}:#{remote}"
+          puts "Putting file #{local} to #{remote} via #{command}" if verbose
+          system(command) || raise("Scp Error") unless dry_run
           $?
         end
 
         begin
           cmdopts = ["-MNf -S \"~/.ssh/master-%l-%r@%h:%p\""]
-          cmdopts << "-oProxyCommand=\"ssh #{gateway} exec nc %h %p\"" if defined? :gateway
+          cmdopts << "-oProxyCommand=\"ssh #{gateway} exec nc %h %p\"" if defined?(gateway) && gateway
           command = "ssh #{cmdopts.join(' ')} #{user}@#{host}"
           puts "Running #{command}" if verbose
           system(command) || raise("SSH Error") unless dry_run

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doo
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mat Trudel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 -04:00
+date: 2010-09-20 00:00:00 -04:00
 default_executable: doo
 dependencies: []