vagrant-ssh 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d63a012e0986566a8b5a4cd7815b6d545ff3c8
-  data.tar.gz: 562292fd94769cba2d7b8ab9d5799da864949bf6
+  metadata.gz: 0af5558194fc3997641c12db6b3ae1c001cc5440
+  data.tar.gz: 08d8eb176faffe7f2c96496794aae9d094bd0676
 SHA512:
-  metadata.gz: e76a00db51b6afce972127adb430a268ee70a224f6ca60f6af4e94d95c90e2fe9f6a804408a4e61892ba838b8713d06a25770c20de5530beefa7c5bcedef4f28
-  data.tar.gz: 240257a085c9f4c844a1490f8cd3ff21730bc55b3af7fe45ca1622c06269b8d2468a2aa5b0146198216994455fd7783835a435160b42a71eb73abb1f837306f1
+  metadata.gz: bbfbd59884b411347ff8a57880e0b3e8c813fe643e226748c526707490ff0ee30a6fa5fe47c1d6db3074952d5d2003978f628694c4e63ca05a9c789e2c1b9949
+  data.tar.gz: ebf4701ac94a1e815fbd3a1c57f6c6fda328e9ef1ee6fe624dd052c824d9c2004d59953b8887567488121394d566d3cc06610b4e4b8e1079ac26bc89aba853de

data/lib/vagrant-ssh/shell.rb

@@ -1,11 +1,11 @@
 module VagrantSsh
   class Shell
-    attr_reader :options
+    attr_reader :options, :exit_code, :exit_signal
 
     def initialize(hostname, logger: Logger.new(STDOUT), options: {})
       @options  = { user:     'vagrant',
                     password: 'vagrant' }.merge(options)
-      @user     = options[:user]
+      @user     = @options[:user]
       @hostname = hostname
       @logger   = logger # left out of options so it does not conflict with Net::SSH own options hash
     end
@@ -15,23 +15,23 @@ module VagrantSsh
       @logger.info "Executing SSH command: #{command}"
       stdout      = ''
       stderr      = ''
-      exit_code   = nil
-      exit_signal = nil
+      @exit_code   = nil
+      @exit_signal = nil
       ssh.open_channel do |channel|
         channel.exec(command) do |_ch, success|
           abort "FAILED: couldn't execute command: (#{command})" unless success
           channel.on_data { |_ch, data| stdout += data }
           channel.on_extended_data { |_ch, _type, data| stderr += data }
-          channel.on_request('exit-status') { |_ch, data| exit_code = data.read_long }
-          channel.on_request('exit-signal') { |_ch, data| exit_signal = data.read_long }
+          channel.on_request('exit-status') { |_ch, data| @exit_code = data.read_long }
+          channel.on_request('exit-signal') { |_ch, data| @exit_signal = data.read_long }
         end
       end
       ssh.loop
 
       if stderr.size > 0
-        @logger.error "#{exit_code} #{stderr}"
-      elsif exit_code != 0
-        @logger.info "SSH Completed with non-zero exit code '#{exit_code}'"
+        @logger.error "#{@exit_code} #{stderr}"
+      elsif @exit_code != 0
+        @logger.info "SSH Completed with non-zero exit code '#{@exit_code}'"
       end
       if stdout.size > 0
         @logger.info "#{stdout}"

data/lib/vagrant-ssh/version.rb

@@ -1,3 +1,3 @@
 module VagrantSsh
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/vagrant_ssh_spec.rb

@@ -1,3 +1,5 @@
+require_relative 'spec_helper'
+
 describe VagrantSsh::Shell do
   subject(:vagrant_ssh) { VagrantSsh::Shell.new(host, logger: nil_logger) }
 
@@ -12,4 +14,19 @@ describe VagrantSsh::Shell do
   it 'should interface with a Vagrant VM correctly' do
     expect(vagrant_ssh.execute('whoami').strip).to eq 'vagrant'
   end
+
+  context 'when modifying the defaults' do
+    let(:non_default_credentials) { { user: 'foo', password: 'bar' } }
+
+    it 'uses the provided credentials' do
+      vagrant_ssh = VagrantSsh::Shell.new(host, logger: nil_logger, options: non_default_credentials)
+      expect(vagrant_ssh.options[:user]).to eq 'foo'
+      expect(vagrant_ssh.options[:password]).to eq 'bar'
+    end
+  end
+
+  it 'provides the last exit code' do
+    vagrant_ssh.execute('exit 1')
+    expect(vagrant_ssh.exit_code).to eq 1
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ssh
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Snape
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh