scmd 2.1.2 → 2.2.0

data/Gemfile

@@ -3,5 +3,9 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'pry'
-gem "whysoslow"
+gem 'pry', "~> 0.9.0"
+gem 'whysoslow'
+
+platform :rbx do
+  gem 'rubysl'
+end

data/lib/scmd/command.rb

@@ -14,11 +14,12 @@ module Scmd
     READ_CHECK_TIMEOUT   = 0.001 # seconds
     DEFAULT_STOP_TIMEOUT = 3     # seconds
 
-    attr_reader :cmd_str
+    attr_reader :cmd_str, :env
     attr_reader :pid, :exitstatus, :stdout, :stderr
 
-    def initialize(cmd_str)
+    def initialize(cmd_str, env = nil)
       @cmd_str = cmd_str
+      @env     = stringify_hash(env || {})
       reset_attrs
     end
 
@@ -130,7 +131,7 @@ module Scmd
       reset_attrs
       @stop_r, @stop_w = IO.pipe
       @read_output_thread = nil
-      @child_process = ChildProcess.new(@cmd_str)
+      @child_process = ChildProcess.new(@cmd_str, @env)
     end
 
     def teardown_run
@@ -154,12 +155,18 @@ module Scmd
       ::Process.kill sig, @child_process.pid
     end
 
+    def stringify_hash(hash)
+      hash.inject({}) do |h, (k, v)|
+        h.merge(k.to_s => v.to_s)
+      end
+    end
+
     class ChildProcess
 
       attr_reader :pid, :stdin, :stdout, :stderr
 
-      def initialize(cmd_str)
-        @pid, @stdin, @stdout, @stderr = *::POSIX::Spawn::popen4(cmd_str)
+      def initialize(cmd_str, env)
+        @pid, @stdin, @stdout, @stderr = *::POSIX::Spawn::popen4(env, cmd_str)
         @wait_pid, @wait_status = nil, nil
       end
 

data/lib/scmd/version.rb

@@ -1,3 +1,3 @@
 module Scmd
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/test/unit/command_tests.rb

@@ -11,7 +11,8 @@ class Scmd::Command
     end
     subject { @success_cmd }
 
-    should have_readers :cmd_str, :pid, :exitstatus, :stdout, :stderr
+    should have_readers :cmd_str, :env
+    should have_readers :pid, :exitstatus, :stdout, :stderr
     should have_imeths :run, :run!
     should have_imeths :start, :wait, :stop, :kill
     should have_imeths :running?, :success?
@@ -21,6 +22,18 @@ class Scmd::Command
       assert_equal "echo hi", subject.to_s
     end
 
+    should "default its env to an empty hash" do
+      assert_equal({}, subject.env)
+    end
+
+    should "stringify its env hash" do
+      cmd = Scmd::Command.new("echo $SCMD_TEST_VAR", {
+        :SCMD_TEST_VAR => 1
+      })
+      expected = { 'SCMD_TEST_VAR' => '1' }
+      assert_equal expected, cmd.env
+    end
+
     should "default its result values" do
       assert_nil subject.pid
       assert_nil subject.exitstatus
@@ -190,4 +203,19 @@ class Scmd::Command
 
   end
 
+  class WithEnvVarTests < UnitTests
+    desc "with environment variables"
+    setup do
+      @cmd = Scmd::Command.new("echo $SCMD_TEST_VAR", {
+        'SCMD_TEST_VAR' => 'test'
+      })
+    end
+
+    should "use them when running the command" do
+      @cmd.run
+      assert_equal "test\n", @cmd.stdout
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scmd
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
   - 2
-  version: 2.1.2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,11 +16,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-11 00:00:00 Z
+date: 2014-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: assert
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +29,11 @@ dependencies:
         - 2
         - 3
         version: "2.3"
-  type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: posix-spawn
+  type: :development
+  name: assert
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,8 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id002
+  type: :runtime
+  name: posix-spawn
+  prerelease: false
 description: Build and run system commands.
 email: 
 - kelly@kellyredding.com
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Build and run system commands.