moto 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae9e65a6ed5be9e5dcab4f274fb56543e43ce7a8
-  data.tar.gz: 5bcddba5dd2dd8b16e5108219488579eea8827df
+  metadata.gz: d2eb8efa5d64b6f20b2ce57c06b47105d16a8a0d
+  data.tar.gz: 6c0024378bf4157fcd64a7b8c256f93eb57aef6c
 SHA512:
-  metadata.gz: 8b7a58130b054529d9de03e161077931c772beefd3e8c6ae803dab00507ffd9e2caaf6c8dc79f7f106b05fb1115e5ef8de581f8bf72452c6935b91561d76b8e2
-  data.tar.gz: aebd387ed9021158a73b7daa28badaeaea4416a246e0c68b77cf5b5d9032f1e49583cb824b39604d254d83698f5feee584bd642fe48c9defe395276551a37e5b
+  metadata.gz: 9ae78b549ab8f886092296e5556b041888c6ea60bbf5516e9666dd3f3eaab4f2fda5fd5a4a0f1e096edd1a73f9e8baef7f5eb2b96b3cacb856355f0064833492
+  data.tar.gz: 5b1d85e5737de49867d88f4ae5f7b1c45bb8d469558a6cef965a5b949ebfce65771633fea20913915cb6f02033d5392abb0227fa4d9f919790ab8fcc5ca92d89

data/bin/moto

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-
-require_relative '../lib/parser'
-
-Moto::Parser.run ARGV
+#!/usr/bin/env ruby
+
+require_relative '../lib/parser'
+
+Moto::Parser.run ARGV

data/lib/app_generator.rb

@@ -1,9 +1,80 @@
+require 'fileutils'
+
 module Moto
   class AppGenerator
-    
-    def self.run(argv)
-      
+
+    # Creates directories and file with class template for a test.
+    # @param options [Hash] Informations required perfrom the task.
+    #   options[:app_name]        Name of the application that uses Moto Framework.
+    #   options[:dir]             Subdirectories of MotoApp/tests/ where test should be placed.
+    #   options[:base_class]      Path and filename of class from which the test will derive.
+    #   options[:force]           Whether generator should forcibly overwrite previously existing file.
+    def self.run(options)
+
+      # Build list of modules basing on the name of the application and subdirectory provided by the user.
+      # Second module is always 'tests' since it's where they should be kept.
+      modules = [options[:app_name], 'tests'] + options[:dir].split('/')
+      modules.map!(&:camelize)
+
+      # Name of the class in the template
+      class_name = modules.last
+
+      # Evaluate fully qulified name of the class to derive from or, if not specified
+      # use Moto's default one
+      if options[:base_class].nil?
+        base_class_qualified_name = 'Moto::Test'
+      else
+        base_class_qualified_name = "#{options[:app_name]}::Lib::Test::#{options[:base_class].split('/').join('::').camelize}"
+      end
+
+      # Where to put finished template
+      test_file = File.basename(options[:dir]) + '.rb'
+      test_dir = MotoApp::DIR + '/tests/' + options[:dir]
+      test_path = "#{test_dir}/#{test_file}"
+
+      # Create directory
+      FileUtils.mkdir_p(test_dir)
+
+      if !File.exist?(test_path) || options[:force]
+        # Create new file in specified location and add class' template to it
+        File.open(test_path, 'w+') do |file|
+
+          indent = 0
+
+          file << "# FULL_CODE\n"
+
+          if options[:base_class].nil?
+            file << "\n"
+          else
+            file << "require './lib/test/#{options[:base_class]}.rb'\n\n"
+          end
+
+          modules.each do |m|
+            file << (' ' * indent) + "module #{m}\n"
+            indent += 2
+          end
+
+          file << (' ' * indent) + "# Class template genereated by 'moto generate'\n"
+          file << (' ' * indent) + "class #{class_name} < #{base_class_qualified_name}\n\n"
+          indent += 2
+          file << (' ' * indent) + "def run\n"
+          file << (' ' * indent) + "end\n\n"
+          indent -= 2
+          file << (' ' * indent) + "end\n"
+
+          modules.each do
+            indent -= 2
+            file << (' ' * indent) + "end\n"
+          end
+
+        end
+
+        puts 'Result:'
+        puts "  File: #{test_path}"
+        puts "  Class: #{class_name} < #{base_class_qualified_name}"
+      else
+        raise 'File already exists. Use -f or --force to overwrite existing contents.'
+      end
     end
-    
   end
-end
+end

data/lib/empty_listener.rb

@@ -1,17 +1,17 @@
-module Moto
-  module EmptyListener
-
-    def start_run
-    end
-    
-    def end_run
-    end
-    
-    def start_test(test)
-    end
-
-    def end_test(test)
-    end    
-
-  end
+module Moto
+  module EmptyListener
+
+    def start_run
+    end
+    
+    def end_run
+    end
+    
+    def start_test(test)
+    end
+
+    def end_test(test)
+    end    
+
+  end
 end

data/lib/exceptions/moto.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class MotoException < RuntimeError
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class MotoException < RuntimeError
+      
+    end
+  end
 end

data/lib/exceptions/test_forced_failure.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestForcedFailure  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestForcedFailure  < MotoException
+      
+    end
+  end
 end

data/lib/exceptions/test_forced_passed.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestForcedPassed  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestForcedPassed  < MotoException
+      
+    end
+  end
 end

data/lib/exceptions/test_skipped.rb

@@ -1,7 +1,7 @@
-module Moto
-  module Exceptions
-    class TestSkipped  < MotoException
-      
-    end
-  end
+module Moto
+  module Exceptions
+    class TestSkipped  < MotoException
+      
+    end
+  end
 end

data/lib/forward_context_methods.rb

@@ -1,21 +1,21 @@
-module Moto
-  module ForwardContextMethods
-
-      def client(name)
-        @context.client(name)
-      end
-      
-      def logger
-        @context.logger
-      end
-      
-      def const(key)
-        @context.const(key)
-      end
-      
-      def current_test
-        @context.current_test
-      end
-   
-  end
+module Moto
+  module ForwardContextMethods
+
+      def client(name)
+        @context.client(name)
+      end
+      
+      def logger
+        @context.logger
+      end
+      
+      def const(key)
+        @context.const(key)
+      end
+      
+      def current_test
+        @context.current_test
+      end
+   
+  end
 end

data/lib/initializer.rb

@@ -1,7 +1,7 @@
-module Moto
-  class Initializer
-    def initialize(runner)
-      @runner = runner
-    end
-  end
+module Moto
+  class Initializer
+    def initialize(runner)
+      @runner = runner
+    end
+  end
 end

data/lib/listeners/base.rb

@@ -1,26 +1,26 @@
-module Moto
-  module Listeners
-    class Base
-      
-      def initialize(runner)
-        @runner=runner
-      end
-      
-      def start_run
-        # abstract
-      end
-      
-      def end_run
-        # abstract
-      end
-      
-      def start_test(test)
-        # abstract
-      end
-  
-      def end_test(test)
-        # abstract
-      end      
-    end
-  end
+module Moto
+  module Listeners
+    class Base
+      
+      def initialize(runner)
+        @runner=runner
+      end
+      
+      def start_run
+        # abstract
+      end
+      
+      def end_run
+        # abstract
+      end
+      
+      def start_test(test)
+        # abstract
+      end
+  
+      def end_test(test)
+        # abstract
+      end      
+    end
+  end
 end

data/lib/listeners/console.rb

@@ -1,29 +1,29 @@
-module Moto
-  module Listeners
-    class Console < Base
-
-      def start_run
-        puts "START"
-      end
-      
-      def end_run
-        puts ""
-        puts "FINISHED: #{@runner.result.summary[:result]}, duration: #{Time.at(@runner.result.summary[:duration]).utc.strftime("%H:%M:%S")}"
-        puts "Tests executed: #{@runner.result.summary[:cnt_all]}"
-        puts "  Passed:       #{@runner.result.summary[:cnt_passed]}"
-        puts "  Failure:      #{@runner.result.summary[:cnt_failure]}"
-        puts "  Error:        #{@runner.result.summary[:cnt_error]}"
-        puts "  Skipped:      #{@runner.result.summary[:cnt_skipped]}"
-      end
-
-      def start_test(test)
-        print test.name
-      end
-  
-      def end_test(test)
-        puts "\t#{@runner.result[test.name][:result]}"
-      end
-
-    end
-  end
+module Moto
+  module Listeners
+    class Console < Base
+
+      def start_run
+        puts "START"
+      end
+      
+      def end_run
+        puts ""
+        puts "FINISHED: #{@runner.result.summary[:result]}, duration: #{Time.at(@runner.result.summary[:duration]).utc.strftime("%H:%M:%S")}"
+        puts "Tests executed: #{@runner.result.summary[:cnt_all]}"
+        puts "  Passed:       #{@runner.result.summary[:cnt_passed]}"
+        puts "  Failure:      #{@runner.result.summary[:cnt_failure]}"
+        puts "  Error:        #{@runner.result.summary[:cnt_error]}"
+        puts "  Skipped:      #{@runner.result.summary[:cnt_skipped]}"
+      end
+
+      def start_test(test)
+        print test.name
+      end
+  
+      def end_test(test)
+        puts "\t#{@runner.result[test.name][:result]}"
+      end
+
+    end
+  end
 end

data/lib/listeners/console_dots.rb

@@ -1,63 +1,63 @@
-module Moto
-  module Listeners
-    class ConsoleDots < Base
-
-      def start_run
-      end
-      
-      def end_run
-        puts ""
-        puts ""
-        puts "FINISHED: #{@runner.result.summary[:result]}, duration: #{Time.at(@runner.result.summary[:duration]).utc.strftime("%H:%M:%S")}"
-        puts "Tests executed: #{@runner.result.summary[:cnt_all]}"
-        puts "  Passed:       #{@runner.result.summary[:cnt_passed]}"
-        puts "  Failure:      #{@runner.result.summary[:cnt_failure]}"
-        puts "  Error:        #{@runner.result.summary[:cnt_error]}"
-        puts "  Skipped:      #{@runner.result.summary[:cnt_skipped]}"
-        
-        if @runner.result.summary[:cnt_failure] > 0
-          puts ""
-          puts "FAILURES: " 
-          @runner.result.summary[:tests_failure].each do |test_name, data|
-            puts test_name
-            puts "\t#{data[:failures].join("\n\t")}"
-            puts ""
-          end
-        end
-        
-        if @runner.result.summary[:cnt_error] > 0
-          puts ""
-          puts "ERRORS: " 
-          @runner.result.summary[:tests_error].each do |test_name, data|
-            puts test_name
-            puts "\t#{data[:error]}"
-            puts ""
-          end
-        end
-        
-        if @runner.result.summary[:cnt_skipped] > 0
-          puts ""
-          puts "SKIPPED: " 
-          @runner.result.summary[:tests_skipped].each do |test_name, data|
-            puts test_name
-            puts "\t#{data[:error]}"
-            puts ""
-          end
-        end
-      end
-
-      def start_test(test)
-      end
-  
-      def end_test(test)
-        print case @runner.result[test.name][:result]
-        when :passed then "."
-        when :failure then "F"
-        when :error then "E"
-        when :skipped then "S"
-        end 
-      end
-
-    end
-  end
+module Moto
+  module Listeners
+    class ConsoleDots < Base
+
+      def start_run
+      end
+      
+      def end_run
+        puts ""
+        puts ""
+        puts "FINISHED: #{@runner.result.summary[:result]}, duration: #{Time.at(@runner.result.summary[:duration]).utc.strftime("%H:%M:%S")}"
+        puts "Tests executed: #{@runner.result.summary[:cnt_all]}"
+        puts "  Passed:       #{@runner.result.summary[:cnt_passed]}"
+        puts "  Failure:      #{@runner.result.summary[:cnt_failure]}"
+        puts "  Error:        #{@runner.result.summary[:cnt_error]}"
+        puts "  Skipped:      #{@runner.result.summary[:cnt_skipped]}"
+        
+        if @runner.result.summary[:cnt_failure] > 0
+          puts ""
+          puts "FAILURES: " 
+          @runner.result.summary[:tests_failure].each do |test_name, data|
+            puts test_name
+            puts "\t#{data[:failures].join("\n\t")}"
+            puts ""
+          end
+        end
+        
+        if @runner.result.summary[:cnt_error] > 0
+          puts ""
+          puts "ERRORS: " 
+          @runner.result.summary[:tests_error].each do |test_name, data|
+            puts test_name
+            puts "\t#{data[:error]}"
+            puts ""
+          end
+        end
+        
+        if @runner.result.summary[:cnt_skipped] > 0
+          puts ""
+          puts "SKIPPED: " 
+          @runner.result.summary[:tests_skipped].each do |test_name, data|
+            puts test_name
+            puts "\t#{data[:error]}"
+            puts ""
+          end
+        end
+      end
+
+      def start_test(test)
+      end
+  
+      def end_test(test)
+        print case @runner.result[test.name][:result]
+        when :passed then "."
+        when :failure then "F"
+        when :error then "E"
+        when :skipped then "S"
+        end 
+      end
+
+    end
+  end
 end

data/lib/listeners/junit_xml.rb

@@ -1,37 +1,37 @@
-require 'nokogiri'
-
-module Moto
-  module Listeners
-    class JunitXml < Base
-
-      def end_run
-        path = @runner.my_config[:output_file]
-
-        builder = Nokogiri::XML::Builder.new { |xml|
-          xml.testsuite(
-                errors: @runner.result.summary[:cnt_error], 
-                failures: @runner.result.summary[:cnt_failure], 
-                name: "Moto run", 
-                tests: @runner.result.summary[:cnt_all], 
-                time: @runner.result.summary[:duration], 
-                timestamp: Time.at(@runner.result.summary[:started_at])) do
-            @runner.result.all.each do |test_name, data|
-              xml.testcase(name: test_name, time: data[:duration], classname: data[:class].name, moto_result: data[:result]) do
-                if !data[:error].nil?
-                  xml.error(message: data[:error].message)
-                elsif data[:failures].count > 0
-                  data[:failures].each do |f|
-                    xml.failure(message: f)
-                  end
-                end
-              end
-            end
-          end
-        }
-
-        File.open(path, 'w') {|f| f.write(builder.to_xml) }        
-      end
-
-    end
-  end
+require 'nokogiri'
+
+module Moto
+  module Listeners
+    class JunitXml < Base
+
+      def end_run
+        path = @runner.my_config[:output_file]
+
+        builder = Nokogiri::XML::Builder.new { |xml|
+          xml.testsuite(
+                errors: @runner.result.summary[:cnt_error], 
+                failures: @runner.result.summary[:cnt_failure], 
+                name: "Moto run", 
+                tests: @runner.result.summary[:cnt_all], 
+                time: @runner.result.summary[:duration], 
+                timestamp: Time.at(@runner.result.summary[:started_at])) do
+            @runner.result.all.each do |test_name, data|
+              xml.testcase(name: test_name, time: data[:duration], classname: data[:class].name, moto_result: data[:result]) do
+                if !data[:error].nil?
+                  xml.error(message: data[:error].message)
+                elsif data[:failures].count > 0
+                  data[:failures].each do |f|
+                    xml.failure(message: f)
+                  end
+                end
+              end
+            end
+          end
+        }
+
+        File.open(path, 'w') {|f| f.write(builder.to_xml) }        
+      end
+
+    end
+  end
 end

data/lib/parser.rb

@@ -13,9 +13,9 @@ module Moto
         # TODO Generate app / Change the way parsing options goes so it doesnt generate them if they`re not needed
         case argv[0]
           when '--version' then puts Moto::VERSION
-          when 'run' then Moto::Cli.run run_parse(argv)
+          when 'run' then Moto::Cli.run(run_parse(argv))
           when 'help' then show_help
-          when 'generate' then Moto::AppGenerator.run generate_parse(argv)
+          when 'generate' then Moto::AppGenerator.run(generate_parse(argv))
           else puts "Command '#{argv[0]}' not recognized. Type help for list of supported commands."
         end
       rescue Exception => e
@@ -26,7 +26,7 @@ module Moto
     def self.run_parse(argv)
 
       # TODO: fix this dumb verification of current working directory.
-      unless File.exists? "#{MotoApp::DIR}/config/moto.rb"
+      if !File.exists? "#{MotoApp::DIR}/config/moto.rb"
         msg = "Config file (config/moto.rb) not present.\n"
         msg << 'Does current working directory contain Moto application?'
         raise msg
@@ -41,13 +41,13 @@ module Moto
       # TODO Mandatory env var in app config
       options[:config] = eval(File.read("#{MotoApp::DIR}/config/moto.rb"))
       options[:environments] = []
-      options[:name] = ""
+      options[:name] = ''
          
       # Parse arguments
       # TODO eval ?
       # TODO const 
       # TODO reporters should be consts - not strings
-      OptionParser.new do |opts|       
+      OptionParser.new do |opts|
         opts.on('-t', '--tests Tests', Array) { |v| options[:tests ] = v }
         opts.on('-g', '--tags Tags', Array) { |v| options[:tags ] = v }
         opts.on('-r', '--reporters Reporters', Array) { |v| options[:reporters] = v }
@@ -70,8 +70,8 @@ module Moto
     end
     
     def self.evaluate_name(tags, tests)
-      tags ||= ""
-      tests ||= ""
+      tags ||= ''
+      tests ||= ''
       if !tags.empty? && !tests.empty?
         return "#{tags.count} tags + #{tests.count} tests"
       elsif tags.empty?
@@ -80,22 +80,53 @@ module Moto
         return tags.count == 1 ? "Tag: #{tags.first}" : "#{tags.count} tags"
       end
     end
-    
+
+    # Parses attributes passed to the application when run by 'moto generate'
     def self.generate_parse(argv)
       options = {}
-      options[:dir]
+
+      OptionParser.new do |opts|
+        opts.on('-t', '--test Test') { |v| options[:dir ] = v }
+        opts.on('-a', '--appname AppName') { |v| options[:app_name ] = v }
+        opts.on('-b', '--baseclass BaseClass') { |v| options[:base_class] = v }
+        opts.on('-f', '--force') { options[:force ] = true }
+      end.parse!
+
+      options[:dir] = options[:dir].underscore
+
+      if options[:app_name].nil?
+        options[:app_name] = 'MotoApp'
+      end
+
+      return options
     end
     
     def self.show_help
       puts """
       Moto (#{Moto::VERSION}) CLI Help:
       moto --version Display current version
+
       moto run:      
-       -t, --tests = Tests to be executed. For e.x Tests\Failure\Failure.rb should be passed as Tests::Failure
-       -r, --reporter = Reporters to be used. Defaults are Moto::Listeners::ConsoleDots, Moto::Listeners::JunitXml
+       -t, --tests    = Tests to be executed.
+                        For eg. Tests\Failure\Failure.rb should be passed as Tests::Failure
+       -r, --reporter = Reporters to be used.
+                        Defaults are Moto::Listeners::ConsoleDots, Moto::Listeners::JunitXml
        -e, --environment etc etc
+
       moto generate:
-      moto generate app_name -d, --dir = directory. Default is current dir.
+       -t, --test      = Path and name of the test to be created.
+                         Examples:
+                         -ttest_name          will create MotoApp/tests/test_name/test_name.rb
+                         -tdir/test_name      will create MotoApp/tests/dir/test_name/test_name.rb
+       -a, --appname   = Name of the application. Will be also used as topmost module in test file.
+                         Default: MotoApp
+       -b, --baseclass = File (WITHOUT EXTENSION) with base class from which test will derive. Assumes one class per file.
+                         Examples:
+                         -btest_base          will use the file in MotoApp/lib/test/test_base.rb
+                         -bsubdir/test_base   will use the file in MotoApp/lib/test/subdir/test_base.rb
+                         By default class will derive from Moto::Test
+       -f, --force     = Forces generator to overwrite previously existing class file in specified location.
+                         You have been warned.
       """
     end
     

data/lib/result.rb

@@ -1,84 +1,84 @@
-module Moto
-  class Result
-    
-    PENDING = :pending # -2
-    RUNNING = :running # -1
-    PASSED = :passed # 0
-    FAILURE = :failure # 1
-    ERROR = :error # 2
-    SKIPPED = :skipped # 3
-
-    attr_reader :summary
-
-    def [](key)
-      @results[key]
-    end
-    
-    def all
-      @results
-    end
-    
-    def initialize(runner)
-      @runner = runner
-      @results = {}
-      @summary = {}
-    end
-    
-    def start_run
-      # start timer
-      @summary[:started_at] = Time.now.to_f
-    end
-    
-    def end_run
-      # info about duration and overall execution result
-      @summary[:finished_at] = Time.now.to_f
-      @summary[:duration] = @summary[:finished_at] - @summary[:started_at]
-      @summary[:result] = PASSED
-      @summary[:result] = FAILURE unless @results.values.select{ |v| v[:failures].count > 0 }.empty?
-      @summary[:result] = ERROR unless @results.values.select{ |v| v[:result] == ERROR }.empty?
-      @summary[:cnt_all] = @results.count
-      @summary[:tests_passed] = @results.select{ |k,v| v[:result] == PASSED }
-      @summary[:tests_failure] = @results.select{ |k,v| v[:result] == FAILURE }
-      @summary[:tests_error] = @results.select{ |k,v| v[:result] == ERROR }
-      @summary[:tests_skipped] = @results.select{ |k,v| v[:result] == SKIPPED }
-      @summary[:cnt_passed] = @summary[:tests_passed].count
-      @summary[:cnt_failure] = @summary[:tests_failure].count
-      @summary[:cnt_error] = @summary[:tests_error].count
-      @summary[:cnt_skipped] = @summary[:tests_skipped].count
-    end
-    
-    def start_test(test)
-      @results[test.name] = { class: test.class, result: RUNNING, env: test.env, params: test.params, name: test.name, error: nil, failures: [], started_at: Time.now.to_f } 
-    end
-
-    def end_test(test)
-      # calculate result basing on errors/failures
-      @results[test.name][:finished_at] = Time.now.to_f
-      test.result = PASSED
-      test.result = FAILURE unless @results[test.name][:failures].empty?
-      unless @results[test.name][:error].nil?
-        if @results[test.name][:error].is_a? Moto::Exceptions::TestSkipped
-          test.result = SKIPPED
-        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedPassed
-          test.result = PASSED
-        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedFailure
-          add_failure(test, @results[test.name][:error].message)
-          test.result = FAILURE
-        else
-          test.result = ERROR
-        end
-      end
-      @results[test.name][:duration] = @results[test.name][:finished_at] - @results[test.name][:started_at]
-      @results[test.name][:result] = test.result
-    end
-
-    def add_failure(test, msg)
-      @results[test.name][:failures] << msg
-    end
-    
-    def add_error(test, e)
-      @results[test.name][:error] = e
-    end
-    
-  end
+module Moto
+  class Result
+    
+    PENDING = :pending # -2
+    RUNNING = :running # -1
+    PASSED = :passed # 0
+    FAILURE = :failure # 1
+    ERROR = :error # 2
+    SKIPPED = :skipped # 3
+
+    attr_reader :summary
+
+    def [](key)
+      @results[key]
+    end
+    
+    def all
+      @results
+    end
+    
+    def initialize(runner)
+      @runner = runner
+      @results = {}
+      @summary = {}
+    end
+    
+    def start_run
+      # start timer
+      @summary[:started_at] = Time.now.to_f
+    end
+    
+    def end_run
+      # info about duration and overall execution result
+      @summary[:finished_at] = Time.now.to_f
+      @summary[:duration] = @summary[:finished_at] - @summary[:started_at]
+      @summary[:result] = PASSED
+      @summary[:result] = FAILURE unless @results.values.select{ |v| v[:failures].count > 0 }.empty?
+      @summary[:result] = ERROR unless @results.values.select{ |v| v[:result] == ERROR }.empty?
+      @summary[:cnt_all] = @results.count
+      @summary[:tests_passed] = @results.select{ |k,v| v[:result] == PASSED }
+      @summary[:tests_failure] = @results.select{ |k,v| v[:result] == FAILURE }
+      @summary[:tests_error] = @results.select{ |k,v| v[:result] == ERROR }
+      @summary[:tests_skipped] = @results.select{ |k,v| v[:result] == SKIPPED }
+      @summary[:cnt_passed] = @summary[:tests_passed].count
+      @summary[:cnt_failure] = @summary[:tests_failure].count
+      @summary[:cnt_error] = @summary[:tests_error].count
+      @summary[:cnt_skipped] = @summary[:tests_skipped].count
+    end
+    
+    def start_test(test)
+      @results[test.name] = { class: test.class, result: RUNNING, env: test.env, params: test.params, name: test.name, error: nil, failures: [], started_at: Time.now.to_f } 
+    end
+
+    def end_test(test)
+      # calculate result basing on errors/failures
+      @results[test.name][:finished_at] = Time.now.to_f
+      test.result = PASSED
+      test.result = FAILURE unless @results[test.name][:failures].empty?
+      unless @results[test.name][:error].nil?
+        if @results[test.name][:error].is_a? Moto::Exceptions::TestSkipped
+          test.result = SKIPPED
+        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedPassed
+          test.result = PASSED
+        elsif @results[test.name][:error].is_a? Moto::Exceptions::TestForcedFailure
+          add_failure(test, @results[test.name][:error].message)
+          test.result = FAILURE
+        else
+          test.result = ERROR
+        end
+      end
+      @results[test.name][:duration] = @results[test.name][:finished_at] - @results[test.name][:started_at]
+      @results[test.name][:result] = test.result
+    end
+
+    def add_failure(test, msg)
+      @results[test.name][:failures] << msg
+    end
+    
+    def add_error(test, e)
+      @results[test.name][:error] = e
+    end
+    
+  end
 end

data/lib/runner_logging.rb

@@ -1,27 +1,27 @@
-module Moto
-  module RunnerLogging
-
-
-    # TODO: merge it somehow with TestLogging. Parametrize logger object?
-    def self.included(cls)
-      def cls.method_added(name)
-        excluded_methods = Moto::EmptyListener.instance_methods(false)
-        excluded_methods << :new
-        excluded_methods << :initialize
-        # TODO: configure more excluded classes/methods
-        return if @added 
-        @added = true # protect from recursion
-        original_method = "original_#{name}"
-        alias_method original_method, name
-        define_method(name) do |*args|
-          @context.runner.logger.debug("#{self.class.name}::#{__callee__} ENTER >>> #{args}") unless excluded_methods.include? name 
-          result = send original_method, *args
-          @context.runner.logger.debug("#{self.class.name}::#{__callee__} LEAVE <<< #{result} ") unless excluded_methods.include? name
-          result
-        end
-        @added = false
-      end
-
-    end    
-  end
+module Moto
+  module RunnerLogging
+
+
+    # TODO: merge it somehow with TestLogging. Parametrize logger object?
+    def self.included(cls)
+      def cls.method_added(name)
+        excluded_methods = Moto::EmptyListener.instance_methods(false)
+        excluded_methods << :new
+        excluded_methods << :initialize
+        # TODO: configure more excluded classes/methods
+        return if @added 
+        @added = true # protect from recursion
+        original_method = "original_#{name}"
+        alias_method original_method, name
+        define_method(name) do |*args|
+          @context.runner.logger.debug("#{self.class.name}::#{__callee__} ENTER >>> #{args}") unless excluded_methods.include? name 
+          result = send original_method, *args
+          @context.runner.logger.debug("#{self.class.name}::#{__callee__} LEAVE <<< #{result} ") unless excluded_methods.include? name
+          result
+        end
+        @added = false
+      end
+
+    end    
+  end
 end

data/lib/test_logging.rb

@@ -1,49 +1,49 @@
-module Moto
-  module TestLogging
-
-    @@ignore_logging = []
-
-    def self.included(cls)
-
-      def cls.ignore_logging(method)
-        full_name = "#{self.name}::#{method}"
-        @@ignore_logging << full_name
-      end
-      
-      def cls.method_added(name)
-
-        Moto::EmptyListener.instance_methods(false).each do |m|
-          full_name = "#{self.name}::#{m}"
-          @@ignore_logging << full_name unless @@ignore_logging.include? full_name
-        end
-        @@ignore_logging << "#{self.name}::new"
-        @@ignore_logging << "#{self.name}::initialize"
-
-        return if @added 
-        @added = true # protect from recursion
-        original_method = "original_#{name}"
-        alias_method original_method, name
-        define_method(name) do |*args|
-          full_name = "#{self.class.name}::#{__callee__}"
-          # TODO: use self.class.ancestors to figure out if ancestor::__callee__ is not in @@ignore_logging
-          skip_logging = @@ignore_logging.include? full_name
-          unless skip_logging
-            self.class.ancestors.each do |a|
-              ancestor_name = "#{a.name}::#{__callee__}"
-              if @@ignore_logging.include? ancestor_name
-                skip_logging = true
-                break
-              end
-            end
-          end
-          @context.current_test.logger.debug("ENTER >>> #{self.class.name}::#{__callee__}(#{args})") unless skip_logging 
-          result = send original_method, *args
-          @context.current_test.logger.debug("LEAVE <<< #{self.class.name}::#{__callee__} => #{result} ") unless skip_logging
-          result
-        end
-        @added = false
-      end
-    end    
-
-  end
+module Moto
+  module TestLogging
+
+    @@ignore_logging = []
+
+    def self.included(cls)
+
+      def cls.ignore_logging(method)
+        full_name = "#{self.name}::#{method}"
+        @@ignore_logging << full_name
+      end
+      
+      def cls.method_added(name)
+
+        Moto::EmptyListener.instance_methods(false).each do |m|
+          full_name = "#{self.name}::#{m}"
+          @@ignore_logging << full_name unless @@ignore_logging.include? full_name
+        end
+        @@ignore_logging << "#{self.name}::new"
+        @@ignore_logging << "#{self.name}::initialize"
+
+        return if @added 
+        @added = true # protect from recursion
+        original_method = "original_#{name}"
+        alias_method original_method, name
+        define_method(name) do |*args|
+          full_name = "#{self.class.name}::#{__callee__}"
+          # TODO: use self.class.ancestors to figure out if ancestor::__callee__ is not in @@ignore_logging
+          skip_logging = @@ignore_logging.include? full_name
+          unless skip_logging
+            self.class.ancestors.each do |a|
+              ancestor_name = "#{a.name}::#{__callee__}"
+              if @@ignore_logging.include? ancestor_name
+                skip_logging = true
+                break
+              end
+            end
+          end
+          @context.current_test.logger.debug("ENTER >>> #{self.class.name}::#{__callee__}(#{args})") unless skip_logging 
+          result = send original_method, *args
+          @context.current_test.logger.debug("LEAVE <<< #{self.class.name}::#{__callee__} => #{result} ") unless skip_logging
+          result
+        end
+        @added = false
+      end
+    end    
+
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -10,62 +10,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sys-uname
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a development version of a rails philosophy inspired framework
@@ -81,24 +81,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/moto
 - lib/app_generator.rb
 - lib/assert.rb
 - lib/cli.rb
-- lib/clients/base.rb
-- lib/clients/website.rb
 - lib/empty_listener.rb
-- lib/exceptions/moto.rb
-- lib/exceptions/test_forced_failure.rb
-- lib/exceptions/test_forced_passed.rb
-- lib/exceptions/test_skipped.rb
 - lib/forward_context_methods.rb
 - lib/initializer.rb
-- lib/listeners/base.rb
-- lib/listeners/console.rb
-- lib/listeners/console_dots.rb
-- lib/listeners/junit_xml.rb
-- lib/listeners/webui.rb
 - lib/page.rb
 - lib/parser.rb
 - lib/result.rb
@@ -110,6 +98,18 @@ files:
 - lib/thread_context.rb
 - lib/thread_pool.rb
 - lib/version.rb
+- lib/clients/base.rb
+- lib/clients/website.rb
+- lib/exceptions/moto.rb
+- lib/exceptions/test_forced_failure.rb
+- lib/exceptions/test_forced_passed.rb
+- lib/exceptions/test_skipped.rb
+- lib/listeners/base.rb
+- lib/listeners/console.rb
+- lib/listeners/console_dots.rb
+- lib/listeners/junit_xml.rb
+- lib/listeners/webui.rb
+- bin/moto
 homepage: https://github.com/bwilczek/moto
 licenses:
 - MIT
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ~>
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Moto - yet another web testing framework