komenda 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f61bfb2ae2678d1a23fb5730df34bfb4da84246
-  data.tar.gz: 389179e3dc70aef14515646e2524d8ee3821fc33
+  metadata.gz: 80c7a7ea911cf08c74bd57d47c5d29f2e3200b66
+  data.tar.gz: f78bddae9c9776b3103c0c488447416ffc86cebf
 SHA512:
-  metadata.gz: 5d4c8315300bd7b46cf1944cba8fa2484bf28666ae2663da1db0ecd20dce44b06cb21beb85f9866be9bb59c03be14118603bf1d7c31cb83d1d0639459e0a7880
-  data.tar.gz: ca3a6b8d2fe921315c931439545bdeb3351d3245975a313e91f8a110a2ed73460912ddf5fcd992dadff780e1754de75e263ed2950f760e998c45ef15d5b28721
+  metadata.gz: 41ca723a231269e4b5c67d715a8f9415ef15cbfadc3a45bdb84aa8540d4b8fd1784e9ffe63ca25f5edefb3c1745a64f3ef770b20f92c2a43058b29694a31fc23
+  data.tar.gz: 355cb97d2e3d2c9aafcf09e423358c09883ab8c1ce06bb980777cb5cb4c0aadb8111fc3118985aa466bfe0434323d99d19d6faa2eae2f9cc676e592a1cb13ca8

data/README.md

@@ -30,9 +30,10 @@ result = Komenda.run(['echo', '-n', 'hello'])
 result.output   # => "hello"
 ```
 
-The `run()` method has a second argument `options`, which expects these keys:
-- **`env`** (Hash): The environment variables to use. Defaults to the current process' environment.
-- **`cwd`** (String): Directory to change to before running the process. Defaults to `nil`.
+The `run()` method has a second argument `options`, which accepts these optional keys:
+- **`env`** (Hash): Additional environment variables to set.
+- **`reset_bundler_env`** (Boolean): Reset environment variables from your current Ruby bundle using `Bundler.clean_env`. Defaults to `true`.
+- **`cwd`** (String): Directory to change to before running the process.
 
 ### Advanced usage
 The `create()` method creates a `Process` which can be `run()` (or `start()`ed as a Thread).

data/lib/komenda/process.rb

@@ -76,7 +76,8 @@ module Komenda
     def run_process(process_builder)
       opts = {}
       opts[:chdir] = process_builder.cwd unless process_builder.cwd.nil?
-      run_popen3(process_builder.env, process_builder.command, opts)
+      opts[:unsetenv_others] = true
+      run_popen3(process_builder.env_final, process_builder.command, opts)
     rescue Exception => exception
       emit(:error, exception)
       raise exception

data/lib/komenda/process_builder.rb

@@ -1,7 +1,9 @@
 module Komenda
   class ProcessBuilder
     attr_reader :command
+
     attr_reader :env
+    attr_reader :reset_bundler_env
     attr_reader :cwd
     attr_reader :events
 
@@ -9,7 +11,8 @@ module Komenda
     # @param [Hash] options
     def initialize(command, options = {})
       defaults = {
-        env: ENV.to_hash,
+        env: {},
+        reset_bundler_env: true,
         cwd: nil,
         events: {}
       }
@@ -17,6 +20,7 @@ module Komenda
 
       self.command = command
       self.env = options[:env]
+      self.reset_bundler_env = options[:reset_bundler_env]
       self.cwd = options[:cwd]
       self.events = options[:events]
     end
@@ -40,6 +44,11 @@ module Komenda
       @env = Hash[env.to_hash.map { |k, v| [String(k), String(v)] }]
     end
 
+    # @param [Boolean] reset
+    def reset_bundler_env=(reset)
+      @reset_bundler_env = reset ? true : false
+    end
+
     # @param [String] cwd
     def cwd=(cwd = nil)
       @cwd = cwd.nil? ? nil : String(cwd)
@@ -49,5 +58,27 @@ module Komenda
     def events=(events)
       @events = Hash[events.to_hash.map { |k, v| [k.to_sym, v.to_proc] }]
     end
+
+    # @return [Hash]
+    def env_final
+      if reset_bundler_env && Object.const_defined?('Bundler')
+        env_original = bundler_clean_env
+      else
+        env_original = ENV.to_hash
+      end
+      env_original.merge(env)
+    end
+
+    private
+
+    # @return [Hash]
+    def bundler_clean_env
+      if Bundler.methods(false).include?(:clean_env)
+        Bundler.clean_env
+      else
+        # For Bundler < 1.12.0
+        Bundler.with_clean_env { ENV.to_hash }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: komenda
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Cargo Media
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: events