roku_builder 4.24.0 → 4.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b072e460501a9671d72c7014a21bfb00754563439d6e9bef567988c51607a362
-  data.tar.gz: 3ee7363cd19dfdb08217498c107508299e26f692a4dfb040846e14cfc4402411
+  metadata.gz: 52c0b3b6cb2daf28a09b46b92395b0031dca520af02ff829622a914a554931d3
+  data.tar.gz: 7b47eb73a7a97578d564709f020ac1c8a831a406fc1e076406c2905b78d0c091
 SHA512:
-  metadata.gz: 5f4eee2ac6a7a516c508a1339ea70bc941c66901744322fe27ce743ec161649fe7623141d04458d330edf473a063775a5ffe6513414dea607336e1af26b69577
-  data.tar.gz: 45de05bd19128a26f5443104c84535bf1ca0466de87efb94c177854dd871ae344c04391b4e1e50870177b30b8fc84a2e7587506ee29bffdd6010eb05bc55efaa
+  metadata.gz: 9bca38fa14d587fdacefcd43e259c7f8549609cd1dd2658913155a021070eae6208995acfca424e936bc62462e316383ab2fa9a5eadaeae839d892820da43c0b
+  data.tar.gz: 631b044f84ea498713fa8bbfeb74822dab2eede5788ce2dcd46c98385b85daff495841bb7bda3ebeddb1648a08986539b5ee01892584cba5f800f7ec4c35ecca

data/intergration/roku_builder/test_loader.rb

@@ -15,9 +15,9 @@ module RokuBuilder
       cleanup_uuid_script
     end
     def test_sideload
-      output = `#{roku} --sideload --stage production`
+      output = `#{roku} --sideload --stage production -V`
       assert_log @uuid
-      refute_match(/WARN: Missing File/, output)
+      refute_match(/INFO: Missing File/, output)
     end
     def test_delete
       `#{roku} --sideload --working`

data/intergration/roku_builder/test_packager.rb

@@ -17,8 +17,8 @@ module RokuBuilder
     def test_package
       target = File.join(testfiles_path(PackagerIntergrationTest), "pkg.pkg")
       FileUtils.rm(target) if File.exist?(target)
-      output = `#{roku} --package --stage production --out #{target}`
-      refute_match(/WARN: Missing File/, output)
+      output = `#{roku} --package --stage production --out #{target} -V`
+      refute_match(/INFO: Missing File/, output)
       wait_assert {File.exist?(target)}
       refute File.exist?(target+".zip")
       FileUtils.rm(target) if File.exist?(target)
@@ -27,7 +27,7 @@ module RokuBuilder
       target = File.join(testfiles_path(PackagerIntergrationTest), "pkg.pkg")
       FileUtils.rm(target) if File.exist?(target)
       output = `#{roku} --package --stage production --out #{target} -V`
-      refute_match(/WARN: Missing File/, output)
+      refute_match(/INFO: Missing File/, output)
       assert_match(/#{target}/, output)
       wait_assert {File.exist?(target)}
       refute File.exist?(target+".zip")

data/lib/roku_builder/plugins/loader.rb

@@ -40,6 +40,9 @@ module RokuBuilder
       parser.on("--remote-debug", "Sideload will enable remote debug") do
         options[:remoteDebug] = true
       end
+      parser.on("--build-dir DIR", "The directory to load files from when building the app") do |dir|
+        options[:build_dir] = dir
+      end
     end
 
     def self.dependencies
@@ -48,7 +51,6 @@ module RokuBuilder
 
     # Sideload an app onto a roku device
     def sideload(options:)
-      delete(options: options, ignoreFailure: true)
       did_build = false
       unless options[:in]
         did_build = true
@@ -142,7 +144,7 @@ module RokuBuilder
       path = file_path(:out)
       File.delete(path) if File.exist?(path)
       io = Zip::File.open(path, Zip::File::CREATE)
-      writeEntries(@config.parsed[:root_dir], content[:source_files], "", content[:excludes], io)
+      writeEntries(build_dir, content[:source_files], "", content[:excludes], io)
       io.close()
     end
 
@@ -173,7 +175,7 @@ module RokuBuilder
                 @logger.warn "Ignored file with invalid Roku filetype " + File.basename(diskFilePath)
               end
             else
-              @logger.warn "Missing File: #{diskFilePath}"
+              @logger.info "Missing File: #{diskFilePath}"
             end
           end
         end
@@ -188,6 +190,11 @@ module RokuBuilder
         end
       end
     end
+    def build_dir
+      dir = @options[:build_dir]
+      dir ||= @config.parsed[:root_dir]
+      dir
+    end
   end
   RokuBuilder.register_plugin(Loader)
 end

data/lib/roku_builder/plugins/profiler.rb

@@ -138,8 +138,8 @@ module RokuBuilder
       lines = get_command_response(command: "sgnodes all", start_reg: start_reg, end_reg: end_reg)
       xml_string = lines.join("\n")
       stats = {"Total" => {count: 0}}
-      doc = Oga.parse_xml(xml_string)
-      handle_node(stats: stats, node: doc.children.first)
+      doc = Nokogiri::XML(xml_string)
+      handle_node(stats: stats, node: doc.root)
       stats
     end
 
@@ -171,8 +171,7 @@ module RokuBuilder
 
     def handle_node(stats:,  node:)
       if node
-        node.children.each do |element|
-          next unless element.class == Oga::XML::Element
+        node.element_children.each do |element|
           attributes = element.attributes.map{|attr| {"#{attr.name}": attr.value}}.reduce({}, :merge)
           stats[element.name] ||= {count: 0, ids: []}
           stats[element.name][:count] += 1

data/lib/roku_builder/version.rb

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

data/lib/roku_builder.rb

@@ -13,7 +13,7 @@ require 'json'
 require 'pstore'
 require "git"
 #profiler
-require 'oga'
+require 'nokogiri'
 #navigator
 require 'io/console'
 #monitor

data/roku_builder.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "git",                 "~> 1.3"
   spec.add_dependency "net-ping",            "~> 2.0"
   spec.add_dependency "net-telnet",          "~> 0.1"
-  spec.add_dependency "oga",                 "~> 2.11"
+  spec.add_dependency "nokogiri",            "~> 1.12"
   spec.add_dependency "win32-security",      "~> 0.5" # For windows compatibility
   spec.add_dependency "image_size",          "~> 2.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.24.0
+  version: 4.25.0
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: oga
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: win32-security
   requirement: !ruby/object:Gem::Requirement
@@ -633,7 +633,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Build Tool for Roku Apps