offshore 0.0.1 → 0.0.2

data/lib/offshore/client/suite.rb

@@ -26,7 +26,7 @@ module Offshore
     end
   
     def stop
-      Offshore.test # if the last one failed this will stop it
+      Test.flush # if the last one failed this will stop it
       all_hosts!(:suite_stop)
     end
   end

data/lib/offshore/client/test.rb

@@ -1,5 +1,31 @@
 module Offshore
   class Test
+    
+    def self.current
+      @test ||= Test.new
+    end
+    
+    def self.flush
+      if @test && @test.run? && !@test.stopped?
+        # run again because it crashed in execution
+        @test.stop
+      end
+      @test = nil
+    end
+    
+    def self.start(example)
+      flush
+      current.start(example)
+      current
+    end
+    
+    def self.stop
+      current.stop
+      current
+    end
+    
+
+    
     def uuid
       @uid ||= rand(99999999).to_s
     end
@@ -11,29 +37,25 @@ module Offshore
       "#{uuid} #{name}"
     end
     
-    def run!(example)
-      raise "already run test: #{get_name(@run_example)}" if @run_example
-      @run_example = example
-    end
-    
     def run?
       !!@run_example
     end
+    
+    def stopped?
+      !!@stopped
+    end
 
     def start(example=nil)
-      run!(example)
+      raise "already run test: #{get_name(@run_example)}" if @run_example
+      @run_example = example
       Offshore.suite.all_hosts!(:test_start, get_name(example))
     end
   
-    def stop(example=nil)
-      Offshore.suite.all_hosts!(:test_stop, get_name(example))
-      Offshore.send(:internal_test_ended)
-    end
-    
-    def failed
+    def stop
       raise "have not run!" unless @run_example
-      stop(@run_example)
+      raise "already stopped!" if @stopped
+      @stopped = true
+      Offshore.suite.all_hosts!(:test_stop, get_name(@run_example))
     end
-  
   end
 end

data/lib/offshore/version.rb

@@ -1,3 +1,3 @@
 module Offshore
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/offshore.rb

@@ -10,18 +10,7 @@ module Offshore
   end
   
   def test
-    if @test && @test.run?
-      # run again because it crashed in execution
-      @test.failed
-    end
-    @test ||= Test.new
-  end
-  
-  protected
-    
-  def internal_test_ended
-    # called from test.failed and test.stop
-    @test = nil
+    Offshore::Test
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: offshore
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: