net-ssh-simple 1.1.1 → 1.2.0

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 .yardoc
 coverage.data
 coverage
+sync

data/README.rdoc

@@ -55,7 +55,22 @@ Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
  s.scp_ul 'example2.com', '/tmp/local_foo', '/tmp/remote_bar'
  s.scp_dl 'example3.com', '/tmp/remote_foo', '/tmp/local_bar'
  s.close
- 
+
+=== Handling a Timeout
+
+ require 'net/ssh/simple'
+
+ # Hint: Set timeout=0 to disable, default is 60
+ begin
+   Net::SSH::Simple.sync({:timeout => 5}) do
+     ssh('example1.com', 'sleep 1')  # I will (probably) succeed!
+     ssh('example2.com', 'sleep 60') # I will fail :(
+   end
+ rescue Net::SSH::Simple::Error => e
+   puts e.result.timed_out #=> true
+ end
+
+  
 == Documentation
 
 See {Net::SSH::Simple}[http://rubydoc.info/gems/net-ssh-simple/Net/SSH/Simple] for more examples and full API.

data/Rakefile

@@ -8,10 +8,16 @@ task :default => :test
 RSpec::Core::RakeTask.new("test:spec") do |t|
     t.pattern = 'spec/*.rb'
     t.rcov = false
-    #t.rspec_opts = '-b -c -f progress'
-    t.rspec_opts = '-b -c -f documentation'
+    t.rspec_opts = '-b -c -f progress --tag ~benchmark'
 end
 
+RSpec::Core::RakeTask.new("test:benchmark") do |t|
+    t.pattern = 'spec/*.rb'
+    t.rcov = false
+    t.rspec_opts = '-b -c -f documentation --tag benchmark'
+end
+
+
 namespace :test do
   task :coverage do
     require 'cover_me'

data/lib/net/ssh/simple.rb

@@ -1,7 +1,7 @@
 require 'net/ssh/simple/version'
 require 'blockenspiel'
 require 'hashie'
+require 'timeout'
 require 'net/ssh'
 require 'net/scp'
 require 'net/ssh/simple/core'
-

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

@@ -66,8 +66,8 @@ module Net
     #   rescue Net::SSH::Simple::Error => e
     #     puts "Something bad happened!"
     #     puts e          # Human readable error
-    #     puts e.wrapped  # Original Exception from Net::SSH
-    #     puts e.context  # Config that triggered the error
+    #     puts e.wrapped  # Original Exception
+    #     puts e.result   # Net::SSH::Simple::Result (partial result)
     #   end
     #
     # @example
@@ -115,8 +115,8 @@ module Net
     #   rescue Net::SSH::Simple::Error => e
     #     puts "Something bad happened!"
     #     puts e          # Human readable error
-    #     puts e.wrapped  # Original Exception from Net::SSH
-    #     puts e.context  # Config that triggered the error
+    #     puts e.wrapped  # Original Exception
+    #     puts e.result   # Net::SSH::Simple::Result (partial result)
     #   ensure
     #     s.close # don't forget the clean up!
     #   end
@@ -128,6 +128,27 @@ module Net
     #         {:user => 'tom', :password => 'jerry', :port => 1234})
     #   end
     #
+    #   # Parameter inheritance
+    #   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'})
+    #   end
+    #
+    # @example
+    #   # Timeout handling
+    #   #
+    #   # Note: The timeout applies to each command independently.
+    #   # Hint: Set timeout=0 to disable, default is 60
+    #   begin
+    #     Net::SSH::Simple.sync({:timeout => 5}) do
+    #       ssh('example1.com', 'sleep 1')  # I will (probably) succeed!
+    #       ssh('example2.com', 'sleep 60') # I will fail :(
+    #     end
+    #   rescue Net::SSH::Simple::Error => e
+    #     puts e.result.timed_out #=> true
+    #   end
+    #
     # @example
     #   # Using the SCP progress callback
     #   Net::SSH::Simple.sync do
@@ -229,9 +250,9 @@ module Net
       # @param (see Net::SSH::Simple#ssh)
       # @raise [Net::SSH::Simple::Error]
       # @return [Net::SSH::Simple::Result] Result
-      def self.ssh(*args)
+      def self.ssh(*args, &block)
         s = self.new
-        r = s.ssh(*args)
+        r = s.ssh(*args, &block)
         s.close
         r
       end
@@ -297,6 +318,7 @@ module Net
       # @return [Net::SSH::Simple::Result] Result
       #
       def scp_ul(host, src, dst, opts={}, &block)
+        opts = @opts.merge(opts)
         scp(:upload, host, src, dst, opts, &block)
       end
 
@@ -307,12 +329,13 @@ module Net
       # 
       # @param [String] host Destination hostname or ip-address
       # @param [String] cmd  Shell command to execute
-      # @param [Hash]   opts Parameters for the underlying Net::SSH
+      # @param opts (see Net::SSH::Simple#ssh)
       # @param [Block] &block Progress callback (optional)
       # @return [Net::SSH::Simple::Result] Result
       # @see Net::SSH::Simple#scp_ul
       #
       def scp_dl(host, src, dst, opts={}, &block)
+        opts = @opts.merge(opts)
         scp(:download, host, src, dst, opts, &block)
       end
 
@@ -324,8 +347,8 @@ module Net
       # @return [Net::SSH::Simple::Result] Result
       # @param [String] host Destination hostname or ip-address
       # @param [String] cmd  Shell command to execute
-      # @param [Hash]   opts Parameters for the underlying Net::SSH
       # @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
       #
@@ -399,7 +422,7 @@ module Net
       #  the port to use when connecting to the remote host
       #
       # @option opts [Hash] :properties
-      #  a hash of key/value pairs to add to the new connection’s properties
+      #  a hash of key/value pairs to add to the new connection's properties
       #  (see Net::SSH::Connection::Session#properties)
       #
       # @option opts [String] :proxy
@@ -414,8 +437,8 @@ module Net
       # @option opts [Integer] :rekey_packet_limit
       #  the max number of packets to process before rekeying
       #
-      # @option opts [Integer] :timeout
-      #  how long to wait for the initial connection to be made
+      # @option opts [Integer] :timeout (60)
+      #  connection timeout. this is enforced by Net::SSH::Simple.
       #
       # @option opts [String] :user
       #  the username to log in as
@@ -434,10 +457,11 @@ module Net
       # @see http://net-ssh.github.com/ssh/v2/api/classes/Net/SSH/Config.html
       #      Net::SSH documentation for the 'opts'-hash
       def ssh(host, cmd, opts={}, &block)
+        opts = @opts.merge(opts)
         with_session(host, opts) do |session|
           @result = Result.new(
-            { :host   => host, :cmd    => cmd, :start_at => Time.new,
-              :stdout => ''  , :stderr => '' , :success  => nil 
+            { :op => :ssh, :host => host, :cmd => cmd, :start_at => Time.new,
+              :opts => opts, :stdout => '', :stderr => '', :success => nil 
             } )
 
           channel = session.open_channel do |chan|
@@ -477,7 +501,8 @@ module Net
 
       dsl_methods false
 
-      def initialize()
+      def initialize(opts={})
+        @opts     = opts
         @sessions = {}
         @result   = Result.new
       end
@@ -486,23 +511,25 @@ module Net
       # Spawn a Thread to perform a sequence of ssh/scp operations.
       # 
       # @param [Block] block 
+      # @param opts (see Net::SSH::Simple#ssh)
       # @return [Thread] Thread executing the SSH-Block.
       #
-      def self.async(&block)
+      def self.async(opts={}, &block)
         Thread.new do
-          self.sync(&block)
+          self.sync(opts, &block)
         end
       end
 
       #
       # Perform a sequence of ssh/scp operations.
       #
+      # @param opts (see Net::SSH::Simple#ssh)
       # @return [Net::SSH::Simple::Result] Result
       #
-      def self.sync(&block)
-        b = self.new
-        r = Blockenspiel.invoke(block, b)
-        b.close
+      def self.sync(opts={}, &block)
+        s = self.new(opts)
+        r = Blockenspiel.invoke(block, s)
+        s.close
         r
       end
 
@@ -519,23 +546,27 @@ module Net
       end
 
       private
-      def with_session(host, opts, &block)
+      def with_session(host, opts={:timeout => 60}, &block)
         begin
-          session = @sessions[host.hash] = @sessions[host.hash] ||\
-            Net::SSH.start(*[host, opts[:user], opts])
-          block.call(session)
+          Timeout.timeout(opts[:timeout]) do
+            session = @sessions[host.hash] = @sessions[host.hash] ||\
+              Net::SSH.start(*[host, opts[:user], opts])
+            block.call(session)
+          end
         rescue => e
           opts[:password].gsub!(/./,'*') if opts.include? :password
           @result[:exception] = e
-          @result[:context] = [host,opts]
-          raise Net::SSH::Simple::Error, [e, [host,opts]]
+          @result[:success] = false
+          @result[:timed_out] = true
+          @result[:finish_at] = Time.new
+          raise Net::SSH::Simple::Error, [e, [host,opts,@result]]
         end
       end
 
       def scp(mode, host, src, dst, opts={}, &block)
         @result = Result.new(
-          { :host   => host, :cmd  => :scp_dl, :start_at => Time.new,
-            :src => src    , :dst  => dst    , :success  => false
+          { :op => :scp, :host => host, :opts => opts, :cmd => :scp_dl,
+            :start_at => Time.new, :src => src, :dst  => dst, :success => false
           } )
         with_session(host, opts) do |session|
           lt = 0
@@ -556,15 +587,23 @@ module Net
       # Error that occured during a Net::SSH::Simple operation.
       #
       class Error < RuntimeError
-        # Reference to the underlying Net::SSH Exception
+        # Reference to the underlying Exception
         attr_reader :wrapped
-        # The opts-hash of the operation that triggered the Error
+
+        # Context for the operation that failed, as an Array: [host, opts, result].
+        #
+        # @deprecated
+        #   This will be removed soon, use {#result} instead!
         attr_reader :context
 
+        # {Net::SSH::Simple::Result} for the interrupted operation.
+        attr_reader :result
+
         def initialize(msg, e=$!)
           super(msg)
           @wrapped = e
           @context = msg[1]
+          @result  = msg[1][2]
         end
 
         def to_s
@@ -576,9 +615,11 @@ module Net
       # Result of a Net::SSH::Simple operation.
       #
       # @attr [String] host Hostname/IP address
+      # @attr [Symbol] op :ssh or :scp
       # @attr [String] cmd Shell command (SSH only)
       # @attr [Time] start_at Operation start timestamp
       # @attr [Time] finish_at Operation finish timestamp
+      # @attr [Boolean] timed_out Set to true if the operation timed out
       # @attr [String] stdout Output to stdout (SSH only)
       # @attr [String] stderr Output to stderr (SSH only)
       # @attr [boolean] success
@@ -586,7 +627,7 @@ module Net
       # @attr [Integer] total Size of requested file (in bytes, SCP only)
       # @attr [Integer] sent Number of bytes transferred (SCP only)
       # @attr [String] exit_signal
-      #   Only present if the remote command terminates due to a signal (SSH only)
+      #   Only present if the remote command terminated due to a signal (SSH only)
       #
       class Result < Hashie::Mash; end
     end

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

@@ -1,7 +1,7 @@
 module Net
   module SSH
     class Simple
-      VERSION = "1.1.1"
+      VERSION = "1.2.0"
     end
   end
 end

data/net-ssh-simple.gemspec

@@ -11,14 +11,14 @@ Gem::Specification.new do |s|
   s.description = %q{Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.}
   s.summary     = %q{SSH without the headache}
 
-  s.rubyforge_project = "net-ssh-simple"
+  s.required_ruby_version = '>= 1.9.2'
   
   s.add_dependency "net-ssh", "~> 2.1.4"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "blockenspiel", "~> 0.4.3"
   s.add_dependency "hashie", "~> 1.1.0"
 
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "~> 0.9.2.2"
   s.add_development_dependency "rspec"
   s.add_development_dependency "cover_me"
 

data/spec/net-ssh-simple.rb

@@ -17,14 +17,19 @@ require 'securerandom'
 #    Port 22
 #
 # The test-suite will (over)write the following files on localhost:
-#   /tmp/ssh_test_in{0,1,2,3,4}
-#   /tmp/ssh_test_out{0,1,2,3,4}
+#   /tmp/ssh_test_in*
+#   /tmp/ssh_test_out*
 #
 
+CONCURRENCY = 16
+
+BENCHMARK_ITER = 10
+BENCHMARK_CONCURRENCY = 128
+
 describe Net::SSH::Simple do
   describe "singleton" do
     before :each do
-      (0..4).each do |i|
+      (0..CONCURRENCY).each do |i|
         begin
           File.unlink(File.join('/tmp', "ssh_test_in#{i}"))
         rescue; end
@@ -37,16 +42,32 @@ describe Net::SSH::Simple do
       end
     end
 
-    it "fails gently" do
-      lambda {
-        Net::SSH::Simple.ssh('localhost', 'true', {:port => 0})
-      }.should raise_error(Net::SSH::Simple::Error)
+    it "enforces timeout" do
+      raised = false
+      begin
+        r = Net::SSH::Simple.ssh('localhost', 'sleep 60', {:timeout => 1})
+      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 "interprets timeout=0 as no timeout" do
+      Net::SSH::Simple.ssh('localhost', 'sleep 2', {:timeout => 0})
+    end
 
+    it "fails gently" do
+      raised = false
       begin
         Net::SSH::Simple.ssh('localhost', 'true', {:port => 0})
       rescue => e
-        e.to_s.should == 'Connection refused - connect(2) @ ["localhost", {:port=>0}]'
+        raised = true
+        e.to_s.should match /^Connection refused - connect\(2\).*/
       end
+      raised.should == true
     end
 
     it "returns a result" do
@@ -95,7 +116,7 @@ describe Net::SSH::Simple do
     before :each do
       @s = Net::SSH::Simple.new
 
-      (0..4).each do |i|
+      (0..CONCURRENCY).each do |i|
         begin
           File.unlink(File.join('/tmp', "ssh_test_in#{i}"))
         rescue; end
@@ -140,6 +161,7 @@ describe Net::SSH::Simple do
         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
 
@@ -150,6 +172,7 @@ describe Net::SSH::Simple do
         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
   end
@@ -211,7 +234,7 @@ describe Net::SSH::Simple do
 
   describe "asynchronous block syntax" do
     before :each do
-      (0..4).each do |i|
+      (0..CONCURRENCY).each do |i|
         begin
           File.unlink(File.join('/tmp', "ssh_test_in#{i}"))
         rescue; end
@@ -226,7 +249,7 @@ describe Net::SSH::Simple do
 
     it "copes with a little concurrency" do
       t = []
-      (0..4).each do |i|
+      (0..CONCURRENCY).each do |i|
         t[i] = Net::SSH::Simple.async do
           mockback = mock(:progress_callback)
           mockback.should_receive(:ping).at_least(:once)
@@ -245,13 +268,47 @@ describe Net::SSH::Simple do
         end
       end
 
-      (0..4).each do |i|
+      (0..CONCURRENCY).each do |i|
         r = t[i].value
         r.stdout.should == "hello #{i}\n"
         Digest::MD5.file("/tmp/ssh_test_in#{i}").should == Digest::MD5.file("/tmp/ssh_test_out#{i}")
       end
     end
 
+    it "doesn't break under high concurrency", :benchmark => true do
+      iter = 0
+      (0..BENCHMARK_ITER).each do
+        iter += 1
+        t = []
+        (0..BENCHMARK_CONCURRENCY).each do |i|
+          #t[i] = Net::SSH::Simple.async(:verbose=>Logger::DEBUG) do
+          t[i] = Net::SSH::Simple.async do
+            mockback = mock(:progress_callback)
+            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|
+                mockback.ping
+              end
+            else
+              r = scp_ul('localhost', "/tmp/ssh_test_in#{i}", "/tmp/ssh_test_out#{i}") do |sent,total|
+                mockback.ping
+              end
+            end
+            r.success.should == true
+            ssh('localhost', "echo hello #{i}")
+          end
+        end
+
+        (0..BENCHMARK_CONCURRENCY).each do |i|
+          r = t[i].value
+          r.stdout.should == "hello #{i}\n"
+          Digest::MD5.file("/tmp/ssh_test_in#{i}").should == Digest::MD5.file("/tmp/ssh_test_out#{i}")
+        end
+        puts "#{iter}/#{BENCHMARK_ITER}"
+      end
+    end
+
     it "handles signals" do
       victim = Net::SSH::Simple.async do
         begin
@@ -269,11 +326,151 @@ describe Net::SSH::Simple do
       k.success.should == true
 
       v = victim.value
-      v.to_s.should == 'Killed by SIGTERM @ ["localhost", {}]'
+      v.to_s.should match /Killed by SIGTERM @ .*/
+    end
+  end
+
+  describe "parameter inheritance" do
+    it "works with instance syntax" do
+      s = Net::SSH::Simple.new({:timeout => 7})
+      r = s.ssh('localhost', 'date', {:rekey_packet_limit => 42})
+      r.op.should == :ssh
+      r.opts[:timeout].should == 7
+      r.opts[:rekey_packet_limit].should == 42
+
+      r = s.scp_dl('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_ul('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
+
+      s.close
+    end
+
+    it "works with synchronous block syntax" do
+      r = Net::SSH::Simple.sync({:timeout => 7}) do
+        r = ssh('localhost', 'date', {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+
+        r = scp_ul('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_dl('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
+      end
+    end
+
+    it "works with asynchronous block syntax" do
+      t = Net::SSH::Simple.async({:timeout => 7}) do
+        r = ssh('localhost', 'date', {:rekey_packet_limit => 42})
+        r.opts[:timeout].should == 7
+        r.opts[:rekey_packet_limit].should == 42
+
+        r = scp_ul('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_dl('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
+        :happy
+      end
+      t.value.should == :happy
     end
   end
 
   describe "event api" do
+    it "works with singleton syntax" do
+      mockie = mock(:callbacks)
+      mockie.should_receive(:start).once.ordered
+      mockie.should_receive(:finish).once.ordered
+      r = Net::SSH::Simple.ssh('localhost', '/bin/sh') do |e,c,d|
+        case e
+          when :start
+            mockie.start()
+            c.send_data("echo 'hello stdout'\n")
+            c.eof!
+          when :finish
+            mockie.finish()
+        end
+      end
+      r.stdout.should == "hello stdout\n"
+      r.stderr.should == ''
+    end
+
+    it "works with instance syntax" do
+      mockie = mock(:callbacks)
+      mockie.should_receive(:start).once.ordered
+      mockie.should_receive(:finish).once.ordered
+      s =  Net::SSH::Simple.new
+      r = s.ssh('localhost', '/bin/sh') do |e,c,d|
+        case e
+          when :start
+            mockie.start()
+            c.send_data("echo 'hello stdout'\n")
+            c.eof!
+          when :finish
+            mockie.finish()
+        end
+      end
+      r.stdout.should == "hello stdout\n"
+      r.stderr.should == ''
+    end
+
+    it "works with synchronous block syntax" do
+      mockie = mock(:callbacks)
+      mockie.should_receive(:start).once.ordered
+      mockie.should_receive(:finish).once.ordered
+      r = Net::SSH::Simple.sync do
+        ssh('localhost', '/bin/sh') do |e,c,d|
+          case e
+            when :start
+              mockie.start()
+              c.send_data("echo 'hello stdout'\n")
+              c.eof!
+            when :finish
+              mockie.finish()
+          end
+        end
+      end
+      r.stdout.should == "hello stdout\n"
+      r.stderr.should == ''
+    end
+
+    it "works with asynchronous block syntax" do
+      t = Net::SSH::Simple.async do
+        mockie = mock(:callbacks)
+        mockie.should_receive(:start).once.ordered
+        mockie.should_receive(:finish).once.ordered
+        ssh('localhost', '/bin/sh') do |e,c,d|
+          case e
+            when :start
+              mockie.start()
+              c.send_data("echo 'hello stdout'\n")
+              c.eof!
+            when :finish
+              mockie.finish()
+          end
+        end
+      end
+      r = t.value
+      r.stdout.should == "hello stdout\n"
+      r.stderr.should == ''
+    end
+
     it "handles long stdin->stdout pipe" do
       mockie = mock(:callbacks)
       mockie.should_receive(:start).once.ordered
@@ -414,7 +611,7 @@ describe Net::SSH::Simple do
       k.success.should == true
 
       v = victim.value
-      v.to_s.should == 'Killed by SIGTERM @ ["localhost", {}]'
+      v.to_s.should match /Killed by SIGTERM @ .*/
     end
 
     it "handles signals (:no_raise)" do

metadata

@@ -1,131 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: net-ssh-simple
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Moe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-25 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &7024800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *7024800
+- !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &7024140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *7024140
+- !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &7023480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *7023480
+- !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &7022900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *7022900
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &7022240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *7022240
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &7021660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *7021660
+- !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &7020960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *7020960
 description: Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
-email: 
+email:
 - moe@busyloop.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -135,39 +104,31 @@ files:
 - lib/net/ssh/simple/version.rb
 - net-ssh-simple.gemspec
 - spec/net-ssh-simple.rb
-has_rdoc: true
 homepage: https://github.com/busyloop/net-ssh-simple
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4391388084429679989
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4391388084429679989
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2238180045890726956
 requirements: []
-
-rubyforge_project: net-ssh-simple
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: SSH without the headache
 test_files: []
-