buildkite-builder 2.0.0.beta1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a9777c2d258caf0ee500fee89d04fe9385a9357f2df66f007b60c88bd361afa
-  data.tar.gz: f8a8e77e07fe770231f00bc7d3a693524cb5495f45c0529313737152dd44be1f
+  metadata.gz: 827239e1a697a723a13cf14a5793bf17490d102611003270b3ef73e196428f5c
+  data.tar.gz: dfe7bf3a2f6e63916812a28b93af9f8b25979fafa8f1b35a608819e4cc4a94bc
 SHA512:
-  metadata.gz: 824bb77591ec310cace0138dd32269cd379ba244ec0283b53cd86d1e6001b24bd0a208c5662bf1b4d171c773e85c0053decfe619431cccbe6c38e24e7badb32d
-  data.tar.gz: 30502c1de926f6e48423b4d254dc82b86248f2bf5c7e290f50bd972b63ef9d9702bbdd0dd4c81f3cd37aa0da5b3f4076402d72d3f6eb5531b662a96cfdbfa3a4
+  metadata.gz: 3e64effb01732d99febf7516897c95d0dd45ca5a4c5dbf61da73dcb0843a3459c6a5ff3ba1e74861f9ab4029a312cfe6225de2a7dc0968c50952d4473920d5e2
+  data.tar.gz: 3d95fbab003838087d12626fd7240ba7f6359434af0c8e87af15fce0804bcafa219f4af049f6b81e2dbc786eca0152daa8801b41210539e693c0afd2e5607043

data/VERSION

@@ -1 +1 @@
-2.0.0.beta1
+2.0.0

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

@@ -9,7 +9,7 @@ module Buildkite
         self.description = 'Outputs the pipeline YAML.'
 
         def run
-          puts Pipeline.build(pipeline_path).to_yaml
+          puts Pipeline.new(pipeline_path).to_yaml
         end
       end
     end

data/lib/buildkite/builder/dsl.rb

@@ -6,7 +6,11 @@ module Buildkite
       attr_reader :context
 
       def extend(mod)
-        mod < Extension ? super(mod.dsl) : super
+        if mod < Extension
+          super(mod.dsl) if mod.dsl
+        else
+          super
+        end
       end
 
       def initialize(context)

data/lib/buildkite/builder/extension.rb

@@ -28,6 +28,10 @@ module Buildkite
 
       private
 
+      def log
+        context.logger
+      end
+
       def buildkite
         @buildkite ||= begin
           unless Buildkite.env
@@ -43,8 +47,7 @@ module Buildkite
       end
 
       def pipeline(&block)
-        context.dsl.instance_eval(&block) if block_given?
-        context
+        context.dsl.instance_eval(&block)
       end
     end
   end

data/lib/buildkite/builder/extension_manager.rb

@@ -8,10 +8,10 @@ module Buildkite
         @context = context
         @extensions = []
 
-        Loaders::Extensions.load(@context.root)
+        @loader = Loaders::Extensions.load(@context.root)
       end
 
-      def use(extension, **args)
+      def use(extension, native: false, **args)
         unless extension < Buildkite::Builder::Extension
           raise "#{extension} must subclass Buildkite::Builder::Extension"
         end

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

@@ -4,8 +4,8 @@ module Buildkite
       class Steps < Extension
         def prepare
           context.data.steps = StepCollection.new(
-            TemplateRegistry.new(context.root),
-            PluginRegistry.new
+            TemplateManager.new(context.root),
+            PluginManager.new
           )
         end
 
@@ -16,8 +16,8 @@ module Buildkite
             context.data.steps.push(Buildkite::Builder::Group.new(label, context.data.steps, &block))
           end
 
-          def plugin(name, uri, version)
-            context.data.steps.plugins.add(name, uri, version)
+          def plugin(name, uri)
+            context.data.steps.plugins.add(name, uri)
           end
 
           def block(template = nil, **args, &block)

data/lib/buildkite/builder/group.rb

@@ -25,7 +25,8 @@ module Buildkite
         @dsl = Dsl.new(self)
         @dsl.extend(Extensions::Steps)
         @dsl.extend(Extensions::Notify)
-        instance_eval(&block)
+        instance_eval(&block) if block_given?
+        self
       end
 
       def to_h
@@ -33,8 +34,8 @@ module Buildkite
         { group: label }.merge(attributes).merge(data.to_definition)
       end
 
-      def method_missing(method_name, *_args, &_block)
-        @dsl.public_send(method_name, *_args, &_block)
+      def method_missing(method_name, *args, **kwargs, &_block)
+        @dsl.public_send(method_name, *args, **kwargs, &_block)
       end
     end
   end

data/lib/buildkite/builder/pipeline.rb

@@ -23,10 +23,6 @@ module Buildkite
                   :dsl,
                   :data
 
-      def self.build(root, logger: nil)
-        new(root, logger: logger)
-      end
-
       def initialize(root, logger: nil)
         @root = root
         @logger = logger || Logger.new(File::NULL)

data/lib/buildkite/builder/plugin.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Buildkite
+  module Builder
+    class Plugin
+      attr_reader :uri, :source, :version, :options
+
+      def initialize(uri, options = nil)
+        @uri = uri
+        @source, @version = uri.split('#')
+        @options = options
+      end
+
+      def to_h
+        Buildkite::Pipelines::Helpers.sanitize(uri => options)
+      end
+    end
+  end
+end

data/lib/buildkite/builder/plugin_collection.rb

@@ -0,0 +1,49 @@
+module Buildkite
+  module Builder
+    class PluginCollection
+      attr_reader :plugin_manager
+
+      def initialize(plugin_manager)
+        @plugin_manager = plugin_manager
+        @collection = []
+      end
+
+      def add(resource, options = nil)
+        plugin =
+          case resource
+          when Symbol
+            uri = plugin_manager.fetch(resource.to_s)
+
+            raise ArgumentError, "Plugin `#{resource}` does not exist" unless uri
+
+            Plugin.new(uri, options)
+          when String
+            Plugin.new(resource, options)
+          when Plugin
+            resource
+          else
+            raise ArgumentError, "Unknown plugin `#{resource.inspect}`"
+          end
+
+        @collection.push(plugin).last
+      end
+
+      def find(source)
+        source_string =
+          case source
+          when String then source
+          when Plugin then source.source
+          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/{plugin_registry.rb → plugin_manager.rb}

@@ -1,18 +1,18 @@
 module Buildkite
   module Builder
-    class PluginRegistry
+    class PluginManager
       def initialize
         @plugins = {}
       end
 
-      def add(name, uri, version)
+      def add(name, uri)
         name = name.to_s
 
         if @plugins.key?(name)
           raise ArgumentError, "Plugin already defined: #{name}"
         end
 
-        @plugins[name] = [uri, version]
+        @plugins[name] = uri
       end
 
       def fetch(name)

data/lib/buildkite/builder/step_collection.rb

@@ -17,12 +17,12 @@ module Buildkite
         @steps.each do |step|
           if types.include?(step.class.to_sym)
             yield step
-          end
-
-          if step.is_a?(Group)
+          elsif step.is_a?(Group)
             step.data.steps.each(*types) do |step|
               yield step
             end
+          elsif types.empty?
+            yield step
           end
         end
       end

data/lib/buildkite/builder/{template_registry.rb → template_manager.rb}

@@ -1,6 +1,6 @@
 module Buildkite
   module Builder
-    class TemplateRegistry
+    class TemplateManager
       def initialize(root)
         @templates = {}
 

data/lib/buildkite/builder.rb

@@ -20,9 +20,11 @@ module Buildkite
     autoload :Manifest, File.expand_path('builder/manifest', __dir__)
     autoload :Processors, File.expand_path('builder/processors', __dir__)
     autoload :Rainbow, File.expand_path('builder/rainbow', __dir__)
+    autoload :Plugin, File.expand_path('builder/plugin', __dir__)
+    autoload :PluginCollection, File.expand_path('builder/plugin_collection', __dir__)
     autoload :StepCollection, File.expand_path('builder/step_collection', __dir__)
-    autoload :TemplateRegistry, File.expand_path('builder/template_registry', __dir__)
-    autoload :PluginRegistry, File.expand_path('builder/plugin_registry', __dir__)
+    autoload :TemplateManager, File.expand_path('builder/template_manager', __dir__)
+    autoload :PluginManager, File.expand_path('builder/plugin_manager', __dir__)
 
     BUILDKITE_DIRECTORY_NAME = Pathname.new('.buildkite').freeze
 

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/helpers/plugins.rb

@@ -4,19 +4,13 @@ module Buildkite
   module Pipelines
     module Helpers
       module Plugins
-        def plugin(plugin_name, options = nil)
-          plugin_name = plugin_name.to_s
-          @plugins ||= {}
-
-          if @plugins.key?(plugin_name)
-            raise ArgumentError, "Plugin already used for command step: #{plugin_name}"
-          end
-
-          uri, version = step_collection.plugins.fetch(plugin_name)
-          new_plugin = Plugin.new(uri, version, options)
-          @plugins[plugin_name] = new_plugin
+        def plugin(name_or_source, options = nil)
+          attributes['plugins'] ||= Buildkite::Builder::PluginCollection.new(step_collection.plugins)
+          attributes['plugins'].add(name_or_source, options)
+        end
 
-          plugins(new_plugin.to_h)
+        def 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.beta1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorted_set
@@ -155,10 +155,12 @@ files:
 - lib/buildkite/builder/manifest.rb
 - lib/buildkite/builder/manifest/rule.rb
 - lib/buildkite/builder/pipeline.rb
-- lib/buildkite/builder/plugin_registry.rb
+- lib/buildkite/builder/plugin.rb
+- lib/buildkite/builder/plugin_collection.rb
+- lib/buildkite/builder/plugin_manager.rb
 - lib/buildkite/builder/rainbow.rb
 - lib/buildkite/builder/step_collection.rb
-- lib/buildkite/builder/template_registry.rb
+- lib/buildkite/builder/template_manager.rb
 - lib/buildkite/env.rb
 - lib/buildkite/pipelines.rb
 - lib/buildkite/pipelines/api.rb
@@ -175,7 +177,6 @@ files:
 - lib/buildkite/pipelines/helpers/skip.rb
 - lib/buildkite/pipelines/helpers/soft_fail.rb
 - lib/buildkite/pipelines/helpers/timeout_in_minutes.rb
-- lib/buildkite/pipelines/plugin.rb
 - lib/buildkite/pipelines/step_context.rb
 - lib/buildkite/pipelines/steps.rb
 - lib/buildkite/pipelines/steps/abstract.rb
@@ -204,9 +205,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:

data/lib/buildkite/pipelines/plugin.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Buildkite
-  module Pipelines
-    class Plugin
-      attr_reader :uri, :version, :options
-
-      def initialize(uri, version, options = nil)
-        @uri = uri
-        @version = version
-        @options = options
-      end
-
-      def full_uri
-        "#{uri}##{version}"
-      end
-
-      def to_h
-        Helpers.sanitize(full_uri => options)
-      end
-    end
-  end
-end