shellshot 0.2.0 → 0.3.0

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+.rake_tasks

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/shellshot.rb

@@ -1,18 +1,26 @@
 require 'rubygems'
+require 'tempfile'
 require 'system_timer'
 
 module Shellshot
-  
+
+  class CommandError < RuntimeError; end
+
   class Command
 
     alias_method :system_exec, :exec
 
     DEFAULT_TIMEOUT = 60 * 60 # 1 hour
 
-    attr_accessor :pid, :status
+    attr_accessor :pid, :status, :options
 
     def exec(command, options = {})
+
+      self.options = options
+
+      prepare_pipes if no_stderr?
       self.pid = fork do
+        close_reading_pipe if no_stderr?
         redefine_stds(options)
         system_exec(command)
       end
@@ -29,28 +37,79 @@ module Shellshot
 
     def wait_for(seconds)
       SystemTimer.timeout(seconds) do
-        Process.wait(pid)   
+        Process.wait(pid)
         self.status = $?
+        unless self.status.success?
+          raise CommandError, stderr_contents
+        end
       end
     end
 
+    def close_stderr
+      error_tempfile.close
+    end
+
     def terminate_child_process
-      if pid 
+      if pid
         Process.kill("KILL", pid)
         Process.wait(pid) # reaping zombie processes. Not sure if correct.
       end
     end
 
     def redefine_stds(options)
-      $stdout.reopen(File.open(options[:stdout], "w+")) if options[:stdout]
-      $stderr.reopen(File.open(options[:stderr], "w+")) if options[:stderr]
-
-      if options[:stdall]
-        combined = File.open(options[:stdall], "w+")
+      if stdall_location
+        combined = File.open(stdall_location, "w+")
         $stdout.reopen(combined)
         $stderr.reopen(combined)
+      else
+        $stdout.reopen(File.open(stdout_location, "w+")) if stdout_location
+        if no_stderr?
+          $stderr.reopen(@wr)
+        else
+          $stderr.reopen(File.open(stderr_location, "w+"))
+        end
+      end
+    end
+
+    def stderr_location
+      stdall_location || options[:stderr]
+    end
+
+    def no_stderr?
+      !stderr_location
+    end
+
+    def stdout_location
+      stdall_location || options[:stdout]
+    end
+
+    def stdall_location
+      options[:stdall]
+    end
+
+    def close_reading_pipe
+      @rd.close
+    end
+
+    def stderr_contents
+      if no_stderr?
+        @wr.close
+        contents = @rd.read
+        @rd.close
+        contents
+      else
+        File.read(stderr_location)
       end
     end
+
+    def prepare_pipes
+      @rd, @wr = IO.pipe
+    end
+
+    def close_pipes
+      @rd.close
+      @wr.close
+    end
   end
 
   def self.exec(command, options = {})

data/shellshot.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{shellshot}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petyo Ivanov"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-11-24}
   s.description = %q{
       A small library dealing with the obscurities of shell commands, piping and timeouts. 
       Most of the stuff comes from bad experience in http://beanstalkapp.com.
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/underlog/shellshot}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{ruby proxy handling the complexities of system invocations}
   s.test_files = [
     "spec/shellshot_spec.rb",
@@ -57,3 +57,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<SystemTimer>, [">= 0"])
   end
 end
+

data/spec/shellshot_spec.rb

@@ -8,12 +8,12 @@ describe Shellshot do
     "file".should be_a_file
   end
 
-  it "should pipe the out to the right file" do 
+  it "should pipe the out to the right file" do
     Shellshot.exec(%q[ruby -e 'puts "Hello World"'], :stdout => "file")
     "file".should contain("Hello World")
   end
 
-  it "should pipe the err to the right file" do 
+  it "should pipe the err to the right file" do
     Shellshot.exec(%q[ruby -e '$stderr << "error"'], :stderr => "file")
     "file".should contain("error")
   end
@@ -27,6 +27,10 @@ describe Shellshot do
     lambda { Shellshot.exec %q[ruby -e 'sleep 10000'], :timeout => 1 }.should raise_error(Timeout::Error)
   end
 
+  it "should raise error if command returned something else." do
+    lambda { Shellshot.exec %q[ruby -e '$stderr << "problem"; exit 1;'] }.should raise_error(Shellshot::CommandError, "problem")
+  end
+
 end
 
 # EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shellshot
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 +02:00
+date: 2009-11-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: ruby proxy handling the complexities of system invocations