fulmar-shell 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1eecbc826fbdf7fb94816509ec2d7a21eb66ad
-  data.tar.gz: 7eab24649e0767fe10006485d54cd0b23ed8e705
+  metadata.gz: 57c5684bfeaa62855b10e352b1f1dfed3b66da49
+  data.tar.gz: 7fa3c31d6c1a90521070f5fe3871396c65d6d82c
 SHA512:
-  metadata.gz: bb282a8e9b650419a62981e5cca6eac1a219bd752a6b105e2ef8400dd98dd3951d9a7789b699b8b18adb69ec7d0a30f97b1adbd44e330c6bedf11ee0134c312e
-  data.tar.gz: 57e25a5635a7bc7d765c11eccfb9fb6c0335051ec9a79bd045c9770c5ce4b7efb16f3873faf32c012e184a37044db6585f8e917f75934e9ed9263b470fc074d7
+  metadata.gz: 8aeca2e5686ef2d93f4a520db37a0170000c43d4849a08f8e7f7775ecba5b4cf96688386fe98cdf2d0b7c7f19116408e40d1d800cb339fab5fd6479e782b442f
+  data.tar.gz: a2a915681e357b0302ce6ae6a1f9e876dd80e142612a9cf9fb9940dbf269bd79adbd7bece130212842a5d16379b92bc7816bc56c65532866c959f36f1d612b3b

data/lib/fulmar/shell.rb

@@ -5,29 +5,42 @@ require 'open3'
 module Fulmar
   # Implements simple access to shell commands
   class Shell
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
 
     attr_accessor :debug, :last_output, :last_error, :quiet
     attr_reader :path
 
-    def initialize(path, host = 'localhost')
-      @path = File.expand_path((path.nil? || path.empty?) ? '.' : path)
+    def initialize(path = '.', host = 'localhost')
       @host = host
+      @path = (path.nil? || path.empty?) ? '.' : path
+      @path = File.expand_path(@path) if local?
       @last_output = []
       @last_error = []
       @debug = false
       @quiet = false
+      @environment = {}
     end
 
-    def run(command)
+    def run(command, options = {})
       command = [command] if command.class == String
 
-      command.unshift "cd #{@path}"
+      # is a custom path given?
+      if options[:in]
+        # is it absolute?
+        path = options[:in][0, 1] == '/' ? options[:in] : "#{@path}/#{options[:in]}"
+      else
+        path = @path
+      end
+
+      command.unshift "cd #{path}"
+
+      # invoke a login shell?
+      shell_command = options[:login] ? 'env -i bash -lc' : 'bash -c'
 
       if local?
-        execute("sh -c '#{escape_for_sh(command.join(' && '))}'")
+        execute("#{shell_command} '#{escape_for_sh(command.join(' && '))}'")
       else
-        remote_command = escape_for_sh('/bin/sh -c \'' + escape_for_sh(command.join(' && ')) + '\'')
+        remote_command = escape_for_sh("#{shell_command} '#{escape_for_sh(command.join(' && '))}'")
         execute("ssh #{@host} '#{remote_command}'")
       end
     end
@@ -37,14 +50,14 @@ module Fulmar
     end
 
     def path=(path)
-      @path = File.expand_path(path)
+      @path = local? ? File.expand_path(path) : path
     end
 
     protected
 
     # Run the command and capture the output
     def execute(command)
-      # DEBUG, baby!
+      # Ladies and gentleman: More debug, please!
       puts command if @debug
 
       stdin, stdout, stderr, wait_thr = Open3.popen3(command)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar-shell
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Gerrit Visscher