sshkit 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf75e96cd318a56b4936975306dde6410ed40ca1cdc0635f694909024ae50f84
-  data.tar.gz: 5d249a340c75d3916d5793547eb4bff73546a2776c6d818ad76689e10f283779
+  metadata.gz: adf8778cdb780fc5190e6e29a913f97c9367073850ec4db02c30ee5fca61b15e
+  data.tar.gz: b9ad84e2f7cdc7cfd6d5773954b764182a828b3b02886085ce29a96a75f1672f
 SHA512:
-  metadata.gz: c059b4ac0c4bef25dbccc1e3d4c954f5367acdcec3e933a5251ef1f1a0d09b4bf0863d077c185e65f2939b5fbe7211bae88de43ec1cb363435e650723fda98c5
-  data.tar.gz: 2694eb44390c5ed81ef44e0852c37efa5ca131639f6782ba653142773e1552373618a739af0b6e4ebf60b10b90cb92db40beea7742a3ffd7a57c8074b30fcc9e
+  metadata.gz: d7a6fc9a49bf60dc427426a988499d081d0666c1a2e3ac06b57952a6352c3ae93c09792d464ad844295cf3a6fb69cfb238213b6bd93fdf5e761b603df205c36c
+  data.tar.gz: d1e3a4f0eb0cf3e3baca205bffe236581fc260f5c7e70cbd9155d64f827bc3ce6732f2f74f9024171f192aa2e0061dcb9894b651ded2a916479164d98dfcd4fd

data/.travis.yml

@@ -1,12 +1,14 @@
 language: ruby
 rvm:
-  - 2.3.3
-  - 2.2.4
-  - 2.1.8
-  - 2.0.0
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - 2.0
 matrix:
   include:
-    # Run Danger only once, on 2.3.3
-    - rvm: 2.3.3
+    # Run Danger only once, on 2.5
+    - rvm: 2.5
       script: bundle exec danger
 script: bundle exec rake test:units lint

data/CHANGELOG.md

@@ -7,6 +7,10 @@ appear at the top.
 
   * Your contribution here!
 
+## [1.16.1][] (2018-05-20)
+
+  * [#425](https://github.com/capistrano/sshkit/pull/425): Command#group incorrectly escapes double quotes, resulting in a a syntax error when specifying the group execution using `as`. This issue manifested when user command quotes changed from double quotes to single quotes. This fix removes the double quote escaping - [@pblesi](https://github.com/pblesi).
+
 ## [1.16.0][] (2018-02-03)
 
   * [#417](https://github.com/capistrano/sshkit/pull/417): Cache key generation for connections becomes slow when `known_hosts` is a valid `net/ssh` options and `known_hosts` file is big. This changes the cache key generation and fixes performance issue - [@ElvinEfendi](https://github.com/ElvinEfendi).
@@ -738,7 +742,8 @@ version `0.0.5`.
 
 First release.
 
-[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.16.0...HEAD
+[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.16.1...HEAD
+[1.16.1]: https://github.com/capistrano/sshkit/compare/v1.16.0...v1.16.1
 [1.16.0]: https://github.com/capistrano/sshkit/compare/v1.15.1...v1.16.0
 [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

data/EXAMPLES.md

@@ -32,6 +32,10 @@ end
 ## Run a command with specific environmental variables
 
 ```ruby
+# Please see the documentation for caveats related to commands that do not use
+# the command map [such as simple strings].
+#
+# https://github.com/capistrano/sshkit#the-command-map
 on hosts do |host|
   with rack_env: :test do
     puts capture("env | grep RACK_ENV")

data/lib/sshkit/command.rb

@@ -182,7 +182,7 @@ module SSHKit
 
     def group(&_block)
       return yield unless options[:group]
-      "sg #{options[:group]} -c \\\"%s\\\"" % %Q{#{yield}}
+      %Q(sg #{options[:group]} -c "#{yield}")
       # We could also use the so-called heredoc format perhaps:
       #"newgrp #{options[:group]} <<EOC \\\"%s\\\" EOC" % %Q{#{yield}}
     end

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.16.0".freeze
+  VERSION = "1.16.1".freeze
 end

data/test/functional/backends/test_netssh.rb

@@ -42,6 +42,20 @@ module SSHKit
         ], command_lines
       end
 
+      def test_group_netssh
+        Netssh.new(a_host) do
+          as user: :root, group: :admin do
+           execute :touch, 'restart.txt'
+          end
+        end.run
+
+        command_lines = @output.lines.select { |line| line.start_with?('Command:') }
+        assert_equal [
+          "Command: if ! sudo -u root whoami > /dev/null; then echo \"You cannot switch to user 'root' using sudo, please check the sudoers file\" 1>&2; false; fi\n",
+          "Command: sudo -u root -- sh -c 'sg admin -c \"/usr/bin/env touch restart.txt\"'\n"
+        ], command_lines
+      end
+
       def test_capture
         captured_command_result = nil
         Netssh.new(a_host) do |_host|

data/test/unit/test_command.rb

@@ -102,12 +102,12 @@ module SSHKit
 
     def test_working_as_a_given_group
       c = Command.new(:whoami, group: :devvers)
-      assert_equal "sg devvers -c \\\"/usr/bin/env whoami\\\"", c.to_command
+      assert_equal 'sg devvers -c "/usr/bin/env whoami"', c.to_command
     end
 
     def test_working_as_a_given_user_and_group
       c = Command.new(:whoami, user: :anotheruser, group: :devvers)
-      assert_equal "sudo -u anotheruser -- sh -c 'sg devvers -c \\\"/usr/bin/env whoami\\\"'", c.to_command
+      assert_equal %Q(sudo -u anotheruser -- sh -c 'sg devvers -c "/usr/bin/env whoami"'), c.to_command
     end
 
     def test_umask

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-05-21 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.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby