rake_factory 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3409c8bba7e91bcb9287e1ba2f454a27e64a9cf0ede8d32bd560c71959e28cae
-  data.tar.gz: 9fe487e9a057cd5e4a4a7bcae3bdf0752f0715f3d5f00a1a52cfbad9c27f7573
+  metadata.gz: 3ec32ca688b8984c5ae191170b977709dd1b1770a18fba47c5af8390d1092302
+  data.tar.gz: 5bd164bcacccd44e9db7997855a540c7d289fdb977233e48ac6456d7c467e4ba
 SHA512:
-  metadata.gz: 208d93005b80ed7373af2ccd1be79afb961c320fb47dc428c098e3e337537e5dfc229b4c34d96fa549bb5b1b2b9716d6c550cf65cebdff220099545a675d03d2
-  data.tar.gz: 124f0d4f6efa6b97289905a4b82d6b47b843721a1e20a05a9e57fa328d52115d52fc1af9728909c7c011bdfa6ad64a4f3f3eb1a2c8b4d452d2760928b179cef7
+  metadata.gz: 3af977187b1542e5c039478f7d583989b2a9dd1f974721c314f69c1aeb329fa23e777d06480a781e8acc278e40458ad13f4a1db64fcd92dd40c2a9bf86e787cb
+  data.tar.gz: 3ed7c35c6ea466c6e7bd5ad8460b9edd21f361501b555aab7766eda009759acb6658ccdc86d98e3d685ae9e96ccbbe295bf5539a561da7f507abba78680f9d75

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_factory (0.4.0)
+    rake_factory (0.5.0)
       activesupport (~> 5.2)
       rake (~> 13.0)
 

data/lib/rake_factory/actions.rb

@@ -1,11 +1,23 @@
 module RakeFactory
   module Actions
-    def actions
-      @actions ||= []
+    def self.included(base)
+      base.extend(ClassMethods)
     end
 
-    def action(&action_block)
-      actions << action_block
+    def invoke_actions(args)
+      self.class.actions.each do |action|
+        self.instance_exec(*[self, args].slice(0, action.arity), &action)
+      end
+    end
+
+    module ClassMethods
+      def actions
+        @actions ||= []
+      end
+
+      def action(&action_block)
+        actions << action_block
+      end
     end
   end
 end

data/lib/rake_factory/arguments.rb

@@ -0,0 +1,22 @@
+module RakeFactory
+  module Arguments
+    def initialize(*args, &configuration_block)
+      arity = self.method(:initialize).super_method.arity
+      super(*args.slice(0, arity), &configuration_block)
+      process_arguments(args)
+    end
+
+    def process_arguments(args)
+      opts = args.first || {}
+      opts.each { |key, value| set_if_value_present(key, value) }
+    end
+
+    private
+
+    def set_if_value_present(key, value)
+      if self.respond_to?("#{key}=") && !value.nil?
+        self.send("#{key}=", value)
+      end
+    end
+  end
+end

data/lib/rake_factory/configurable.rb

@@ -0,0 +1,36 @@
+module RakeFactory
+  module Configurable
+    def self.included(base)
+      base.class_eval do
+        attr_accessor(:configuration_block)
+      end
+    end
+
+    def initialize(*args, &configuration_block)
+      arity = self.method(:initialize).super_method.arity
+      super(*args.slice(0, arity), &configuration_block)
+      process_configuration_block(configuration_block)
+    end
+
+    def process_configuration_block(configuration_block)
+      set_if_value_present(:configuration_block, configuration_block)
+    end
+
+    def invoke_configuration_block(args=nil)
+      if configuration_block
+        view = ParameterView.new(self, args)
+        params = args ? [view, args] : [view]
+        configuration_block.call(
+            *params.slice(0, configuration_block.arity))
+      end
+    end
+
+    private
+
+    def set_if_value_present(key, value)
+      if self.respond_to?("#{key}=") && !value.nil?
+        self.send("#{key}=", value)
+      end
+    end
+  end
+end

data/lib/rake_factory/defaults.rb

@@ -5,52 +5,58 @@ require_relative 'parameters'
 
 module RakeFactory
   module Defaults
-    include Parameters
-
-    def inherited(inheritor)
-      super(inheritor)
-      inheritor.class_eval do
-        parameter(:name,
-            configurable: false,
-            transform: lambda { |n| n.to_sym })
-        parameter(:argument_names,
-            configurable: false,
-            default: [])
-        parameter(:prerequisites,
-            configurable: false,
-            default: [])
-        parameter(:order_only_prerequisites,
-            configurable: false,
-            default: [])
-        parameter(:description,
-            configurable: false)
-
-        unless inheritor.name.nil?
-          default_name inheritor.name.demodulize.underscore
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      include Parameters
+
+      def inherited(inheritor)
+        super(inheritor)
+        inheritor.class_eval do
+          parameter(:name,
+              configurable: false,
+              transform: lambda { |n| n.to_sym })
+          parameter(:argument_names,
+              configurable: false,
+              default: [])
+          parameter(:prerequisites,
+              configurable: false,
+              default: [])
+          parameter(:order_only_prerequisites,
+              configurable: false,
+              default: [])
+          parameter(:description,
+              configurable: false)
+
+          unless inheritor.name.nil?
+            default_name inheritor.name.demodulize.underscore
+          end
         end
       end
-    end
 
-    def default_name(name)
-      parameter_set.update_default_for(:name, name)
-    end
+      def default_name(name)
+        parameter_set.update_default_for(:name, name)
+      end
 
-    def default_argument_names(argument_names)
-      parameter_set.update_default_for(:argument_names, argument_names)
-    end
+      def default_argument_names(argument_names)
+        parameter_set.update_default_for(:argument_names, argument_names)
+      end
 
-    def default_prerequisites(prerequisites)
-      parameter_set.update_default_for(:prerequisites, prerequisites)
-    end
+      def default_prerequisites(prerequisites)
+        parameter_set.update_default_for(:prerequisites, prerequisites)
+      end
 
-    def default_order_only_prerequisites(order_only_prerequisites)
-      parameter_set
-          .update_default_for(
-              :order_only_prerequisites, order_only_prerequisites)
-    end
+      def default_order_only_prerequisites(order_only_prerequisites)
+        parameter_set
+            .update_default_for(
+                :order_only_prerequisites, order_only_prerequisites)
+      end
 
-    def default_description(description)
-      parameter_set.update_default_for(:description, description)
+      def default_description(description)
+        parameter_set.update_default_for(:description, description)
+      end
     end
   end
 end

data/lib/rake_factory/definable.rb

@@ -0,0 +1,12 @@
+module RakeFactory
+  module Definable
+    def inherited(inheritor)
+      super(inheritor)
+      inheritor.singleton_class.class_eval do
+        define_method :define do |*args, &block|
+          inheritor.new(*args, &block).define_on(Rake.application)
+        end
+      end
+    end
+  end
+end

data/lib/rake_factory/parameter.rb

@@ -51,13 +51,16 @@ module RakeFactory
       instance.send(writer_method, @default) unless @default.nil?
     end
 
+    def read_from(instance)
+      instance.send(reader_method)
+    end
+
     def configurable?
       @configurable
     end
 
     def dissatisfied_by?(instance)
-      value = instance.send(reader_method)
-      @required && value.nil?
+      @required && read_from(instance).nil?
     end
 
     def satisfied_by?(instance)

data/lib/rake_factory/parameter_set.rb

@@ -44,5 +44,11 @@ module RakeFactory
             "Required parameter#{pluralisation_string} #{names_string} unset."
       end
     end
+
+    def read_from(instance)
+      @parameter_set.reduce({}) do |acc, (key, parameter)|
+        acc.merge(Hash[key, parameter.read_from(instance)])
+      end
+    end
   end
 end

data/lib/rake_factory/parameter_view.rb

@@ -12,8 +12,9 @@ module RakeFactory
           if parameter.configurable?
             define_singleton_method parameter.writer_method do |value|
               resolved_value = lambda do |t|
+                params = args ? [t, args] : [t]
                 value.respond_to?(:call) ?
-                    value.call(*[t, args].slice(0, value.arity)) :
+                    value.call(*params.slice(0, value.arity)) :
                     value
               end
               task.send(parameter.writer_method, resolved_value)

data/lib/rake_factory/parameters.rb

@@ -2,13 +2,37 @@ require_relative 'parameter_set'
 
 module RakeFactory
   module Parameters
-    def parameter_set
-      @parameter_set ||= ParameterSet.new
+    def self.included(base)
+      base.extend(ClassMethods)
     end
 
-    def parameter(name, options = {})
-      parameter = parameter_set.add(name, options)
-      parameter.define_on(self)
+    def initialize(*args, &configuration_block)
+      arity = self.method(:initialize).super_method.arity
+      super(*args.slice(0, arity), &configuration_block)
+      setup_parameter_defaults
+    end
+
+    def parameter_values
+      self.class.parameter_set.read_from(self)
+    end
+
+    def setup_parameter_defaults
+      self.class.parameter_set.apply_defaults_to(self)
+    end
+
+    def check_parameter_requirements
+      self.class.parameter_set.enforce_requirements_on(self)
+    end
+
+    module ClassMethods
+      def parameter_set
+        @parameter_set ||= ParameterSet.new
+      end
+
+      def parameter(name, options = {})
+        parameter = parameter_set.add(name, options)
+        parameter.define_on(self)
+      end
     end
   end
-end
+end

data/lib/rake_factory/task.rb

@@ -3,63 +3,24 @@ require 'rake/tasklib'
 require_relative 'parameters'
 require_relative 'parameter_view'
 require_relative 'actions'
+require_relative 'configurable'
 require_relative 'defaults'
+require_relative 'definable'
+require_relative 'arguments'
 
 module RakeFactory
   class Task < ::Rake::TaskLib
-    extend Parameters
-    extend Actions
-    extend Defaults
+    extend Definable
 
-    attr_accessor(:configuration_block)
-
-    def self.inherited(inheritor)
-      super(inheritor)
-      inheritor.singleton_class.class_eval do
-        define_method :define do |*args, &block|
-          inheritor.new(*args, &block).define_on(Rake.application)
-        end
-      end
-    end
-
-    def initialize(*args, &configuration_block)
-      setup_parameter_defaults
-      process_arguments(args)
-      process_configuration_block(configuration_block)
-    end
-
-    def setup_parameter_defaults
-      self.class.parameter_set.apply_defaults_to(self)
-    end
-
-    def process_arguments(args)
-      opts = args.first || {}
-      opts.each { |key, value| set_if_value_present(key, value) }
-    end
-
-    def process_configuration_block(configuration_block)
-      set_if_value_present(:configuration_block, configuration_block)
-    end
-
-    def invoke_configuration_block(args)
-      if configuration_block
-        view = ParameterView.new(self, args)
-        configuration_block.call(
-            *[view, args].slice(0, configuration_block.arity))
-      end
-    end
-
-    def check_parameter_requirements
-      self.class.parameter_set.enforce_requirements_on(self)
-    end
-
-    def invoke_actions(args)
-      self.class.actions.each do |action|
-        self.instance_exec(*[self, args].slice(0, action.arity), &action)
-      end
-    end
+    include Parameters
+    include Configurable
+    include Defaults
+    include Arguments
+    include Actions
 
     def define_on(application)
+      creator = self
+
       @task = application.define_task(
           Rake::Task,
           name,
@@ -71,6 +32,9 @@ module RakeFactory
         invoke_actions(args)
       end
       @task.add_description(description)
+      @task.instance_eval do
+        define_singleton_method(:creator) { creator }
+      end
 
       self
     end
@@ -82,13 +46,5 @@ module RakeFactory
         super(method, *args, &block)
       end
     end
-
-    private
-
-    def set_if_value_present(key, value)
-      if self.respond_to?("#{key}=") && !value.nil?
-        self.send("#{key}=", value)
-      end
-    end
   end
 end

data/lib/rake_factory/task_set.rb

@@ -0,0 +1,77 @@
+require 'rake/tasklib'
+
+require_relative 'parameters'
+require_relative 'definable'
+require_relative 'defaults'
+
+module RakeFactory
+  class TaskSet < ::Rake::TaskLib
+    extend Definable
+
+    include Parameters
+    include Configurable
+    include Arguments
+
+    class TaskDefinition
+      attr_accessor :klass, :args, :overrides, :block
+
+      def initialize(klass, *args, &block)
+        self.klass = klass
+        self.args = args
+        self.block = block
+        self.overrides = {}
+      end
+
+      def with_overrides(overrides)
+        self.overrides = overrides
+        self
+      end
+
+      def define_on(application)
+        self.klass.new(*resolved_args, &self.block)
+            .define_on(application)
+      end
+
+      private
+
+      def resolved_args
+        initial_args = self.args.empty? && self.overrides ?
+            [self.overrides] : self.args
+
+        unless initial_args.first && initial_args.first.is_a?(Hash)
+          return initial_args
+        end
+
+        other_args = initial_args.drop(1)
+        merged_parameters = initial_args.first.merge(self.overrides)
+        merged_parameters = merged_parameters.include?(:name_parameter) ?
+            {name: self.overrides[merged_parameters[:name_parameter]]}
+                .merge(merged_parameters) :
+            merged_parameters
+
+        [merged_parameters, *other_args]
+      end
+    end
+
+    class << self
+      def tasks
+        @tasks ||= []
+      end
+
+      def task(klass, *args, &block)
+        tasks << TaskDefinition.new(klass, *args, &block)
+      end
+    end
+
+    def define_on(application)
+      invoke_configuration_block
+      parameter_values = self.parameter_values
+      self.class.tasks.each do |task_definition|
+        task_definition
+            .with_overrides(parameter_values)
+            .define_on(application)
+      end
+      self
+    end
+  end
+end

data/lib/rake_factory/version.rb

@@ -1,3 +1,3 @@
 module RakeFactory
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/rake_factory.rb

@@ -1,5 +1,6 @@
 require 'rake_factory/version'
 require 'rake_factory/task'
+require 'rake_factory/task_set'
 
 module RakeFactory
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_factory
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,13 +145,17 @@ files:
 - go
 - lib/rake_factory.rb
 - lib/rake_factory/actions.rb
+- lib/rake_factory/arguments.rb
+- lib/rake_factory/configurable.rb
 - lib/rake_factory/defaults.rb
+- lib/rake_factory/definable.rb
 - lib/rake_factory/exceptions.rb
 - lib/rake_factory/parameter.rb
 - lib/rake_factory/parameter_set.rb
 - lib/rake_factory/parameter_view.rb
 - lib/rake_factory/parameters.rb
 - lib/rake_factory/task.rb
+- lib/rake_factory/task_set.rb
 - lib/rake_factory/version.rb
 - rake_factory.gemspec
 - scripts/ci/common/configure-git.sh