Resolve ruby 2.7 warnings

ViacomInc · Nov 27, 2020 · e95eb13 · e95eb13
1 parent d9ed35a
commit e95eb13
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/lib/roku_builder.rb b/lib/roku_builder.rb
@@ -200,7 +200,7 @@ def self.execute_command
           stager.stage
         end
         instance = plugin.new(config: @@config)
-        instance.send(@@options.command, {options: @@options})
+        instance.send(@@options.command, **{options: @@options})
         stager.unstage if stager
       end
     end
@@ -224,7 +224,7 @@ def self.options_parse(options:)
   def self.process_hook(hook:, params:)
     @@plugins.each do |plugin|
       if plugin.respond_to?("#{hook}_hook".to_sym)
-        plugin.send("#{hook}_hook", params)
+        plugin.send("#{hook}_hook", **params)
       end
     end
   end

diff --git a/lib/roku_builder/config_validator.rb b/lib/roku_builder/config_validator.rb
@@ -89,7 +89,7 @@ def call_validate_method_for_section(section:, content:)
       attrs = {}
       attrs[section_singular] = content
       method = "validate_#{section_singular}".to_sym
-      send(method, attrs)
+      send(method, **attrs)
     end
 
     def singularize(section:)

diff --git a/lib/roku_builder/plugins/analyzer.rb b/lib/roku_builder/plugins/analyzer.rb
@@ -30,6 +30,7 @@ def self.dependencies
     def analyze(options:, quiet: false)
       @options = options
       @warnings = []
+      @sca_warning = {}
       performance_config = get_config("performance_config.json")
       linter_config = get_config(".roku_builder_linter.json", true)
       linter_config ||= {is_ssai: false}

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.21.4"
+  VERSION = "4.21.5"
 end
diff --git a/test/roku_builder/plugins/test_analyzer.rb b/test/roku_builder/plugins/test_analyzer.rb
@@ -106,7 +106,7 @@ def test_performance_skip_warning_comment_upper_case
       warnings = test_file(text: "function test() as String 'IGNORE-WARNING\n? \"test\"\nend function")
       assert_equal 0, warnings.count
     end
-    def test_performance_for_loop_title_case
+    def test_performance_for_each_loop_title_case
       warnings = test_file(text: "For each button in buttons\n ? button\nEND FOR")
       assert_equal 0, warnings.count
     end
@@ -148,6 +148,7 @@ def test_logger_with_file_content(text:, severity:)
       end
 
       logger.verify
+      warnings
     end
 
     def test(quiet=true)

diff --git a/test/roku_builder/plugins/test_profiler.rb b/test/roku_builder/plugins/test_profiler.rb
@@ -32,7 +32,8 @@ def test_profiler_node_tracking
       end
       count = 0
       read_stub = Proc.new do |size|
-        raise SystemExit if count = 2
+        shouldExit = (count = 2)
+        raise SystemExit if shouldExit
         count += 1
       end
       connection = Minitest::Mock.new

diff --git a/test/roku_builder/test_options.rb b/test/roku_builder/test_options.rb
@@ -32,14 +32,13 @@ def test_options_initialize_params
     end
     def test_options_parse
       parser = Minitest::Mock.new()
-      options_hash = {}
       options = Options.allocate
       parser.expect(:banner=, nil, [String])
       parser.expect(:parse!, nil)
       OptionParser.stub(:new, parser) do
         options.stub(:add_plugin_options, nil) do
           options.stub(:validate_parser, nil) do
-            options_hash = options.send(:parse)
+            options.send(:parse)
           end
         end
       end