ion1-mischacks 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.3 / 2009-06-28
+
+* Rename checking_exit_status as fork_and_check to make it clear it forks.
+* Add catching_exit, which is now used by the do_and_exit methods.
+* Pass a fallthrough exit status to do_and_exit.
+
 === 0.0.2 / 2009-06-28
 
 * Initial release

data/lib/mischacks.rb

@@ -14,7 +14,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 module MiscHacks
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   class ChildError < RuntimeError
     attr_reader :status
@@ -25,7 +25,7 @@ module MiscHacks
     end
   end
 
-  def self.checking_exit_status
+  def self.fork_and_check
     fork do
       yield
     end.tap do |pid|
@@ -36,27 +36,32 @@ module MiscHacks
     nil
   end
 
-  def self.do_and_exit bang=false
-    my_exit = if bang then method :exit! else method :exit end
+  def self.catching_exit final_proc, fallthrough_status
+    status = fallthrough_status
 
-    status = 1
     begin
       yield
     rescue SystemExit => e
       status = e.status
     ensure
-      my_exit.call status
+      final_proc.call status
     end
+
+    status
+  end
+
+  def self.do_and_exit status=1, &block
+    catching_exit method(:exit), status, &block
   end
 
-  def self.do_and_exit! &block
-    do_and_exit true, &block
+  def self.do_and_exit! status=1, &block
+    catching_exit method(:exit!), status, &block
   end
 
   def self.sh cmd, *args
     env = if args.last.is_a? Hash then args.pop else {} end
 
-    checking_exit_status do
+    fork_and_check do
       do_and_exit! do
         begin
           env.each_pair do |k, v| ENV[k.to_s] = v.to_s end

data/mischacks.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mischacks}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johan Kiviniemi"]

data/spec/mischacks_spec.rb

@@ -22,27 +22,65 @@ mh = MiscHacks
 ce = MiscHacks::ChildError
 
 describe mh do
-  describe 'checking_exit_status' do
+  describe 'fork_and_check' do
     it 'should raise an error when child fails' do
-      lambda do mh.checking_exit_status do exit  1 end end.should raise_error ce
-      lambda do mh.checking_exit_status do exit! 1 end end.should raise_error ce
+      lambda do mh.fork_and_check do exit  1 end end.should raise_error ce
+      lambda do mh.fork_and_check do exit! 1 end end.should raise_error ce
 
-      lambda do mh.checking_exit_status do exit  0 end end.should_not raise_error
-      lambda do mh.checking_exit_status do exit! 0 end end.should_not raise_error
+      lambda do mh.fork_and_check do exit  0 end end.should_not raise_error
+      lambda do mh.fork_and_check do exit! 0 end end.should_not raise_error
     end
 
     it 'should handle exec' do
-      lambda do mh.checking_exit_status do exec 'false' end end.should raise_error ce
-      lambda do mh.checking_exit_status do exec 'true'  end end.should_not raise_error
+      lambda do mh.fork_and_check do exec 'false' end end.should raise_error ce
+      lambda do mh.fork_and_check do exec 'true'  end end.should_not raise_error
+    end
+  end
+
+  describe 'catching_exit' do
+    it 'should call final_proc with the fallthrough status when the block does not exit' do
+      [0, 1, 42, 255].each do |i|
+        foo = nil
+        mh.catching_exit(lambda {|status| foo = status }, 2) do end
+        foo.should == 2
+      end
+
+    end
+
+    it 'should call final_proc with the exit status when the block exits' do
+      [0, 1, 42, 255].each do |i|
+        foo = nil
+        mh.catching_exit(lambda {|status| foo = status }, 2) do exit i end
+        foo.should == i
+      end
     end
   end
 
   describe 'do_and_exit' do
-    it 'should have an exit status of 1 when the block does not exit' do
+    it 'should have the proper exit status when the block does not exit' do
       lambda do
         mh.do_and_exit do end
         exit 2  # Should never reach this.
       end.should exit_with 1
+
+      lambda do
+        mh.do_and_exit! do end
+        exit! 2  # Should never reach this.
+      end.should exit_with 1
+
+      [0, 1, 42, 255].each do |i|
+        lambda do
+          mh.do_and_exit i do end
+          exit 2  # Should never reach this.
+        end.should exit_with i
+      end
+
+      [0, 1, 42, 255].each do |i|
+        lambda do
+          mh.do_and_exit! i do end
+          exit! 2  # Should never reach this.
+        end.should exit_with i
+      end
     end
 
     it 'should have the proper exit status when the block exits' do
@@ -52,13 +90,20 @@ describe mh do
           exit 2  # Should never reach this.
         end.should exit_with i
       end
+
+      [0, 1, 42, 255].each do |i|
+        lambda do
+          mh.do_and_exit! do exit! i end
+          exit! 2  # Should never reach this.
+        end.should exit_with i
+      end
     end
 
     it 'should handle exec' do
       [0, 1, 42, 255].each do |i|
         lambda do
-          mh.do_and_exit do exec *%W{sh -c #{'exit "$1"'} sh #{i}} end
-          exit 2  # Should never reach this.
+          mh.do_and_exit! do exec *%W{sh -c #{'exit "$1"'} sh #{i}} end
+          exit! 2  # Should never reach this.
         end.should exit_with i
       end
     end
@@ -72,14 +117,6 @@ describe mh do
         end
       end.should exit_with 2
 
-      lambda do
-        begin
-          mh.do_and_exit true do end
-        rescue SystemExit => e
-          exit 2  # Should never reach this.
-        end
-      end.should exit_with 1
-
       lambda do
         begin
           mh.do_and_exit! do end

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ Spec::Matchers.define :exit_with do |expected|
     @status = 0
 
     begin
-      MiscHacks.checking_exit_status do
+      MiscHacks.fork_and_check do
         block.call
       end
     rescue MiscHacks::ChildError => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ion1-mischacks
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Johan Kiviniemi