loader 1.2.5 → 1.2.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/loader/meta.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2437076db69c76c793a5420f7b6e29e2ee1981e0
|
4
|
+
data.tar.gz: 2a83311b0593eb2c31941bf275cf074500355dc2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c27ed6f273f0bd3e909c63e0fc4ff312089c1ffb8257714ba0e009ce52c6acf043e437ff8005a9388c83c9f01c86ab961cd40b1a646b891fab87a335f7d23c49
|
7
|
+
data.tar.gz: f5d7645769cce9783b88044d015899025ba4e1e52c4dc63c0f77591b35c9b581bf64511abb115fe4e45a11215375d6ce515b27ffa652628b39ef3e3da24249e3
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.2.
|
1
|
+
1.2.6
|
data/lib/loader/meta.rb
CHANGED
@@ -99,10 +99,10 @@ module Loader
|
|
99
99
|
begin
|
100
100
|
|
101
101
|
input_config_file = opts[:f] || opts[:config_file]
|
102
|
-
target_config_hash = opts[:o] || opts[:
|
102
|
+
target_config_hash = opts[:o] || opts[:out] || opts[:config_obj] || {}
|
103
103
|
root_folder = opts[:r] || opts[:root] || caller_root_folder
|
104
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")
|
105
|
+
lib_folder = opts[:l] || opts[:lib] || opts[:lib_folder] || File.join(root_folder,"{lib,libs}","**","meta")
|
106
106
|
environment = opts[:e] || opts[:env] || opts[:environment]
|
107
107
|
raise unless target_config_hash.class <= Hash
|
108
108
|
|