ultra_marathon 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78af7958fcfe70a891487fcd799959195c4b2499
-  data.tar.gz: dac02b061c91219cda0fbd62dfd95bcb47be2590
+  metadata.gz: c7d97a30d4a344932ef8d315457e5072ec08da58
+  data.tar.gz: 1aaf3b10556ce6344fe795438a1d176254b43a77
 SHA512:
-  metadata.gz: a876d0f4901169613407e0d9d7de5522a64cd4acb5b500b36a7513e68cf8e1f7951e08c529996bdb0a6371625c6965dc1b08c69a404f81b7768c9d5861a5393f
-  data.tar.gz: 8a21f8f77b94922fe2be0e6fd334708d8e6bcabba890bb28924e9d98d9d860564681cac2529272bf4777f6c05f798eb552986870964cc2c50cc0708cc8e2cdfe
+  metadata.gz: cb05ac7278f5cb8d6537650dde46c3fb8377d8460afe832e243b87079162e0c20ec9065903257aaf3e34666378099ee6ebc8c871a29ec2b99e675bb3fa39fd11
+  data.tar.gz: 32a14722374518f955594603987ebde23ed1443ee8579164c7021b18e611b032a1f038f200e9a5be1ce068149d4b70613824d898d5f52a370ef4140c4275512f

data/lib/ultra_marathon/abstract_runner.rb

@@ -22,10 +22,11 @@ module UltraMarathon
     def run!
       if self.class.run_blocks.any?
         begin
-          self.success = true
+          self.success = nil
           invoke_before_run_callbacks
           instrument(:run_unrun_sub_runners) { run_unrun_sub_runners }
-          self.success = failed_sub_runners.empty?
+          # If any of the sub runners explicitly set the success flag, don't override it
+          self.success = failed_sub_runners.empty? if self.success.nil?
         rescue StandardError => error
           invoke_on_error_callbacks(error)
         ensure
@@ -43,7 +44,7 @@ module UltraMarathon
     # sets the unrun sub_runners to be the uncompleted/failed ones
     def reset
       reset_failed_runners
-      @success = true
+      @success = nil
       invoke_on_reset_callbacks
       self
     end

data/lib/ultra_marathon/instrumentation/profile.rb

@@ -1,7 +1,7 @@
 module UltraMarathon
   module Instrumentation
     class Profile
-      attr_reader :name, :instrument_block, :start_time, :end_time
+      attr_reader :name, :start_time, :end_time
 
       ## Public Instance Methods
 
@@ -9,7 +9,7 @@ module UltraMarathon
         @name = name
         # Ruby cannot marshal procs or lambdas, so we need to define a method.
         # Binding to self allows us to intercept logging calls.
-        define_singleton_method :instrumentated_block do
+        define_singleton_method :instrumented_block do
           block.call
         end
       end
@@ -17,7 +17,7 @@ module UltraMarathon
       def call
         @start_time = Time.now
         begin
-          return_value = instrumentated_block
+          return_value = instrumented_block
         ensure
           @end_time = Time.now
         end

data/lib/ultra_marathon/version.rb

@@ -2,7 +2,7 @@ module UltraMarathon
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 1 unless defined? MINOR
-    PATCH = 5 unless defined? PATCH
+    PATCH = 7 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

data/spec/ultra_marathon/abstract_runner_spec.rb

@@ -41,6 +41,15 @@ describe UltraMarathon::AbstractRunner do
           test_instance.success.should_not be
         end
       end
+
+      context 'when the run block explicitly sets success' do
+        let(:run_block) { Proc.new { self.success = false } }
+
+        it 'should not override it' do
+          subject
+          test_instance.success.should_not be
+        end
+      end
     end
 
     describe 'with multiple run blocks' do
@@ -148,10 +157,10 @@ describe UltraMarathon::AbstractRunner do
   end
 
   describe '#reset' do
-    it 'should change success to true' do
+    it 'should change success to nil' do
       test_instance.success = false
       test_instance.reset
-      test_instance.success.should be
+      test_instance.success.should be_nil
     end
 
     it 'returns itself' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultra_marathon
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Chris Maddox