Exit_Zero 0.1.0 → 1.0.0

data/Gemfile

@@ -4,3 +4,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in Bob.gemspec
 gemspec
+gem 'open4'

data/lib/Exit_Zero/version.rb

@@ -1,3 +1,3 @@
 class Exit_Zero
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/lib/Exit_Zero.rb

@@ -4,41 +4,42 @@ require 'posix/spawn'
 
 def Exit_Zero cmd=:no_cmd, &blok
   
-  if cmd == :no_cmd
-    r = yield
-    Exit_Zero.check blok, r
-    r
+  both = cmd != :no_cmd && block_given?
+  raise ArgumentError, "Both command and block are not allowed." if both
+
+  if block_given?
+    cmd = blok
+    r = p = blok.call
+    msg = cmd
   else
-    raise ArgumentError, "Both command and block are not allowed." if block_given?
-    r = Exit_Zero::Result.new(POSIX::Spawn::Child.new(cmd))
-    Exit_Zero.check cmd, r.status
-    r
+    r = p = Exit_Zero::Child.new(cmd)
+    msg = p.err.strip.empty? ? cmd : p.err
   end
-  
+
+  (r = r.status) if r.respond_to?(:status)
+  raise(Exit_Zero::Unknown_Exit, msg.inspect) unless r.respond_to?(:exitstatus)
+  raise(Exit_Zero::Non_Zero, "#{r.exitstatus} => #{msg}") if r.exitstatus != 0
+
+  p
 end # === Exit_Zero
 
 class Exit_Zero
   
+  Non_Zero      = Class.new(RuntimeError)
+  Unknown_Exit  = Class.new(RuntimeError)
+  
   module Class_Methods
-    
-    def check cmd, r = :no_status
-      r = $? if !r.respond_to?(:exitstatus)
-      raise(Exit_Zero::Non_Zero, cmd) if r.exitstatus != 0
-    end
-    
   end # === Class_Methods
   
   extend Class_Methods
-
-  class Non_Zero < RuntimeError
-  end # === class Non_Zero
   
-  class Result
+  class Child
     module Base
       
-      attr_reader :child
-      def initialize child
-        @child = child
+      attr_reader :cmd, :child
+      def initialize cmd
+        @cmd = cmd
+        @child = POSIX::Spawn::Child.new(cmd)
       end
 
       def split_lines
@@ -55,6 +56,6 @@ class Exit_Zero
 
     end # === Base
     include Base
-  end # === Result
+  end # === Child
   
 end # === class Exit_Zero

data/spec/tests/Child.rb

@@ -0,0 +1,30 @@
+describe "Child.new" do
+  
+  it 'executes given string' do
+    Exit_Zero::Child.new("pwd").out.should == `pwd`
+  end
+  
+end # === Exit_Zero::Child
+
+describe "Child#split_lines" do
+  
+  it "returns split lines of output through :split_lines" do
+    r = Exit_Zero::Child.new('ls -Al')
+    r.split_lines.should == `ls -Al`.strip.split("\n")
+  end
+  
+end # === Child#split_lines
+
+describe "Child delegate methods" do
+  
+  %w{ out err status }.each { |m|
+    it "sets :#{m} equal to Child##{m}" do
+      cmd = %q! ruby -e "puts 'a'; warn 'b'; exit(127);"!
+      target = POSIX::Spawn::Child.new(cmd)
+      Exit_Zero::Child.new(cmd)
+      .send(m).should == target.send(m)
+    end
+  }
+  
+end # === Child delegate methods
+

data/spec/tests/Exit_Zero.rb

@@ -1,20 +1,3 @@
-describe "Exit_Zero::Result" do
-  
-  it "provides split_lines" do
-    r = Exit_Zero::Result.new(POSIX::Spawn::Child.new('ls -Al'))
-    r.split_lines.should == `ls -Al`.strip.split("\n")
-  end
-  
-  %w{ out err status }.each { |m|
-    it "sets :#{m} equal to Child##{m}" do
-      cmd = %q! ruby -e "puts 'a'; warn 'b'; exit(127);"!
-      target = POSIX::Spawn::Child.new(cmd)
-      Exit_Zero::Result.new(POSIX::Spawn::Child.new(cmd))
-      .send(m).should == target.send(m)
-    end
-  }
-  
-end # === Exit_Zero::Result
 
 describe "Exit_Zero 'cmd'" do
 
@@ -22,10 +5,11 @@ describe "Exit_Zero 'cmd'" do
     lambda {
       Exit_Zero 'uptimes'
     }.should.raise(Exit_Zero::Non_Zero)
+    .message.should == %!127 => uptimes!
   end
 
-  it "returns a Exit_Zero::Result" do
-    Exit_Zero('whoami').class.should.be == Exit_Zero::Result
+  it "returns a Exit_Zero::Child" do
+    Exit_Zero('whoami').class.should.be == Exit_Zero::Child
   end
 
   it "executes valid command" do
@@ -42,12 +26,25 @@ end # === Exit_Zero 'cmd'
 
 describe "Exit_Zero { }" do
   
-  it "raises Exit_Zero::Non_Zero if $?.exitstatus != 0" do
+  it "returns last value of the block" do
+    Exit_Zero{ POSIX::Spawn::Child.new("ls ~") }
+    .out.should. == `ls ~`
+  end
+
+  it "raises Exit_Zero::Non_Zero if return value has exitstatus != 0" do
+    b = lambda { POSIX::Spawn::Child.new("something_not_found") }
     lambda {
-      Exit_Zero { 
-        POSIX::Spawn::Child.new("uptimes")
-      }
+      Exit_Zero(&b)
     }.should.raise(Exit_Zero::Non_Zero)
+    .message.should == "127 => #{b.inspect}"
+  end
+  
+  it "raise Unknown_Exit if block return value does not respond to :status and :exitstatus" do
+    target = lambda { :a }
+    lambda {
+      Exit_Zero(&target)
+    }.should.raise(Exit_Zero::Unknown_Exit)
+    .message.should.match %r!#{Regexp.escape target.inspect}!
   end
   
 end # === Exit_Zero { }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Exit_Zero
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &8271400 !ruby/object:Gem::Requirement
+  requirement: &14691860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8271400
+  version_requirements: *14691860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8270660 !ruby/object:Gem::Requirement
+  requirement: &14691120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8270660
+  version_requirements: *14691120
 - !ruby/object:Gem::Dependency
   name: Bacon_Colored
-  requirement: &8270180 !ruby/object:Gem::Requirement
+  requirement: &14690640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8270180
+  version_requirements: *14690640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &8269700 !ruby/object:Gem::Requirement
+  requirement: &14690160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8269700
+  version_requirements: *14690160
 - !ruby/object:Gem::Dependency
   name: Split_Lines
-  requirement: &8269260 !ruby/object:Gem::Requirement
+  requirement: &14689720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8269260
+  version_requirements: *14689720
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &8268760 !ruby/object:Gem::Requirement
+  requirement: &14689200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8268760
+  version_requirements: *14689200
 description: ! "\n    A simple method that raises Exit_Zero::Non_Zero\n    if $?.exitstatus
   is not zero.\n    Be sure to use the \"posix-spawn\" since almost everything \n
   \   else is just plain wrong when handling child processes.\n  "
@@ -94,6 +94,7 @@ files:
 - lib/Exit_Zero/version.rb
 - spec/helper.rb
 - spec/main.rb
+- spec/tests/Child.rb
 - spec/tests/Exit_Zero.rb
 - spec/tests/bin.rb
 homepage: ''