active_publisher 0.1.2-java → 0.1.3-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/active_publisher/configuration.rb +3 -3
- data/lib/active_publisher/version.rb +1 -1
- 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: 5b97f80fbe12ef39aceab4654d28b67a4ba7d7bd
|
4
|
+
data.tar.gz: c2792ec4e2fa9b9147f5bf02fdf9d251518e57ae
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cb26478a4fb42a1bfd1fa7bfecf99bd04c7f5642a64c742d942fe1b7c0f8049c6b1dbfdc176a87ffb6204033a16b2bf7daa255d2a2cce158640e7d76ad4eb36c
|
7
|
+
data.tar.gz: 472bb51eb38abcf601af28fb5d010a41d6c9a4f8034aa2a483c3108eb86b49e61f834ae6ceb855edd828ea9d9d0d082eff9a2540a6f6ddc62836590774dc862b
|
@@ -45,8 +45,8 @@ module ActivePublisher
|
|
45
45
|
|
46
46
|
yaml_config = attempt_to_load_yaml_file(env)
|
47
47
|
DEFAULTS.each_pair do |key, value|
|
48
|
-
setting = cli_options[key] || yaml_config[key.to_s]
|
49
|
-
::ActivePublisher.
|
48
|
+
setting = cli_options[key] || cli_options[key.to_s] || yaml_config[key] || yaml_config[key.to_s]
|
49
|
+
::ActivePublisher.configuration.public_send("#{key}=", setting) if setting
|
50
50
|
end
|
51
51
|
|
52
52
|
true
|
@@ -60,7 +60,7 @@ module ActivePublisher
|
|
60
60
|
def self.attempt_to_load_yaml_file(env)
|
61
61
|
yaml_config = {}
|
62
62
|
absolute_config_path = ::File.expand_path(::File.join("config", "active_publisher.yml"))
|
63
|
-
|
63
|
+
action_subscriber_config_file = ::File.expand_path(::File.join("config", "action_subscriber.yml"))
|
64
64
|
if ::File.exists?(absolute_config_path)
|
65
65
|
yaml_config = ::YAML.load_file(absolute_config_path)[env]
|
66
66
|
elsif ::File.exists?(action_subscriber_config_file)
|