buildkite-builder 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c47c9c53151cf213174d4be297b48cc832a92d112c0227eea50ee04f7b8a2951
-  data.tar.gz: 1d2db37e56f3e5a5dbe13b2cb5b6355fe58a698ef60197ad4bd7d16d07d347cf
+  metadata.gz: 4bf8325879836987ca1d33d9822e1c2aaf315843c7ee2b99e5791378a893c767
+  data.tar.gz: 2e9edbde3a0db277878a8f307ef0e1975a4dde99c396e87a3ecb1b9b2673b405
 SHA512:
-  metadata.gz: 256e662ade3a59a9ed2660b8e954781c3cbe995476187e8c186eadbe9e35a0e9c41ac750e5df8afc932c2643df59b99c51bb35b6dc878cddd7f17580e41b17ba
-  data.tar.gz: 40d109033e53bfc4eb80a4bfb9721cd5569d7fe9c608962da1e9003a0d202c1ff3d3edd7b89f1b6239ba3c7a3108513733abd898f1983491c12dc2fdb8c4d528
+  metadata.gz: bb4cf5652a702e0d030350db16c0447d72cd2000a6cb32fa4f1a89d00c38cc0e5820661ca1fb67de8abe4a56b177172a4a806a4d05ff954744a01dcd2ec56c32
+  data.tar.gz: c04110b0ca0f550a4a2be480f9aecde71566358fb9d638a4a0c96d1c503c3de6272a75b78083bb21b60d81a3fc12d4440c80445e5a0f9d41bbae5ea4a130ee30

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 4.6.0
+* Remove `capture` concept on `Buildkite::Pipelines::Command#run` and replaced with `Buildkite::Pipelines::Command::Result` object to represent `Open3.capture3` result.
+
 ### 4.5.0
 * Do not upload `pipeline.yml` when steps is empty.
 

data/VERSION

@@ -1 +1 @@
-4.5.0
+4.6.0

data/lib/buildkite/builder/commands/run.rb

@@ -17,7 +17,7 @@ module Buildkite
           # variables to be set. It also uploads the pipeline to Buildkite.
           log.info "+++ 🧰 #{'Buildkite Builder'.color(:springgreen)} v#{Buildkite::Builder.version} ─ #{relative_pipeline_path.to_s.yellow}"
 
-          if Buildkite::Pipelines::Command.meta_data(:exists, Builder.meta_data.fetch(:job))
+          if Buildkite::Pipelines::Command.meta_data(:exists, Builder.meta_data.fetch(:job)).success?
             log.info "Pipeline already uploaded in #{Buildkite.env.step_id} step".color(:dimgray)
           else
             Pipeline.new(pipeline_path, logger: log).upload

data/lib/buildkite/builder/pipeline.rb

@@ -54,8 +54,11 @@ module Buildkite
             file.write(contents)
 
             logger.info "+++ :pipeline: Uploading pipeline"
-            unless Buildkite::Pipelines::Command.pipeline(:upload, file.path)
-              logger.info "Pipeline upload failed, saving as artifact…"
+
+            result = Buildkite::Pipelines::Command.pipeline(:upload, file.path)
+
+            unless result.success?
+              logger.info "Pipeline upload failed with #{result.stderr}, saving as artifact…"
               Buildkite::Pipelines::Command.artifact!(:upload, file.path)
               abort
             end

data/lib/buildkite/pipelines/command.rb

@@ -7,6 +7,23 @@ module Buildkite
     class Command
       class CommandFailedError < StandardError; end
 
+      class Result
+        attr_reader :stdout, :stderr
+        def initialize(stdout, stderr, status)
+          @stdout = stdout.strip
+          @stderr = stderr.strip
+          @status = status
+        end
+
+        def success?
+          @status.success?
+        end
+
+        def output
+          @output ||= "#{stdout}\n#{stderr}".strip
+        end
+      end
+
       BIN_PATH = 'buildkite-agent'
       COMMANDS = %w(
         pipeline
@@ -21,12 +38,12 @@ module Buildkite
         end
 
         def artifact(subcommand, *args, exception: false)
-          capture = case subcommand.to_s
-          when 'shasum', 'search' then true
-          else false
-          end
+          result = new(:artifact, subcommand, *args).run(exception: exception)
 
-          new(:artifact, subcommand, *args).run(capture: capture, exception: exception)
+          case subcommand.to_s
+          when 'shasum', 'search' then result.output
+          else result
+          end
         end
 
         def annotate(body, *args, exception: false)
@@ -34,12 +51,12 @@ module Buildkite
         end
 
         def meta_data(subcommand, *args, exception: false)
-          capture = case subcommand.to_s
-          when 'get', 'keys' then true
-          else false
-          end
+          result = new(:'meta-data', subcommand, *args).run(exception: exception)
 
-          new(:'meta-data', subcommand, *args).run(capture: capture, exception: exception)
+          case subcommand.to_s
+          when 'get', 'keys' then result.output
+          else result
+          end
         end
       end
 
@@ -58,16 +75,14 @@ module Buildkite
         @args = transform_args(args)
       end
 
-      def run(capture: false, exception: false)
+      def run(exception: false)
         stdout, stderr, status = Open3.capture3(*to_a)
-        if capture
-          stdout
-        elsif status.success?
-          true
-        elsif exception
-          raise CommandFailedError, "#{stdout}\n#{stderr}"
+        result = Result.new(stdout, stderr, status)
+
+        if !result.success? && exception
+          raise CommandFailedError, "#{result.output}"
         else
-          false
+          result
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow