net-scp 1.1.1 → 1.1.2

data/CHANGES.txt

@@ -1,4 +1,8 @@
 
+=== 1.1.2 / 6 Jul 2013
+
+* Explicit convert to string in shellescape [jwils]
+
 === 1.1.1 / 13 May 2013
 
 * Allow passing a shell to use when executing scp. [Arthur Schreiber]

data/README.rdoc

@@ -1,5 +1,8 @@
 = Net::SCP
 
+<em><b>Please note: this project is in maintenance mode. It is not under active development but pull requests are very much welcome. Just be sure to include tests! -- delano</b></em>
+
+
 * Docs: http://net-ssh.github.com/net-scp
 * Issues: https://github.com/net-ssh/net-scp/issues
 * Codes: https://github.com/net-ssh/net-scp
@@ -28,18 +31,18 @@ In a nutshell:
   # upload a file to a remote server
   Net::SCP.upload!("remote.host.com", "username",
     "/local/path", "/remote/path",
-    :password => "password")
+    :ssh => { :password => "password" })
 
   # download a file from a remote server
   Net::SCP.download!("remote.host.com", "username",
     "/remote/path", "/local/path",
-    :password => password)
+    :ssh => { :password => "password" })
 
   # download a file to an in-memory buffer
   data = Net::SCP::download!("remote.host.com", "username", "/remote/path")
 
   # use a persistent connection to transfer files
-  Net::SCP.start("remote.host.com", "username", :password => "password") do |scp|
+  Net::SCP.start("remote.host.com", "username", :ssh => { :password => "password" }) do |scp|
     # upload a file to a remote server
     scp.upload! "/local/path", "/remote/path"
 

data/lib/net/scp.rb

@@ -53,7 +53,7 @@ module Net
   # == Progress Reporting
   #
   # By default, uploading and downloading proceed silently, without any
-  # outword indication of their progress. For long running uploads or downloads
+  # outward indication of their progress. For long running uploads or downloads
   # (and especially in interactive environments) it is desirable to report
   # to the user the progress of the current operation.
   #
@@ -408,7 +408,10 @@ module Net
       end
 
       # Imported from ruby 1.9.2 shellwords.rb
-      def shellescape(str)
+      def shellescape(path)
+        # Convert path to a string if it isn't already one.
+        str = path.to_s
+
         # ruby 1.8.7+ implements String#shellescape
         return str.shellescape if str.respond_to? :shellescape
 

data/lib/net/scp/version.rb

@@ -6,7 +6,7 @@ module Net; class SCP
   class Version < Net::SSH::Version
     MAJOR = 1
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-scp.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "net-scp"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]
   s.cert_chain = ["gem-public_cert.pem"]
-  s.date = "2013-05-13"
+  s.date = "2013-07-06"
   s.description = "A pure Ruby implementation of the SCP client protocol"
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-scp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ cert_chain:
   MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
   NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh