sheller 0.0.3 → 0.0.4

data/lib/sheller.rb

@@ -1,7 +1,7 @@
-require 'POpen4'
+require 'popen4'
 
 module Sheller
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   
   INESCAPABLE = {}
   
@@ -30,11 +30,12 @@ module Sheller
     
     def execute(*args)
       stdout, stderr = nil
-      status = POpen4.popen4(command(*args)) do |_stdout, _stderr, _stdin, _pid|
+      shell_command = command(*args)
+      status = POpen4.popen4(shell_command) do |_stdout, _stderr, _stdin, _pid|
         stdout = _stdout.read
         stderr = _stderr.read
       end
-      ShellerResult.new(stdout, stderr, status)
+      ShellerResult.new(stdout, stderr, status, shell_command)
     end
     
     private
@@ -54,12 +55,13 @@ module Sheller
   end
   
   class ShellerResult
-    attr_reader 'stdout', 'stderr', 'exit_status'
+    attr_reader 'stdout', 'stderr', 'exit_status', 'command'
     
-    def initialize(stdout, stderr, exit_status)
-      @stdout = stdout
-      @stderr = stderr
+    def initialize(stdout, stderr, exit_status, command)
+      @stdout      = stdout
+      @stderr      = stderr
       @exit_status = exit_status
+      @command     = command
     end
   end
 end

data/test/sheller_test.rb

@@ -89,4 +89,9 @@ class ShellerTest < Test::Unit::TestCase
     result = Sheller.execute('grep', 'Dublin', Sheller::STDIN_FROM_FILE, './fixtures/cities.txt')
     assert_equal "Dublin\n", result.stdout
   end
+  
+  def test_command
+    result = Sheller.execute('echo', 'barnacle')
+    assert_equal "'echo' 'barnacle'", result.command
+  end
 end

data/test/test_helper.rb

@@ -3,4 +3,4 @@ require 'fileutils'
 
 $: << File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 
-require 'sheller'
+require File.join(File.dirname(__FILE__), '../lib/sheller')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sheller
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Duncan Beevers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -07:00
+date: 2010-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency