sshkit-interactive 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85a367dc3b5b858208966b608522f5cfa5437184
-  data.tar.gz: dbade21d2bfb2b0e4e438ccff779f4d998f1d5cc
+SHA256:
+  metadata.gz: 51e9cecfe07a2b9b600c7399e0c33ffc2e916ac28badd117948bdc20d9878ad1
+  data.tar.gz: cf9cea1f88cb5868630f1c2aebe2e0f35faa7db2fe3ded186243e405f97ffc90
 SHA512:
-  metadata.gz: aa2aedd29c8f938e711165aacee63d03869e523bbe39950d99aa189fc210a1d567fabe882d8a2270dae8f1b90e04f332f2d8e3c43bc9b5f141fba431a08d1315
-  data.tar.gz: 41adf32334b6ea3abe35eaa6a52a2970547366af9821fbd6a69c884b9d37a4039511d18e22073f5c833fc490cc7bd7c11a331cc7e5b9e089e6e773e17a0f3a94
+  metadata.gz: b9228c6782fbc0d77a97e2f32e45791147add79e785e4bced6225c7aab4170e74cad1eb40ae41e9312416266a2221112b38c822e379fd9577ed2b31b7cd9073d
+  data.tar.gz: 9b78d748aa11d9f9a9296e3b73ee2c1086133cc4b15ae274d24dca98ef89b55ef048fe0bc331225aba5c2a0a24c99502ef29ed7fda982c9fa356e0eb67bda319

data/.travis.yml

@@ -3,11 +3,12 @@ sudo: false
 language: ruby
 
 rvm:
-  - ruby-2.2.7
-  - ruby-2.3.4
-  - ruby-2.4.1
+  - ruby-2.2.9
+  - ruby-2.3.6
+  - ruby-2.4.3
+  - ruby-2.5.0
   - jruby-1.7
-  - jruby-9.1.12.0
+  - jruby-9.1.15.0
 
 gemfile:
   - spec/gemfiles/net-ssh2_8.gemfile
@@ -17,6 +18,7 @@ gemfile:
   - spec/gemfiles/net-ssh3_2.gemfile
   - spec/gemfiles/net-ssh4_0.gemfile
   - spec/gemfiles/net-ssh4_1.gemfile
+  - spec/gemfiles/net-ssh4_2.gemfile
 
 matrix:
   exclude:
@@ -30,5 +32,7 @@ matrix:
       gemfile: spec/gemfiles/net-ssh4_0.gemfile
     - rvm: jruby-1.7
       gemfile: spec/gemfiles/net-ssh4_1.gemfile
+    - rvm: jruby-1.7
+      gemfile: spec/gemfiles/net-ssh4_2.gemfile
 
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.3.0 (2018-02-03)
+### Feature
+- allow to set shell
+
 ## 0.2.3 (2017-09-03)
 ### Fix
 - [fix sudo with new variable expansion](https://github.com/afeld/sshkit-interactive/pull/18)

data/README.md

@@ -63,6 +63,17 @@ namespace :rails do
 end
 ```
 
+And it is possible to set the shell to be used:
+
+```ruby
+namespace :foo do
+  task :bar do
+    run_interactively primary(:app), shell: '/bin/bash' do
+      ...
+    end
+  end
+end
+
 ### Manually setting the backend
 
 Use the [interactive backend](lib/sshkit/interactive/backend.rb) and execute commands as normal:

data/lib/sshkit/interactive/backend.rb

@@ -1,6 +1,12 @@
 module SSHKit
   module Interactive
     class Backend < SSHKit::Backend::Printer
+      def initialize(host, options = {}, &block)
+        super(host, &block)
+
+        @options = options
+      end
+
       def run
         instance_exec(host, &@block)
       end
@@ -34,7 +40,7 @@ module SSHKit
         super
 
         options = args.extract_options!
-        cmd     = Command.new(host, command(args, options))
+        cmd     = Command.new(host, command(args, options), @options)
 
         debug(cmd.to_s)
 

data/lib/sshkit/interactive/command.rb

@@ -7,9 +7,10 @@ module SSHKit
       #
       # @param host [SSHKit::Host] the host to run `remote_command` on.
       # @param remote_command [SSHKit::Command] the command to run on `host`.
-      def initialize(host, remote_command = nil)
+      def initialize(host, remote_command = nil, options = {})
         @host           = host
         @remote_command = remote_command
+        @options        = options
       end
 
       # Run the command on the remote host via SSH binary.
@@ -86,9 +87,10 @@ module SSHKit
       end
 
       def command
-        cmd = remote_command.to_command.gsub("'", "\\\"") # replace single quotes with double quotes
+        cmd   = remote_command.to_command.gsub("'", "\\\"") # replace single quotes with double quotes
+        shell = @options[:shell] || '$SHELL'
 
-        %Q{'$SHELL -l -c \"#{cmd}\"'}
+        %Q{'#{shell} -l -c \"#{cmd}\"'}
       end
     end
   end

data/lib/sshkit/interactive/dsl.rb

@@ -2,13 +2,13 @@ module SSHKit
   module Interactive
     module DSL
       # run commands interactively
-      def run_interactively(host, &block)
+      def run_interactively(host, options = {}, &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
+        SSHKit::Interactive::Backend.new(host, options, &block).run
       ensure
         Thread.current[:run_interactively] = false
       end

data/lib/sshkit/interactive/version.rb

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

data/spec/backend_spec.rb

@@ -40,6 +40,12 @@ describe SSHKit::Interactive::Backend do
       end
     end
 
+    it 'respects the specified shell' do
+      expect_system_call('ssh -t -A example.com \'/bin/bash -l -c "/usr/bin/env ls"\'')
+
+      SSHKit::Interactive::Backend.new(host, shell: '/bin/bash').execute('ls')
+    end
+
     describe 'prevents calling unsupported operations' do
       it '#upload!' do
         expect { backend.upload!(:a, :b) }.to raise_error(::SSHKit::Backend::MethodUnavailableError)

data/spec/dsl_spec.rb

@@ -12,6 +12,14 @@ describe SSHKit::Interactive::DSL do
       end
     end
 
+    it 'will use specified shell' do
+      expect_system_call('ssh -t -A example.com \'/bin/bash -l -c "/usr/bin/env ls"\'')
+
+      run_interactively host, shell: '/bin/bash' do
+        execute(:ls)
+      end
+    end
+
     it 'does not support switching hosts' do
       expect {
         run_interactively host do

data/spec/gemfiles/net-ssh4_2.gemfile

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sshkit-interactive
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Aidan Feldman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-03 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -82,6 +82,7 @@ files:
 - spec/gemfiles/net-ssh3_2.gemfile
 - spec/gemfiles/net-ssh4_0.gemfile
 - spec/gemfiles/net-ssh4_1.gemfile
+- spec/gemfiles/net-ssh4_2.gemfile
 - spec/spec_helper.rb
 - sshkit-interactive.gemspec
 homepage: https://github.com/afeld/sshkit-interactive
@@ -104,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: An SSHKit backend that allows you to execute interactive commands on your
@@ -120,4 +121,5 @@ test_files:
 - spec/gemfiles/net-ssh3_2.gemfile
 - spec/gemfiles/net-ssh4_0.gemfile
 - spec/gemfiles/net-ssh4_1.gemfile
+- spec/gemfiles/net-ssh4_2.gemfile
 - spec/spec_helper.rb