sshkit 1.11.3 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55991102eb1f68ef187977bcafd1e2daa71885bc
-  data.tar.gz: 655886ef5681e121c8003ec8248b7f4606a327c6
+  metadata.gz: 1be4ae412e0c02545ceaa90409ec6f4d04b8db6e
+  data.tar.gz: 5f2fa57fbd2d8a7ddd470f6775abc5a2accea2cb
 SHA512:
-  metadata.gz: 51a9ab26eb4ac3359b6fe7a06a3ef93d35fc6ddef838256a7b9f699edc940decf2ed4b5a5fac85ff83c7a0e75cc62cc980be4e8341523b29c4726840012596bf
-  data.tar.gz: 7f7a17a8917f57034299298a8445ab20194db4404780653f251dc009b71347c3ea755ec10a4f569acc989d73590dcea510a935f9d040e7e72a5e259542016d65
+  metadata.gz: 3b85b42a0de7970b0507244a799bea1baa8cba179d3af3e76f2a4d90d43ba11d62099dc9981800d62b38eb4ae38fdcf5b4662835ce3ab4b10bfdc4e5c108b9e4
+  data.tar.gz: c7776b71095e7ca183db2a96b4e358bd164ee8fce708fdd84d11cd2ddfd8be1570d9d696d82f9d8af47efddd86c3d0aa1e31b54fb41492f7f7ef8e24acd07b54

data/CHANGELOG.md

@@ -8,6 +8,13 @@ appear at the top.
   * Add your entries below here, remember to credit yourself however you want
     to be credited!
 
+## [1.11.4][] (2016-11-02)
+
+  * Use string interpolation for environment variables to avoid escaping issues
+    with sprintf
+    [PR #280](https://github.com/capistrano/sshkit/pull/280)
+    @Sinjo - Chris Sinjakli
+
 ## [1.11.3][] (2016-09-16)
 
   * Fix known_hosts caching to match on the entire hostlist
@@ -649,7 +656,8 @@ version `0.0.5`.
 
 First release.
 
-[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.11.3...HEAD
+[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.11.4...HEAD
+[1.11.4]: https://github.com/capistrano/sshkit/compare/v1.11.3...v1.11.4
 [1.11.3]: https://github.com/capistrano/sshkit/compare/v1.11.2...v1.11.3
 [1.11.2]: https://github.com/capistrano/sshkit/compare/v1.11.1...v1.11.2
 [1.11.1]: https://github.com/capistrano/sshkit/compare/v1.11.0...v1.11.1

data/lib/sshkit/backends/abstract.rb

@@ -150,7 +150,7 @@ module SSHKit
       end
 
       def command(args, options)
-        SSHKit::Command.new(*[*args, options.merge({in: pwd_path, env: @env, host: @host, user: @user, group: @group})])
+        SSHKit::Command.new(*args, options.merge({in: pwd_path, env: @env, host: @host, user: @user, group: @group}))
       end
 
     end

data/lib/sshkit/command.rb

@@ -163,12 +163,12 @@ module SSHKit
 
     def with(&_block)
       return yield unless environment_hash.any?
-      sprintf("( export #{environment_string} ; %s )", yield)
+      "( export #{environment_string} ; #{yield} )"
     end
 
     def user(&_block)
       return yield unless options[:user]
-      "sudo -u #{options[:user]} #{environment_string + " " unless environment_string.empty?}-- sh -c '%s'" % %Q{#{yield}}
+      "sudo -u #{options[:user]} #{environment_string + " " unless environment_string.empty?}-- sh -c '#{yield}'"
     end
 
     def in_background(&_block)

data/lib/sshkit/host.rb

@@ -29,23 +29,7 @@ module SSHKit
         @hostname = "localhost"
         @user = ENV['USER'] || ENV['LOGNAME'] || ENV['USERNAME']
       elsif !host_string_or_options_hash.is_a?(Hash)
-        suitable_parsers = [
-          SimpleHostParser,
-          HostWithPortParser,
-          HostWithUsernameAndPortParser,
-          IPv6HostWithPortParser,
-          HostWithUsernameParser,
-        ].select do |p|
-          p.suitable?(host_string_or_options_hash)
-        end
-
-        if suitable_parsers.any?
-          suitable_parsers.first.tap do |parser|
-            @user, @hostname, @port = parser.new(host_string_or_options_hash).attributes
-          end
-        else
-          raise UnparsableHostStringError, "Cannot parse host string #{host_string_or_options_hash}"
-        end
+        @user, @hostname, @port = first_suitable_parser(host_string_or_options_hash).attributes
       else
         host_string_or_options_hash.each do |key, value|
           if self.respond_to?("#{key}=")
@@ -94,6 +78,11 @@ module SSHKit
       @properties ||= OpenStruct.new
     end
 
+    def first_suitable_parser(host)
+      parser = PARSERS.find{|p| p.suitable?(host) }
+      fail UnparsableHostStringError, "Cannot parse host string #{host}" if parser.nil?
+      parser.new(host)
+    end
   end
 
   # @private
@@ -192,4 +181,12 @@ module SSHKit
     end
   end
 
+  PARSERS = [
+    SimpleHostParser,
+    HostWithPortParser,
+    HostWithUsernameAndPortParser,
+    IPv6HostWithPortParser,
+    HostWithUsernameParser,
+  ].freeze
+
 end

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.11.3".freeze
+  VERSION = "1.11.4".freeze
 end

data/test/unit/test_command.rb

@@ -49,6 +49,12 @@ module SSHKit
       assert_equal %{( export FOO="asdf\\\"hjkl" ; /usr/bin/env rails server )}, c.to_command
     end
 
+    def test_percentage_symbol_handled_in_env
+      SSHKit.config = nil
+      c = Command.new(:rails, 'server', env: {foo: 'asdf%hjkl'}, user: "anotheruser")
+      assert_equal %{( export FOO="asdf%hjkl" ; sudo -u anotheruser FOO=\"asdf%hjkl\" -- sh -c '/usr/bin/env rails server' )}, c.to_command
+    end
+
     def test_including_the_env_doesnt_addressively_escape
       SSHKit.config = nil
       c = Command.new(:rails, 'server', env: {path: '/example:$PATH'})

metadata

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