roku_builder 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a9f485846b42df5df6187aeeb2611620c90efa
-  data.tar.gz: 52ccf4b5a9642cf40ec84552464ce03d542f7f17
+  metadata.gz: 6322e6c2a7bbfdd85a34a647b6f94bfafdf8ff57
+  data.tar.gz: 1e390ba875b1f1fddfbe9eb2b11baa6d8cadb082
 SHA512:
-  metadata.gz: e0e3c653d5482fa18f1cf46d86fe8cd79a0f00db30c0317e886927027d6693a4f4292f7a9a66ddb2807ff9369d2e6bda1db0c17170e9060087df15ea48350d30
-  data.tar.gz: f2207a16b2bc713971293de9e553f6dbd53375dbf83119c5d71d30cb36c3cd271bc39d3ce1ff7d2e6789f07ba6ea26920866bcab6c6f5d590e2a926739a0bf2a
+  metadata.gz: d1afd342f9649741f4ce8e423175a8dedba501410813181e98eb49bf6a1067853a44f8de0497000734cacbd57dfa344fad1d8a632246c7b207a48618ac7be28b
+  data.tar.gz: f0c1a0479f891055d7fd8ce52c553d3fed30301a98151d47ab40382981640f4cde545f6a953bdfe813b2147abf273d66aef88ef6e01e472d6809a65ab014a5b5

data/CHANGELOG

@@ -1,4 +1,8 @@
- = 4.6.0
+ = 4.6.1 =
+
+ - Prevent double loading configs
+
+ = 4.6.0 =
 
  - Allow locally defined key files
  - Allow locally defined config to omit directory

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (4.6.0)
+    roku_builder (4.6.1)
       faraday (~> 0.13)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
@@ -135,4 +135,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   1.15.1
+   1.16.1

data/lib/roku_builder/config.rb

@@ -82,9 +82,11 @@ module RokuBuilder
 
 
     def load_config
+      @loaded_configs = []
       @config = {parent_config: @options[:config]}
       depth = 1
       while @config[:parent_config]
+        @loaded_configs.push(File.expand_path(@config[:parent_config]))
         parent_config_hash = read_config(parent_io)
         @config[:child_config] = @config[:parent_config]
         @config.delete(:parent_config)
@@ -119,7 +121,7 @@ module RokuBuilder
 
     def merge_local_config
       local_config_path = "./.roku_config.json"
-      if File.exist?(local_config_path)
+      if File.exist?(local_config_path) and !@loaded_configs.include?(File.expand_path(local_config_path))
         local_config_hash = read_config(File.open(local_config_path))
         add_missing_directories(local_config_hash)
         @config = @config.deep_merge(local_config_hash)
@@ -129,7 +131,7 @@ module RokuBuilder
     def add_missing_directories(local_config)
       if local_config[:projects]
         local_config[:projects].each_pair do |key,value|
-          unless value[:directory]
+          unless !value.is_a?(Hash) or value[:directory]
             local_config[:projects][key][:directory] = RokuBuilder.system(command: "pwd")
           end
         end

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.6.0"
+  VERSION = "4.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - greeneca