net-scp 1.2.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cbfca972e9cc5bd85bd596ce1be966402e2d6d30
+  data.tar.gz: 33451e0d0cd8d4d9c77f8c2aecc70f28d67100a2
+SHA512:
+  metadata.gz: 660a95fd1181762c52dc1929637ce5791f11c101f327dfce376bce9b412ac539b4448d345438c70773c842abdc031acf3b5e5b179864ac98050d0931e4962271
+  data.tar.gz: c6b069bde4616271d17cc86f48dae3abcc69d098b9a63880dd31559b1da04c8780d64f5b4f1ca3e2525b32d184eca50b1abecf1f973c20a6f463942d65e9bbbc

data/.gitignore

@@ -0,0 +1,6 @@
+coverage
+pkg
+doc
+*.swp
+
+.DS_Store

data/.travis.yml

@@ -1,11 +1,16 @@
 language: ruby
+cache: bundler
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.0"
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
+  - ruby-head
 
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 
 install: gem install jeweler test-unit mocha net-ssh
 
 script: rake test
-

data/CHANGES.txt

@@ -1,3 +1,6 @@
+=== 2.0.0
+
+* NetSSH 5.* support
 
 === 1.2.1 / 30 Apr 2014
 

data/Gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in mygem.gemspec
+gemspec
+
+# TODO: add to gemspec
+gem "bundler", "~> 1.11"
+gem "rake", "~> 12.0"
+
+gem 'byebug', group: %i[development test] if !Gem.win_platform? && RUBY_ENGINE == "ruby"
+
+if ENV["CI"]
+  gem 'codecov', require: false, group: :test
+  gem 'simplecov', require: false, group: :test
+end

data/README.rdoc

@@ -13,7 +13,7 @@
 
 == DESCRIPTION:
 
-Net::SCP is a pure-Ruby implementation of the SCP protocol. This operates over SSH (and requires the Net::SSH library), and allows files and directory trees to copied to and from a remote server.
+Net::SCP is a pure-Ruby implementation of the SCP protocol. This operates over SSH (and requires the Net::SSH library), and allows files and directory trees to be copied to and from a remote server.
 
 == FEATURES/PROBLEMS:
 
@@ -42,7 +42,7 @@ In a nutshell:
   data = Net::SCP::download!("remote.host.com", "username", "/remote/path")
 
   # use a persistent connection to transfer files
-  Net::SCP.start("remote.host.com", "username", :ssh => { :password => "password" }) do |scp|
+  Net::SCP.start("remote.host.com", "username", :password => "password") do |scp|
     # upload a file to a remote server
     scp.upload! "/local/path", "/remote/path"
 
@@ -74,12 +74,12 @@ If you wish to run the tests, you'll also need:
 
 * gem install net-scp (might need sudo privileges)
 
-However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signiture[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
+However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signiture[http://docs.seattlerb.org/rubygems/Gem/Security.html]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
 
     # Add the public key as a trusted certificate
     # (You only need to do this once)
-    $ curl -O https://raw.github.com/net-ssh/net-ssh/master/gem-public_cert.pem
-    $ gem cert --add gem-public_cert.pem
+    $ curl -O https://raw.githubusercontent.com/net-ssh/net-ssh/master/net-ssh-public_cert.pem
+    $ gem cert --add net-ssh-public_cert.pem
 
 Then, when install the gem, do so with high security:
 
@@ -87,7 +87,6 @@ Then, when install the gem, do so with high security:
 
 If you don't add the public key, you'll see an error like "Couldn't verify data signature". If you're still having trouble let me know and I'll give you a hand.
 
-
 Or, you can do it the hard way (without Rubygems):
 
 * tar xzf net-scp-*.tgz

data/Rakefile

@@ -2,40 +2,64 @@ require "rubygems"
 require "rake"
 require "rake/clean"
 require "rdoc/task"
+require "bundler/gem_tasks"
 
-task :default => ["build"]
+desc "When releasing make sure NET_SSH_BUILDGEM_SIGNED is set"
+task :check_NET_SSH_BUILDGEM_SIGNED do
+  raise "NET_SSH_BUILDGEM_SIGNED should be set to release" unless ENV['NET_SSH_BUILDGEM_SIGNED']
+end
+
+Rake::Task[:release].enhance [:check_NET_SSH_BUILDGEM_SIGNED]
+Rake::Task[:release].prerequisites.unshift(:check_NET_SSH_BUILDGEM_SIGNED)
+
+task default: ["build"]
 CLEAN.include [ 'pkg', 'rdoc' ]
 name = "net-scp"
 
-$:.unshift File.join(File.dirname(__FILE__), 'lib')
-require "net/scp/version"
-version = Net::SCP::Version::STRING.dup
+require_relative "lib/net/scp/version"
+version = Net::SCP::Version::CURRENT
+
+namespace :cert do
+  desc "Update public cert from private - only run if public is expired"
+  task :update_public_when_expired do
+    require 'openssl'
+    require 'time'
+    raw = File.read "net-scp-public_cert.pem"
+    certificate = OpenSSL::X509::Certificate.new raw
+    raise Exception, "Not yet expired: #{certificate.not_after}" unless certificate.not_after < Time.now
+    sh "gem cert --build netssh@solutious.com --days 365*5 --private-key /mnt/gem/net-ssh-private_key.pem"
+    sh "mv gem-public_cert.pem net-scp-public_cert.pem"
+    sh "gem cert --add net-scp-public_cert.pem"
+  end
+end
 
-begin
-  require "jeweler"
-  Jeweler::Tasks.new do |s|
-    s.version = version
-    s.name = name
-    s.rubyforge_project = s.name
-    s.summary = "A pure Ruby implementation of the SCP client protocol"
-    s.description = s.summary
-    s.email = "net-ssh@solutious.com"
-    s.homepage = "https://github.com/net-ssh/net-scp"
-    s.authors = ["Jamis Buck", "Delano Mandelbaum"]
+if false
+  begin
+    require "jeweler"
+    Jeweler::Tasks.new do |s|
+      s.version = version
+      s.name = name
+      s.rubyforge_project = s.name
+      s.summary = "A pure Ruby implementation of the SCP client protocol"
+      s.description = s.summary
+      s.email = "net-ssh@solutious.com"
+      s.homepage = "https://github.com/net-ssh/net-scp"
+      s.authors = ["Jamis Buck", "Delano Mandelbaum"]
 
-    s.add_dependency 'net-ssh', ">=2.6.5"
+      s.add_dependency 'net-ssh', ">=2.6.5"
 
-    s.add_development_dependency 'test-unit'
-    s.add_development_dependency 'mocha'
+      s.add_development_dependency 'test-unit'
+      s.add_development_dependency 'mocha'
 
-    s.license = "MIT"
+      s.license = "MIT"
 
-    s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
-    s.cert_chain  = ['gem-public_cert.pem']
+      s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
+      s.cert_chain  = ['gem-public_cert.pem']
+    end
+    Jeweler::GemcutterTasks.new
+  rescue LoadError
+    puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
   end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/testtask'
@@ -56,5 +80,3 @@ RDoc::Task.new do |rdoc|
     rdoc.rdoc_files.include(file) if File.exists?(file)
   }
 end
-
-

data/lib/net/scp.rb

@@ -194,7 +194,7 @@ module Net
     include Net::SSH::Loggable
     include Upload, Download
 
-    # Starts up a new SSH connection and instantiates a new SCP session on 
+    # Starts up a new SSH connection and instantiates a new SCP session on
     # top of it. If a block is given, the SCP session is yielded, and the
     # SSH session is closed automatically when the block terminates. If no
     # block is given, the SCP session is returned.
@@ -293,7 +293,7 @@ module Net
     # * :preserve - the atime and mtime of the file should be preserved.
     # * :verbose - the process should result in verbose output on the server
     #   end (useful for debugging).
-    # 
+    #
     # This method will return immediately, returning the Net::SSH::Connection::Channel
     # object that will support the download. To wait for the download to finish,
     # you can either call the #wait method on the channel, or otherwise run
@@ -343,7 +343,7 @@ module Net
       # (See Net::SCP::Upload and Net::SCP::Download).
       def start_command(mode, local, remote, options={}, &callback)
         session.open_channel do |channel|
-        
+
           if options[:shell]
             escaped_file = shellescape(remote).gsub(/'/) { |m| "'\\''" }
             command = "#{options[:shell]} -c '#{scp_command(mode, options)} #{escaped_file}'"
@@ -362,10 +362,10 @@ module Net
               channel[:stack   ] = []
               channel[:error_string] = ''
 
-              channel.on_close                  { |ch| send("#{channel[:state]}_state", channel); raise Net::SCP::Error, "SCP did not finish successfully (#{channel[:exit]}): #{channel[:error_string]}" if channel[:exit] != 0 }
-              channel.on_data                   { |ch, data| channel[:buffer].append(data) }
-              channel.on_extended_data          { |ch, type, data| debug { data.chomp } }
-              channel.on_request("exit-status") { |ch, data| channel[:exit] = data.read_long }
+              channel.on_close                  { |ch2| send("#{channel[:state]}_state", channel); raise Net::SCP::Error, "SCP did not finish successfully (#{channel[:exit]}): #{channel[:error_string]}" if channel[:exit] != 0 }
+              channel.on_data                   { |ch2, data| channel[:buffer].append(data) }
+              channel.on_extended_data          { |ch2, type, data| debug { data.chomp } }
+              channel.on_request("exit-status") { |ch2, data| channel[:exit] = data.read_long }
               channel.on_process                { send("#{channel[:state]}_state", channel) }
             else
               channel.close
@@ -395,7 +395,7 @@ module Net
       def await_response_state(channel)
         return if channel[:buffer].available == 0
         c = channel[:buffer].read_byte
-        raise "#{c.chr}#{channel[:buffer].read}" if c != 0
+        raise Net::SCP::Error, "#{c.chr}#{channel[:buffer].read}" if c != 0
         channel[:next], channel[:state] = nil, channel[:next]
         send("#{channel[:state]}_state", channel)
       end

data/lib/net/scp/download.rb

@@ -20,7 +20,7 @@ module Net; class SCP
       elsif channel[:local].respond_to?(:write) && channel[:options][:preserve]
         lwarn { ":preserve option is ignored when downloading to an in-memory buffer" }
         channel[:options].delete(:preserve)
-      elsif channel[:options][:recursive] && !File.exists?(channel[:local])
+      elsif channel[:options][:recursive] && !File.exist?(channel[:local])
         Dir.mkdir(channel[:local])
       end
 
@@ -128,9 +128,9 @@ module Net; class SCP
 
       channel[:local] = File.join(channel[:local], directive[:name])
 
-      if File.exists?(channel[:local]) && !File.directory?(channel[:local])
-        raise "#{channel[:local]} already exists and is not a directory"
-      elsif !File.exists?(channel[:local])
+      if File.exist?(channel[:local]) && !File.directory?(channel[:local])
+        raise Net::SCP::Error, "#{channel[:local]} already exists and is not a directory"
+      elsif !File.exist?(channel[:local])
         Dir.mkdir(channel[:local], directive[:mode] | 0700)
       end
 
@@ -162,4 +162,4 @@ module Net; class SCP
     end
   end
 
-end; end
+end; end

data/lib/net/scp/version.rb

@@ -1,18 +1,68 @@
-require 'net/ssh/version'
+module Net
+  module SCP
+    # A class for describing the current version of a library. The version
+    # consists of three parts: the +major+ number, the +minor+ number, and the
+    # +tiny+ (or +patch+) number.
+    #
+    # Two Version instances may be compared, so that you can test that a version
+    # of a library is what you require:
+    #
+    #   require 'net/scp/version'
+    #
+    #   if Net::SCP::Version::CURRENT < Net::SCP::Version[2,1,0]
+    #     abort "your software is too old!"
+    #   end
+    class Version
+      include Comparable
 
-module Net; class SCP
+      # A convenience method for instantiating a new Version instance with the
+      # given +major+, +minor+, and +tiny+ components.
+      def self.[](major, minor, tiny, pre = nil)
+        new(major, minor, tiny, pre)
+      end
 
-  # Describes the current version of the Net::SCP library.
-  class Version < Net::SSH::Version
-    MAJOR = 1
-    MINOR = 2
-    TINY  = 1
+      attr_reader :major, :minor, :tiny
 
-    # The current version, as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
+      # Create a new Version object with the given components.
+      def initialize(major, minor, tiny, pre = nil)
+        @major, @minor, @tiny, @pre = major, minor, tiny, pre
+      end
 
-    # The current version, as a String instance
-    STRING  = CURRENT.to_s
-  end
+      # Compare this version to the given +version+ object.
+      def <=>(version)
+        to_i <=> version.to_i
+      end
+
+      # Converts this version object to a string, where each of the three
+      # version components are joined by the '.' character. E.g., 2.0.0.
+      def to_s
+        @to_s ||= [@major, @minor, @tiny, @pre].compact.join(".")
+      end
+
+      # Converts this version to a canonical integer that may be compared
+      # against other version objects.
+      def to_i
+        @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
+      end
+
+      # The major component of this version of the Net::SSH library
+      MAJOR = 2
+
+      # The minor component of this version of the Net::SSH library
+      MINOR = 0
 
-end; end
+      # The tiny component of this version of the Net::SSH library
+      TINY  = 0
+
+      # The prerelease component of this version of the Net::SSH library
+      # nil allowed
+      PRE   = nil
+
+      # The current version of the Net::SSH library as a Version instance
+      CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
+
+      # The current version of the Net::SSH library as a String
+      STRING = CURRENT.to_s
+    end
+  end
+end

data/net-scp-public_cert.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBBMQ8wDQYDVQQDDAZuZXRz
+c2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZFgNj
+b20wHhcNMTgwNjA0MTA0OTQwWhcNMTkwNjA0MTA0OTQwWjBBMQ8wDQYDVQQDDAZu
+ZXRzc2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZ
+FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGJ4TbZ9H+qZ08
+pQfJhPJTHaDCyQvCsKTFrL5O9z3tllQ7B/zksMMM+qFBpNYu9HCcg4yBATacE/PB
+qVVyUrpr6lbH/XwoN5ljXm+bdCfmnjZvTCL2FTE6o+bcnaF0IsJyC0Q2B1fbWdXN
+6Off1ZWoUk6We2BIM1bn6QJLxBpGyYhvOPXsYoqSuzDf2SJDDsWFZ8kV5ON13Ohm
+JbBzn0oD8HF8FuYOewwsC0C1q4w7E5GtvHcQ5juweS7+RKsyDcVcVrLuNzoGRttS
+KP4yMn+TzaXijyjRg7gECfJr3TGASaA4bQsILFGG5dAWcwO4OMrZedR7SHj/o0Kf
+3gL7P0axAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+BBQF8qLA7Z4zg0SJGtUbv3eoQ8tjIzAfBgNVHREEGDAWgRRuZXRzc2hAc29sdXRp
+b3VzLmNvbTAfBgNVHRIEGDAWgRRuZXRzc2hAc29sdXRpb3VzLmNvbTANBgkqhkiG
+9w0BAQsFAAOCAQEAXnNaYXWVr/sCsfZdza+yBBOobYPgjOgDRfqNO2YX8RFEyDNB
+AxBCQIF4OeUaoMbTQTVh24MwaDHpDTgqBAEfSs9h41lZewQaw4QUGJ6yxNVzO194
+2vYohv9vHpodBukIpUFGk40vQq8nOq2MzVyCb911wnt5d0ZQg+UJf5tdMYvRvATa
+F/dkTaqhq3wq/JJRghq8fJUqWN5aBtMQb/61z5J3mKAUJsUN2/VdDph2fRPDpECa
+uWREKzWwXbaB96/ZyzoyP7FsQBLgdDL++g2nF0neCENc5Wj5IlQZiH0a2+X3jAgm
+7UnoE3CP9Tk5GHVUina5gPyzl0VI4s4pYCPehQ==
+-----END CERTIFICATE-----

data/net-scp.gemspec

@@ -1,69 +1,46 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "net-scp"
-  s.version = "1.2.1"
+require_relative 'lib/net/scp/version'
 
-  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 = "2014-04-30"
-  s.description = "A pure Ruby implementation of the SCP client protocol"
-  s.email = "net-ssh@solutious.com"
-  s.extra_rdoc_files = [
+Gem::Specification.new do |spec|
+  spec.name          = "net-scp"
+  spec.version       = Net::SCP::Version::STRING
+  spec.authors       = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
+  spec.email         = ["net-ssh@solutious.com"]
+
+  if ENV['NET_SSH_BUILDGEM_SIGNED']
+    spec.cert_chain = ["net-scp-public_cert.pem"]
+    spec.signing_key = "/mnt/gem/net-ssh-private_key.pem"
+  end
+
+  spec.summary       = %q{A pure Ruby implementation of the SCP client protocol.}
+  spec.description   = %q{A pure Ruby implementation of the SCP client protocol}
+  spec.homepage      = "https://github.com/net-ssh/net-scp"
+  spec.license       = "MIT"
+  spec.required_rubygems_version = Gem::Requirement.new(">= 0") if spec.respond_to? :required_rubygems_version=
+
+  spec.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = [
-    ".travis.yml",
-    "CHANGES.txt",
-    "LICENSE.txt",
-    "Manifest",
-    "README.rdoc",
-    "Rakefile",
-    "gem-public_cert.pem",
-    "lib/net/scp.rb",
-    "lib/net/scp/download.rb",
-    "lib/net/scp/errors.rb",
-    "lib/net/scp/upload.rb",
-    "lib/net/scp/version.rb",
-    "lib/uri/open-scp.rb",
-    "lib/uri/scp.rb",
-    "net-scp.gemspec",
-    "setup.rb",
-    "test/common.rb",
-    "test/test_all.rb",
-    "test/test_download.rb",
-    "test/test_scp.rb",
-    "test/test_upload.rb"
-  ]
-  s.homepage = "https://github.com/net-ssh/net-scp"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "net-scp"
-  s.rubygems_version = "1.8.23"
-  s.signing_key = "/mnt/gem/gem-private_key.pem"
-  s.summary = "A pure Ruby implementation of the SCP client protocol"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.require_paths = ["lib"]
+
+  if spec.respond_to? :specification_version then
+    spec.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<net-ssh>, [">= 2.6.5"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
+      spec.add_runtime_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
+      spec.add_development_dependency(%q<test-unit>, [">= 0"])
+      spec.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<net-ssh>, [">= 2.6.5"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
+      spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
+      spec.add_dependency(%q<test-unit>, [">= 0"])
+      spec.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<net-ssh>, [">= 2.6.5"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
+    spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
+    spec.add_dependency(%q<test-unit>, [">= 0"])
+    spec.add_dependency(%q<mocha>, [">= 0"])
   end
 end
-