fulmar-shell 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02faa56b011ad6bd33e19a36970e2cbdf237bfc2
-  data.tar.gz: eb4d109c408c27a0b40ab85c2555be092ac3fca4
+  metadata.gz: 3fc5bb14a5ba3fd7793238ee0e27c9e5261d958f
+  data.tar.gz: e4266432900391b2580dcc65609f38daebf9f3b1
 SHA512:
-  metadata.gz: 4370dc0fea4ea5f87e3b39c6a05f0e739196845f9fcd1a7ccaad81f3c380f9329499fba750839e933a53ec849fd70833d57a62ff984803d5012566a28cb0e57c
-  data.tar.gz: 7e7c0a719ef02c1470d927e57ef33fd4822b0a9a81986feb618c456f86e8953072756c143630cf7fe3f99e653ef7d7d69d70329128ae65d7ff01383b2f79828c
+  metadata.gz: 96cb5b258fdb9c2187bee07ab4b86c9fa65930acec3132a0eda2fa6507d535b60c15a1fbc392e1efe37140c85fad8fec1a4c63ebd4b33beb27c0b30f8ff0d3ef
+  data.tar.gz: 3b37acc54f5b39c6118dd1293b4d71ce2ad15890126eb25263f883e02a1a636876c14fe6e6de683f32d1890496f29440e23e0fdba91e86a7f9ba068b584c340b

data/lib/fulmar/shell.rb

@@ -5,11 +5,16 @@ require 'open3'
 module Fulmar
   # Implements simple access to shell commands
   class Shell
-    VERSION = '1.5.2'
+    VERSION = '1.6.0'
 
     attr_accessor :debug, :last_output, :last_error, :quiet, :strict
     attr_reader :path
 
+    DEFAULT_OPTIONS = {
+      login: false,
+      bundler: true #
+    }
+
     def initialize(path = '.', host = 'localhost')
       @host = host
       @path = (path.nil? || path.empty?) ? '.' : path
@@ -18,11 +23,11 @@ module Fulmar
       @last_error = []
       @debug = false
       @quiet = false
-      @environment = {}
       @strict = false
+      @clean_environment = [] # list of things to clean from environment variables
     end
 
-    def run(command, options = {})
+    def run(command, options = DEFAULT_OPTIONS)
       command = [command] if command.class == String
 
       # is a custom path given?
@@ -38,7 +43,9 @@ module Fulmar
       command.unshift "cd #{path}"
 
       # invoke a login shell?
-      shell_command = options[:login] ? clean_environment : 'bash -c'
+      shell_command = shell_command(options[:login])
+
+      @clean_environment << 'bundler' if options[:escape_bundler]
 
       if local?
         execute("#{shell_command} '#{escape_for_sh(command.join(' && '))}'", options[:error_message])
@@ -58,8 +65,23 @@ module Fulmar
 
     protected
 
-    def clean_environment
-      "env -i HOME=\"#{ENV['HOME']}\" LANG=\"#{ENV['LANG']}\" bash -lc"
+    def shell_command(login)
+      login ? "env -i HOME=\"#{ENV['HOME']}\" LANG=\"#{ENV['LANG']}\" bash -lc" : 'bash -c'
+    end
+
+    def environment
+      env = ENV.clone
+      if @clean_environment.include? 'bundler'
+        bundler_variable_parts = %w(ruby gem_ bundle)
+        # Remove any variables which contain the words above
+        env.delete_if { |key| bundler_variable_parts.select { |part| key.downcase.include?(part) }.any? }
+        env['PATH'] = path_without_bundler
+      end
+      env
+    end
+
+    def path_without_bundler
+      ENV['PATH'].split(':').reject { |path| path.include?('ruby') || path.include?('gems') }.join(':')
     end
 
     # Run the command and capture the output
@@ -67,7 +89,7 @@ module Fulmar
       # Ladies and gentleman: More debug, please!
       puts command if @debug
 
-      stdin, stdout, stderr, wait_thr = Open3.popen3(command)
+      stdin, stdout, stderr, wait_thr = Open3.popen3(environment, command)
 
       # Remove annoying newlines at the end
       @last_output = stdout.readlines.collect(&:chomp)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fulmar-shell
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Gerrit Visscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Small service to run shell commands on a local or remote shell