buildkite-builder 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671edc2f2b7a65af8d8c8d1390485c9591fb4814c1f9d1acb49e82fd3d648c27
-  data.tar.gz: 78f6374f0b352172d61185ed5bb9c9054dbf20581001d634d5474ffdaf13afdb
+  metadata.gz: a4927ec61e94b42ab3c54f0cdafa0c9773b24876e9f5fd067eed495269db3e08
+  data.tar.gz: c730432ae672df3893b03e1ee0a6097f0f525c2f5236df642159ae93882cdbbc
 SHA512:
-  metadata.gz: 8be88ac275466dc0dec40db8ce78f752b488b568ed7b32403977e53905fc4fd8518298716cb1864a5bb9ab6a51ea3ed3572051a839f215c76cf7b6e6efdbf218
-  data.tar.gz: 013a0a8e0ea3a56671088a1ec32994d456e83f49fd64b1b8d802b4fce53f54048581d10f21db56d213a8f9057797f494627b14e7390df83bc0b19ee6aceefb19
+  metadata.gz: 92fe3fea6d81dabd5da1eacb55445e54845ba6d53c6b059f17e665de6e794341367cdedcad6d89d14cd47a229e8503bf59120bbb6e0ccad40c2e49fa49f51589
+  data.tar.gz: fb4b849e2987e39c6bef52c3896822900151e1c8f12a00b4e825e405348bba62c3dc91275ecc93ae2ac892a96efbcb1d7b12a5962723e8b84664d96249908630

data/VERSION

@@ -1 +1 @@
-2.0.0.beta2
+2.0.0.beta3

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/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,45 @@
+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.inpect}"
+          end
+
+        @collection.select do |plugin|
+          plugin.source == source_string
+        end
+      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/{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/helpers/plugins.rb

@@ -4,19 +4,18 @@ module Buildkite
   module Pipelines
     module Helpers
       module Plugins
-        def plugin(plugin_name, options = nil)
-          plugin_name = plugin_name.to_s
-          @plugins ||= {}
+        def plugin(name_or_source, options = nil)
+          append(:plugins, plugin_collection.add(name_or_source, options).to_h)
+        end
 
-          if @plugins.key?(plugin_name)
-            raise ArgumentError, "Plugin already used for command step: #{plugin_name}"
-          end
+        def plugins
+          plugin_collection
+        end
 
-          uri, version = step_collection.plugins.fetch(plugin_name)
-          new_plugin = Plugin.new(uri, version, options)
-          @plugins[plugin_name] = new_plugin
+        private
 
-          plugins(new_plugin.to_h)
+        def plugin_collection
+          @plugin_collection ||= Buildkite::Builder::PluginCollection.new(step_collection.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.beta2
+  version: 2.0.0.beta3
 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-24 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

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