diddy 0.9.4 → 0.10.0

data/diddy.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "diddy"
-  gem.version       = '0.9.4'
+  gem.version       = '0.10.0'
   gem.authors       = ["Diederick Lawson", "Marcel de Graaf"]
   gem.email         = ["diederick@altovista.nl", "mail@marceldegraaf.net"]
   gem.description   = %q{Diddy script runner}

data/lib/diddy/run_result.rb

@@ -19,6 +19,10 @@ module Diddy
     # Start the run of an entire scenario.
     #
     def run_scenario(description)
+      unless @current_script
+        @current_script = Script.new("Unknown")
+      end
+
       @current_scenario = Scenario.new(description)
       @current_scenario.script = @current_script
 

data/lib/diddy/scenario.rb

@@ -59,6 +59,10 @@ module Diddy
       begin
         @resetted = {}
 
+        # also log
+        puts("Scenario: #{description}")
+        run_result.run_scenario("Scenario: #{description}")
+
         @steps.each do |step|
           run_step(step)
         end
@@ -129,6 +133,16 @@ module Diddy
       @shared_scope ||= SharedScope.new
     end
 
+    #
+    # Runs a given scenario
+    #
+    def self.run(run_result, scenario, options = {})
+      scenario.reset!
+      scenario.context = Context.new(options)
+      scenario.run_result = run_result
+      scenario.run
+    end
+
     class ScenarioAborted < Exception; end
   end
 end

data/lib/diddy/script.rb

@@ -46,12 +46,6 @@ module Diddy
         # reset scenario
         scenario.reset!
 
-        # print on screen
-        puts("Scenario #{index + 1}: #{scenario.description}")
-
-        # also log
-        run_result.run_scenario("Scenario #{index + 1}: #{scenario.description}")
-
         # run all the steps within the scenario
         scenario.run_result = run_result
         scenario.context = context
@@ -93,8 +87,17 @@ module Diddy
     # Runs a given script
     #
     def self.run(run_result, description, options = {})
+      script = nil
+
       # find script
-      script = scripts.find { |script| script.description == description }
+      if description.is_a?(String)
+        script = scripts.find { |script| script.description == description }
+
+      elsif description.is_a?(Diddy::Script)
+        script = description
+
+      end
+
       raise CannotFindScriptError.new("Cannot find script #{description}") unless script
 
       # output and run
@@ -105,10 +108,10 @@ module Diddy
       end
 
       # print to screen what we are doing
-      puts(bold("Running #{description}#{vars}"))
+      puts(bold("Running #{script.description}#{vars}"))
 
       # also log to result logger
-      run_result.run_script("Running #{description}#{vars}")
+      run_result.run_script("Running #{script.description}#{vars}")
 
       # apply the context and run result
       script.context = Context.new(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diddy
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term/ansicolor