moto 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a363f8cb75325f915a8d93bc1ed70cf2ca463989
-  data.tar.gz: 85fadc6408d3d036b8128f3a7ef3ec75147150d3
+  metadata.gz: '0955cad669b3d86d71325ab80d3d04010a485880'
+  data.tar.gz: f7b3aff8cfdd40bd0fbd009ded30ba332214f513
 SHA512:
-  metadata.gz: 1f4fca1306f23d4204586ab4db764262b37573f62987aebdf46d35d4f9f402e701c1c6ca838e11b1b41bb117397dbc1cd04e6bc0e0b7d587cd1bc8e50d0a1053
-  data.tar.gz: 7340766bd423343db618046782b5f279854799324d8bb9c29afdd9e22cca849bc2ed60098b09c16b91dd88190785c93d76d5ebf31e76b1674bf643e720b88113
+  metadata.gz: 061e7b129091f5caff204a38c68a64ebbfed6870e512d20634132bb8f2441eb922de07f532a2a2decd4858a47133a32ad3911b31865e6b84cee954af33acda4b
+  data.tar.gz: a9ed51f091931e0781f7340852c4d72c6138f52fef2f3afb2644041f1482a6ddb877ee0b3fe3643685b8f864598f465ff42849ce8458b63a05eff633b5b3391e

data/lib/config/hash.rb

@@ -0,0 +1,9 @@
+module Moto
+  module Config
+    # Purpose of this class is to enable developers of Moto-reliant apps to be able to monkey patch their custom methods
+    # to data structure (this) that holds, retrieves and modifies env config data
+    class Hash < Hash
+
+    end
+  end
+end

data/lib/{config.rb → config/manager.rb}

@@ -1,8 +1,9 @@
 require 'active_support/core_ext/hash/deep_merge'
+require_relative 'hash'
 
 module Moto
-  module Lib
-    class Config
+  module Config
+    class Manager
 
       # @return [String] String representing the name of the current environment
       def self.environment
@@ -57,14 +58,14 @@ module Moto
       end
 
       # @return [Hash] Hash representing data from MotoApp/config/moto.rb file
-      def self.moto
+      def self.config_moto
         @@moto
       end
 
 
       # @return [Hash] Configuration for selected environment + current thread combination
-      def self.environment_config
-        Thread.current['environment_config'] ||= Marshal.load(Marshal.dump(@@env_consts))
+      def self.config_environment
+        Thread.current['config_environment'] ||= Moto::Config::Hash.new.merge!(Marshal.load(Marshal.dump(@@env_consts)))
       end
 
     end

data/lib/modes/mode_selector.rb

@@ -16,7 +16,7 @@ module Moto
         tests_metadata = prepare_metadata(parsed_arguments)
         test_reporter = prepare_test_reporter(parsed_arguments)
 
-        if Moto::Lib::Config.moto[:test_runner][:dry_run]
+        if Moto::Config::Manager.config_moto[:test_runner][:dry_run]
           runner = Moto::Modes::Run::DryRunner.new(tests_metadata, test_reporter)
         else
           runner = Moto::Modes::Run::TestRunner.new(tests_metadata, test_reporter, parsed_arguments[:stop_on])

data/lib/modes/run/test_provider.rb

@@ -11,7 +11,7 @@ module Moto
         # @param [Array] tests_metadata
         def initialize(tests_metadata)
           super()
-          @test_repeats = Moto::Lib::Config.moto[:test_runner][:test_repeats]
+          @test_repeats = Moto::Config::Manager.config_moto[:test_runner][:test_repeats]
           @current_test_repeat = 1
           @queue = Queue.new
           @tests_metadata = tests_metadata

data/lib/modes/run/test_runner.rb

@@ -23,7 +23,7 @@ module Moto
 
         def run
           test_provider = TestProvider.new(@tests_metadata)
-          threads_max = Moto::Lib::Config.moto[:test_runner][:thread_count] || 1
+          threads_max = Moto::Config::Manager.config_moto[:test_runner][:thread_count] || 1
 
           # remove log/screenshot files from previous execution
           @tests_metadata.each do |metadata|
@@ -38,7 +38,7 @@ module Moto
 
           Thread.abort_on_exception = true
 
-          (1..threads_max).each do |index|
+          threads_max.times do
             Thread.new do
 
               loop do

data/lib/modes/run/thread_context.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require_relative '../../config'
+require_relative '../../config/manager'
 
 module Moto
   module Modes
@@ -72,7 +72,7 @@ module Moto
 
         # @return [Hash] Hash with config for ThreadContext
         def config
-          Moto::Lib::Config.moto[:test_runner]
+          Moto::Config::Manager.config_moto[:test_runner]
         end
         private :config
 

data/lib/parameter_parser.rb

@@ -7,7 +7,7 @@ end
 
 require 'optparse'
 require 'logger'
-require_relative 'config'
+require_relative 'config/manager'
 require_relative 'modes/mode_selector'
 
 module Moto
@@ -20,7 +20,7 @@ module Moto
 
         # TODO: IMPORTANT ISSUE
         # xxx_parse functions should not return parsed arguments and pass them to functions
-        # but instead all should inject proper values into Moto::Lib::Config.moto[:xxx][:yyy]
+        # but instead all should inject proper values into Moto::Config::Manager.config_moto[:xxx][:yyy]
         # on which all further components should relay
 
         if argv[0] == '--version'
@@ -44,24 +44,24 @@ module Moto
     end
 
     def self.prepare_config(options)
-      Moto::Lib::Config.load_configuration(options[:config_name], options[:environment])
+      Moto::Config::Manager.load_configuration(options[:config_name], options[:environment])
 
       if !config_test_runner
-        Moto::Lib::Config.moto[:test_runner] = {}
+        Moto::Config::Manager.config_moto[:test_runner] = {}
       end
 
       if !config_test_generator
-        Moto::Lib::Config.moto[:test_generator] = {}
+        Moto::Config::Manager.config_moto[:test_generator] = {}
       end
 
     end
 
     def self.config_test_runner
-      Moto::Lib::Config.moto[:test_runner]
+      Moto::Config::Manager.config_moto[:test_runner]
     end
 
     def self.config_test_generator
-      Moto::Lib::Config.moto[:test_generator]
+      Moto::Config::Manager.config_moto[:test_generator]
     end
 
     def self.run_parse(argv)
@@ -104,15 +104,15 @@ module Moto
 
       # Runner configuration
 
-      Moto::Lib::Config.moto[:test_runner][:thread_count] = options[:threads] if options[:threads]
-      Moto::Lib::Config.moto[:test_runner][:test_attempt_max] = options[:attempts] if options[:attempts]
-      Moto::Lib::Config.moto[:test_runner][:dry_run] = options[:dry_run] if options[:dry_run]
-      Moto::Lib::Config.moto[:test_runner][:explicit_errors] = options[:explicit_errors] if options[:explicit_errors]
+      Moto::Config::Manager.config_moto[:test_runner][:thread_count] = options[:threads] if options[:threads]
+      Moto::Config::Manager.config_moto[:test_runner][:test_attempt_max] = options[:attempts] if options[:attempts]
+      Moto::Config::Manager.config_moto[:test_runner][:dry_run] = options[:dry_run] if options[:dry_run]
+      Moto::Config::Manager.config_moto[:test_runner][:explicit_errors] = options[:explicit_errors] if options[:explicit_errors]
 
       # Test log level parsing
 
       if options[:log_level]
-        Moto::Lib::Config.moto[:test_runner][:log_level] = case options[:log_level].downcase
+        Moto::Config::Manager.config_moto[:test_runner][:log_level] = case options[:log_level].downcase
         when 'info'   then Logger::INFO
         when 'warn'   then Logger::WARN
         when 'error'  then  Logger::ERROR
@@ -120,11 +120,11 @@ module Moto
         else Logger::DEBUG
         end
       else
-        Moto::Lib::Config.moto[:test_runner][:log_level] = Logger::DEBUG
+        Moto::Config::Manager.config_moto[:test_runner][:log_level] = Logger::DEBUG
       end
 
       # Generator configuration
-      Moto::Lib::Config.moto[:test_generator][:param_name] = options[:param_name] if options[:param_name]
+      Moto::Config::Manager.config_moto[:test_generator][:param_name] = options[:param_name] if options[:param_name]
 
       return options
     end

data/lib/reporting/listeners/junit_xml.rb

@@ -7,7 +7,7 @@ module Moto
 
         def end_run(run_status)
 
-          path =  Moto::Lib::Config.moto[:test_reporter][:listeners][:junit_xml][:output_file]
+          path =  Moto::Config::Manager.config_moto[:test_reporter][:listeners][:junit_xml][:output_file]
 
           run_status_hash = {
               errors:     run_status.tests_error.length,

data/lib/reporting/listeners/webui.rb

@@ -138,7 +138,7 @@ module Moto
 
         # @return [Hash] Hash with config for WebUI
         def config
-          Moto::Lib::Config.moto[:test_reporter][:listeners][:webui]
+          Moto::Config::Manager.config_moto[:test_reporter][:listeners][:webui]
         end
         private :config
 

data/lib/reporting/test_reporter.rb

@@ -90,7 +90,7 @@ module Moto
 
       # @return [Hash] Hash with config for TestReporter
       def config
-        Moto::Lib::Config.moto[:test_reporter]
+        Moto::Config::Manager.config_moto[:test_reporter]
       end
       private :config
 

data/lib/test/base.rb

@@ -163,7 +163,7 @@ module Moto
 
       # @return [Hash] Configuration for selected environment + current thread combination
       def env
-        Moto::Lib::Config.environment_config
+        Moto::Config::Manager.config_environment
       end
 
       # @return [Logger]

data/lib/test/generator.rb

@@ -122,7 +122,7 @@ module Moto
 
       # @return [Hash] Hash with config for test generator
       def config
-        Moto::Lib::Config.moto[:test_generator]
+        Moto::Config::Manager.config_moto[:test_generator]
       end
       private :config
 

data/lib/test/metadata_generator.rb

@@ -4,7 +4,7 @@ end
 
 require_relative 'metadata'
 require_relative '../version'
-require_relative '../config'
+require_relative '../config/manager'
 
 module Moto
   module Test

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '1.1.4'
+  VERSION = '1.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,7 +68,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/moto
-- lib/config.rb
+- lib/config/hash.rb
+- lib/config/manager.rb
 - lib/exceptions/base.rb
 - lib/exceptions/test_forced_failure.rb
 - lib/exceptions/test_forced_passed.rb