diddy 0.2.0 → 0.5.0

data/.gitignore

@@ -0,0 +1 @@
+*.gem

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.2.0'
+  gem.version       = '0.5.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/script.rb

@@ -1,6 +1,11 @@
+# encoding: utf-8
 module Diddy
   class Script
-    attr_accessor :steps, :scenario
+    STATE_OK = 1
+    STATE_FAILED = 2
+    STATE_EXCEPTION = 3
+
+    attr_accessor :steps, :scenario, :log
 
     #
     # Creates a script
@@ -17,6 +22,13 @@ module Diddy
       @steps_instances << klass.new(shared_scope)
     end
 
+    #
+    # Full log
+    #
+    def log
+      @log ||= ""
+    end
+
     #
     # Describes which step should be run
     #
@@ -43,7 +55,7 @@ module Diddy
     #
     def run
       begin
-        puts scenario
+        self.class.write_log(scenario)
 
         @steps.each do |step|
           run_step(step)
@@ -51,12 +63,19 @@ module Diddy
         return true
 
       rescue ScriptAborted
-        puts "Aborted"
+        self.class.write_log("Aborted")
         return false
 
       end
     end
 
+    #
+    # Returns the log of the last run
+    #
+    def self.last_log
+      @last_log ||= ""
+    end
+
     #
     # Defines a script
     #
@@ -82,16 +101,27 @@ module Diddy
     # scripts returned true. Otherwise returns false.
     #
     def self.run_all
-      puts "[#{Time.now}] Diddy starting to run #{@scripts.size} scripts"
+      # empty log
+      @last_log = ""
+
+      write_log("[#{Time.now}] Diddy starting to run #{@scripts.size} scripts")
 
       # Run all scripts and remember their return status
-      script_statuses = @scripts.map { |script| script.run }
+      status = @scripts.map do |script|
+        # run the script
+        result = script.run
+
+        # concat log of script to general log
+        write_log(script.log)
 
-      puts "[#{Time.now}] Diddy finished running #{@scripts.size} scripts"
+        result
+      end
+
+      write_log("[#{Time.now}] Diddy finished running #{@scripts.size} scripts")
 
       # If one of the scripts returned with "false"; make the entire run
       # return false as well
-      script_statuses.include?(false) ? false : true
+      status.include?(false) ? false : true
     end
 
     #
@@ -107,6 +137,11 @@ module Diddy
 
     private
 
+    def self.write_log(message, print = true)
+      puts(message) if print
+      self.last_log << "#{message}\n"
+    end
+
     #
     # Runs one step
     #
@@ -116,27 +151,46 @@ module Diddy
         result = step.run
 
       rescue Exception => exception
-        step.log(Diddy::Step::STATE_EXCEPTION)
+        log_step(step, STATE_EXCEPTION)
         print_exception(step, exception)
         raise ScriptAborted.new
       end
 
       if result
-        step.log(Diddy::Step::STATE_OK)
+        log_step(step, STATE_OK)
       else
-        step.log(Diddy::Step::STATE_EXCEPTION)
+        log_step(step, STATE_EXCEPTION)
         raise ScriptAborted.new
       end
     end
 
+    #
+    # Logs step to log
+    #
+    def log_step(step, state)
+      if state == STATE_FAILED || state == STATE_EXCEPTION
+        print(red(bold("✕ #{step.description}")))
+        self.class.write_log("✕ #{step.description}", false)
+
+        if state == STATE_EXCEPTION
+          print(" [EXCEPTION]")
+          print("\n\n")
+          self.class.write_log("[EXCEPTION]", false)
+        end
+      else
+        print(green("✓ #{step.description}"), "\n")
+        self.class.write_log("✓ #{step.description}", false)
+      end
+    end
+
     #
     # Prints exception thrown by step, on screen
     #
     def print_exception(current_step, exception)
       # print backtrace
-      puts "- #{exception.message}"
-      puts "  #{exception.backtrace.join("\n  ")}"
-      puts "\n"
+      self.class.write_log("- #{exception.message}")
+      self.class.write_log("  #{exception.backtrace.join("\n  ")}")
+      self.class.write_log("\n")
     end
 
     #

data/lib/diddy/step.rb

@@ -1,10 +1,6 @@
 # encoding: utf-8
 module Diddy
   class Step
-    STATE_OK = 1
-    STATE_FAILED = 2
-    STATE_EXCEPTION = 3
-
     attr_accessor :description, :definition, :steps_instance
 
     #
@@ -20,18 +16,5 @@ module Diddy
     def run
       steps_instance.instance_eval(&definition)
     end
-
-    #
-    # Logs state of step to screen
-    #
-    def log(state)
-      if state == STATE_FAILED || state == STATE_EXCEPTION
-        print red(bold("✕ #{description}"))
-        print " [EXCEPTION]" if state == STATE_EXCEPTION
-        print "\n\n"
-      else
-        print green("✓ #{description}"), "\n"
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diddy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term/aniscolor
@@ -36,6 +36,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rbenv-version
 - .rvmrc
 - README.md