dotanuki 0.0.4 → 0.1.0

data/dotanuki.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "popen4"
+  s.add_dependency "posix-spawn"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "metric_fu"

data/lib/dotanuki.rb

@@ -1,4 +1,4 @@
-require 'popen4'
+require 'posix/spawn'
 
 # Module intented to be included into classes which execute system commands
 # @author Martin Englund
@@ -90,6 +90,7 @@ module Dotanuki
   #     execute "ls /does/not/exist"
   #   end
   # @note this method isn't thread safe
+  # @todo pass an environment too
   def guard(options={}, &block)
     opts = @defaults.merge(options)
     validate_options(opts)
@@ -108,48 +109,41 @@ module Dotanuki
   # @param [String, Array] commands string or array containing the command to be executed
   # @param [Hash] options (see #guard)
   # @return [ExecResult]
+  # @todo pass an environment too
   def execute(commands, options={})
     validate_options(options)
 
     result = ExecResult.new
 
     [commands].flatten.each do |command|
-      stdout, stderr, exit_status = _execute(command)
-      result.add(stdout, stderr, exit_status)
-      if options[:on_error] == :exception || @guard
-        if exit_status.nil?
+      begin
+        child = POSIX::Spawn::Child.new(command)
+        stdout = child.out.strip
+        stderr = child.err.strip
+        result.add(stdout, stderr, child.status.exitstatus)
+
+        if child.status.exitstatus != 0
+          if options[:on_error] == :exception || @guard
+            @guard << result if @guard
+            raise ExecError, stderr
+          end
+          break
+        end
+      rescue Errno::ENOENT
+        result.add(nil, nil, nil)
+        if options[:on_error] == :exception
           @guard << result if @guard
           raise ExecError, "#{command}: command not found"
-        elsif exit_status != 0
-          @guard << result if @guard
-          raise ExecError, stderr
         end
-      elsif exit_status.nil? || exit_status != 0
         break
       end
     end
+
     @guard << result if @guard
 
     return result
   end
 
-  # Execute a single command
-  #
-  # @param [String] command string containing the command to be executed
-  # @return [String, String, Fixnum] standard out, standard error and exit
-  #   status of the command
-  def _execute(command)
-    stdout = stderr = ""
-
-    status =
-      POpen4::popen4(command) do |out, err, stdin, pid|
-        stdout = out.read.chomp
-        stderr = err.read.chomp
-      end
-
-    return stdout, stderr, status ? status.exitstatus : status
-  end
-
   # Validates options for Dotanuki#execute or Dotanuki#guard
   #
   # @raise [ArgumentError] if an unknown option is given

data/lib/dotanuki/version.rb

@@ -1,4 +1,4 @@
 module Dotanuki
   # gem version
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/spec/dotanuki_spec.rb

@@ -110,10 +110,6 @@ describe Dotanuki do
       r.stderr.should == [""]
     end
 
-    it "should execute a single command" do
-      _execute("echo 'foo'").should == ["foo", "", 0]
-    end
-
     describe "with exception option should throw an exception" do
       it "on missing command" do
         lambda { execute(COMMAND_NOT_FOUND, {:on_error => :exception}) }.should raise_error Dotanuki::ExecError, "#{NON_EXISTING_PATH}: command not found"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotanuki
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-02 00:00:00.000000000 -07:00
+date: 2011-06-06 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: popen4
-  requirement: &2161180600 !ruby/object:Gem::Requirement
+  name: posix-spawn
+  requirement: &2152082320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161180600
+  version_requirements: *2152082320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161180020 !ruby/object:Gem::Requirement
+  requirement: &2151846680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161180020
+  version_requirements: *2151846680
 - !ruby/object:Gem::Dependency
   name: metric_fu
-  requirement: &2161179480 !ruby/object:Gem::Requirement
+  requirement: &2151810360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161179480
+  version_requirements: *2151810360
 description: A command executioner which doesn't blindly stumble on when a command
   fails'
 email: