buildkite-builder 2.0.0.beta3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4927ec61e94b42ab3c54f0cdafa0c9773b24876e9f5fd067eed495269db3e08
-  data.tar.gz: c730432ae672df3893b03e1ee0a6097f0f525c2f5236df642159ae93882cdbbc
+  metadata.gz: fa814669915f68e9320907c458b3e71fb6583e03722ec13af9e091f7b602e9c8
+  data.tar.gz: 15ba5f61fbf4c6547bcc01fc8cafab9b5d4e8e5a391c549ebc236f5723f82499
 SHA512:
-  metadata.gz: 92fe3fea6d81dabd5da1eacb55445e54845ba6d53c6b059f17e665de6e794341367cdedcad6d89d14cd47a229e8503bf59120bbb6e0ccad40c2e49fa49f51589
-  data.tar.gz: fb4b849e2987e39c6bef52c3896822900151e1c8f12a00b4e825e405348bba62c3dc91275ecc93ae2ac892a96efbcb1d7b12a5962723e8b84664d96249908630
+  metadata.gz: 4d40812d9c6457031445ca6a67749519fe5df7fa37f8d386acc77009da93f1b7f864117bc975d87db6ba17375b0e8145eba301a788ad69ab7099b319027d19d8
+  data.tar.gz: 44e89a2b59f846f8c5d8d1e2538c0039baf312bbd8ed043bff00ce124930f247094f4dde9af53d3a18dfd8943109d5eb83ed6e587042ed62f158ba7b14adaee1

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.1.0
+* Add `.buildkite/lib` directory to $LOAD_PATH if it exists.
+
+## 2.1.0
+* Fix a bug introduced in 2.0.0 where artifacts were being uploaded before extensions had a chance to do work.
+* Remove `SortedSet` dependency.
+* Add `annotate` pipeline command helper.
+* Add `StepCollection#find` and `StepCollection#find!` for ease of finding a step by its key in extensions.
+* `group` now supports the `emoji:` helper. (Eg. `group "foobar", emoji: :smile`)
+
+## 2.0.0
+* Add support for `group`.
+* `Processor`s has been renamed to `Extension`. Extensions add more capabilities (will document separately).
+* `plugin` no longer takes 2 arguments (source, version). It's simply 1 arg that is both source and version, separated by a `#`. This is more akin to Buildkite's usage.
+* Full refactor of pipeline code allowing for extensions to extend DSL methods.
+
 ## 1.5.0
 * Merge `BuildKite::Builder::Context` and `BuildKite::Pipelines::Pipeline` to `BuildKite::Builder::Pipeline` (#37)
 

data/README.md

@@ -28,7 +28,7 @@ steps:
   - label: ":toolbox:"
     plugins:
       - docker#v3.7.0:
-          image: gusto/buildkite-builder:1.2.0
+          image: gusto/buildkite-builder:2.1.0
           propagate-environment: true
 ```
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta3
+2.2.0

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

@@ -0,0 +1,15 @@
+module Buildkite
+  module Builder
+    module Extensions
+      class Lib < Extension
+        def prepare
+          lib_dir = Buildkite::Builder.root.join(Buildkite::Builder::BUILDKITE_DIRECTORY_NAME, 'lib')
+
+          if lib_dir.directory? && !$LOAD_PATH.include?(lib_dir)
+            $LOAD_PATH.unshift(lib_dir)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,9 +10,14 @@ module Buildkite
         end
 
         dsl do
-          def group(label = nil, &block)
+          def group(label = nil, emoji: nil, &block)
             raise "Group does not allow nested in another Group" if context.is_a?(Group)
 
+            if emoji
+              emoji = Array(emoji).map { |name| ":#{name}:" }.join
+              label = [emoji, label].compact.join(' ')
+            end
+
             context.data.steps.push(Buildkite::Builder::Group.new(label, context.data.steps, &block))
           end
 

data/lib/buildkite/builder/extensions.rb

@@ -4,6 +4,7 @@ module Buildkite
   module Builder
     module Extensions
       autoload :Env, File.expand_path('extensions/env', __dir__)
+      autoload :Lib, File.expand_path('extensions/lib', __dir__)
       autoload :Notify, File.expand_path('extensions/notify', __dir__)
       autoload :Steps, File.expand_path('extensions/steps', __dir__)
       autoload :Use, File.expand_path('extensions/use', __dir__)

data/lib/buildkite/builder/file_resolver.rb

@@ -20,7 +20,7 @@ module Buildkite
       end
 
       def initialize
-        @modified_files = SortedSet.new(pull_request? ? files_from_pull_request : files_from_git)
+        @modified_files = Set.new(pull_request? ? files_from_pull_request.sort! : files_from_git.sort!)
       end
 
       private

data/lib/buildkite/builder/manifest/rule.rb

@@ -36,7 +36,7 @@ module Buildkite
           matched.map! { |file| Pathname.new(file) }
           matched.reject!(&:directory?)
           matched.map! { |file| file.relative_path_from(Builder.root) }
-          SortedSet.new(matched)
+          Set.new(matched.sort!)
         end
       end
 

data/lib/buildkite/builder/manifest.rb

@@ -2,7 +2,6 @@
 
 require 'digest/md5'
 require 'pathname'
-require 'sorted_set'
 
 module Buildkite
   module Builder
@@ -56,7 +55,7 @@ module Buildkite
       end
 
       def files
-        @files ||= inclusion_rules.map(&:files).reduce(SortedSet.new, :merge) - exclusion_rules.map(&:files).reduce(SortedSet.new, :merge)
+        @files ||= (inclusion_rules.map(&:files).reduce(Set.new, :merge) - exclusion_rules.map(&:files).reduce(Set.new, :merge)).sort.to_set
       end
 
       def digest

data/lib/buildkite/builder/pipeline.rb

@@ -33,6 +33,7 @@ module Buildkite
         @data = Data.new
 
         use(Extensions::Use)
+        use(Extensions::Lib)
         use(Extensions::Env)
         use(Extensions::Notify)
         use(Extensions::Steps)
@@ -40,9 +41,6 @@ module Buildkite
       end
 
       def upload
-        logger.info '+++ :paperclip: Uploading artifacts'
-        upload_artifacts
-
         # Upload the pipeline.
         Tempfile.create(['pipeline', '.yml']) do |file|
           file.sync = true
@@ -53,6 +51,9 @@ module Buildkite
           logger.info '+++ :pipeline: Uploading pipeline'
           Buildkite::Pipelines::Command.pipeline!(:upload, file.path)
         end
+
+        logger.info '+++ :paperclip: Uploading artifacts'
+        upload_artifacts
       end
 
       def to_h

data/lib/buildkite/builder/plugin_collection.rb

@@ -33,13 +33,17 @@ module Buildkite
           case source
           when String then source
           when Plugin then source.source
-          else raise ArgumentError, "Unknown source #{source.inpect}"
+          else raise ArgumentError, "Unknown source #{source.inspect}"
           end
 
         @collection.select do |plugin|
           plugin.source == source_string
         end
       end
+
+      def to_definition
+        @collection.map(&:to_h)
+      end
     end
   end
 end

data/lib/buildkite/builder/step_collection.rb

@@ -27,6 +27,14 @@ module Buildkite
         end
       end
 
+      def find(key)
+        @steps.find { |step| step.has?(:key) && step.key == key.to_s }
+      end
+
+      def find!(key)
+        find(key) || raise(ArgumentError, "Can't find step with key: #{key}")
+      end
+
       def add(step_class, template = nil, **args, &block)
         @steps.push(step_class.new(self, template, **args, &block)).last
       end

data/lib/buildkite/builder.rb

@@ -46,7 +46,7 @@ module Buildkite
 
       def find_buildkite_directory(start_path)
         path = Pathname.new(start_path)
-        until path.join(BUILDKITE_DIRECTORY_NAME).exist? && path.join(BUILDKITE_DIRECTORY_NAME).directory?
+        until path.join(BUILDKITE_DIRECTORY_NAME).directory?
           raise "Unable to find #{BUILDKITE_DIRECTORY_NAME} from #{start_path}" if path == path.parent
 
           path = path.parent

data/lib/buildkite/pipelines/attributes.rb

@@ -48,7 +48,9 @@ module Buildkite
 
       def to_h
         permitted_attributes.each_with_object({}) do |attr, hash|
-          hash[attr] = get(attr) if has?(attr)
+          next unless has?(attr)
+
+          hash[attr] = get(attr).respond_to?(:to_definition) ? get(attr).to_definition : get(attr)
         end
       end
 

data/lib/buildkite/pipelines/command.rb

@@ -21,6 +21,14 @@ module Buildkite
         new(:artifact, subcommand, *args).run
       end
 
+      def self.annotate(body, *args)
+        new(:annotate, body, *args).run
+      end
+
+      def self.annotate!(*args)
+        abort unless annotate(*args)
+      end
+
       def initialize(command, subcommand, *args)
         @command = command.to_s
         @subcommand = subcommand.to_s

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

@@ -5,17 +5,12 @@ module Buildkite
     module Helpers
       module Plugins
         def plugin(name_or_source, options = nil)
-          append(:plugins, plugin_collection.add(name_or_source, options).to_h)
+          attributes['plugins'] ||= Buildkite::Builder::PluginCollection.new(step_collection.plugins)
+          attributes['plugins'].add(name_or_source, options)
         end
 
         def plugins
-          plugin_collection
-        end
-
-        private
-
-        def plugin_collection
-          @plugin_collection ||= Buildkite::Builder::PluginCollection.new(step_collection.plugins)
+          attributes['plugins']
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.2.0
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,22 +9,8 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sorted_set
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +126,7 @@ files:
 - lib/buildkite/builder/extension_manager.rb
 - lib/buildkite/builder/extensions.rb
 - lib/buildkite/builder/extensions/env.rb
+- lib/buildkite/builder/extensions/lib.rb
 - lib/buildkite/builder/extensions/notify.rb
 - lib/buildkite/builder/extensions/steps.rb
 - lib/buildkite/builder/extensions/use.rb
@@ -205,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.2
 signing_key: