buildkite-builder 4.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9385a6b39f83697f501167fac9988d2e0b351a3e1b877b24e6c93670959d27
-  data.tar.gz: d5fe308edf2e426eb4c7be9bf9bf5996056533eb70724e18d438109732101492
+  metadata.gz: 8d0f3ff0ed7f9f3733ecf88da93150959025b484bdae546237b96a3ace1ac46e
+  data.tar.gz: 14abc08e2a993a622c937b8822cbdc01b467883bbeca37f598185a7f21293a43
 SHA512:
-  metadata.gz: c406b7822bd571773bc3e2f29bf71b1067cacf1cf434b92457c8936a64757efdc48c8f8a63f9f56fc7885d5505d2505bd6f9ac8c9447f1f90d992b263508b3cb
-  data.tar.gz: ddfc34afe276f2716b86d5db4fe07a6854ef0135dd93f8e4b0bd8d5fb14aa07ffcd8c892661823bad17b90e6bcea3b977a7d5ca46694429250e7c9f818ea9baa
+  metadata.gz: 9263c2d4f11e8313e79a567a2efe2a5bfeeee06fa3b476763c550f092f6285413bd9a859875e598b457484b870a4a738ee5ac9d90c2fe7334c5856ce755d4891
+  data.tar.gz: 6d44131cc78e0a56c5aa859419d3e5386bee8b02664b999db93eacccb9f51028250ab80fd358226c4e5f5b5defa26a8ed00aa0a8a9cb9a3304681845462e79ee

data/VERSION

@@ -1 +1 @@
-4.0.0
+4.1.1

data/lib/buildkite/builder/extension.rb

@@ -14,12 +14,12 @@ module Buildkite
 
       attr_reader :context
       attr_reader :options
-      attr_reader :option_block
+      attr_reader :options_block
 
       def initialize(context, **options, &block)
         @context = context
         @options = options
-        @option_block = block
+        @options_block = block
 
         prepare
       end

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

@@ -56,15 +56,6 @@ module Buildkite
             context.extensions.find(Steps).build_step(Pipelines::Steps::Trigger, template, **args, &block)
           end
 
-          def skip(template = nil, **args, &block)
-            context.extensions.find(Steps).build_step(Pipelines::Steps::Skip, template, **args, &block).tap do |step|
-              # A skip step has a nil/noop command.
-              step.command(nil)
-              # Always set the skip attribute if it's in a falsey state.
-              step.skip(true) if !step.get(:skip) || step.skip.empty?
-            end
-          end
-
           def wait(attributes = {}, &block)
             context.extensions.find(Steps).build_step(Pipelines::Steps::Wait, nil, &block).tap do |step|
               step.wait(nil)

data/lib/buildkite/builder/plugin_manager.rb

@@ -14,7 +14,7 @@ module Buildkite
 
       def build(name, attributes = {})
         plugin = @plugins[name.to_s]
-        raise(ArgumentError, "Plugin is not registered: #{resource}") unless plugin
+        raise(ArgumentError, "Plugin is not registered: #{name}") unless plugin
 
         { plugin.uri => plugin.default_attributes.merge(attributes) }
       end

data/lib/buildkite/builder/step_collection.rb

@@ -1,30 +1,47 @@
 module Buildkite
   module Builder
     class StepCollection
+      STEP_TYPES = {
+        block: Pipelines::Steps::Block,
+        command: Pipelines::Steps::Command,
+        group: Pipelines::Steps::Group,
+        input: Pipelines::Steps::Input,
+        trigger: Pipelines::Steps::Trigger,
+        wait: Pipelines::Steps::Wait
+      }.freeze
+
       attr_reader :steps
 
       def initialize
         @steps = []
       end
 
-      def each(*types)
+      def each(*types, &block)
         types = types.flatten
+        types.map! { |type| STEP_TYPES.values.include?(type) ? type : STEP_TYPES.fetch(type) }
+        types = STEP_TYPES.values if types.empty?
 
-        @steps.each do |step|
-          if step.class.to_sym == :group
-            step.steps.each(*types) do |step|
-              yield step
-            end
-          elsif types.include?(step.class.to_sym)
-            yield step
-          elsif types.empty?
-            yield step
+        matched_steps = steps.each_with_object([]) do |step, matches|
+          if types.any? { |step_type| step.is_a?(step_type) }
+            matches << step
+          end
+          if step.is_a?(Pipelines::Steps::Group)
+            step.steps.each(types) { |step| matches << step }
           end
         end
+        matched_steps.each(&block)
       end
 
       def find(key)
-        @steps.find { |step| step.has?(:key) && step.key == key.to_s }
+        steps.find { |step| step.has?(:key) && step.key.to_s == key.to_s }
+      end
+
+      def remove(step)
+        steps.delete(step)
+      end
+
+      def replace(old_step, new_step)
+        steps[steps.index(old_step)] = new_step
       end
 
       def find!(key)

data/lib/buildkite/builder/template_manager.rb

@@ -18,10 +18,6 @@ module Buildkite
 
         definition
       end
-
-      def to_definition
-        # No-op
-      end
     end
   end
 end

data/lib/buildkite/pipelines/steps/group.rb

@@ -4,9 +4,9 @@ module Buildkite
   module Pipelines
     module Steps
       class Group < Abstract
-        attribute :depends_on, append: true
-        attribute :key
         attribute :label
+        attribute :key
+        attribute :depends_on, append: true
 
         attr_reader :steps
 

data/lib/buildkite/pipelines/steps.rb

@@ -8,7 +8,6 @@ module Buildkite
       autoload :Command, File.expand_path('steps/command', __dir__)
       autoload :Group, File.expand_path('steps/group', __dir__)
       autoload :Input, File.expand_path('steps/input', __dir__)
-      autoload :Skip, File.expand_path('steps/skip', __dir__)
       autoload :Trigger, File.expand_path('steps/trigger', __dir__)
       autoload :Wait, File.expand_path('steps/wait', __dir__)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -149,7 +149,6 @@ files:
 - lib/buildkite/pipelines/steps/command.rb
 - lib/buildkite/pipelines/steps/group.rb
 - lib/buildkite/pipelines/steps/input.rb
-- lib/buildkite/pipelines/steps/skip.rb
 - lib/buildkite/pipelines/steps/trigger.rb
 - lib/buildkite/pipelines/steps/wait.rb
 homepage: https://github.com/Gusto/buildkite-builder

data/lib/buildkite/pipelines/steps/skip.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Buildkite
-  module Pipelines
-    module Steps
-      class Skip < Abstract
-        # This skip step is not an official Buildkite step. A skip step is really
-        # just a command step that does nothing and is used to portray a hidden
-        # step on the Buildkite web UI.
-        #
-        # Since it is it's own class, pipeline processors will be able to distinguish
-        # between this type of skip and a conditional skip. Conditional skips are
-        # full command or trigger steps skipped by the `skip` attribute. They can be
-        # unskipped in processors for certain situations. See the `DefaultBranch`
-        # processor for example.
-
-        # Do NOT sort this list. The order here is carried over to the YAML output.
-        # The order specified here was deliberate.
-        attribute :label
-        attribute :skip
-        attribute :if, as: :condition
-        attribute :depends_on, append: true
-        attribute :allow_dependency_failure
-        attribute :command
-      end
-    end
-  end
-end