net-scp 1.0.3 → 1.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.0.4 / 16 Sep 2010
+
+* maintain filename sanitization compatibility with ruby 1.8.6 [Sung Pae, Tim Charper]
+
 === 1.0.3 / 17 Aug 2010
 
 * replace :sanitize_file_name with a call to String#shellescape [Sung Pae]

data/Rakefile

@@ -41,6 +41,7 @@ Rake::GemPackageTask.new(@spec) do |p|
 end
 
 task :release => [ :rdoc, :package ]
+task :build => [ :package ]
 task :install => [ :rdoc, :package ] do
 	sh %{sudo gem install pkg/#{name}-#{version}.gem}
 end

data/lib/net/scp.rb

@@ -338,7 +338,7 @@ module Net
       # (See Net::SCP::Upload and Net::SCP::Download).
       def start_command(mode, local, remote, options={}, &callback)
         session.open_channel do |channel|
-          command = "#{scp_command(mode, options)} #{remote.shellescape}"
+          command = "#{scp_command(mode, options)} #{shellescape remote}"
           channel.exec(command) do |ch, success|
             if success
               channel[:local   ] = local
@@ -399,6 +399,27 @@ module Net
       def progress_callback(channel, name, sent, total)
         channel[:callback].call(channel, name, sent, total) if channel[:callback]
       end
+
+      # Imported from ruby 1.9.2 shellwords.rb
+      def shellescape(str)
+        # ruby 1.8.7+ implements String#shellescape
+        return str.shellescape if str.respond_to? :shellescape
+
+        # An empty argument will be skipped, so return empty quotes.
+        return "''" if str.empty?
+
+        str = str.dup
+
+        # Process as a single byte sequence because not all shell
+        # implementations are multibyte aware.
+        str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
+
+        # A LF cannot be escaped with a backslash because a backslash + LF
+        # combo is regarded as line continuation and simply ignored.
+        str.gsub!(/\n/, "'\n'")
+
+        return str
+      end
   end
 end
 

data/lib/net/scp/version.rb

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

data/net-scp.gemspec

@@ -2,13 +2,13 @@
 
 @spec = Gem::Specification.new do |s|
   s.name = %q{net-scp}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]
   s.date = %q{2010-08-17}
   s.description = %q{A pure Ruby implementation of the SCP client protocol}
-  s.email = %q{jamis@jamisbuck.org}
+  s.email = %q{net-scp@solutious.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/scp/download.rb", "lib/net/scp/errors.rb", "lib/net/scp/upload.rb", "lib/net/scp/version.rb", "lib/net/scp.rb", "lib/uri/open-scp.rb", "lib/uri/scp.rb", "README.rdoc"]
   s.files = ["CHANGELOG.rdoc", "lib/net/scp/download.rb", "lib/net/scp/errors.rb", "lib/net/scp/upload.rb", "lib/net/scp/version.rb", "lib/net/scp.rb", "lib/uri/open-scp.rb", "lib/uri/scp.rb", "Rakefile", "README.rdoc", "setup.rb", "test/common.rb", "test/test_all.rb", "test/test_download.rb", "test/test_scp.rb", "test/test_upload.rb", "Manifest", "net-scp.gemspec"]
   s.homepage = %q{http://net-ssh.rubyforge.org/scp}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-scp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Jamis Buck
@@ -36,7 +36,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: A pure Ruby implementation of the SCP client protocol
-email: jamis@jamisbuck.org
+email: net-scp@solutious.com
 executables: []
 
 extensions: []