shexy 0.1 → 0.2

data/lib/shexy.rb

@@ -32,7 +32,7 @@ require 'net/scp'
 #
 module Shexy
 
-  VERSION = '0.1'
+  VERSION = '0.2'
 
   @flags = {}
 
@@ -40,7 +40,7 @@ module Shexy
   def self.password; flags[:password]; end
   def self.key=(key); flags[:keys] = [File.expand_path(key)]; end
   def self.key; flags[:keys]; end
-  def self.use_sudo; @sudo = true; end
+  def self.use_sudo(v=true); @sudo = v; end
   def self.sudo?; @sudo ||= false; end
 
   class << self
@@ -70,17 +70,25 @@ module Shexy
           # to implement access to stdout,stderr this way
           stdout = ""
           stderr = ""
+          exit_code = -1
+          exit_signal = -1
           ch.on_extended_data do |c2, type, data|
             # ERROR output here
             stderr << data
-            yield stdout, stderr if block_given?
+            yield nil, data if block_given?
           end
           ch.on_data do |c2, data|
             stdout << data
-            yield stdout, stderr if block_given?
+            yield data, nil if block_given?
           end
           ch.on_close do |c2|
-            return stdout, stderr
+            return stdout, stderr, exit_code, exit_signal
+          end
+          ch.on_request("exit-status") do |c2,data|
+            exit_code = data.read_long
+          end
+          ch.on_request("exit-signal") do |c2, data|
+            exit_signal = data.read_long
           end
         end
       end
@@ -97,6 +105,12 @@ module Shexy
   # Shexy.copy_to 'source_file', 'dest_file'
   # 
   def self.copy_to(*args)
+    opts = {}
+    if args.include?(:recursive)
+      opts = { :recursive => true }
+      args.delete :recursive
+    end
+    
     if args.size > 2
       # First arg assumed to be foo@host.net
       @host = args[0]
@@ -113,7 +127,7 @@ module Shexy
     end
     from = File.expand_path from
     Net::SCP.start(host, user, flags) do |scp|
-      scp.upload! from, to
+      scp.upload! from, to, opts
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shexy
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -129,12 +129,12 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - lib/shexy.rb
 - test/helper.rb
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 518133985048816115
+      hash: 2098135952916495063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: