roku_builder 4.23.0 → 4.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373790650070231c745746cd44c6ad316f34746e27fd73a4849b2d02279df624
-  data.tar.gz: de065657de7cf806f4db60a01230eef93d1f92aba581c5456752367e01554900
+  metadata.gz: 1d1ca3fbc26d92a86625530b1578517b2db8f0932f10a723e27e471a08d848da
+  data.tar.gz: 8c06399f94abd5dd482bce4111da7f647ca16497ab021ffc838c0387d924691c
 SHA512:
-  metadata.gz: 16a02701b5eaed8f0f6dbee5edd0c42d3f26481139384aac9ecc545c96695259d0c4509274b3543cf5fd137c55f9ae19e27dda9f21a0813a725f6d1e0ae870ce
-  data.tar.gz: 01fbc2cd1d4bf08f4ee2f8a8fed846300d0a6629b54cb6a45484af7b4ff0388dde3ebfc84ac7d940bed5697700c5be690bc7491c10fcc366a374c59a8caaf75f
+  metadata.gz: ebd9c0cddf2a18fd73f69c864152b2e78fa942bb1ffc63862f35ad767623b3d9e109c14aa0fca8b5f5a7511967732677bb6f885aec5db8908ab8ac56257228bd
+  data.tar.gz: a6e9341c1e88ed59b10a6c2aafc6c9cff8646509e0cc7fa6092b549724d8964a5a2d822a67561fd058853b8fd8d80a25bc5df2acd4ccdf1bb10c6053f4b9d110

data/lib/roku_builder/config_parser.rb

@@ -169,10 +169,12 @@ module RokuBuilder
     end
 
     def setup_key_config
-      if @parsed[:stage]
-        @parsed[:key] = @parsed[:stage][:key]
-        get_global_key_config if @parsed[:key].class == String
-        test_key_file
+      if @options.keyed_command?
+        if @parsed[:stage]
+          @parsed[:key] = @parsed[:stage][:key]
+          get_global_key_config if @parsed[:key].class == String
+          test_key_file
+        end
       end
     end
 

data/lib/roku_builder/config_validator.rb

@@ -26,7 +26,7 @@ module RokuBuilder
     KEY_MISSING_PATH          = 19
     KEY_MISSING_PASSWORD      = 20
     INVALID_MAPPING_INFO      = 21
-    MISSING_KEY               = 22
+    #                         = 22
     MISSING_STAGE_METHOD      = 23
 
     def initialize(config:)
@@ -153,7 +153,6 @@ module RokuBuilder
       errors= [
         [STAGE_MISSING_BRANCH, (!stage[:branch] and project[:stage_method] == :git)],
         [STAGE_MISSING_SCRIPT, (!stage[:script] and project[:stage_method] == :script)],
-        [MISSING_KEY, (!!stage[:key] and stage[:key].class == String and (!@config[:keys] or !@config[:keys][stage[:key].to_sym]))]
       ]
       process_errors(errors: errors)
     end

data/lib/roku_builder/options.rb

@@ -31,6 +31,10 @@ module RokuBuilder
       device_commands.include?(command)
     end
 
+    def keyed_command?
+      keyed_commands.include?(command)
+    end
+
     def has_source?
       !(keys & sources).empty?
     end
@@ -41,7 +45,7 @@ module RokuBuilder
       RokuBuilder.plugins.each do |plugin|
         plugin.commands.each do |command, attributes|
           commands << command
-          [:device, :source, :exclude].each do |type|
+          [:device, :source, :exclude, :keyed].each do |type|
             if attributes[type]
               send("#{type}_commands".to_sym) << command
             end
@@ -148,5 +152,11 @@ module RokuBuilder
     def device_commands
       @device_commands ||= []
     end
+
+    # List of commands that require a key
+    # @return [Array<Symbol>] List of commands that require a key
+    def keyed_commands
+      @keyed_commands ||= []
+    end
   end
 end

data/lib/roku_builder/plugins/core.rb

@@ -8,7 +8,7 @@ module RokuBuilder
     def self.commands
       {
         configure: {},
-        validate: {},
+        validate: {keyed: true},
         increment: {source: true, stage: true},
         dostage: {source: true},
         dounstage: {source: true}

data/lib/roku_builder/plugins/indentation_inspector.rb

@@ -50,7 +50,7 @@ module RokuBuilder
             elsif @prev_line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
               @ind += @count
             elsif @prev_line =~ /^\s*#?if\b|^\s*#?else\b/i
-              unless @prev_line =~ /\bthen\b[ \t ]*[^' \r\n']+.*$/i or @prev_line =~ /\breturn\b/i
+              unless @prev_line =~ /\bthen\b[ \t]*[^' \r\n]+.*$/i or @prev_line =~ /\breturn\b/i
                 @ind += @count
               end
             elsif @prev_line =~ /^\s*\bfor\b|^\s*\bwhile\b/i

data/lib/roku_builder/plugins/packager.rb

@@ -7,9 +7,9 @@ module RokuBuilder
 
     def self.commands
       {
-        package: {device: true, source: true, stage: true, exclude: true},
+        package: {device: true, source: true, stage: true, exclude: true, keyed: true},
         genkey: {device: true},
-        key: {device: true, source: true}
+        key: {device: true, source: true, keyed: true}
       }
     end
 

data/lib/roku_builder/version.rb

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

data/test/roku_builder/test_config_validator.rb

@@ -167,13 +167,6 @@ module RokuBuilder
       assert_equal [15, -1], validator.instance_variable_get(:@codes)
     end
 
-    def test_config_manager_validate_project_key
-      config = good_config
-      config[:projects][:project2][:stages][:production][:key] = "b"
-      validator = ConfigValidator.new(config: config)
-      assert_equal [22], validator.instance_variable_get(:@codes)
-    end
-
     def test_config_manager_validate_keys_pkg
       config = good_config
       config[:keys][:a][:keyed_pkg] = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roku_builder
 version: !ruby/object:Gem::Version
-  version: 4.23.0
+  version: 4.23.1
 platform: ruby
 authors:
 - greeneca
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip