sshkit 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 45f49f25df22edea1abf8c5db3edda63255ddbb2
-  data.tar.gz: 71642fd8de408f19d9e40fad80ce7315ca553235
+SHA256:
+  metadata.gz: f014bf146a912a66d7378d4ed9361ad19afabead2046d5ca35b9b44f9956a7e6
+  data.tar.gz: c7a83d9d9ac1cac5c598db99713a0d6bb1059922ebbe31f76aa9c960bb1b202c
 SHA512:
-  metadata.gz: 2483400c0e519f6ea60432371a04d77c523a965db7cf117c611056aa052f87125ccb605ec1ae241bec4f24ec1e75f03ef2927dce8d0a64757147a4fe0ce8e4f0
-  data.tar.gz: 360df78c26c2e413e54d02f0152279f968f25ad3373e3f0fd36086d6bc867f1aa473937e84e7be0602047307042c45426d35833e8c0c5be803da243d95ced76b
+  metadata.gz: 8beca7b0370fddca01b404215d324e43222602847ee11080806e047a19967874a94838fc7913e630f473df0b9a4c115649adc1daae43bf02ff996a8959244b8e
+  data.tar.gz: 40d829a5730abfd31ad8d06ed890a92063f30661ea6d48d05e8303f2cfef881eef0656cf464e51555cc2c0199c48866485621bec65ecddbd22433851078ac745

data/CHANGELOG.md

@@ -7,6 +7,19 @@ appear at the top.
 
   * Your contribution here!
 
+## [1.15.1][] (2017-11-18)
+
+This is a small bug-fix release that fixes problems with `upload!` and `download!` that were inadvertently introduced in 1.15.0.
+
+### Breaking changes
+
+  * None
+
+### Bug fixes
+
+  * [#410](https://github.com/capistrano/sshkit/pull/410): fix NoMethodError when using upload!/download! with Pathnames - [@UnderpantsGnome](https://github.com/UnderpantsGnome)
+  * [#411](https://github.com/capistrano/sshkit/pull/410): fix upload!/download! when using relative paths outside of `within` blocks -  [@Fjan](https://github.com/Fjan)
+
 ## [1.15.0][] (2017-11-03)
 
 ### New features
@@ -721,7 +734,8 @@ version `0.0.5`.
 
 First release.
 
-[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.15.0...HEAD
+[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.15.1...HEAD
+[1.15.1]: https://github.com/capistrano/sshkit/compare/v1.15.0...v1.15.1
 [1.15.0]: https://github.com/capistrano/sshkit/compare/v1.14.0...v1.15.0
 [1.14.0]: https://github.com/capistrano/sshkit/compare/v1.13.1...v1.14.0
 [1.13.1]: https://github.com/capistrano/sshkit/compare/v1.13.0...v1.13.1

data/lib/sshkit/backends/local.rb

@@ -11,7 +11,7 @@ module SSHKit
       end
 
       def upload!(local, remote, options = {})
-        remote = File.join(pwd_path, remote) unless remote.start_with?("/")
+        remote = File.join(pwd_path, remote) unless remote.to_s.start_with?("/") || pwd_path.nil?
         if local.is_a?(String)
           if options[:recursive]
             FileUtils.cp_r(local, remote)
@@ -26,7 +26,7 @@ module SSHKit
       end
 
       def download!(remote, local=nil, _options = {})
-        remote = File.join(pwd_path, remote) unless remote.start_with?("/")
+        remote = File.join(pwd_path, remote) unless remote.to_s.start_with?("/") || pwd_path.nil?
         if local.nil?
           FileUtils.cp(remote, File.basename(remote))
         else

data/lib/sshkit/backends/netssh.rb

@@ -63,7 +63,7 @@ module SSHKit
 
       def upload!(local, remote, options = {})
         summarizer = transfer_summarizer('Uploading', options)
-        remote = File.join(pwd_path, remote) unless remote.start_with?("/")
+        remote = File.join(pwd_path, remote) unless remote.to_s.start_with?("/") || pwd_path.nil?
         with_ssh do |ssh|
           ssh.scp.upload!(local, remote, options, &summarizer)
         end
@@ -71,7 +71,7 @@ module SSHKit
 
       def download!(remote, local=nil, options = {})
         summarizer = transfer_summarizer('Downloading', options)
-        remote = File.join(pwd_path, remote) unless remote.start_with?("/")
+        remote = File.join(pwd_path, remote) unless remote.to_s.start_with?("/") || pwd_path.nil?
         with_ssh do |ssh|
           ssh.scp.download!(remote, local, options, &summarizer)
         end

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.15.0".freeze
+  VERSION = "1.15.1".freeze
 end

data/test/functional/backends/test_local.rb

@@ -20,6 +20,16 @@ module SSHKit
         end
       end
 
+      def test_upload_via_pathname
+        Dir.mktmpdir do |dir|
+          File.new("#{dir}/local", 'w')
+          Local.new do
+            upload!("#{dir}/local", Pathname.new("#{dir}/remote"))
+          end.run
+          assert File.exist?("#{dir}/remote")
+        end
+      end
+
       def test_upload_within
         file_contents = "Some Content"
         actual_file_contents = nil

data/test/functional/backends/test_netssh.rb

@@ -145,6 +145,16 @@ module SSHKit
         assert_equal File.open(file_name).read, file_contents
       end
 
+      def test_upload_via_pathname
+        file_contents = ""
+        Netssh.new(a_host) do |_host|
+          file_name = Pathname.new(File.join("/tmp", SecureRandom.uuid))
+          upload!(StringIO.new('example_io'), file_name)
+          file_contents = download!(file_name)
+        end.run
+        assert_equal "example_io", file_contents
+      end
+
       def test_interaction_handler
         captured_command_result = nil
         Netssh.new(a_host) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby