net-ssh-simple 1.5.4 → 1.5.8

data/Rakefile

@@ -7,25 +7,14 @@ 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 --tag ~benchmark'
+    t.rspec_opts = '--fail-fast -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'
-    CoverMe.complete!
-  end
-end
-
 desc 'Run full test suite'
-task :test => [ 'test:spec', 'test:coverage' ]
-
+task :test => [ 'test:spec' ]
 

data/lib/net/ssh/simple.rb

@@ -22,7 +22,7 @@
 
 require 'net/ssh/simple/version'
 require 'blockenspiel'
-require 'hashie'
+require 'hashie/dash'
 require 'timeout'
 require 'net/ssh'
 require 'net/scp'
@@ -598,7 +598,7 @@ module Net
 
 
       private
-      EXTRA_OPTS = [:operation_timeout, :close_timeout, :keepalive_interval]
+      EXTRA_OPTS = [:operation_timeout, :close_timeout, :keepalive_interval, :scp_src, :scp_dst]
 
       def with_session(host, opts={}, &block)
         opts[:timeout] ||= 60
@@ -641,15 +641,15 @@ module Net
       end
 
       def scp(mode, host, src, dst, opts={}, &block)
+        opts[:scp_src] = src
+        opts[:scp_dst] = dst
         @result = Result.new(
           { :op => :scp, :host => host, :opts => opts, :cmd => :scp_dl,
-            :last_event_at => Time.new, :start_at => Time.new, 
-            :src => src, :dst  => dst, :success => false
+            :last_event_at => Time.new, :start_at => Time.new, :success => false
           } )
         with_session(host, opts) do |session|
           lt = 0
           channel = session.scp.send(mode, src, dst) do |ch, name, sent, total|
-            @result[:name] ||= name
             @result[:total] ||= total
             @result[:sent] = sent
             @result[:last_event_at] = Time.new
@@ -679,7 +679,7 @@ module Net
         end
 
         def to_s
-          "#{super[0]} @ #{super[1]}"
+          "#{@wrapped} @ #{@result}"
         end
       end
 
@@ -700,10 +700,30 @@ module Net
       # @attr [String] exit_code UNIX exit code (SSH only)
       # @attr [Integer] total Size of requested file (in bytes, SCP only)
       # @attr [Integer] sent Number of bytes transferred (SCP only)
+      # @attr [Hash] opts The options that the operation was parametrized with
+      # @attr [Exception] exception Exception that occurred during this operation (if any)
       # @attr [String] exit_signal
       #   Only present if the remote command terminated due to a signal (SSH only)
       #
-      class Result < Hashie::Mash; end
+      class Result < Hashie::Dash
+        property :host
+        property :op
+        property :cmd
+        property :start_at
+        property :finish_at
+        property :last_keepalive_at
+        property :last_event_at
+        property :timed_out
+        property :stdout, :default => ''
+        property :stderr, :default => ''
+        property :success, :default => false
+        property :exit_code
+        property :total
+        property :sent
+        property :opts
+        property :exception
+        property :exit_signal
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Net
   module SSH
     class Simple
-      VERSION = "1.5.4"
+      VERSION = "1.5.8"
     end
   end
 end

data/net-ssh-simple.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake", "~> 0.9.2.2"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "cover_me"
+  s.add_development_dependency "simplecov"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/net-ssh-simple.rb

@@ -1,4 +1,6 @@
-require 'cover_me'
+require 'simplecov'
+SimpleCov.start
+
 require 'net/ssh/simple'
 require 'digest/md5'
 require 'securerandom'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh-simple
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000Z
+date: 2012-10-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &17323340 !ruby/object:Gem::Requirement
+  requirement: &15723220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *17323340
+  version_requirements: *15723220
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &17322560 !ruby/object:Gem::Requirement
+  requirement: &15722740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *17322560
+  version_requirements: *15722740
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &17321620 !ruby/object:Gem::Requirement
+  requirement: &15722260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *17321620
+  version_requirements: *15722260
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &17320880 !ruby/object:Gem::Requirement
+  requirement: &15721660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *17320880
+  version_requirements: *15721660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17317060 !ruby/object:Gem::Requirement
+  requirement: &15721200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *17317060
+  version_requirements: *15721200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17316460 !ruby/object:Gem::Requirement
+  requirement: &15720820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17316460
+  version_requirements: *15720820
 - !ruby/object:Gem::Dependency
-  name: cover_me
-  requirement: &17315240 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &15720220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17315240
+  version_requirements: *15720220
 description: Net::SSH::Simple is a simple wrapper around Net::SSH and Net::SCP.
 email:
 - moe@busyloop.net
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4150931459409160842
+      hash: 3891783157923390254
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10