roku_builder 4.5.3 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b82094fab56c8c0774b2a28b3af4bcbcc557ae1
-  data.tar.gz: 01c3112a67d4395a72543d7f1094b0d1652c5694
+  metadata.gz: 14a9f485846b42df5df6187aeeb2611620c90efa
+  data.tar.gz: 52ccf4b5a9642cf40ec84552464ce03d542f7f17
 SHA512:
-  metadata.gz: 6f00700d91331017b295030fbbad5553f6dfea5eeecfbacaa7b84590034fbfc57162bda93b9e89023bb612a21446624412dd2c14557f645b7fc5a906eadf354f
-  data.tar.gz: ada412c6e3736f5727e5a30b40147aa66640dc552a8734c2133e2a11c2cc8ffc916fc6c06c6e427bde51bc2046abdf46e1f13101987d26d530969ef63ee7cb8c
+  metadata.gz: e0e3c653d5482fa18f1cf46d86fe8cd79a0f00db30c0317e886927027d6693a4f4292f7a9a66ddb2807ff9369d2e6bda1db0c17170e9060087df15ea48350d30
+  data.tar.gz: f2207a16b2bc713971293de9e553f6dbd53375dbf83119c5d71d30cb36c3cd271bc39d3ce1ff7d2e6789f07ba6ea26920866bcab6c6f5d590e2a926739a0bf2a

data/CHANGELOG

@@ -1,3 +1,10 @@
+ = 4.6.0
+
+ - Allow locally defined key files
+ - Allow locally defined config to omit directory
+ - Allow absolute project paths as well as a project_dir config
+ - Update Dependancies
+
  = 4.5.3 =
 
  - Allow development of installed plugin

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (4.5.3)
+    roku_builder (4.6.0)
       faraday (~> 0.13)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
@@ -18,7 +18,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     ast (2.4.0)
-    byebug (10.0.0)
+    byebug (10.0.2)
     coderay (1.1.2)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
@@ -29,7 +29,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
-    faraday (0.14.0)
+    faraday (0.15.0)
       multipart-post (>= 1.2, < 3)
     faraday-digestauth (0.3.0)
       faraday (~> 0.7)
@@ -58,7 +58,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     m (1.5.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -73,19 +73,19 @@ GEM
     multipart-post (2.0.0)
     nenv (0.3.0)
     net-http-digest_auth (1.4.1)
-    net-ping (2.0.2)
+    net-ping (2.0.4)
     net-telnet (0.1.1)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oga (2.14)
+    oga (2.15)
       ast
       ruby-ll (~> 2.1)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rake (12.3.0)
+    rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)

data/lib/roku_builder.rb

@@ -37,7 +37,6 @@ module RokuBuilder
   # @param options [Hash] The options hash
   def self.run(options: nil)
     @@options = nil
-    @@dev = false
     setup_plugins
     setup_options(options: options)
     return unless @@options
@@ -75,6 +74,7 @@ module RokuBuilder
   end
 
   def self.register_plugin(plugin)
+    @@dev ||= false
     @@plugins ||= []
     @@plugins.delete(plugin) if @@dev
     @@plugins << plugin

data/lib/roku_builder/config.rb

@@ -121,10 +121,21 @@ module RokuBuilder
       local_config_path = "./.roku_config.json"
       if File.exist?(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)
       end
     end
 
+    def add_missing_directories(local_config)
+      if local_config[:projects]
+        local_config[:projects].each_pair do |key,value|
+          unless value[:directory]
+            local_config[:projects][key][:directory] = RokuBuilder.system(command: "pwd")
+          end
+        end
+      end
+    end
+
     def fix_config_symbol_values
       if @config[:devices]
         @config[:devices][:default] = @config[:devices][:default].to_sym

data/lib/roku_builder/config_parser.rb

@@ -73,7 +73,7 @@ module RokuBuilder
     end
 
     def get_repo_path(project_config:)
-      if @config[:projects][:project_dir]
+      if @config[:projects][:project_dir] and !Pathname.new(project_config[:directory]).absolute?
         Pathname.new(File.join(@config[:projects][:project_dir], project_config[:directory])).realdirpath
       else
         Pathname.new(project_config[:directory]).realdirpath
@@ -137,7 +137,7 @@ module RokuBuilder
     end
 
     def set_project_directory
-      if @config[:projects][:project_dir]
+      if @config[:projects][:project_dir]  and !Pathname.new(@parsed[:project][:directory]).absolute?
         @parsed[:project][:directory] = File.join(@config[:projects][:project_dir], @parsed[:project][:directory])
       end
       unless Dir.exist?(@parsed[:project][:directory])
@@ -170,7 +170,7 @@ module RokuBuilder
     def get_global_key_config
       raise ParseError, "Unknown Key: #{@parsed[:key]}" unless @config[:keys][@parsed[:key].to_sym]
       @parsed[:key] = @config[:keys][@parsed[:key].to_sym].dup
-      if @config[:keys][:key_dir]
+      if @config[:keys][:key_dir]  and !@parsed[:key][:keyed_pkg].start_with?("./")
         @parsed[:key][:keyed_pkg] = File.join(@config[:keys][:key_dir], @parsed[:key][:keyed_pkg])
       end
     end

data/lib/roku_builder/version.rb

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

data/test/roku_builder/test_config.rb

@@ -103,6 +103,32 @@ module RokuBuilder
       assert_equal "app2", config.raw[:projects][:p2][:app_name]
     end
 
+    def test_config_read_local_directory
+      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 `pwd`.chomp, config.raw[:projects][:p2][:directory]
+    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_config_parser.rb

@@ -196,6 +196,24 @@ module RokuBuilder
       assert_equal "/tmp/project2", configs[:project][:directory]
     end
 
+    def test_manifest_config_project_directory_select
+      options = build_options({validate: true, working: true})
+      options.define_singleton_method(:source_commands){[:validate]}
+      config = good_config(ConfigParserTest)
+      config[:projects][:project_dir] = "/tmp"
+      config[:projects][:project1][:directory] = "/tmp/project1"
+
+      configs = nil
+      Pathname.stub(:pwd, Pathname.new("/tmp/project1")) do
+        Dir.stub(:exist?, true) do
+          configs = ConfigParser.parse(options: options, config: config)
+        end
+      end
+
+      assert_equal Hash, config.class
+      assert_equal "/tmp/project1", configs[:project][:directory]
+    end
+
     def test_key_config_key_directory
       tmp_file = Tempfile.new("pkg")
       options = build_options({validate: true, project: :project2, stage: 'production'})
@@ -211,6 +229,23 @@ module RokuBuilder
       tmp_file.close
     end
 
+    def test_key_config_key_local_directory
+      tmp_file = Tempfile.new("pkg")
+      FileUtils.touch("./pkg")
+      options = build_options({validate: true, project: :project2, stage: 'production'})
+      options.define_singleton_method(:source_commands){[:validate]}
+      config = good_config(ConfigParserTest)
+      config[:keys][:key_dir] = File.dirname(tmp_file.path)
+      config[:keys][:a][:keyed_pkg] = "./pkg"
+
+      configs = ConfigParser.parse(options: options, config: config)
+
+      assert_equal Hash, config.class
+      assert_equal "./pkg", configs[:key][:keyed_pkg]
+      tmp_file.close
+      FileUtils.rm("./pkg")
+    end
+
     def test_key_config_key_directory_bad
       tmp_file = Tempfile.new("pkg")
       options = build_options({validate: true, project: :project2, stage: 'production'})

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

@@ -1,7 +1,6 @@
 {
   "projects": {
     "p2": {
-      "directory": "/tmp",
       "folders": ["resources","source"],
       "files": ["manifest"],
       "app_name": "app2",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.5.3
+  version: 4.6.0
 platform: ruby
 authors:
 - greeneca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip