buildkite-builder 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d0f3ff0ed7f9f3733ecf88da93150959025b484bdae546237b96a3ace1ac46e
-  data.tar.gz: 14abc08e2a993a622c937b8822cbdc01b467883bbeca37f598185a7f21293a43
+  metadata.gz: 1a02f80263e1373648688276099006c4d2c6870803bb82196cdce5be97d89ad5
+  data.tar.gz: bee2180eac619b4bc4931434f12e02d199fd95c82bcf43e9798b96d01f76f263
 SHA512:
-  metadata.gz: 9263c2d4f11e8313e79a567a2efe2a5bfeeee06fa3b476763c550f092f6285413bd9a859875e598b457484b870a4a738ee5ac9d90c2fe7334c5856ce755d4891
-  data.tar.gz: 6d44131cc78e0a56c5aa859419d3e5386bee8b02664b999db93eacccb9f51028250ab80fd358226c4e5f5b5defa26a8ed00aa0a8a9cb9a3304681845462e79ee
+  metadata.gz: c8f8028dbc2b311ed71a5dd287d805e8cf417832495172405e2d5556f6535163ab5400a8506c7c9ecd0a32099a0cf7283c32f854f86781c1615284e3032c9319
+  data.tar.gz: eda46a592c6f8630e177f539369c3bbf1d619429b32407db7fbf461420592ef9263982dbe4ed4e6f0203baeac8a5a06362aa493e5a6b26680a52f05c904f73f2

data/VERSION

@@ -1 +1 @@
-4.1.1
+4.1.2

data/lib/buildkite/pipelines/command.rb

@@ -5,6 +5,8 @@ require 'open3'
 module Buildkite
   module Pipelines
     class Command
+      class CommandFailedError < StandardError; end
+
       BIN_PATH = 'buildkite-agent'
       COMMANDS = %w(
         pipeline
@@ -14,36 +16,38 @@ module Buildkite
       )
 
       class << self
-        def pipeline(subcommand, *args)
-          new(:pipeline, subcommand, *args).run
+        def pipeline(subcommand, *args, exception: false)
+          new(:pipeline, subcommand, *args).run(exception: exception)
         end
 
-        def artifact(subcommand, *args)
+        def artifact(subcommand, *args, exception: false)
           capture = case subcommand.to_s
           when 'shasum', 'search' then true
           else false
           end
 
-          new(:artifact, subcommand, *args).run(capture: capture)
+          new(:artifact, subcommand, *args).run(capture: capture, exception: exception)
         end
 
-        def annotate(body, *args)
-          new(:annotate, body, *args).run
+        def annotate(body, *args, exception: false)
+          new(:annotate, body, *args).run(exception: exception)
         end
 
-        def meta_data(subcommand, *args)
+        def meta_data(subcommand, *args, exception: false)
           capture = case subcommand.to_s
           when 'get', 'keys' then true
           else false
           end
 
-          new(:'meta-data', subcommand, *args).run(capture: capture)
+          new(:'meta-data', subcommand, *args).run(capture: capture, exception: exception)
         end
       end
 
       COMMANDS.each do |command|
         define_singleton_method("#{command}!") do |*args|
-          abort unless public_send(command, *args)
+          public_send(command, *args, exception: true)
+        rescue CommandFailedError => e
+          abort e.message
         end
       end
 
@@ -54,9 +58,17 @@ module Buildkite
         @args = transform_args(args)
       end
 
-      def run(capture: false)
-        stdout, _, status = Open3.capture3(*to_a)
-        capture ? stdout : status.success?
+      def run(capture: false, exception: false)
+        stdout, stderr, status = Open3.capture3(*to_a)
+        if capture
+          stdout
+        elsif status.success?
+          true
+        elsif exception
+          raise CommandFailedError, "#{stdout}\n#{stderr}"
+        else
+          false
+        end
       end
 
       private

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

@@ -4,15 +4,36 @@ module Buildkite
   module Pipelines
     module Helpers
       module Retry
-        def automatic_retry_on(exit_status:, limit:)
+        def automatic_retry_on(exit_status: nil, limit: nil, signal_reason: nil)
+          raise 'limit must set for `automatic_retry_on`.' unless limit
+
+          if exit_status.nil? && signal_reason.nil?
+            raise 'signal_reason or exit_status must set for `automatic_retry_on`.'
+          end
+
           retry_value = get(:retry) || set(:retry, {})
 
           unless retry_value[:automatic].is_a?(Array)
             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)
+          automatic_options = { limit: limit }
+
+          if exit_status && signal_reason
+            retry_value[:automatic].delete_if do |rule|
+              rule[:exit_status] == exit_status && rule[:signal_reason] == signal_reason
+            end
+            automatic_options[:exit_status] = exit_status
+            automatic_options[:signal_reason] = signal_reason
+          elsif exit_status
+            retry_value[:automatic].delete_if { |rule| rule[:exit_status] == exit_status }
+            automatic_options[:exit_status] = exit_status
+          elsif signal_reason
+            retry_value[:automatic].delete_if { |rule| rule[:signal_reason] == signal_reason }
+            automatic_options[:signal_reason] = signal_reason
+          end
+
+          retry_value[:automatic].push(automatic_options)
         end
 
         def automatic_retry(enabled)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-21 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: A gem for programmatically creating Buildkite pipelines.