moto 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7dd8f5b2e3a238f83d7e898e6279ec2f788ce54
-  data.tar.gz: 7ab6ef95c08fa90a159db853094efaacb06f1c01
+  metadata.gz: b8893539c7e555384f14655fb9cbccefbdf7084f
+  data.tar.gz: ce183c409b9d6800ad422cecb7997cf24df2741c
 SHA512:
-  metadata.gz: b32033f7ea015858a23f4546b9e03ef1e8627c3e3639f0f240a253376cacab9e2950970e7c4441e956f206ffbba32279ba465c0a10b10ce212de47a168e9c61f
-  data.tar.gz: a5a1d760afaee024f47d736065bfbcc203846c16076a9f8333d820db042718b98c48264627ffaf2d8576db4dde3c0334949e3213fbf195bc15a2cbaca6755e69
+  metadata.gz: 7e9e6bb3ca9fe6f4621fc88f6f7ad3a574af73317cbd62dfee3c3d362fd87dd8eff55b3f04244ea0d258a730c36518add55774f3fd2eef7f730df83fcad04405
+  data.tar.gz: 9bac80f78ab1e58caf6adab8e791362b18db54915efd1dd42a837e6a00f64292c01f3234f24b2228f70dbccd23c328b8a4308264fb68a01eac0a8adc96f5fad8

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/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/listeners/webui.rb

@@ -1,71 +1,71 @@
-require 'rest-client'
-require 'sys/uname'
-
-module Moto
-  module Listeners
-    class Webui < Base
-
-      def start_run
-        # POST http://sandbox.dev:3000/api/runs/create
-        @url = @runner.my_config[:url]
-        data = {
-          name:  @runner.name,
-          result: Moto::Result::RUNNING,
-          cnt_all: nil,
-          cnt_passed: nil,
-          cnt_failure: nil,
-          cnt_error: nil,
-          cnt_skipped: nil,
-          user: Sys::Uname.sysname.downcase.include?('windows') ? ENV['USERNAME'] : ENV['LOGNAME'],
-          host: Sys::Uname.nodename,
-          pid: Process.pid
-        }
-        @run = JSON.parse( RestClient.post( "#{@url}/api/runs", data.to_json, :content_type => :json, :accept => :json ) )
-        @tests = {}
-      end
-      
-      def end_run
-        # PUT http://sandbox.dev:3000/api/runs/1
-        data = {
-          result: @runner.result.summary[:result],
-          cnt_all: @runner.result.summary[:cnt_all],
-          cnt_passed: @runner.result.summary[:cnt_passed],
-          cnt_failure: @runner.result.summary[:cnt_failure],
-          cnt_error: @runner.result.summary[:cnt_error],
-          cnt_skipped: @runner.result.summary[:cnt_skipped],
-          duration: @runner.result.summary[:duration]
-        }
-        @run = JSON.parse( RestClient.put( "#{@url}/api/runs/#{@run['id']}", data.to_json, :content_type => :json, :accept => :json ) )
-      end
-
-      def start_test(test)
-        # POST http://sandbox.dev:3000/api/tests/create
-        data = {
-          name:  test.name,
-          class_name: test.class.name,
-          log: nil,
-          run_id: @run['id'],
-          env: test.env,
-          parameters: test.params.to_s,
-          result: Moto::Result::RUNNING,
-          error: nil,
-          failures: nil,
-        }
-        @tests[test.name] = JSON.parse( RestClient.post( "#{@url}/api/tests", data.to_json, :content_type => :json, :accept => :json ) )        
-      end
-
-      def end_test(test)
-        log = File.read(test.log_path)
-        data = {
-          log: log,
-          result: @runner.result[test.name][:result],
-          error: @runner.result[test.name][:error].nil? ? nil : @runner.result[test.name][:error].message,
-          failures: @runner.result[test.name][:failures].join("\n\t"),
-          duration: @runner.result[test.name][:duration]
-        }
-        @tests[test.name] = JSON.parse( RestClient.put( "#{@url}/api/tests/#{@tests[test.name]['id']}", data.to_json, :content_type => :json, :accept => :json ) )
-      end
-
-    end
-  end
+require 'rest-client'
+require 'sys/uname'
+
+module Moto
+  module Listeners
+    class Webui < Base
+
+      def start_run
+        # POST http://sandbox.dev:3000/api/runs/create
+        @url = @runner.my_config[:url]
+        data = {
+          name:  @runner.name,
+          result: Moto::Result::RUNNING,
+          cnt_all: nil,
+          cnt_passed: nil,
+          cnt_failure: nil,
+          cnt_error: nil,
+          cnt_skipped: nil,
+          user: Sys::Uname.sysname.downcase.include?('windows') ? ENV['USERNAME'] : ENV['LOGNAME'],
+          host: Sys::Uname.nodename,
+          pid: Process.pid
+        }
+        @run = JSON.parse( RestClient.post( "#{@url}/api/runs", data.to_json, :content_type => :json, :accept => :json ) )
+        @tests = {}
+      end
+      
+      def end_run
+        # PUT http://sandbox.dev:3000/api/runs/1
+        data = {
+          result: @runner.result.summary[:result],
+          cnt_all: @runner.result.summary[:cnt_all],
+          cnt_passed: @runner.result.summary[:cnt_passed],
+          cnt_failure: @runner.result.summary[:cnt_failure],
+          cnt_error: @runner.result.summary[:cnt_error],
+          cnt_skipped: @runner.result.summary[:cnt_skipped],
+          duration: @runner.result.summary[:duration]
+        }
+        @run = JSON.parse( RestClient.put( "#{@url}/api/runs/#{@run['id']}", data.to_json, :content_type => :json, :accept => :json ) )
+      end
+
+      def start_test(test)
+        # POST http://sandbox.dev:3000/api/tests/create
+        data = {
+          name:  test.name,
+          class_name: test.class.name,
+          log: nil,
+          run_id: @run['id'],
+          env: test.env,
+          parameters: test.params.to_s,
+          result: Moto::Result::RUNNING,
+          error: nil,
+          failures: nil,
+        }
+        @tests[test.name] = JSON.parse( RestClient.post( "#{@url}/api/tests", data.to_json, :content_type => :json, :accept => :json ) )        
+      end
+
+      def end_test(test)
+        log = File.read(test.log_path)
+        data = {
+          log: log,
+          result: @runner.result[test.name][:result],
+          error: @runner.result[test.name][:error].nil? ? nil : @runner.result[test.name][:error].message,
+          failures: @runner.result[test.name][:failures].join("\n\t"),
+          duration: @runner.result[test.name][:duration]
+        }
+        @tests[test.name] = JSON.parse( RestClient.put( "#{@url}/api/tests/#{@tests[test.name]['id']}", data.to_json, :content_type => :json, :accept => :json ) )
+      end
+
+    end
+  end
 end

data/lib/thread_context.rb

@@ -103,7 +103,8 @@ module Moto
           (1..max_attempts).each do |attempt|
             @test.init(env, params, params_index)
             # TODO: log path might be specified (to some extent) by the configuration
-            @test.log_path = "#{@test.dir}/#{@test.name.gsub(/\s+/, '_').gsub(':', '_').gsub('::', '_').gsub('/', '_')}.log"
+            #@test.log_path = "#{@test.dir}/#{@test.name.gsub(/\s+/, '_').gsub(':', '_').gsub('::', '_').gsub('/', '_')}.log"
+            @test.log_path = "#{@test.dir}/#{@test.name.demodulize.gsub('/', '_')}.log"
             @logger = Logger.new(File.open(@test.log_path, File::WRONLY | File::TRUNC | File::CREAT))
             @logger.level = @runner.my_config[:log_level] || Logger::DEBUG
             @current_test = @test

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.30'
+  VERSION = '0.0.31'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport