#27 Add missing hex validation

ViacomInc · Jan 8, 2019 · 1ef3596 · 1ef3596
1 parent 5d75f32
commit 1ef3596
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+ = 4.11.4 =
+
+ - Allow leading zeros on manifest integers
+ - Add missing hex manifest validation
+
  = 4.11.3 =
 
  - Fix syntax error

diff --git a/lib/roku_builder/plugins/manifest_inspector.rb b/lib/roku_builder/plugins/manifest_inspector.rb
@@ -49,6 +49,10 @@ def run(inspector_config)
                   unless "%0#{@attributes[key].length}i" % @attributes[key].to_i == @attributes[key]
                     add_warning(warning: :manifestInvalidValue, key: key)
                   end
+                when :hex
+                  unless @attributes[key][0] == "#" and !@attributes[key][1..-1][/\H/]
+                    add_warning(warning: :manifestInvalidValue, key: key)
+                  end
                 when :float
                   unless @attributes[key].to_f.to_s == @attributes[key]
                     add_warning(warning: :manifestInvalidValue, key: key)

diff --git a/lib/roku_builder/version.rb b/lib/roku_builder/version.rb
@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.11.3"
+  VERSION = "4.11.4"
 end
diff --git a/test/roku_builder/plugins/test_analyzer.rb b/test/roku_builder/plugins/test_analyzer.rb
@@ -70,6 +70,14 @@ def test_manifest_invalid_value_integer
       assert_equal 2, warnings[0][:line]
       assert_equal "manifest", warnings[0][:path]
     end
+    def test_manifest_invalid_value_hex
+      warnings = test_manifest("manifest_invalid_value_hex")
+      assert_equal 1, warnings.count
+      assert_match(/splash_color/, warnings[0][:message])
+      assert_match(/bad/, warnings[0][:message])
+      assert_equal 9, warnings[0][:line]
+      assert_equal "manifest", warnings[0][:path]
+    end
     def test_manifest_invalid_value_float
       warnings = test_manifest("manifest_invalid_value_float")
       assert_equal 1, warnings.count

diff --git a/test/roku_builder/test_files/analyzer_test/manifest_invalid_value_hex b/test/roku_builder/test_files/analyzer_test/manifest_invalid_value_hex
@@ -0,0 +1,9 @@
+title=Test
+major_version=1
+minor_version=0
+build_version=01
+mm_icon_focus_hd=pkg:/images/focus_hd.png
+mm_icon_focus_sd=pkg:/images/focus_sd.png
+splash_screen_hd=pkg:/images/splash_hd.png
+splash_screen_sd=pkg:/images/splash_sd.png
+splash_color=bad
diff --git a/test/roku_builder/test_files/analyzer_test/manifest_template b/test/roku_builder/test_files/analyzer_test/manifest_template
@@ -6,3 +6,4 @@ mm_icon_focus_hd=pkg:/images/focus_hd.png
 mm_icon_focus_sd=pkg:/images/focus_sd.png
 splash_screen_hd=pkg:/images/splash_hd.png
 splash_screen_sd=pkg:/images/splash_sd.png
+splash_color=#121212