fulmar-shell 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7ee1f834b78193c9007227b8388222fcf4a7f24
-  data.tar.gz: 82d0f09080b98ac7c8be68671ec3119ebf7f88f9
+  metadata.gz: 88ce8ef3e2a814df451c45651e4a0a49b6692e8a
+  data.tar.gz: b6edafdcd35b1c425df302ada29080e617b1ebc9
 SHA512:
-  metadata.gz: eabf95f05e15df887b532fa5f75018767ea6b05a30d4bb8a6a06d2eb7ae726f663418a0f9c51a878d5b39231344dc5c5dabd2eae1fbef66a80c10f00752231b2
-  data.tar.gz: 2570d005d648dc7089286478460abc27807f204c25c3eb32322e75072bb3e42c96cfc2c72c9604dbb15d8952acaf0aa7d95d9666d5b8c3f910ed4e998e881bdb
+  metadata.gz: f23e524956f89d7183847ea181708792206a3e3eeec2dd802ea4f17e1626e397ef246276eed0be581873fcf04104222fb1d0c0ee98f13bb462439e6e138254c4
+  data.tar.gz: 1d13cb867c913cc1cdfee160dbaaea532b9df8cdad730596c696c69324cf789a22bd1b0214bfa77a7fd6356681d034d3e56761c4bc4a070a92db28671f85b46a

data/lib/fulmar/shell.rb

@@ -5,7 +5,7 @@ require 'open3'
 module Fulmar
   # Implements simple access to shell commands
   class Shell
-    VERSION = '1.4.0'
+    VERSION = '1.5.1'
 
     attr_accessor :debug, :last_output, :last_error, :quiet, :strict
     attr_reader :path
@@ -33,16 +33,18 @@ module Fulmar
         path = @path
       end
 
+      options[:error_message] ||= 'Last shell command returned an error.'
+
       command.unshift "cd #{path}"
 
       # invoke a login shell?
-      shell_command = options[:login] ? 'env -i bash -lc' : 'bash -c'
+      shell_command = options[:login] ? clean_environment : 'bash -c'
 
       if local?
-        execute("#{shell_command} '#{escape_for_sh(command.join(' && '))}'")
+        execute("#{shell_command} '#{escape_for_sh(command.join(' && '))}'", options[:error_message])
       else
         remote_command = escape_for_sh("#{shell_command} '#{escape_for_sh(command.join(' && '))}'")
-        execute("ssh #{@host} '#{remote_command}'")
+        execute("ssh #{@host} '#{remote_command}'", options[:error_message])
       end
     end
 
@@ -56,8 +58,12 @@ module Fulmar
 
     protected
 
+    def clean_environment
+      "env -i HOME=\"#{ENV['HOME']}\" bash -lc"
+    end
+
     # Run the command and capture the output
-    def execute(command)
+    def execute(command, error_message)
       # Ladies and gentleman: More debug, please!
       puts command if @debug
 
@@ -75,7 +81,7 @@ module Fulmar
 
       if @strict and wait_thr.value != 0
         dump_error_message(command)
-        fail 'Last shell command returned an error.'
+        fail error_message
       end
 
       wait_thr.value == 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fulmar-shell
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Gerrit Visscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler