net-ssh-simple 1.5.9 → 1.6.0

data/.gitignore

@@ -1,3 +1,4 @@
+.rbenv-version
 *.gem
 .bundle
 Gemfile.lock

data/README.rdoc

@@ -1,6 +1,4 @@
-{<img src="https://gemnasium.com/busyloop/net-ssh-simple.png" alt="Dependency Status" />}[https://gemnasium.com/busyloop/net-ssh-simple]
-
-= Net::SSH::Simple
+= Net::SSH::Simple {<img src="https://gemnasium.com/busyloop/net-ssh-simple.png" alt="Dependency Status" />}[https://gemnasium.com/busyloop/net-ssh-simple]
 
 Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
 
@@ -39,8 +37,8 @@ version with syntax highlighting.
    r = ssh 'example1.com', 'echo "Hello World."'
    puts r.stdout #=> "Hello World."
 
-   scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
-   scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+   scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+   scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
  end
 
 === Block Syntax (asynchronous)
@@ -48,11 +46,11 @@ version with syntax highlighting.
  require 'net/ssh/simple'
 
  t1 = Net::SSH::Simple.async do
-   scp_ul 'example1.com', '/tmp/local_foo', '/tmp/remote_bar'
+   scp_put 'example1.com', '/tmp/local_foo', '/tmp/remote_bar'
    ssh    'example3.com', 'echo "Hello World A."'
  end
  t2 = Net::SSH::Simple.async do
-   scp_dl 'example6.com', '/tmp/remote_foo', '/tmp/local_bar'
+   scp_get 'example6.com', '/tmp/remote_foo', '/tmp/local_bar'
    ssh    'example7.com', 'echo "Hello World B."'
  end
  r1 = t1.value # wait for t1 to finish and grab return value
@@ -67,8 +65,8 @@ version with syntax highlighting.
 
  s = Net::SSH::Simple.new
  s.ssh    'example1.com', 'echo "Hello World."'
- s.scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
- s.scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+ s.scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+ s.scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
  s.close
 
 == Thread safety
@@ -104,15 +102,15 @@ then the following idiom will provide the best performance:
    # The connections to example1-5.com are re-used across
    # multiple calls to this method.
    ss.ssh    'example1.com', 'echo "Hello World."', {:user => 'not_bob'}
-   ss.scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
-   ss.scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+   ss.scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+   ss.scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
 
    t = ss.async do
-     scp_ul 'example4.com', '/tmp/local_foo', '/tmp/remote_bar'
+     scp_put 'example4.com', '/tmp/local_foo', '/tmp/remote_bar'
    end
 
    ss.sync do
-     scp_ul 'example5.com', '/tmp/local_foo', '/tmp/remote_bar'
+     scp_put 'example5.com', '/tmp/local_foo', '/tmp/remote_bar'
    end
 
    # wait for our async call to finish

data/lib/net/ssh/simple/version.rb

@@ -1,7 +1,7 @@
 module Net
   module SSH
     class Simple
-      VERSION = "1.5.9"
+      VERSION = "1.6.0"
     end
   end
 end

data/lib/net/ssh/simple.rb

@@ -38,18 +38,18 @@ module Net
     #     puts r.stdout    #=> "Hello World."
     #     puts r.exit_code #=> 0
     #
-    #     scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
-    #     scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+    #     scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+    #     scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
     #   end
     #
     # @example
     #   # Block Syntax (asynchronous)
     #   t1 = Net::SSH::Simple.async do
-    #     scp_ul 'example1.com', '/tmp/local_foo', '/tmp/remote_bar'
+    #     scp_put 'example1.com', '/tmp/local_foo', '/tmp/remote_bar'
     #     ssh    'example3.com', 'echo "Hello World A."'
     #   end
     #   t2 = Net::SSH::Simple.async do
-    #     scp_dl 'example6.com', '/tmp/remote_foo', '/tmp/local_bar'
+    #     scp_get 'example6.com', '/tmp/remote_foo', '/tmp/local_bar'
     #     ssh    'example7.com', 'echo "Hello World B."'
     #   end
     #   r1 = t1.value # wait for t1 to finish and grab return value
@@ -61,18 +61,18 @@ module Net
     # @example
     #   # Using an instance
     #   s = Net::SSH::Simple.new
-    #   s.ssh    'example1.com', 'echo "Hello World."'
-    #   s.scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
-    #   s.scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+    #   s.ssh     'example1.com', 'echo "Hello World."'
+    #   s.scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+    #   s.scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
     #   s.close
     #
     # @example
     #   # Using no instance
     #   # Note: This will create a new connection for each operation!
     #   #       Use instance- or block-syntax for better performance.
-    #   Net::SSH::Simple.ssh    'example1.com', 'echo "Hello World."'
-    #   Net::SSH::Simple.scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
-    #   Net::SSH::Simple.scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+    #   Net::SSH::Simple.ssh     'example1.com', 'echo "Hello World."'
+    #   Net::SSH::Simple.scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+    #   Net::SSH::Simple.scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
     #
     # @example
     #   # Error Handling with Block Syntax (synchronous)
@@ -83,12 +83,12 @@ module Net
     #         puts "Success! I Helloed World."
     #       end
     #
-    #       r = scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+    #       r = scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
     #       if r.success and r.sent == r.total
     #         puts "Success! Uploaded #{r.sent} of #{r.total} bytes."
     #       end
     #
-    #       r = scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+    #       r = scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
     #       if r.success and r.sent == r.total
     #         puts "Success! Downloaded #{r.sent} of #{r.total} bytes."
     #       end
@@ -108,9 +108,9 @@ module Net
     #
     #   a = Net::SSH::Simple.async do
     #     begin
-    #       ssh    'example1.com', 'echo "Hello World."'
-    #       scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
-    #       scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+    #       ssh     'example1.com', 'echo "Hello World."'
+    #       scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+    #       scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
     #     rescue Net::SSH::Simple::Error => e
     #       # return our exception to the parent thread
     #       e
@@ -132,12 +132,12 @@ module Net
     #       puts "Success! I Helloed World."
     #     end
     #
-    #     r = s.scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
+    #     r = s.scp_put 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
     #     if r.success and r.sent == r.total
     #       puts "Success! Uploaded #{r.sent} of #{r.total} bytes."
     #     end
     #
-    #     r = s.scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
+    #     r = s.scp_get 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
     #     if r.success and r.sent == r.total
     #       puts "Success! Downloaded #{r.sent} of #{r.total} bytes."
     #     end
@@ -161,13 +161,13 @@ module Net
     #   Net::SSH::Simple.sync({:user => 'tom', :port => 1234}) do
     #     # Both commands will inherit :user and :port
     #     ssh('example1.com', 'echo "Hello World."', {:password => 'jerry'})
-    #     scp_ul('example2.com', '/tmp/a', '/tmp/a', {:password => 's3cr3t'})
+    #     scp_put('example2.com', '/tmp/a', '/tmp/a', {:password => 's3cr3t'})
     #   end
     #
     # @example
     #   # Using the SCP progress callback
     #   Net::SSH::Simple.sync do
-    #     scp_ul 'example1.com', '/tmp/local_foo', '/tmp/remote_bar' do |sent, total|
+    #     scp_put 'example1.com', '/tmp/local_foo', '/tmp/remote_bar' do |sent, total|
     #       puts "Bytes uploaded: #{sent} of #{total}"
     #     end
     #   end
@@ -278,20 +278,20 @@ module Net
       #
       # @example
       #   # SCP Upload
-      #   Net::SSH::Simple.scp_ul('localhost', '/tmp/local_foo', '/tmp/remote_bar')
+      #   Net::SSH::Simple.scp_put('localhost', '/tmp/local_foo', '/tmp/remote_bar')
       #
       # @example
       #   # Pass a block to monitor progress
-      #   Net::SSH::Simple.scp_ul('localhost', '/tmp/local_foo', '/tmp/remote_bar') do |sent, total|
+      #   Net::SSH::Simple.scp_put('localhost', '/tmp/local_foo', '/tmp/remote_bar') do |sent, total|
       #     puts "Bytes uploaded: #{sent} of #{total}"
       #   end
       #
-      # @param (see Net::SSH::Simple#scp_ul)
+      # @param (see Net::SSH::Simple#scp_put)
       # @raise [Net::SSH::Simple::Error]
       # @return [Net::SSH::Simple::Result] Result
-      def self.scp_ul(*args, &block)
+      def self.scp_put(*args, &block)
         s = self.new
-        r = s.scp_ul(*args, &block)
+        r = s.scp_put(*args, &block)
         s.close
         r
       end
@@ -302,37 +302,50 @@ module Net
       #
       # @example
       #   # SCP Download
-      #   Net::SSH::Simple.scp_dl('localhost', '/tmp/remote_foo', '/tmp/local_bar')
+      #   Net::SSH::Simple.scp_get('localhost', '/tmp/remote_foo', '/tmp/local_bar')
       #
       # @example
       #   # Pass a block to monitor progress
-      #   Net::SSH::Simple.scp_dl('localhost', '/tmp/remote_foo', '/tmp/local_bar') do |sent, total|
+      #   Net::SSH::Simple.scp_get('localhost', '/tmp/remote_foo', '/tmp/local_bar') do |sent, total|
       #     puts "Bytes downloaded: #{sent} of #{total}"
       #   end
       #
-      # @param (see Net::SSH::Simple#scp_dl)
+      # @param (see Net::SSH::Simple#scp_get)
       # @raise [Net::SSH::Simple::Error]
       # @return [Net::SSH::Simple::Result] Result
       #
-      def self.scp_dl(*args, &block)
+      def self.scp_get(*args, &block)
         s = self.new
-        r = s.scp_dl(*args, &block)
+        r = s.scp_get(*args, &block)
         s.close
         r
       end
 
+      # @deprecated Use scp_put instead.
+      def self.scp_ul(*args, &block)
+        warn "[DEPRECATION] Net::SSH::Simple.scp_ul is deprecated. Please use .scp_put instead (usage is identical, the method was only renamed)."
+        self.scp_put(*args, &block)
+      end
+
+      # @deprecated Use scp_get instead.
+      def self.scp_dl(*args, &block)
+        warn "[DEPRECATION] Net::SSH::Simple.scp_dl is deprecated. Please use .scp_get instead (usage is identical, the method was only renamed)."
+        self.scp_get(*args, &block)
+      end
+
       # 
       # SCP upload to a remote host.
       # The underlying Net::SSH::Simple instance will re-use
       # existing connections for optimal performance.
       #
       # @param [String] host Destination hostname or ip-address
-      # @param [String] cmd  Shell command to execute
+      # @param [String] src Source path (on localhost)
+      # @param [String] dst Destination path (on remote host)
       # @param opts (see Net::SSH::Simple#ssh)
-      # @param [Block] &block Progress callback (optional)
+      # @param [Block] block Progress callback (optional)
       # @return [Net::SSH::Simple::Result] Result
       #
-      def scp_ul(host, src, dst, opts={}, &block)
+      def scp_put(host, src, dst, opts={}, &block)
         opts = @opts.merge(opts)
         scp(:upload, host, src, dst, opts, &block)
       end
@@ -343,17 +356,30 @@ module Net
       # existing connections for optimal performance.
       # 
       # @param [String] host Destination hostname or ip-address
-      # @param [String] cmd  Shell command to execute
+      # @param [String] src Source path (on remote host)
+      # @param [String] dst Destination path (on localhost)
       # @param opts (see Net::SSH::Simple#ssh)
-      # @param [Block] &block Progress callback (optional)
+      # @param [Block] block Progress callback (optional)
       # @return [Net::SSH::Simple::Result] Result
-      # @see Net::SSH::Simple#scp_ul
+      # @see Net::SSH::Simple#scp_put
       #
-      def scp_dl(host, src, dst, opts={}, &block)
+      def scp_get(host, src, dst, opts={}, &block)
         opts = @opts.merge(opts)
         scp(:download, host, src, dst, opts, &block)
       end
 
+      # @deprecated Use scp_put instead.
+      def scp_ul(host, src, dst, opts={}, &block)
+        warn "[DEPRECATION] Net::SSH::Simple#scp_ul is deprecated. Please use #scp_put instead (usage is identical, the method was only renamed)."
+        scp_put(host, src, dst, opts, &block)
+      end
+
+      # @deprecated Use scp_get instead.
+      def scp_dl(host, src, dst, opts={}, &block)
+        warn "[DEPRECATION] Net::SSH::Simple#scp_dl is deprecated. Please use #scp_get instead (usage is identical, the method was only renamed)."
+        scp_get(host, src, dst, opts, &block)
+      end
+
       #
       # Perform SSH operation on a remote host and capture the result.
       # The underlying Net::SSH::Simple instance will re-use
@@ -362,7 +388,7 @@ module Net
       # @return [Net::SSH::Simple::Result] Result
       # @param [String] host Destination hostname or ip-address
       # @param [String] cmd  Shell command to execute
-      # @param [Block]  &block Use the event-API (see example above)
+      # @param [Block]  block Use the event-API (see example above)
       # @param [Hash]   opts SSH options
       # @option opts [Array] :auth_methods
       #  an array of authentication methods to try
@@ -644,7 +670,7 @@ module Net
         opts[:scp_src] = src
         opts[:scp_dst] = dst
         @result = Result.new(
-          { :op => :scp, :host => host, :opts => opts, :cmd => :scp_dl,
+          { :op => :scp, :host => host, :opts => opts, :cmd => mode,
             :last_event_at => Time.new, :start_at => Time.new, :success => false
           } )
         with_session(host, opts) do |session|

data/net-ssh-simple.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
   
-  s.add_dependency "net-ssh", "~> 2.6.2"
+  s.add_dependency "net-ssh", "~> 2.6.3"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "blockenspiel", "~> 0.4.3"
   s.add_dependency "hashie", ">= 1.1.0"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 10.0.3"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "yard"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/net-ssh-simple.rb

@@ -70,7 +70,24 @@ describe Net::SSH::Simple do
       raised.should == true
     end
 
-    it "enforces operation timeout on scp_ul" do
+    it "enforces operation timeout on scp_put" do
+      raised = false
+      begin
+        r = Net::SSH::Simple.scp_put('localhost', '/tmp/ssh_test_in0',
+                                    '/tmp/ssh_test_out0', {:operation_timeout=>1}) \
+        do |sent,total|
+          sleep 5
+        end
+      rescue => e
+        raised = true
+        e.to_s.should match /^execution expired @ .*/
+        e.result.op == :ssh
+        e.result.timed_out.should == true
+      end
+      raised.should == true
+    end
+
+    it "enforces operation timeout on scp_ul [DEPRECATED]" do
       raised = false
       begin
         r = Net::SSH::Simple.scp_ul('localhost', '/tmp/ssh_test_in0',
@@ -87,7 +104,24 @@ describe Net::SSH::Simple do
       raised.should == true
     end
 
-    it "enforces operation timeout on scp_dl" do
+    it "enforces operation timeout on scp_get" do
+      raised = false
+      begin
+        r = Net::SSH::Simple.scp_get('localhost', '/tmp/ssh_test_in0',
+                                    '/tmp/ssh_test_out0', {:operation_timeout=>1}) \
+        do |sent,total|
+          sleep 5
+        end
+      rescue => e
+        raised = true
+        e.to_s.should match /^execution expired @ .*/
+        e.result.op == :ssh
+        e.result.timed_out.should == true
+      end
+      raised.should == true
+    end
+
+    it "enforces operation timeout on scp_dl [DEPRECATED]" do
       raised = false
       begin
         r = Net::SSH::Simple.scp_dl('localhost', '/tmp/ssh_test_in0',
@@ -153,7 +187,17 @@ describe Net::SSH::Simple do
       Digest::MD5.hexdigest(long).should == 'dea9193b768319cbb4ff1a137ac03113'
     end
 
-    it "uploads via scp" do
+    it "uploads via scp_put" do
+      mockback = mock(:progress_callback)
+      mockback.should_receive(:ping).at_least(:once)
+      r = Net::SSH::Simple.scp_put('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
+        mockback.ping
+      end
+      r.success.should == true
+      Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
+    end
+
+    it "uploads via scp_ul [DEPRECATED]" do
       mockback = mock(:progress_callback)
       mockback.should_receive(:ping).at_least(:once)
       r = Net::SSH::Simple.scp_ul('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
@@ -163,7 +207,17 @@ describe Net::SSH::Simple do
       Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
     end
 
-    it "downloads via scp" do
+    it "downloads via scp_get" do
+      mockback = mock(:progress_callback)
+      mockback.should_receive(:ping).at_least(:once)
+      r = Net::SSH::Simple.scp_get('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
+        mockback.ping
+      end
+      r.success.should == true
+      Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
+    end
+
+    it "downloads via scp_dl [DEPRECATED]" do
       mockback = mock(:progress_callback)
       mockback.should_receive(:ping).at_least(:once)
       r = Net::SSH::Simple.scp_dl('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
@@ -216,7 +270,18 @@ describe Net::SSH::Simple do
       Digest::MD5.hexdigest(long).should == 'dea9193b768319cbb4ff1a137ac03113'
     end
 
-    it "uploads via scp" do
+    it "uploads via scp_put" do
+      mockback = mock(:progress_callback)
+      mockback.should_receive(:ping).at_least(:once)
+      r = @s.scp_put('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
+        mockback.ping
+      end
+      r.success.should == true
+      r.op.should == :scp
+      Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
+    end
+
+    it "uploads via scp_ul [DEPRECATED]" do
       mockback = mock(:progress_callback)
       mockback.should_receive(:ping).at_least(:once)
       r = @s.scp_ul('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
@@ -227,7 +292,18 @@ describe Net::SSH::Simple do
       Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
     end
 
-    it "downloads via scp" do
+    it "downloads via scp_get" do
+      mockback = mock(:progress_callback)
+      mockback.should_receive(:ping).at_least(:once)
+      r = @s.scp_get('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
+        mockback.ping
+      end
+      r.success.should == true
+      r.op.should == :scp
+      Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
+    end
+
+    it "downloads via scp_dl [DEPRECATED]" do
       mockback = mock(:progress_callback)
       mockback.should_receive(:ping).at_least(:once)
       r = @s.scp_dl('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
@@ -288,7 +364,19 @@ describe Net::SSH::Simple do
       end
     end
 
-    it "uploads via scp" do
+    it "uploads via scp_put" do
+      Net::SSH::Simple.sync do
+        mockback = mock(:progress_callback)
+        mockback.should_receive(:ping).at_least(:once)
+        r = scp_put('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
+          mockback.ping
+        end
+        r.success.should == true
+        Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
+      end
+    end
+
+    it "uploads via scp_ul [DEPRECATED]" do
       Net::SSH::Simple.sync do
         mockback = mock(:progress_callback)
         mockback.should_receive(:ping).at_least(:once)
@@ -300,7 +388,19 @@ describe Net::SSH::Simple do
       end
     end
 
-    it "downloads via scp" do
+    it "downloads via scp_get" do
+      Net::SSH::Simple.sync do
+        mockback = mock(:progress_callback)
+        mockback.should_receive(:ping).at_least(:once)
+        r = scp_get('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0') do |sent,total|
+          mockback.ping
+        end
+        r.success.should == true
+        Digest::MD5.file('/tmp/ssh_test_in0').should == Digest::MD5.file('/tmp/ssh_test_out0')
+      end
+    end
+
+    it "downloads via scp_dl [DEPRECATED]" do
       Net::SSH::Simple.sync do
         mockback = mock(:progress_callback)
         mockback.should_receive(:ping).at_least(:once)
@@ -338,11 +438,11 @@ describe Net::SSH::Simple do
           begin
             r = nil
             if 0 == i % 2 
-              r = scp_dl('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
+              r = scp_get('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
                 mockback.ping
               end
             else
-              r = scp_ul('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
+              r = scp_put('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
                 mockback.ping
               end
             end
@@ -374,11 +474,11 @@ describe Net::SSH::Simple do
             mockback.should_receive(:ping).at_least(:once)
             r = nil
             if 0 == i % 2 
-              r = scp_dl('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
+              r = scp_get('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
                 mockback.ping
               end
             else
-              r = scp_ul('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
+              r = scp_put('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
                 mockback.ping
               end
             end
@@ -427,6 +527,19 @@ describe Net::SSH::Simple do
       r.opts[:timeout].should == 7
       r.opts[:rekey_packet_limit].should == 42
 
+      r = s.scp_get('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                     {:rekey_packet_limit => 42})
+      r.op.should == :scp
+      r.opts[:timeout].should == 7
+      r.opts[:rekey_packet_limit].should == 42
+
+      r = s.scp_put('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                     {:rekey_packet_limit => 42})
+      r.op.should == :scp
+      r.opts[:timeout].should == 7
+      r.opts[:rekey_packet_limit].should == 42
+
+      # also test deprecated scp_dl and scp_ul
       r = s.scp_dl('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
                      {:rekey_packet_limit => 42})
       r.op.should == :scp
@@ -438,6 +551,7 @@ describe Net::SSH::Simple do
       r.op.should == :scp
       r.opts[:timeout].should == 7
       r.opts[:rekey_packet_limit].should == 42
+      # /deprecated
 
       s.close
     end
@@ -450,6 +564,19 @@ describe Net::SSH::Simple do
         r.opts[:rekey_packet_limit].should == 42
         r.opts[:operation_timeout].should == 11
 
+        r = scp_put('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+        r.opts[:operation_timeout].should == 11
+
+        r = scp_get('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+        r.opts[:operation_timeout].should == 11
+
+        # also test deprecated scp_dl and scp_ul
         r = scp_ul('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
                    {:rekey_packet_limit => 42})
         r.opts[:timeout].should == 7
@@ -461,6 +588,8 @@ describe Net::SSH::Simple do
         r.opts[:timeout].should == 7
         r.opts[:rekey_packet_limit].should == 42
         r.opts[:operation_timeout].should == 11
+        # /deprecated methods
+
         :happy
       end
       t.value.should == :happy
@@ -472,6 +601,17 @@ describe Net::SSH::Simple do
         r.opts[:timeout].should == 7
         r.opts[:rekey_packet_limit].should == 42
 
+        r = scp_put('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+
+        r = scp_get('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+
+        # also test deprecated scp_dl and scp_ul
         r = scp_ul('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
                    {:rekey_packet_limit => 42})
         r.opts[:timeout].should == 7
@@ -481,6 +621,7 @@ describe Net::SSH::Simple do
                    {:rekey_packet_limit => 42})
         r.opts[:timeout].should == 7
         r.opts[:rekey_packet_limit].should == 42
+        # /deprecated methods
       end
     end
 
@@ -490,6 +631,17 @@ describe Net::SSH::Simple do
         r.opts[:timeout].should == 7
         r.opts[:rekey_packet_limit].should == 42
 
+        r = scp_put('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+
+        r = scp_get('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
+                   {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+
+        # also test deprecated scp_dl and scp_ul
         r = scp_ul('localhost', '/tmp/ssh_test_in0', '/tmp/ssh_test_out0',
                    {:rekey_packet_limit => 42})
         r.opts[:timeout].should == 7
@@ -499,6 +651,8 @@ describe Net::SSH::Simple do
                    {:rekey_packet_limit => 42})
         r.opts[:timeout].should == 7
         r.opts[:rekey_packet_limit].should == 42
+        # /deprecated methods
+
         :happy
       end
       t.value.should == :happy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-simple
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000Z
+date: 2013-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &22888160 !ruby/object:Gem::Requirement
+  requirement: &22685820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *22888160
+  version_requirements: *22685820
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &22887660 !ruby/object:Gem::Requirement
+  requirement: &22685360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *22887660
+  version_requirements: *22685360
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &22887080 !ruby/object:Gem::Requirement
+  requirement: &22684780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *22887080
+  version_requirements: *22684780
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &22886120 !ruby/object:Gem::Requirement
+  requirement: &22684160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *22886120
+  version_requirements: *22684160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22885180 !ruby/object:Gem::Requirement
+  requirement: &22683440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 10.0.3
   type: :development
   prerelease: false
-  version_requirements: *22885180
+  version_requirements: *22683440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22884800 !ruby/object:Gem::Requirement
+  requirement: &22682740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22884800
+  version_requirements: *22682740
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &22884200 !ruby/object:Gem::Requirement
+  requirement: &22680960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22884200
+  version_requirements: *22680960
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &22680500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *22680500
 description: Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
 email:
 - moe@busyloop.net
@@ -123,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1613519226124125474
+      hash: 510085356993968652
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -131,3 +142,4 @@ signing_key:
 specification_version: 3
 summary: SSH without the headache
 test_files: []
+has_rdoc: