sshkit-interactive 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b9f9fe3a0df465a8ce537cde0a15dd59a8c757a
-  data.tar.gz: 8d66b61a1c46fec1547fd4aeaa0bd99396daba00
+  metadata.gz: bdc3246ae37e2704528c372a077f39f0c248cf7b
+  data.tar.gz: e9d0427c36f308df360a923f5fd7b76db8f0ab05
 SHA512:
-  metadata.gz: c7c4f24a202860ae9b4543fd05c16531b64daea2718a39a3ac8e906bc5470271de288e09badaf8ee6d34310ebed65388f67f138bd75c86a1f7bc9ae07e5ffa70
-  data.tar.gz: 1c344d7c66e3fe33ebfe57ad387d073238c1d6f621595dda8fea50b7c85dd5e6d53eb122274628d367065816fcbf3bed2a96e1570af2c08ced4d94285573c97b
+  metadata.gz: b94273bcde5b62b76c7a3845f72eb4dbc08caa4d3f85151b321bc1270325bec604c8edaa883022b37107880a4b2879ec45fd2421771ff8a14d5bb9cfb041f26a
+  data.tar.gz: 92fb8c75c9a99a40ea5b7478fcedee27ec684a628d1250fb1ade9143921353910c953ddb417515c9c1907811444de1658c071489dcd5e06e9544846dbea4ffc0

data/.gitignore

@@ -11,4 +11,4 @@
 *.so
 *.o
 *.a
-mkmf.log
+*.log

data/.travis.yml

@@ -3,11 +3,11 @@ sudo: false
 language: ruby
 
 rvm:
-  - ruby-2.2.5
-  - ruby-2.3.1
-  - rbx-2.5.8
+  - ruby-2.2.6
+  - ruby-2.3.3
+  - ruby-2.4.0
   - jruby-1.7
-  - jruby-9.1.2.0
+  - jruby-9.1.7.0
 
 gemfile:
   - spec/gemfiles/net-ssh2_8.gemfile
@@ -15,6 +15,8 @@ gemfile:
   - spec/gemfiles/net-ssh3_0.gemfile
   - spec/gemfiles/net-ssh3_1.gemfile
   - spec/gemfiles/net-ssh3_2.gemfile
+  - spec/gemfiles/net-ssh4_0.gemfile
+  - spec/gemfiles/net-ssh4_1.gemfile
 
 matrix:
   exclude:
@@ -24,8 +26,12 @@ matrix:
       gemfile: spec/gemfiles/net-ssh3_1.gemfile
     - rvm: jruby-1.7
       gemfile: spec/gemfiles/net-ssh3_2.gemfile
+    - rvm: jruby-1.7
+      gemfile: spec/gemfiles/net-ssh4_0.gemfile
+    - rvm: jruby-1.7
+      gemfile: spec/gemfiles/net-ssh4_1.gemfile
 
 before_install:
-  - gem install bundler -v '~> 1.13'
+  - gem install bundler -v '~> 1.14.0'
 
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.1 (2017-05-01)
+### Change
+- run dummy command to force setting global netssh_options on host if using with capistrano
+
 ## 0.2.0 (2016-09-16)
 ### Feature
 - add DSL for interactive command invocation (`run_interactively`)

data/lib/sshkit/interactive/command.rb

@@ -25,7 +25,7 @@ module SSHKit
         args << '-A' if forward_agent?
         args << "-p #{port}" if port
         args << "-l #{user}" if user
-        args << %Q{-o "PreferredAuthentications #{auth_methods_str}"} if auth_methods.count > 0
+        args << %Q{-o "PreferredAuthentications #{auth_methods.join(',')}"} if auth_methods.count > 0
         args << %Q{-o "ProxyCommand #{proxy_command}"} if proxy
         args << %Q{-o "HostName #{host_name}"} if host_name
 
@@ -42,7 +42,7 @@ module SSHKit
           :ssh,
           *ssh_cmd_args,
           host.hostname,
-          "\"#{remote_command_str}\""
+          %Q{"\\$SHELL -l -c \\"#{remote_command.to_command}\\""}
         ].reject(&:empty?).join(' ')
       end
 
@@ -70,15 +70,11 @@ module SSHKit
       end
 
       def keys
-        netssh_options[:keys] || []
+        Array(netssh_options[:keys])
       end
 
       def auth_methods
-        netssh_options[:auth_methods] || []
-      end
-
-      def auth_methods_str
-        auth_methods.join(',')
+        Array(netssh_options[:auth_methods])
       end
 
       def proxy
@@ -88,10 +84,6 @@ module SSHKit
       def proxy_command
         proxy.command_line_template
       end
-
-      def remote_command_str
-        %Q{\\$SHELL -l -c \\"#{remote_command.to_command}\\"}
-      end
     end
   end
 end

data/lib/sshkit/interactive/dsl.rb

@@ -3,6 +3,9 @@ module SSHKit
     module DSL
       # run commands interactively
       def run_interactively(host, &block)
+        # Force setting global netssh_options on host if using capistrano
+        SSHKit.config.backend.new(host) { test(:true) }.run
+
         Thread.current[:run_interactively] = true
 
         SSHKit::Interactive::Backend.new(host, &block).run

data/lib/sshkit/interactive/version.rb

@@ -1,5 +1,5 @@
 module SSHKit
   module Interactive
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/spec/backend_spec.rb

@@ -30,7 +30,12 @@ describe SSHKit::Interactive::Backend do
       }.to raise_error(SSHKit::Interactive::Unsupported)
     end
 
-    it 'respects the specified env'
+    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 )\\""')
+        backend.execute('ls')
+      end
+    end
 
     describe 'prevents calling unsupported operations' do
       it '#upload!' do

data/spec/gemfiles/net-ssh4_0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+
+gem 'net-ssh', '~> 4.0.0'
+
+# Specify your gem's dependencies in sshkit-interactive.gemspec
+gemspec path: '../..'

data/spec/gemfiles/net-ssh4_1.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+
+gem 'net-ssh', '~> 4.1.0'
+
+# Specify your gem's dependencies in sshkit-interactive.gemspec
+gemspec path: '../..'

data/spec/spec_helper.rb

@@ -94,6 +94,8 @@ RSpec.configure do |config|
 =end
 
   config.before(:each) do
+    SSHKit.config.backend = SSHKit::Backend::Printer
+
     # block all system calls
     allow_any_instance_of(SSHKit::Interactive::Command).to receive(:system)
 

data/sshkit-interactive.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sshkit', '~> 1.9'
+  spec.add_dependency 'sshkit', '~> 1.12'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake',    '~> 11.0'
-  spec.add_development_dependency 'rspec',   '~> 3.5'
+  spec.add_development_dependency 'bundler', '~> 1.14.0'
+  spec.add_development_dependency 'rake',    '~> 12.0.0'
+  spec.add_development_dependency 'rspec',   '~> 3.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-interactive
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.5.0
 description: 
 email:
 - aidan.feldman@gmail.com
@@ -94,6 +94,8 @@ files:
 - spec/gemfiles/net-ssh3_0.gemfile
 - spec/gemfiles/net-ssh3_1.gemfile
 - spec/gemfiles/net-ssh3_2.gemfile
+- spec/gemfiles/net-ssh4_0.gemfile
+- spec/gemfiles/net-ssh4_1.gemfile
 - spec/spec_helper.rb
 - sshkit-interactive.gemspec
 homepage: https://github.com/afeld/sshkit-interactive
@@ -116,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An SSHKit backend that allows you to execute interactive commands on your
@@ -130,4 +132,6 @@ test_files:
 - spec/gemfiles/net-ssh3_0.gemfile
 - spec/gemfiles/net-ssh3_1.gemfile
 - spec/gemfiles/net-ssh3_2.gemfile
+- spec/gemfiles/net-ssh4_0.gemfile
+- spec/gemfiles/net-ssh4_1.gemfile
 - spec/spec_helper.rb