roku_builder 4.6.0 → 4.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG +5 -1
- data/Gemfile.lock +2 -2
- data/lib/roku_builder/config.rb +4 -2
- data/lib/roku_builder/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: 6322e6c2a7bbfdd85a34a647b6f94bfafdf8ff57
|
|
4
|
+
data.tar.gz: 1e390ba875b1f1fddfbe9eb2b11baa6d8cadb082
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d1afd342f9649741f4ce8e423175a8dedba501410813181e98eb49bf6a1067853a44f8de0497000734cacbd57dfa344fad1d8a632246c7b207a48618ac7be28b
|
|
7
|
+
data.tar.gz: f0c1a0479f891055d7fd8ce52c553d3fed30301a98151d47ab40382981640f4cde545f6a953bdfe813b2147abf273d66aef88ef6e01e472d6809a65ab014a5b5
|
data/CHANGELOG
CHANGED
data/Gemfile.lock
CHANGED
data/lib/roku_builder/config.rb
CHANGED
|
@@ -82,9 +82,11 @@ module RokuBuilder
|
|
|
82
82
|
|
|
83
83
|
|
|
84
84
|
def load_config
|
|
85
|
+
@loaded_configs = []
|
|
85
86
|
@config = {parent_config: @options[:config]}
|
|
86
87
|
depth = 1
|
|
87
88
|
while @config[:parent_config]
|
|
89
|
+
@loaded_configs.push(File.expand_path(@config[:parent_config]))
|
|
88
90
|
parent_config_hash = read_config(parent_io)
|
|
89
91
|
@config[:child_config] = @config[:parent_config]
|
|
90
92
|
@config.delete(:parent_config)
|
|
@@ -119,7 +121,7 @@ module RokuBuilder
|
|
|
119
121
|
|
|
120
122
|
def merge_local_config
|
|
121
123
|
local_config_path = "./.roku_config.json"
|
|
122
|
-
if File.exist?(local_config_path)
|
|
124
|
+
if File.exist?(local_config_path) and !@loaded_configs.include?(File.expand_path(local_config_path))
|
|
123
125
|
local_config_hash = read_config(File.open(local_config_path))
|
|
124
126
|
add_missing_directories(local_config_hash)
|
|
125
127
|
@config = @config.deep_merge(local_config_hash)
|
|
@@ -129,7 +131,7 @@ module RokuBuilder
|
|
|
129
131
|
def add_missing_directories(local_config)
|
|
130
132
|
if local_config[:projects]
|
|
131
133
|
local_config[:projects].each_pair do |key,value|
|
|
132
|
-
unless value[:directory]
|
|
134
|
+
unless !value.is_a?(Hash) or value[:directory]
|
|
133
135
|
local_config[:projects][key][:directory] = RokuBuilder.system(command: "pwd")
|
|
134
136
|
end
|
|
135
137
|
end
|
data/lib/roku_builder/version.rb
CHANGED