moto 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c72891d116e48d0ff3999c21d91c6522ac0b1bc
-  data.tar.gz: 9dcb05b25cc17e74dc7e52007bf68b4cae2f61a9
+  metadata.gz: be0991718ac695d0b5b90b955f896fe52472b982
+  data.tar.gz: 5a979cb0d173620014ee1c765bd1613c42d0c227
 SHA512:
-  metadata.gz: 18653e61b99561362a55b000258b37e0b63c1e429dfd368662dcef12497366be63580488a33e9370b6ce8852a63160741fcaaadbd4616ddc697223db7eae577f
-  data.tar.gz: 36412b9a3a27c4e76546937aa0d21916370774ef283cb9d7617601e48b857b6e54c4f0bf332b48dee796f036fba061f72c1d9798061a1abde9aeebf08fd7e04d
+  metadata.gz: 219808323dfc15c7046c2f29759907df267345b4839aeaaebd9f3f4c5397c199e20a49c37420a3b5de4ba0eaa6cc06219d9723bde4d9da8b857e6d45902d306f
+  data.tar.gz: 97ceabe6d63dc2c1275e295fbae4a8bc4aeb567d0cdda684655e686f6ee71e7c97696365657bfea8f805a21da96a8d555c6324717a087475d7d8d34aee22f18e

data/lib/config.rb

@@ -16,9 +16,12 @@ module Moto
       end
 
       # Loads configuration for whole test run and files responsible for environmental constants.
-      def self.load_configuration
-        if File.exists? "#{MotoApp::DIR}/config/moto.rb"
-          @@moto = eval(File.read("#{MotoApp::DIR}/config/moto.rb"))
+      # @param [String] config_name Name of the main Moto/MotoApp config to be loaded. Without extension.
+      def self.load_configuration(config_name)
+        config_path = "#{MotoApp::DIR}/config/#{config_name}.rb"
+
+        if File.exists?(config_path)
+          @@moto = eval(File.read(config_path))
 
           # Try reading constants that are common for all environments
           begin
@@ -35,9 +38,8 @@ module Moto
           end
 
           @@env_consts = common_constants.deep_merge(environment_constants)
-
         else
-          raise "Config file (config/moto.rb) not present.\nDoes current working directory contain Moto application?"
+          raise "Config file: #{config_path} does not exist.\nDoes current working directory contain Moto application?"
         end
       end
 

data/lib/parser.rb

@@ -43,19 +43,19 @@ module Moto
         opts.on('-l', '--listeners Listeners', Array)      { |v| options[:listeners] = v }
         opts.on('-e', '--environment Environment')         { |v| options[:environment] = v }
         opts.on('-n', '--name Name')                       { |v| options[:name] = v }
-        # opts.on('-f', '--config Config')                   { |v| options[:config].deep_merge!( eval( File.read(v) ) ) }
+        opts.on('-c', '--config Config')                   { |v| options[:config_name] = v}
       end.parse!
 
       if options[:name].empty?
         options[:name] = evaluate_name(options[:tags], options[:tests])
       end
 
-      if !options[:environment]
+      if options[:environment]
+        Moto::Lib::Config.environment = options[:environment]
+        Moto::Lib::Config.load_configuration(options[:config_name] ? options[:config_name] : 'moto')
+      else
         puts 'ERROR: Environment is mandatory.'
         exit 1
-      else
-        Moto::Lib::Config.environment = options[:environment]
-        Moto::Lib::Config.load_configuration
       end
 
 
@@ -105,6 +105,8 @@ module Moto
        -l, --listeners = Reporters to be used.
                          Defaults are Moto::Listeners::ConsoleDots, Moto::Listeners::JunitXml
        -e, --environment Mandatory environment. Environment constants and tests parametrized in certain way depend on this.
+       -c, --config      Name of the config, without extension, to be loaded from MotoApp/config/CONFIG_NAME.rb
+                         Default: moto (which loads: MotoApp/config/moto.rb)
 
 
       moto generate:
@@ -114,7 +116,7 @@ module Moto
                          -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.
+       -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

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Moto
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moto
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Bartek Wilczek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport