buildkite-builder 3.3.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e5b7c5ee30bb570f214b7061ecc8c9dee2e118e0116ddfe2cc3d070fb2bed5
-  data.tar.gz: a9bad724efa96a3a613eb3c7e3e016c0697d9d4c6e66deba2e09d3056651aad9
+  metadata.gz: 64089d229e28dcf07061f4a32178cbf29fc157f2004e03adb84a800f24c2b8fd
+  data.tar.gz: d4faa31aac7205a07c29ef2766ae3067079d6d72ddb938adfdcec943babd564c
 SHA512:
-  metadata.gz: 6e6758542d63fdfe9b824a5c47765f01ed8ed8aea0130da1249aa9e2f6c7b593ee4bde1ea69b92b897d1ef8e0f1a9df235dddd87a36b0c807496bfefc98ad993
-  data.tar.gz: d91ce92070ebacf6b22477c6b16a353578d6c52231c20e6f21f45675ee9e21f889263aa4454b1c5173c069984ae34fbd1b16e9037fdb479ab7cf9447c3cf97e4
+  metadata.gz: 67c3325a7b86690c80d771a4cf7738718f1d072481cd23a2b21e9cd1bdb9c9a76b96fc35bb270d09c2ca1e69fbbd7e1d81c8b334a6973e4b148a27ebbf98c504
+  data.tar.gz: 7f4263163c198d8158fbc93e52dab34369ec51e5957860f4203d602ed6c7e445c018d8cf842584fafbfa2e9d44e0722e0ded99efb754d373bbff96f45bb676c2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.5.0
+* `plugin` registrations now takes an optional default attributes hash as the third argument.
+
+## 3.4.1
+* `automatic_retry_on` now overwrites rules with the same exit status.
+
+## 3.4.0
+* `automatically_retry(status:, limit:)` has been renamed to `automatic_retry_on(exit_status:, limit:)`
+* Added `automatic_retry` for setting boolean for `retry.automatic`
+* Added `manual_retry` for setting `retry.manual`
+
 ## 3.3.2
 * Fix subpipeline trigger step attributes leak to subpipeline.
 

data/VERSION

@@ -1 +1 @@
-3.3.2
+3.5.0

data/lib/buildkite/builder/extensions/steps.rb

@@ -21,8 +21,8 @@ module Buildkite
             context.data.steps.push(Buildkite::Builder::Group.new(label, context.data.steps, &block))
           end
 
-          def plugin(name, uri)
-            context.data.steps.plugins.add(name, uri)
+          def plugin(name, uri, default_attributes = {})
+            context.data.steps.plugins.add(name, uri, default_attributes)
           end
 
           def block(template = nil, **args, &block)

data/lib/buildkite/builder/plugin.rb

@@ -3,16 +3,16 @@
 module Buildkite
   module Builder
     class Plugin
-      attr_reader :uri, :source, :version, :options
+      attr_reader :uri, :source, :version, :attributes
 
-      def initialize(uri, options = nil)
+      def initialize(uri, attributes = {})
         @uri = uri
         @source, @version = uri.split('#')
-        @options = options
+        @attributes = attributes
       end
 
       def to_h
-        Buildkite::Pipelines::Helpers.sanitize(uri => options)
+        Buildkite::Pipelines::Helpers.sanitize(uri => (attributes&.empty? ? nil : attributes))
       end
     end
   end

data/lib/buildkite/builder/plugin_collection.rb

@@ -8,17 +8,17 @@ module Buildkite
         @collection = []
       end
 
-      def add(resource, options = nil)
+      def add(resource, attributes = {})
         plugin =
           case resource
           when Symbol
-            uri = plugin_manager.fetch(resource.to_s)
+            registered_plugin = plugin_manager.fetch(resource.to_s)
 
-            raise ArgumentError, "Plugin `#{resource}` does not exist" unless uri
+            raise ArgumentError, "Plugin `#{resource}` does not exist" unless registered_plugin
 
-            Plugin.new(uri, options)
+            Plugin.new(registered_plugin[:uri], registered_plugin[:default_attributes].merge(attributes))
           when String
-            Plugin.new(resource, options)
+            Plugin.new(resource, attributes)
           when Plugin
             resource
           else

data/lib/buildkite/builder/plugin_manager.rb

@@ -5,14 +5,17 @@ module Buildkite
         @plugins = {}
       end
 
-      def add(name, uri)
+      def add(name, uri, default_attributes = {})
         name = name.to_s
 
         if @plugins.key?(name)
           raise ArgumentError, "Plugin already defined: #{name}"
         end
 
-        @plugins[name] = uri
+        @plugins[name] = {
+          uri: uri,
+          default_attributes: default_attributes
+        }
       end
 
       def fetch(name)

data/lib/buildkite/pipelines/helpers/plugins.rb

@@ -4,9 +4,9 @@ module Buildkite
   module Pipelines
     module Helpers
       module Plugins
-        def plugin(name_or_source, options = nil)
+        def plugin(name_or_source, plugin_attributes = {})
           attributes['plugins'] ||= Buildkite::Builder::PluginCollection.new(step_collection.plugins)
-          attributes['plugins'].add(name_or_source, options)
+          attributes['plugins'].add(name_or_source, plugin_attributes)
         end
 
         def plugins

data/lib/buildkite/pipelines/helpers/retry.rb

@@ -4,15 +4,27 @@ module Buildkite
   module Pipelines
     module Helpers
       module Retry
-        def automatically_retry(status:, limit:)
-          retry_value = get(:retry)&.[](:automatic)
+        def automatic_retry_on(exit_status:, limit:)
+          retry_value = get(:retry) || set(:retry, {})
 
-          unless retry_value.is_a?(Array)
-            retry_value = []
-            self.retry(automatic: retry_value)
+          unless retry_value[:automatic].is_a?(Array)
+            retry_value[:automatic] = []
           end
 
-          retry_value.push(exit_status: status, limit: limit)
+          retry_value[:automatic].delete_if { |rule| rule[:exit_status] == exit_status }
+          retry_value[:automatic].push(exit_status: exit_status, limit: limit)
+        end
+
+        def automatic_retry(enabled)
+          retry_value = get(:retry) || set(:retry, {})
+          retry_value[:automatic] = enabled
+        end
+
+        def manual_retry(allowed, reason: nil, permit_on_passed: nil)
+          retry_value = get(:retry) || set(:retry, {})
+          retry_value[:manual] = { allowed: allowed }
+          retry_value[:manual][:reason] = reason unless reason.nil?
+          retry_value[:manual][:permit_on_passed] = permit_on_passed unless permit_on_passed.nil?
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -40,21 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,14 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A gem for programmatically creating Buildkite pipelines.