sshkit-interactive 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa21fa52487a0259580739a067b40bc6e93271bd
-  data.tar.gz: aed020db6d9d2237c2e4ab4abf92f457971df2ce
+  metadata.gz: 85a367dc3b5b858208966b608522f5cfa5437184
+  data.tar.gz: dbade21d2bfb2b0e4e438ccff779f4d998f1d5cc
 SHA512:
-  metadata.gz: b1aabaaae24517f83f4fb6da0bbc1ba6a7c3daabc00c179f93b6fc8dada732ef9c56e0ffa0bd331713f9a5270b21d5bcf64cf332c8cab636ba70ea2f02986390
-  data.tar.gz: 360de74bbd40174aaa3a19c0aab5258fb037e4ecaf90925c8678ca0b043d9ff92bcfa4be7a02a83086f0046bb09159f301ff99062c75c7e1b17ed3b38905a963
+  metadata.gz: aa2aedd29c8f938e711165aacee63d03869e523bbe39950d99aa189fc210a1d567fabe882d8a2270dae8f1b90e04f332f2d8e3c43bc9b5f141fba431a08d1315
+  data.tar.gz: 41adf32334b6ea3abe35eaa6a52a2970547366af9821fbd6a69c884b9d37a4039511d18e22073f5c833fc490cc7bd7c11a331cc7e5b9e089e6e773e17a0f3a94

data/.travis.yml

@@ -3,11 +3,11 @@ sudo: false
 language: ruby
 
 rvm:
-  - ruby-2.2.6
-  - ruby-2.3.3
-  - ruby-2.4.0
+  - ruby-2.2.7
+  - ruby-2.3.4
+  - ruby-2.4.1
   - jruby-1.7
-  - jruby-9.1.7.0
+  - jruby-9.1.12.0
 
 gemfile:
   - spec/gemfiles/net-ssh2_8.gemfile
@@ -31,7 +31,4 @@ matrix:
     - rvm: jruby-1.7
       gemfile: spec/gemfiles/net-ssh4_1.gemfile
 
-before_install:
-  - gem install bundler -v '~> 1.14.0'
-
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 
-## 0.2.2 (2017-08-07)
+## 0.2.3 (2017-09-03)
+### Fix
+- [fix sudo with new variable expansion](https://github.com/afeld/sshkit-interactive/pull/18)
+- [fix Travis CI builds](https://github.com/afeld/sshkit-interactive/pull/19)
+
 ### Change
+- bump rspec version to 3.6.x
+
+## 0.2.2 (2017-08-07)
+### Fix
 - [fix incorrect variable expansion](https://github.com/afeld/sshkit-interactive/pull/16)
 
 ## 0.2.1 (2017-05-01)

data/lib/sshkit/interactive/command.rb

@@ -42,7 +42,7 @@ module SSHKit
           :ssh,
           *ssh_cmd_args,
           host.hostname,
-          %Q{'$SHELL -l -c "#{remote_command.to_command}"'}
+          command
         ].reject(&:empty?).join(' ')
       end
 
@@ -84,6 +84,12 @@ module SSHKit
       def proxy_command
         proxy.command_line_template
       end
+
+      def command
+        cmd = remote_command.to_command.gsub("'", "\\\"") # replace single quotes with double quotes
+
+        %Q{'$SHELL -l -c \"#{cmd}\"'}
+      end
     end
   end
 end

data/lib/sshkit/interactive/version.rb

@@ -1,5 +1,5 @@
 module SSHKit
   module Interactive
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/spec/backend_spec.rb

@@ -4,20 +4,22 @@ describe SSHKit::Interactive::Backend do
     let(:backend) { SSHKit::Interactive::Backend.new(host) }
 
     it 'does a system call with the SSH command' do
-      expect_system_call('ssh -t -A example.com "\\$SHELL -l -c \\"/usr/bin/env ls\\""')
+      expect_system_call('ssh -t -A example.com \'$SHELL -l -c "/usr/bin/env ls"\'')
       backend.execute('ls')
     end
 
     it 'respects the specified directory' do
       backend.within('/var/log') do
-        expect_system_call('ssh -t -A example.com "\\$SHELL -l -c \\"cd /var/log && /usr/bin/env ls\\""')
+        expect_system_call('ssh -t -A example.com \'$SHELL -l -c "cd /var/log && /usr/bin/env ls"\'')
+
         backend.execute('ls')
       end
     end
 
     it 'respects the specified user' do
       backend.as('deployer') do
-        expect_system_call('ssh -t -A example.com "\\$SHELL -l -c \\"sudo -u deployer -- sh -c \'/usr/bin/env ls\'\\""')
+        expect_system_call('ssh -t -A example.com \'$SHELL -l -c "sudo -u deployer -- sh -c \\"/usr/bin/env ls\\""\'')
+
         backend.execute('ls')
       end
     end
@@ -32,7 +34,8 @@ describe SSHKit::Interactive::Backend do
 
     it 'respects the specified env' do
       backend.with(foo: :bar) do
-        expect_system_call('ssh -t -A example.com "\\$SHELL -l -c \\"( export FOO="bar" ; /usr/bin/env ls )\\""')
+        expect_system_call('ssh -t -A example.com \'$SHELL -l -c "( export FOO="bar" ; /usr/bin/env ls )"\'')
+
         backend.execute('ls')
       end
     end

data/spec/command_spec.rb

@@ -85,20 +85,20 @@ describe SSHKit::Interactive::Command do
       cmd = SSHKit::Interactive::Command.new(host, command)
 
       expect(cmd).to receive(:ssh_cmd_args).and_return(%w(-A -B -C))
-      expect(cmd.to_s).to eq('ssh -A -B -C example.com "\\$SHELL -l -c \\"/usr/bin/env ls\\""')
+      expect(cmd.to_s).to eq('ssh -A -B -C example.com \'$SHELL -l -c "/usr/bin/env ls"\'')
     end
 
     it 'excludes options if they\'re blank' do
       cmd = SSHKit::Interactive::Command.new(host, command)
 
       expect(cmd).to receive(:ssh_cmd_args).and_return([])
-      expect(cmd.to_s).to eq('ssh example.com "\\$SHELL -l -c \\"/usr/bin/env ls\\""')
+      expect(cmd.to_s).to eq('ssh example.com \'$SHELL -l -c "/usr/bin/env ls"\'')
     end
 
     it 'accepts a remote command' do
       cmd = SSHKit::Interactive::Command.new(host, command)
 
-      expect(cmd.to_s).to eq('ssh -t -A example.com "\\$SHELL -l -c \\"/usr/bin/env ls\\""')
+      expect(cmd.to_s).to eq('ssh -t -A example.com \'$SHELL -l -c "/usr/bin/env ls"\'')
     end
   end
 end

data/spec/dsl_spec.rb

@@ -5,7 +5,7 @@ describe SSHKit::Interactive::DSL do
     let(:host) { SSHKit::Host.new('example.com') }
 
     it 'will execute interactively' do
-      expect_system_call('ssh -t -A example.com "\\$SHELL -l -c \\"/usr/bin/env ls\\""')
+      expect_system_call('ssh -t -A example.com \'$SHELL -l -c "/usr/bin/env ls"\'')
 
       run_interactively host do
         execute(:ls)

data/sshkit-interactive.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'sshkit', '~> 1.12'
 
-  spec.add_development_dependency 'bundler', '~> 1.14.0'
-  spec.add_development_dependency 'rake',    '~> 12.0.0'
-  spec.add_development_dependency 'rspec',   '~> 3.5.0'
+  spec.add_development_dependency 'rake',  '~> 12.0.0'
+  spec.add_development_dependency 'rspec', '~> 3.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-interactive
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 description: 
 email:
 - aidan.feldman@gmail.com
@@ -118,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: An SSHKit backend that allows you to execute interactive commands on your