roku_builder 4.29.7 → 4.29.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70824117e5993d1c97135aa2ca527e4c24acd462520f5a602b7bb30bd951498
-  data.tar.gz: c4e916020854f907ae533640adcb25d7cfbee05723ad22879e6db39297d37a10
+  metadata.gz: 82d24a2f934584b2ddf6531d7f087aab02a8e6fbb30b95c611a825f9dae45f1d
+  data.tar.gz: 727d3649d936ff4a0ac96bed9c5b53f0e2b1ecdea043130f8e622a05a3b12868
 SHA512:
-  metadata.gz: cc67d446e88e8a672f289ca56e4312a46c6a7fe788f84eb146a2258e3d9fbf59143e9e58c0b2ae3282df937123be019fc8540a62f9f5b2a70d7267d487af6023
-  data.tar.gz: 483489cf278804bb6e2a83207abae7ad8cc7c40f66bc9c97a85b80326e58af916de41e61cb42303bd4b89f47d1990b1070074f76f379a0790bad6b4cb9648cd6
+  metadata.gz: bd3c416558b52d1b852e6e4101cd1a702fbf1de6c3b125b53d429e6d7e365a8453236c4498a16f9b0afc1a1b233b3fac897346736a2359921a820a14a834718f
+  data.tar.gz: 0ebeaae1a028abfe252177528cdb295ad7a0655959c218d59b8b6f910768f58ef950d0df3be17d7169d57553f18f262e97b2f32d1ebc401fd1a0c447a3c34c19

data/lib/roku_builder/config_parser.rb

@@ -26,10 +26,10 @@ module RokuBuilder
       setup_project
       setup_in_out_file
       setup_project_config
-      setup_build_dir
       setup_stage_config
       setup_key_config
       setup_root_dir
+      setup_build_dir
       setup_input_mappings
       setup_console_log
       setup_deeplinks
@@ -171,12 +171,6 @@ module RokuBuilder
       @parsed[:project][:stage_method] = :working if @options[:working]
     end
 
-    def setup_build_dir
-      if @options[:build_dir].nil? and parsed[:project] and not @parsed[:project][:build_dir].nil?
-        @options[:build_dir] = File.expand_path(@parsed[:project][:build_dir], @parsed[:project][:directory])
-      end
-    end
-
     def setup_stage_config
       if project_required
         stage = @options[:stage].to_sym if @options[:stage]
@@ -222,6 +216,15 @@ module RokuBuilder
       root_dir
     end
 
+    def setup_build_dir
+      if @options[:build_dir].nil? and @parsed[:project] and not @parsed[:project][:build_dir].nil?
+        @options[:build_dir] = File.expand_path(@parsed[:project][:build_dir], @parsed[:root_dir])
+      end
+      unless @options[:build_dir].nil?
+        @parsed[:build_dir] = File.expand_path(@options[:build_dir], @parsed[:root_dir])
+      end
+    end
+
     def setup_input_mappings
       @parsed[:input_mappings] = @config[:input_mappings]
     end

data/lib/roku_builder/manifest.rb

@@ -4,7 +4,9 @@ module RokuBuilder
   class Manifest
 
     def self.generate(config:, attributes:)
-      FileUtils.touch(File.join(config.parsed[:root_dir], "manifest"))
+      root_dir  = config.build_dir
+      root_dir ||= config.root_dir
+      FileUtils.touch(File.join(root_dir, "manifest"))
       manifest = new(config: config)
       manifest.update(attributes: default_params.merge(attributes))
       manifest
@@ -78,7 +80,8 @@ module RokuBuilder
     end
 
     def process_manifest(process_folder, process_zip)
-      root_dir = @config.root_dir
+      root_dir = @config.build_dir
+      root_dir ||= @config.root_dir
       if File.directory?(root_dir)
         path = File.join(root_dir, "manifest")
         process_folder.call(path)
@@ -95,7 +98,8 @@ module RokuBuilder
     end
 
     def write_file
-      root_dir = @config.parsed[:root_dir]
+      root_dir = @config.build_dir
+      root_dir ||= @config.root_dir
       raise ManifestError, "Cannot Update zipped manifest" if File.extname(root_dir) == ".zip"
       path = File.join(root_dir, "manifest")
       File.open(path, "wb") do |file|

data/lib/roku_builder/version.rb

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

data/roku_builder.gemspec

@@ -32,18 +32,17 @@ Gem::Specification.new do |spec|
   spec.add_dependency "image_size",          "~> 2.0"
   spec.add_dependency "jwt",                 "~> 2.7"
 
-  spec.add_development_dependency "bundler",           "~> 2.0"
-  spec.add_development_dependency "rake",              "~> 12.0"
-  spec.add_development_dependency "byebug",            "~> 10.0"
-  spec.add_development_dependency "minitest",          "~> 5.16"
-  spec.add_development_dependency "minitest-autotest", "~> 1.0"
-  spec.add_development_dependency "minitest-server",   "~> 1.0"
-  spec.add_development_dependency "minitest-utils",    "~> 0.3"
-  spec.add_development_dependency "webmock",           "~> 3.0"
-  spec.add_development_dependency "simplecov",         "~> 0.14"
-  spec.add_development_dependency "coveralls",         "~> 0.8"
-  spec.add_development_dependency "yard",              "~> 0.9"
-  spec.add_development_dependency "guard",             "~> 2.14"
-  spec.add_development_dependency "guard-minitest",    "~> 2.4"
-  spec.add_development_dependency "m",                 "~> 1.5"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-autotest"
+  spec.add_development_dependency "minitest-server"
+  spec.add_development_dependency "minitest-utils"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "yard"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-minitest"
+  spec.add_development_dependency "m"
 end

data/test/roku_builder/plugins/test_profiler.rb

@@ -195,7 +195,7 @@ module RokuBuilder
       waitfor = Proc.new do |telnet_config, &blk|
       assert_equal(/.+/, telnet_config["Match"])
       assert_equal(1, telnet_config["Timeout"])
-      txt = " RoGraphics instance\n0x234 1 2 3 4\nAvailable memory\n"
+      txt = " RoGraphics instance\n0x234 1 2 3 4\nAvailable texture memory\n"
       blk.call(txt)
       true
       end
@@ -227,7 +227,7 @@ module RokuBuilder
       waitfor = Proc.new do |telnet_config, &blk|
       assert_equal(/.+/, telnet_config["Match"])
       assert_equal(1, telnet_config["Timeout"])
-      txt = " RoGraphics instance 0x123\nAvailable memory 123 used 456 max 579\n"
+      txt = " RoGraphics instance 0x123\nAvailable texture memory 123 used 456 max 579\n"
       blk.call(txt)
       true
       end

data/test/roku_builder/test_config_parser.rb

@@ -78,6 +78,20 @@ module RokuBuilder
       assert_equal "/dev/null/infile", configs[:root_dir]
     end
 
+    def test_config_build_dir
+      options = build_options({
+        validate: true,
+        working: true,
+        build_dir: "build_dir"
+      })
+      options.define_singleton_method(:source_commands){[:validate]}
+      config = good_config(ConfigParserTest)
+      configs = ConfigParser.parse(options: options, config: config)
+
+      assert_equal Hash, config.class
+      assert_equal File.join(test_files_path(ConfigParserTest), "build_dir"), configs[:build_dir]
+    end
+
     def test_setup_project_config_bad_project
       config = good_config(ConfigParserTest)
       options = build_options({validate: true, project: :project3, stage: "production"})

data/test/roku_builder/test_files/manifest_test/build_dir/manifest

@@ -0,0 +1,7 @@
+#comment
+title=Build Dir Title
+major_version=1
+minor_version=0
+build_version=010101.1
+mm_icon_focus_hd=pkg:/images/focus.png
+mm_icon_focus_sd=pkg:/images/focus.png

data/test/roku_builder/test_helper.rb

@@ -1,11 +1,9 @@
 # ********** Copyright Viacom, Inc. Apache 2.0 **********
 
 require "simplecov"
-require "coveralls"
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter::new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
+  SimpleCov::Formatter::HTMLFormatter
 ])
 SimpleCov.start
 

data/test/roku_builder/test_manifest.rb

@@ -19,6 +19,12 @@ module RokuBuilder
     def test_manifest_read
       Manifest.new(config: @config)
     end
+    def test_manifest_read_build_dir
+      build_dir = File.join(test_files_path(ManifestTest), "build_dir")
+      @config.instance_variable_set(:@parsed, {root_dir: @root_dir, build_dir: build_dir})
+      manifest = Manifest.new(config: @config)
+      assert_equal "Build Dir Title", manifest.title
+    end
     def test_manifest_read_missing
       FileUtils.rm(File.join(@config.parsed[:root_dir], "manifest"))
       assert_raises ManifestError do
@@ -74,6 +80,17 @@ module RokuBuilder
       assert !!manifest.mm_icon_focus_hd
       assert !!manifest.splash_screen_fhd
     end
+    def test_manifest_generate_build_dir
+      attributes = {
+        title: "New Title"
+      }
+      build_dir = File.join(test_files_path(ManifestTest), "build_dir_gen")
+      @config.instance_variable_set(:@parsed, {root_dir: @root_dir, build_dir: build_dir})
+      manifest = Manifest.generate(config: @config,  attributes: attributes)
+      manifest = Manifest.new(config: @config)
+      assert_equal attributes[:title], manifest.title
+      FileUtils.rm(File.join(@root_dir, "build_dir_gen", "manifest"))
+    end
     def test_manifest_increment_build_version
       manifest = Manifest.new(config: @config)
       assert_equal "010101.1", manifest.build_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.29.7
+  version: 4.29.8
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -168,198 +168,184 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 description: Allows the user to easily sideload, package, deeplink, test, roku apps.
 email:
 - charles.greene@redspace.com
@@ -624,6 +610,8 @@ files:
 - test/roku_builder/test_files/manifest_manager_test/manifest_template_2
 - test/roku_builder/test_files/manifest_manager_test/test.zip
 - test/roku_builder/test_files/manifest_manager_test/updated_title_manifest
+- test/roku_builder/test_files/manifest_test/build_dir/manifest
+- test/roku_builder/test_files/manifest_test/build_dir_gen/.keep
 - test/roku_builder/test_files/manifest_test/manifest_comments
 - test/roku_builder/test_files/manifest_test/manifest_template
 - test/roku_builder/test_files/manifest_test/test.zip
@@ -758,6 +746,8 @@ test_files:
 - test/roku_builder/test_files/manifest_manager_test/manifest_template_2
 - test/roku_builder/test_files/manifest_manager_test/test.zip
 - test/roku_builder/test_files/manifest_manager_test/updated_title_manifest
+- test/roku_builder/test_files/manifest_test/build_dir/manifest
+- test/roku_builder/test_files/manifest_test/build_dir_gen/.keep
 - test/roku_builder/test_files/manifest_test/manifest_comments
 - test/roku_builder/test_files/manifest_test/manifest_template
 - test/roku_builder/test_files/manifest_test/test.zip