shell_command 0.1.1 → 0.2.0

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
-  #- jruby-19mode (Appears to have popen3(…) from 1.8.7) 
-  #- rbx-19mode   (Appears to not implement Open3.spawn(…))
+  # - jruby-19mode  
+  - rbx-19mode   
 
 notifications:
   irc: "irc.freenode.org#flowof.info"

data/README.md

@@ -30,7 +30,7 @@ __1.__
       if command.success?
         puts command.stdout
       else
-        raise RuntimeError, "The command 'ls' failed." 
+        puts "Looks like I couldn't execute `ls`, sorry!"
       end
     end
 
@@ -44,10 +44,8 @@ __2.__
 
 __SUPPORTED PLATFORMS__
 
-JRuby, and Rubinius do not implement `Open3.popen3(…)` properly yet. :(  
-As soon as they do they will be supported in 1.9 mode.
-
-  * CRuby 1.9+
+  - Rubinius (1.9 mode)
+  - CRuby 1.9+
 
 __LICENSE__
 

data/lib/shell_command.rb

@@ -1,5 +1,5 @@
 require "shell_command/version"
-require 'open3'
+require 'open4'
 
 module ShellCommand
 
@@ -16,7 +16,7 @@ module ShellCommand
   # @attr [String] stdout
   #   The output written by the command to standard output.
   #
-  class Command < Struct.new(:status, :stderr, :stdout)
+  class Command < Struct.new(:status, :stdout, :stderr)
 
     def method_missing method, *args, &block
       if status.respond_to?(method)
@@ -34,7 +34,7 @@ module ShellCommand
 
   #
   # @param [String] *args
-  #   A command and its arguments to execute (if any).
+  #   A command and its arguments(if any) to execute.
   #
   # @yieldparam [ShellCommand::Command] command
   #   Yields {ShellCommand::Command} if a block is given.
@@ -46,16 +46,15 @@ module ShellCommand
     if args.empty?
       raise ArgumentError, 'Wrong number of arguments (0 for 1)'
     end
-
-    Open3.popen3(*args) do |_, stdout, stderr, thr|
-      status  = thr.value
-      command = Command.new(status, stderr.read, stdout.read)
-
-      if block_given?
-        yield(command)
-      else
-        command
-      end
+    
+    pid, stdin, stdout, stderr = Open4.open4(*args)
+    _, status = Process.wait2(pid)
+    command = Command.new(status, stdout.read, stderr.read)
+    
+    if block_given?
+      yield command
+    else
+      command
     end
   end
   module_function :run

data/lib/shell_command/version.rb

@@ -1,3 +1,3 @@
 module ShellCommand
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/shell_command.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 1.9.1'
 
+  s.add_runtime_dependency "open4"
   s.add_development_dependency "rake"
   s.add_development_dependency "minitest"
 

data/test/test_shell_command.rb

@@ -1,22 +1,22 @@
 context ShellCommand do
 
   context 'run' do
-    it 'must successfully execute "echo".' do
+    it 'executes a command successfully.' do
       command = ShellCommand.run "echo -n Hi!"
       command.success?.must_equal(true)
     end
 
-    it 'must give access to the standard output of "echo"' do
+    it 'gives access to the standard output of a command.' do
       command = ShellCommand.run "echo -n Hi!"
       command.stdout.must_equal("Hi!")
     end
 
-    it 'must give access to the standard error output of "echo"' do
+    it 'gives access to the standard error output of a command.' do
       command = ShellCommand.run "ls /i_do_not_exist"
       command.stderr.empty?.must_equal(false)
     end
 
-    it 'must call a block, if given.' do
+    it 'calls a block, if given.' do
       mock = MiniTest::Mock.new
       mock.expect(:ok, nil)
 
@@ -27,13 +27,13 @@ context ShellCommand do
       mock.verify
     end
 
-    it "must yield a parameter, if asked." do
+    it "yields a parameter, if given." do
       ShellCommand.run "ls" do |command|
         command.must_be_instance_of(ShellCommand::Command)
       end
     end
 
-    it 'must raise a ArgumentError if given no arguments.' do
+    it 'raises an ArgumentError if given no arguments.' do
       proc {
         ShellCommand.run
       }.must_raise(ArgumentError)
@@ -41,13 +41,13 @@ context ShellCommand do
   end
 
   context 'run!' do
-    it 'must raise a exception when a command fails.' do
+    it 'raises ShellCommand::Exception when a command fails.' do
       proc {
         ShellCommand.run! "ls /opskddiofjfsiodjf"
       }.must_raise(ShellCommand::Exception)
     end
 
-    it 'must give a Command when a command is successful.' do
+    it 'gives a ShellCommand::Command when a command is successful.' do
       command = ShellCommand.run! "ls"
       command.must_be_instance_of(ShellCommand::Command)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shell_command
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70169586060480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70169586060480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70177434104300 !ruby/object:Gem::Requirement
+  requirement: &70169586094980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177434104300
+  version_requirements: *70169586094980
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70177434103840 !ruby/object:Gem::Requirement
+  requirement: &70169586092480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177434103840
+  version_requirements: *70169586092480
 description: shell_command tries to provide a better interface for  communicating
   with commands you spawn on the shell
 email:
@@ -74,10 +85,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1630982936348667376
+      hash: 2310391994670122031
 requirements: []
 rubyforge_project: shell_command
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: shell_command tries to provide a better interface for  communicating with