shellshot 0.3.1 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/shellshot.rb

@@ -18,10 +18,10 @@ module Shellshot
 
       self.options = options
 
-      prepare_pipes if no_stderr?
+      prepare_pipes
       self.pid = fork do
-        close_reading_pipe if no_stderr?
-        redefine_stds(options)
+        close_reading_pipes
+        redefine_stds
         system_exec(command)
       end
 
@@ -35,6 +35,28 @@ module Shellshot
       true
     end
 
+    def stderr_contents
+      unless stderr_defined?
+        @stderr_wr.close
+        contents = @stderr_rd.read
+        @stderr_rd.close
+        contents
+      else
+        File.read(stderr_location)
+      end
+    end
+
+    def stdout_contents
+      unless stdout_defined?
+        @stdout_wr.close
+        contents = @stdout_rd.read
+        @stdout_rd.close
+        contents
+      else
+        File.read(stdout_location)
+      end
+    end
+
     private
 
     def wait_for(seconds)
@@ -47,10 +69,6 @@ module Shellshot
       end
     end
 
-    def close_stderr
-      error_tempfile.close
-    end
-
     def terminate_child_process
       if pid
         Process.kill("KILL", pid)
@@ -58,60 +76,55 @@ module Shellshot
       end
     end
 
-    def redefine_stds(options)
-      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
+    def redefine_stds
+      $stdout.reopen(stdout_descriptor)
+      $stderr.reopen(stderr_descriptor)
     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]
+    def stderr_descriptor
+      stdall_descriptor || @stderr_wr || File.open(stderr_location, "w+")
     end
 
-    def close_reading_pipe
-      @rd.close
+    def stdout_descriptor
+      stdall_descriptor || @stdout_wr || File.open(stdout_location, "w+")
     end
 
-    def stderr_contents
-      if no_stderr?
-        @wr.close
-        contents = @rd.read
-        @rd.close
-        contents
-      else
-        File.read(stderr_location)
+    def stdall_descriptor
+      if stdall_location
+        @stdall_descriptor ||= File.open(stdall_location, "w+")
       end
     end
 
-    def prepare_pipes
-      @rd, @wr = IO.pipe
+    def stderr_defined?
+      !!stderr_location
     end
 
-    def close_pipes
-      @rd.close
-      @wr.close
+    def stdout_defined?
+      !!stdout_location
     end
+
+    def stdall_location
+      options[:stdall]
+    end
+
+    def close_reading_pipes
+      @stderr_rd.close unless stderr_defined?
+      @stdout_rd.close unless stdout_defined?
+    end
+
+    def prepare_pipes
+      @stderr_rd, @stderr_wr = IO.pipe unless stderr_defined?
+      @stdout_rd, @stdout_wr = IO.pipe unless stdout_defined?
+    end
+
   end
 
   def self.exec(command, options = {})

data/shellshot.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{shellshot}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Petyo Ivanov"]
-  s.date = %q{2009-12-01}
+  s.date = %q{2009-12-16}
   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.
@@ -57,4 +57,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<SystemTimer>, [">= 0"])
   end
 end
-

data/spec/shellshot_spec.rb

@@ -31,6 +31,18 @@ describe Shellshot do
     lambda { Shellshot.exec %q[ruby -e '$stderr << "problem"; exit 1;'] }.should raise_error(Shellshot::CommandError, "problem")
   end
 
+  it "should capture stdout by default" do
+    cmd = Shellshot::Command.new
+    cmd.exec %q[ruby -e '$stdout << "test"']
+    cmd.stdout_contents.should == "test"
+  end
+
+  it "should capture stderr by default" do
+    cmd = Shellshot::Command.new
+    cmd.exec %q[ruby -e '$stderr << "test"']
+    cmd.stderr_contents.should == "test"
+  end
+
 end
 
 # EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shellshot
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 +02:00
+date: 2009-12-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency