moto 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39f52f8dccdb00eac3991c483030debf6aa9f025
-  data.tar.gz: cb1036e945d4e20785f2ba5663a14a499ab03075
+  metadata.gz: f4b0da411925819e71869d6cec3b81471ac4cdd3
+  data.tar.gz: 1a678c0f42a28cc37e01b41a4a4419c9290985f0
 SHA512:
-  metadata.gz: e02c742053a59067709a674518f8a9952d31dc089e7f82e60e2f9502055e3697b4c5c16293e25a014a838b8f144373cf6d12ad5eecf2b5e0d54f8d79b3187f89
-  data.tar.gz: bd7a4b7f81656b77e2a37020cdc2bc1275eef12d3571de59b5cd8caf37f5e302529c046fb9b655f7fbc1fcfda35e04c7ddadc85ae6bd7d7a22698bcf4af9ed0f
+  metadata.gz: dab17cc2b292dbabda911d5d989573c32749d8e9930cdf10d6c119b704807a10bc4c029509bfea88d6d95e096055321b2438cc09ba3ce9b944f02d793f1a2e72
+  data.tar.gz: a7fc7db8a00321daf7ba728c7bf1ee232b66d4a186ae86dfffadaa1193496717d5f2f9f64f0c93df75a5950e5bbb312c6708780abd5740fb8a637df7174ee6c3

data/lib/config.rb

@@ -1,4 +1,4 @@
-require 'active_support'
+require 'active_support/core_ext/hash/deep_merge'
 
 module Moto
   module Lib
@@ -61,26 +61,10 @@ module Moto
         @@moto
       end
 
-      #
-      # @param [String] key Name of the key which's value is to be retrieved
-      # @return [String] Value of the key
-      def self.environment_const(key)
-        key = key.to_s
 
-        code = if key.include? '.'
-                 "@@env_consts#{key.split('.').map { |a| "[:#{a}]" }.join('')}"
-               else
-                 "@@env_consts[:#{key}]"
-               end
-
-        begin
-          value = eval(code)
-          raise if value.nil?
-        rescue
-          raise "There is no const defined for key: #{key}."
-        end
-
-        Marshal.load(Marshal.dump(value))
+      # @return [Hash] Configuration for selected environment + current thread combination
+      def self.environment_config
+        Thread.current['environment_config'] ||= Marshal.load(Marshal.dump(@@env_consts))
       end
 
     end

data/lib/modes/run/test_runner.rb

@@ -40,16 +40,22 @@ module Moto
 
           (1..threads_max).each do |index|
             Thread.new do
-              Thread.current[:id] = index
+
               loop do
                 tc = ThreadContext.new(test_provider.get_test, @test_reporter)
                 tc.run
+
+                # unset all leftover variables stored 'globally' in Thread
+                Thread.current.keys.each do |k|
+                  Thread.current[k] = nil
+                end
+
               end
             end
           end
 
           # Waiting for all threads to run out of work so we can end the application
-          # or abonormal termination to be triggered based on options provided by the user
+          # or abnormal termination to be triggered based on options provided by the user
           loop do
             run_status = @test_reporter.run_status
             if (test_provider.num_waiting == threads_max) ||

data/lib/reporting/listeners/webui.rb

@@ -1,5 +1,4 @@
 require 'rest-client'
-require 'sys/uname'
 require 'uri'
 
 module Moto

data/lib/test/base.rb

@@ -6,7 +6,6 @@ module Moto
     class Base
 
       attr_reader   :name
-      attr_reader   :env
       attr_reader   :params
       attr_accessor :static_path
       attr_accessor :status
@@ -120,22 +119,6 @@ module Moto
         raise Exceptions::TestForcedPassed.new msg
       end
 
-
-      # Checks for equality of both arguments
-      def assert_equal(a, b)
-        assert(a == b, "Arguments should be equal: #{a} != #{b}.")
-      end
-
-      # Checks if passed value is equal to True
-      def assert_true(value)
-        assert(value, 'Logical condition not met, expecting true, given false.')
-      end
-
-      # Checks if passed value is equal to False
-      def assert_false(value)
-        assert(!value, 'Logical condition not met, expecting false, given true.')
-      end
-
       # Checks if result of condition equals to True
       def assert(condition, message)
         if !condition
@@ -143,14 +126,13 @@ module Moto
 
           status.log_failure("ASSERTION FAILED in line #{line_number}: #{message}")
           logger.error(message)
+          env
         end
       end
 
-      # Read a constants value from configuration files while taking the execution environment into the account.
-      # @param [String] key Key to be searched for.
-      # @return [String] Value of the key or nil if not found
-      def const(key)
-        Moto::Lib::Config.environment_const(key)
+      # @return [Hash] Configuration for selected environment + current thread combination
+      def env
+        Moto::Lib::Config.environment_config
       end
 
       # @return [Logger]

data/lib/test/metadata_generator.rb

@@ -1,7 +1,3 @@
-require 'logger'
-require 'pp'
-require 'yaml'
-
 module MotoApp
   DIR = Dir.pwd
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '1.0.12'
+  VERSION = '1.0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport