roku_builder 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b09590f2140d74e4d8e7df74d529a6671caa604d
-  data.tar.gz: '095ab9e4a6140114bd075778b16f67cec461be10'
+  metadata.gz: b0772c12ebdcd69b9302ca440d1f2e5051940d4d
+  data.tar.gz: b13067ec43f38578d3393bfad7c8ba6e30d4a3b3
 SHA512:
-  metadata.gz: 8a9285f2d9190207a250bf7a3e62fd7e2963db54735fb5ccc00b3018eed5f96c77fbaad72b1962944bf6268c6b53dde64b3be12f5f03682fc65ea741e3807264
-  data.tar.gz: e477faa4ac4f846670240268b7c3224f5711d0b824317e75bf10fcbf2f83917ae48d41d70fb7f4469937e8d454d5d7f696ecacd5f69eba1339e74519ff953dbf
+  metadata.gz: 44f6adf44331e86cc7b26abd5675a192982a27e4cd7c2d10c75f5ed6abfa432f7a7f736841ed614b337a8b1e1d9390b65a97e939bbead151bf67590ec2f2039d
+  data.tar.gz: '090622268bdabcbd3806c5dfa7e8687227048f730db1542a334419ba87e3cbfedc28c3fb45dd7b1fb4150a2ea921bb44b436e149c56d54bec1c52d223436df86'

data/CHANGELOG

@@ -1,7 +1,7 @@
  = 4.2.3 =
 
  - Fix Windows compatiability issues #21 and #23 on github
- - Update Dependancies
+ - Update Dependencies
 
  = 4.2.2 =
 

data/intergration/roku_builder/test_helper.rb

@@ -15,7 +15,7 @@ require "minitest/autorun"
 require "minitest/utils"
 require "securerandom"
 
-ROKU_IP = "192.168.1.114"
+ROKU_IP = "192.168.1.127"
 
 module Minitest
   module Assertions

data/lib/roku_builder/config.rb

@@ -84,19 +84,20 @@ module RokuBuilder
       @config = {parent_config: @options[:config]}
       depth = 1
       while @config[:parent_config]
-        parent_config_hash = get_parent_config
+        parent_config_hash = read_config(parent_io)
         @config[:child_config] = @config[:parent_config]
         @config.delete(:parent_config)
         @config.merge!(parent_config_hash) {|_key, v1, _v2| v1}
         depth += 1
         raise InvalidConfig, "Parent Configs Too Deep." if depth > 10
       end
+      merge_local_config
       fix_config_symbol_values
     end
 
-    def get_parent_config
+    def read_config(io)
       begin
-        JSON.parse(parent_io.read, {symbolize_names: true})
+        JSON.parse(io.read, {symbolize_names: true})
       rescue JSON::ParserError
         raise InvalidConfig, "Config file is not valid JSON"
       end
@@ -115,6 +116,14 @@ module RokuBuilder
       end
     end
 
+    def merge_local_config
+      local_config_path = "./.roku_config.json"
+      if File.exist?(local_config_path)
+        local_config_hash = read_config(File.open(local_config_path))
+        @config = @config.deep_merge(local_config_hash)
+      end
+    end
+
     def fix_config_symbol_values
       if @config[:devices]
         @config[:devices][:default] = @config[:devices][:default].to_sym

data/lib/roku_builder/version.rb

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

data/test/roku_builder/test_config.rb

@@ -77,6 +77,32 @@ module RokuBuilder
       assert_equal "app", config.raw[:projects][:p1][:app_name]
     end
 
+    def test_config_read_local
+      options = build_options({config: File.join(test_files_path(ConfigTest), "config.json"), validate: true})
+      config = Config.new(options: options)
+
+      mock = Minitest::Mock.new
+      io = proc { |path|
+        if path == './.roku_config.json'
+          mock
+        else
+          IO.new(IO.sysopen(path))
+        end
+      }
+      local_config_content = IO.read(File.join(test_files_path(ConfigTest), "local.json"))
+      mock.expect(:read, local_config_content)
+
+      File.stub(:exist?, true) do
+        File.stub(:open, io) do
+          config.load
+        end
+      end
+
+      mock.verify
+      refute_nil config.raw[:projects][:p2]
+      assert_equal "app2", config.raw[:projects][:p2][:app_name]
+    end
+
     def test_config_edit
       orginal = File.join(test_files_path(ConfigTest), "config.json")
       tmp = File.join(test_files_path(ConfigTest), "tmpconfig.json")

data/test/roku_builder/test_files/config_test/local.json

@@ -0,0 +1,20 @@
+{
+  "projects": {
+    "p2": {
+      "directory": "/tmp",
+      "folders": ["resources","source"],
+      "files": ["manifest"],
+      "app_name": "app2",
+      "stage_method": "git",
+      "stages":{
+        "production": {
+          "branch": "master",
+          "key": {
+            "keyed_pkg": "/tmp/package.pkg",
+            "password": "password"
+          }
+        }
+      }
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -503,6 +503,7 @@ files:
 - test/roku_builder/test_files/config_test/bad.json
 - test/roku_builder/test_files/config_test/child.json
 - test/roku_builder/test_files/config_test/config.json
+- test/roku_builder/test_files/config_test/local.json
 - test/roku_builder/test_files/config_test/non_json.json
 - test/roku_builder/test_files/config_test/parent.json
 - test/roku_builder/test_files/config_test/parent_projects.json
@@ -596,6 +597,7 @@ test_files:
 - test/roku_builder/test_files/config_test/bad.json
 - test/roku_builder/test_files/config_test/child.json
 - test/roku_builder/test_files/config_test/config.json
+- test/roku_builder/test_files/config_test/local.json
 - test/roku_builder/test_files/config_test/non_json.json
 - test/roku_builder/test_files/config_test/parent.json
 - test/roku_builder/test_files/config_test/parent_projects.json