roku_builder 4.29.7 → 4.29.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70824117e5993d1c97135aa2ca527e4c24acd462520f5a602b7bb30bd951498
-  data.tar.gz: c4e916020854f907ae533640adcb25d7cfbee05723ad22879e6db39297d37a10
+  metadata.gz: 7f556d2bdac60b5a1c852aff402451f8db62724ef9f70d2f2c69bb044ba84d90
+  data.tar.gz: b29aa27d5d0868b61772f7413998f800693b3c7410795e12264a5f866b10ecbf
 SHA512:
-  metadata.gz: cc67d446e88e8a672f289ca56e4312a46c6a7fe788f84eb146a2258e3d9fbf59143e9e58c0b2ae3282df937123be019fc8540a62f9f5b2a70d7267d487af6023
-  data.tar.gz: 483489cf278804bb6e2a83207abae7ad8cc7c40f66bc9c97a85b80326e58af916de41e61cb42303bd4b89f47d1990b1070074f76f379a0790bad6b4cb9648cd6
+  metadata.gz: 54afc02cb2f2e28601ae6a9da3695f572a34bf0aab27330cfff5d41b93fc402982c20eeefa0c115e8548b7e70303a4011b7282cfbfce4b9650cbf8f8d61cf7ec
+  data.tar.gz: 738ba6cf30630263c2901c16e5b0a034449703cf311d839a9abbffb5e908199961cd30f5b6a8f6a2c3c8dcf500f54beaf05ff4fb76e95ee4b60e6c8fce5e791f

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/plugins/analyzer.rb

@@ -44,6 +44,7 @@ module RokuBuilder
         libraries = @config.project[:libraries]
         libraries ||= []
         Dir.glob(File.join(dir, "**", "*")).each do |file_path|
+          #byebug if file_path.include?("adTuningChannelComponent.brs")
           file = file_path.dup; file.slice!(dir)
           unless libraries.any_is_start?(file) and not @options[:include_libraries]
             if File.file?(file_path) and file_path.end_with?(".brs", ".xml")
@@ -73,6 +74,7 @@ module RokuBuilder
       end
       @logger.debug("Command: '#{command}'")
       results = `#{command} #{path} 2>#{stderr}`.split("\n")
+      @logger.debug("Results: '#{results}'")
       process_sca_results(results, linter_config)
     end
 
@@ -102,7 +104,7 @@ module RokuBuilder
         end
         libraries = @config.project[:libraries]
         libraries ||= []
-        if @sca_warning[:path] and libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_libraries]
+        if @sca_warning[:path] and libraries.any_is_start?(@sca_warning[:path].gsub(/pkg:/, "")) and not @options[:include_libraries] and not linter_config[:sca_libraries]
           return false
         end
         if linter_config[:ignore_warnings]

data/lib/roku_builder/plugins/line_inspector.rb

@@ -18,7 +18,7 @@ module RokuBuilder
         lines_to_ignore = []
         file.readlines.each_with_index do |line, line_number|
           full_line = line.dup
-          line.gsub!(/'.*/, "") if file_path.end_with?(".brs")
+          line.gsub!(/'[^"]*("[^"]*"[^"\n]*)*$/, "\n") if file_path.end_with?(".brs")
           if file_path.end_with?(".xml")
             if in_xml_comment
               if line.gsub!(/.*-->/, "")
@@ -41,6 +41,7 @@ module RokuBuilder
         no_comments = file_no_comments.join("")
         file = full_file.join("")
         @inspector_config.each do |line_inspector|
+          next if line_inspector[:skip_xml] and file_path.end_with?(".xml")
           unless line_inspector[:disabled]
             to_check = no_comments
             to_check = file if line_inspector[:include_comments]
@@ -67,6 +68,7 @@ module RokuBuilder
               if (not line_inspector[:pass_if_match] and match) or (line_inspector[:pass_if_match] and not match)
                 error_match = match
                 if match
+
                   line_number = to_check[0..match.begin(0)+start].split("\n", -1).count - 1
                   start = match.end(0) + start
                 else

data/lib/roku_builder/plugins/loader.rb

@@ -217,7 +217,7 @@ module RokuBuilder
     def copy_channel_files(content)
       content[:source_files].each do |entity|
         begin
-          FileUtils.copy_entry(File.join(@config.parsed[:root_dir], entity), File.join(@target, entity))
+          FileUtils.copy_entry(File.join(build_dir, entity), File.join(@target, entity))
         rescue Errno::ENOENT
           @logger.warn "Missing Entry: #{entity}"
         end

data/lib/roku_builder/version.rb

@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.29.7"
+  VERSION = "4.29.9"
 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.9
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-11-21 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