moto 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67513bc98ab3246d5619d69d560a15956f4d01f7
-  data.tar.gz: e062119f15ac74b5012c701525a0e2ff6c1463ab
+  metadata.gz: 3799edbb3011aab7abc3f801548862865d5dc196
+  data.tar.gz: 49183582720dd86f5f1fd4335a5e5ca3d9228731
 SHA512:
-  metadata.gz: 93f8ce00760e6ea9e2c37d7f873d5a1e2bc1fa6a4f9f316e365ba0584a98eeff49445822683fb2e9da608f22424e14a5818b732e075cefcea8a1ff0e6908b026
-  data.tar.gz: dad258914f1fd10fa21f30614621c9dc9ab2f552a87d420cf848ab33880765dbc52aac23412e674e20018d92baf3b1c6728853a7281bbaebf9acc6514c8aa4f7
+  metadata.gz: 49c6e8a0e15ee3275fced887be1e25296be84dedf652e54f372040b1d5b8fe55593efe32a0b659a3a707d4b3289491b0bff10a77c741decdc4b003491164335d
+  data.tar.gz: 32d7e271f59cbdbc46f8712b5ef2bc0c141f38057c1a633fc8f85c7f679f5799065390d9965810939d0a249fdec6894314bf73811004d9f55d317a77ce6e667c

data/lib/cli.rb

@@ -18,6 +18,7 @@ require_relative './test_logging'
 require_relative './runner_logging'
 require_relative './runner'
 require_relative './thread_context'
+require_relative './thread_pool'
 require_relative './result'
 require_relative './assert'
 require_relative './test'
@@ -51,29 +52,21 @@ module Moto
       end
 
       # TODO Optimization for files without #MOTO_TAGS
-      unless argv[ :tags ].nil?
+      unless argv[:tags].nil?
         tests_total = Dir.glob("#{MotoApp::DIR}/tests/**/*.rb")
-        argv[ :tags ].each do |tag_name|
-          tests_total.each do |test_dir|
-            test_body = File.read(test_dir)
-            test_body.each_line do |line|
-              line = line.delete(' ')
-              if line.include?( '#MOTO_TAGS')
-                if line.include?(tag_name + ',')
-                  test_paths_absolute.include?(test_dir) || test_paths_absolute << test_dir
-                  break
-                else
-                  break
-                end
-              end
-            end
+        tests_total.each do |test_path|
+          test_body = File.read(test_path)
+          matches = test_body.match(/^#(\s*)MOTO_TAGS:([^\n\r]+)$/m)
+          if matches
+            test_tags = matches.to_a[2].gsub(/\s*/, '').split(',')
+            test_paths_absolute << test_path unless (argv[:tags]&test_tags).empty?
           end
         end
       end
 
       #TODO Display criteria used
       if test_paths_absolute.empty?
-        puts 'No tests found for given arguments'
+        puts 'No tests found for given arguments.'
         exit 1
       end
 

data/lib/initializer.rb

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

data/lib/result.rb

@@ -35,7 +35,7 @@ module Moto
       @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[:error].nil? }.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 }

data/lib/runner.rb

@@ -1,6 +1,6 @@
 module Moto
   class Runner
-    
+
     attr_reader :result
     attr_reader :listeners
     attr_reader :logger
@@ -8,24 +8,24 @@ module Moto
     attr_reader :assert
     attr_reader :config
     attr_reader :name
-    
+
     def initialize(tests, listeners, environments, config, name)
       @tests = tests
       @config = config
-      @threads = []
+      @thread_pool = ThreadPool.new(my_config[:thread_count] || 1)
       @name = name
-      
+
       # TODO: initialize logger from config (yml or just ruby code)
       # @logger = Logger.new(STDOUT)
       @logger = Logger.new(File.open("#{MotoApp::DIR}/moto.log", File::WRONLY | File::APPEND | File::CREAT))
       # @logger.level = Logger::WARN
-      
+
       @result = Result.new(self)
-      
+
       # TODO: validate envs, maybe no-env should be supported as well?
       environments << :__default if environments.empty?
       @environments = environments
-      
+
       @listeners = []
       if listeners.empty?
         my_config[:default_listeners].each do |l|
@@ -38,7 +38,7 @@ module Moto
       end
       @listeners.unshift(@result)
     end
-    
+
     def my_config
       caller_path = caller.first.to_s.split(/:\d/)[0]
       keys = []
@@ -55,19 +55,23 @@ module Moto
       eval "@config#{keys.map{|k| "[:#{k}]" }.join('')}"
     end
 
-    # TODO: assigning tests to threads dynamically
     def run
+      if File.exists?( "#{MotoApp::DIR}/lib/initializer.rb" )
+        require("#{Moto::DIR}/lib/initializer.rb")
+        require("#{MotoApp::DIR}/lib/initializer.rb")
+        initializer = MotoApp::Initializer.new(self)
+        initializer.init
+      end
       @listeners.each { |l| l.start_run }
-      test_slices = @tests.each_slice((@tests.size.to_f/my_config[:thread_count]).ceil).to_a
-      test_slices.each do |slice|
-        @threads << Thread.new do
-          tc = ThreadContext.new(self, slice)
+      @tests.each do |test|
+        @thread_pool.schedule do
+          tc = ThreadContext.new(self, test)
           tc.run
         end
       end
-      @threads.each{ |t| t.join }
+      @thread_pool.shutdown
       @listeners.each { |l| l.end_run }
     end
-    
+
   end
 end

data/lib/test_generator.rb

@@ -23,6 +23,7 @@ module Moto
     end
     
     def create_module_tree(root_module, next_modules)
+      return root_module if next_modules.empty?
       next_module_name = next_modules.shift
       if root_module.const_defined?(next_module_name.to_sym)
         m = root_module.const_get(next_module_name.to_sym)
@@ -30,7 +31,6 @@ module Moto
         m = Module.new
         root_module.const_set(next_module_name.to_sym, m)
       end
-      return m if next_modules.empty?
       create_module_tree(m, next_modules)
     end
     

data/lib/thread_context.rb

@@ -2,32 +2,30 @@ require 'erb'
 
 module Moto
   class ThreadContext
-    
+
     # all resources specific for single thread will be initialized here. E.g. browser session
     attr_reader :runner
     attr_reader :logger
     # attr_reader :log_path
     attr_reader :current_test
-    
-    def initialize(runner, tests)
+
+    def initialize(runner, test)
       @runner = runner
-      @tests = tests
+      @test = test
       @clients = {}
-      @tests.each do |t|
-        t.context = self
-      end
+      @test.context = self
       @config = {}
       Dir.glob("config/*.yml").each do |f|
         @config.deep_merge! YAML.load_file(f)
       end
     end
-    
+
     def client(name)
       return @clients[name] if @clients.key? name
-      
+
       name_app = 'MotoApp::Clients::' + name
       name_moto = 'Moto::Clients::' + name
-      
+
       c = try_client(name_app, "#{MotoApp::DIR}/lib")
       unless c.nil?
         @clients[name] = c
@@ -41,11 +39,11 @@ module Moto
       end
       raise "Could not find client class for name #{name}"
     end
-    
+
     def try_client(name, dir)
-      begin      
+      begin
         a = name.underscore.split('/')
-        client_path = a[1..20].join('/')
+        client_path = a[1..-1].join('/')
         require "#{dir}/#{client_path}"
         client_const = name.constantize
         instance = client_const.new(self)
@@ -53,13 +51,13 @@ module Moto
         instance.start_run
         instance.start_test(@current_test)
         return instance
-      rescue Exception => e 
+      rescue Exception => e
         # puts e
-        # puts e.backtrace 
+        # puts e.backtrace
         return nil
       end
     end
-    
+
     def const(key)
       key = key.to_s
       key = "#{@current_test.env.to_s}.#{key}" if @current_test.env != :__default
@@ -76,57 +74,56 @@ module Moto
       end
       v
     end
-    
+
     def run
-      @tests.each do |test|
-        # remove log files from previous execution
-        Dir.glob("#{test.dir}/*.log").each {|f| File.delete f }
-        max_attempts = @runner.my_config[:max_attempts] || 1
-        @runner.environments.each do |env|
-          params_path = "#{test.dir}/#{test.filename}.yml"
-          params_all = [{}]
-          params_all = YAML.load(ERB.new(File.read(params_path)).result) if File.exists?(params_path)
-          #params_all = YAML.load_file(params_path) if File.exists?(params_path)
-          # or convert keys to symbols?
-          # params_all = YAML.load_file(params_path).map{|h| Hash[ h.map{|k,v| [ k.to_sym, v ] } ] } if File.exists?(params_path)
-          params_all.each_with_index do |params, params_index|
-            # TODO: add filtering out params that are specific to certain envs
-            (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('/', '_')}.log"
-              @logger = Logger.new(File.open(test.log_path, File::WRONLY | File::TRUNC | File::CREAT))
-              # TODO: make logger level configurable
-              @logger.level = @runner.my_config[:log_level]
-              @current_test = test
-              @runner.listeners.each { |l| l.start_test(test) }
-              @clients.each_value { |c| c.start_test(test) }
-              test.before
-              @logger.info "Start: #{test.name} attempt #{attempt}/#{max_attempts}"
-              begin
-                test.run
-              rescue Exceptions::TestForcedPassed, Exceptions::TestForcedFailure, Exceptions::TestSkipped => e
-                logger.info(e.message)
-                @runner.result.add_error(test, e)
-              rescue Exception => e  
-                @logger.error("#{e.class.name}: #{e.message}")  
-                @logger.error(e.backtrace.join("\n"))
-                @runner.result.add_error(test, e)
-              end 
-              test.after
-              @clients.each_value { |c| c.end_test(test) }
-              # HAX: running end_test on results now, on other listeners after logger is closed
-              @runner.listeners.first.end_test(test)
-              @logger.info("Result: #{test.result}")
-              @logger.close
-              @runner.listeners[1..-1].each { |l| l.end_test(test) }
-              break unless [Result::FAILURE, Result::ERROR].include? test.result
-            end # RETRY
+      # remove log files from previous execution
+      Dir.glob("#{@test.dir}/*.log").each {|f| File.delete f }
+      max_attempts = @runner.my_config[:max_attempts] || 1
+      @runner.environments.each do |env|
+        params_path = "#{@test.dir}/#{@test.filename}.yml"
+        params_all = [{}]
+        params_all = YAML.load(ERB.new(File.read(params_path)).result) if File.exists?(params_path)
+        #params_all = YAML.load_file(params_path) if File.exists?(params_path)
+        params_all.each_with_index do |params, params_index|
+          # Filtering out param sets that are specific to certain envs
+          unless params['__env'].nil?
+            allowed_envs = params['__env'].is_a?(String) ? [params['__env']] : params['__env'] 
+            next unless allowed_envs.include? env
           end
+          (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('/', '_')}.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
+            @runner.listeners.each { |l| l.start_test(@test) }
+            @clients.each_value { |c| c.start_test(@test) }
+            @test.before
+            @logger.info "Start: #{@test.name} attempt #{attempt}/#{max_attempts}"
+            begin
+              @test.run
+            rescue Exceptions::TestForcedPassed, Exceptions::TestForcedFailure, Exceptions::TestSkipped => e
+              logger.info(e.message)
+              @runner.result.add_error(@test, e)
+            rescue Exception => e
+              @logger.error("#{e.class.name}: #{e.message}")
+              @logger.error(e.backtrace.join("\n"))
+              @runner.result.add_error(@test, e)
+            end
+            @test.after
+            @clients.each_value { |c| c.end_test(@test) }
+            # HAX: running end_test on results now, on other listeners after logger is closed
+            @runner.listeners.first.end_test(@test)
+            @logger.info("Result: #{@test.result}")
+            @logger.close
+            @runner.listeners[1..-1].each { |l| l.end_test(@test) }
+            break unless [Result::FAILURE, Result::ERROR].include? @test.result
+          end # RETRY
         end
       end
       @clients.each_value { |c| c.end_run }
     end
-  
+
   end
 end

data/lib/thread_pool.rb

@@ -0,0 +1,32 @@
+module Moto
+  class ThreadPool
+
+    def initialize(size=1)
+      @size = size
+      @jobs = Queue.new
+      @pool = Array.new(@size) do |i|
+        Thread.new do
+          Thread.current[:id] = i
+          catch(:exit) do
+            loop do
+              job, args = @jobs.pop
+              job.call(*args)
+            end
+          end
+        end
+      end
+    end
+
+    def schedule(*args, &block)
+      @jobs << [block, args]
+    end
+
+    def shutdown
+      @size.times do
+        schedule { throw :exit }
+      end
+      @pool.each(&:join)
+    end
+
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,6 +86,7 @@ files:
 - lib/cli.rb
 - lib/empty_listener.rb
 - lib/forward_context_methods.rb
+- lib/initializer.rb
 - lib/page.rb
 - lib/parser.rb
 - lib/result.rb
@@ -95,6 +96,7 @@ files:
 - lib/test_generator.rb
 - lib/test_logging.rb
 - lib/thread_context.rb
+- lib/thread_pool.rb
 - lib/version.rb
 - lib/clients/base.rb
 - lib/clients/website.rb