buildkite-builder 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e74780f14a94f7db9cdac81ed2f28657f94dc9547d5b8bc54c10b7f8797c256
-  data.tar.gz: 0c2191c768092e804eb7b9623234d46c9c1496fdc8062bd5dcaf45a2de48c7a9
+  metadata.gz: 93d05d1f845781bebfd8b0ad224f1b50ca3d48237817a7ae4391add514dc6103
+  data.tar.gz: 2c33310049a5c2c47e00813bbc02304c9dd8fe2b8842e013ea03ace5e5e607d0
 SHA512:
-  metadata.gz: 9632e4990ba1d48ea5231d256e8a9143a99ff3a6fdabc41635e71c3092a0a89a839359819a6feffdb0357f006f894d3d40235efd0ebece5d4e4bca85f3d59c64
-  data.tar.gz: bd5848e4a08412331d740aebacd0f9373009ca12427598943c7de630302a4ad7ab6f2907d790052e496433f8cd1463f7cc340212ef4dead044691bd5081f0657
+  metadata.gz: 03675ba911feade1199a7ca2b86a7656107160e6b2994f0994a5cc8cc9b1e24e28c6e132f05e335827da1f4c191a7a07854707ba15015348734b67fa078eb2b7
+  data.tar.gz: ad283bfdeb754f8fb04373d39a9b383e3d66fcfefc51ed41627958b144993d9b21ceec3e8f41af607163334895c3e2f0da0ce02f92b5ab31f6be04ce47240d29

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 3.6.0
+* `Buildkite::Pipelines::Command#run` now uses `Open3.capture3` to run system commands, and accepts an optional arg `capture`. When `capture` is true, it returns the stdout of the command. `capture` is true for the meta_data subcommands `get` and `keys` and for the artifact subcommands `shasum` and `search`.
+
+## 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`

data/VERSION

@@ -1 +1 @@
-3.4.0
+3.6.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/command.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open3'
+
 module Buildkite
   module Pipelines
     class Command
@@ -17,7 +19,12 @@ module Buildkite
         end
 
         def artifact(subcommand, *args)
-          new(:artifact, subcommand, *args).run
+          capture = case subcommand.to_s
+          when 'shasum', 'search' then true
+          else false
+          end
+
+          new(:artifact, subcommand, *args).run(capture: capture)
         end
 
         def annotate(body, *args)
@@ -25,7 +32,12 @@ module Buildkite
         end
 
         def meta_data(subcommand, *args)
-          new(:'meta-data', subcommand, *args).run
+          capture = case subcommand.to_s
+          when 'get', 'keys' then true
+          else false
+          end
+
+          new(:'meta-data', subcommand, *args).run(capture: capture)
         end
       end
 
@@ -42,8 +54,9 @@ module Buildkite
         @args = transform_args(args)
       end
 
-      def run
-        system(*to_a)
+      def run(capture: false)
+        stdout, _, status = Open3.capture3(*to_a)
+        capture ? stdout : status.success?
       end
 
       private

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

@@ -11,6 +11,7 @@ module Buildkite
             retry_value[:automatic] = []
           end
 
+          retry_value[:automatic].delete_if { |rule| rule[:exit_status] == exit_status }
           retry_value[:automatic].push(exit_status: exit_status, limit: limit)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -171,7 +171,7 @@ 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:
   - - ">="