loader 1.2.0.rc → 1.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/lib/loader/meta.rb +7 -14
  4. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 80d5026a46aa747e48da743f3a97437c20f67a3c
4
- data.tar.gz: ea2662f408bda885a2f13d59e0dbefd147c31b61
3
+ metadata.gz: b1c64ff0bae49bf6b26fb8b902b7af8dc798f92f
4
+ data.tar.gz: a1bff72bf56b9acc1bab658263b367a7e9562965
5
5
  SHA512:
6
- metadata.gz: 2e1fd02ec6480af17a9659562db8a4b93431730d663cf6baf367aa9d14c4988ff40d30465c2762c4ab9dc02a1db3356b0e59a1a5ac2816daca8aadf76d53d0a1
7
- data.tar.gz: 6d79d2ed852bce1e85b304a704e91a35354733d4eda993e7deab879aac3b7f966339da2a5741bfb4beaf5f1e81d83d8d8d2fea54cea0f0e25f70f82424626371
6
+ metadata.gz: 422b51ffe6a249888412bbf2d33e17966603f32d023ad73871398fc5f3d22be9a2ddc439dec267b823165c9e6cdf4ad8b3ca22be46757b25821ed5954fc03d21
7
+ data.tar.gz: f05692fc5c06d74c61a3d10da08a7e091e26cce079a19a1602cda133f88190cbf2d89b79d5303c2a8d17586a49d82528c23f1c505a2369eba141f8c18e0082c9
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.2.0.rc
1
+ 1.2.1
@@ -98,20 +98,13 @@ module Loader
98
98
  # defaults
99
99
  begin
100
100
 
101
- root_folder = opts[:root]
102
- root_folder ||= caller_root_folder
103
-
104
- target_config_hash = opts[:config_obj]
105
- target_config_hash ||= Hash.new
106
-
107
- lib_folder = opts[:lib_folder]
108
- lib_folder ||= File.join(root_folder,"{lib,libs}","**","meta")
109
-
110
- config_folder = opts[:config_folder]
111
- config_folder ||= File.join(root_folder,"{config,conf}","**")
112
-
113
- input_config_file = opts[:config_file]
114
- environment = opts[:environment]
101
+ input_config_file = opts[:f] || opts[:config_file]
102
+ target_config_hash = opts[:o] || opts[:config_obj] || Hash.new
103
+ root_folder = opts[:r] || opts[:root] || caller_root_folder
104
+ config_folder = opts[:d] || opts[:config_folder] || File.join(root_folder,"{config,conf}","**")
105
+ lib_folder = opts[:l] || opts[:lib_folder] || File.join(root_folder,"{lib,libs}","**","meta")
106
+ environment = opts[:e] || opts[:env] || opts[:environment]
107
+ raise unless target_config_hash.class <= Hash
115
108
 
116
109
  end
117
110
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: loader
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.rc
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Luzsi
@@ -52,9 +52,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
52
52
  version: '0'
53
53
  required_rubygems_version: !ruby/object:Gem::Requirement
54
54
  requirements:
55
- - - ">"
55
+ - - ">="
56
56
  - !ruby/object:Gem::Version
57
- version: 1.3.1
57
+ version: '0'
58
58
  requirements: []
59
59
  rubyforge_project:
60
60
  rubygems_version: 2.2.2