rake_factory 0.30.0.pre.5 → 0.30.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bc6f45f24a86f52229b2ba36a92c53b7de5f20f86480793224abf7860e5f225
-  data.tar.gz: e00a0089e63b0fd40909459f995822b8d2a6e46748c977511f2e996b2ee54004
+  metadata.gz: 53ae8ca634d2b17634f99bd3262d140cd80036446cca4af6d3400c09ecb3a563
+  data.tar.gz: 8e5f4e267242f671e4844bc88c7568dc265aeba64700e2cf647fe30613699839
 SHA512:
-  metadata.gz: c8f42d4b1b53bfcefb615ca55a758c0932d42233cfc62a67d6676b2b30e8b594ac7815771e99362cda91b0c92cf93fdd9ad42f925d754496ebd63cac7a6b1482
-  data.tar.gz: f03a63b6737e1de801573032ee73a3c370cd598f0a831913ccdce635c94cd2361a9726b0d617716baf541ec144d9bbdb2e0c27cb066252bff36587e8ec40787b
+  metadata.gz: f0ce4594aa132a37dd28580767978759d779c94358f6a582223d52db2d739f8ba7d187614f2a8889331cf940a8bde1fa75425cba509a3555fc2090ef6d53c8bc
+  data.tar.gz: 637f0a19b55dce094ff7f7f4a930df6b346c8ed1040bded85985ec14ed625c0a0fa33977a1049a04b1a8307813c772183267711adee2006ae79c6689a53534b8

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rake_tasklib.gemspec

data/Gemfile.lock

@@ -1,26 +1,27 @@
 PATH
   remote: .
   specs:
-    rake_factory (0.30.0.pre.5)
+    rake_factory (0.30.0.pre.6)
       activesupport (>= 4)
       rake (~> 13.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
     excon (0.92.0)
-    fakefs (1.4.1)
+    fakefs (1.8.0)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -47,18 +48,22 @@ GEM
     gem-release (2.2.2)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     lino (3.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.15.0)
+    minitest (5.16.3)
     multipart-post (2.1.1)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.22.1)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
     public_suffix (4.0.6)
+    rainbow (3.1.1)
     rake (13.0.6)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
@@ -77,6 +82,8 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -90,6 +97,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
+    rubocop (1.26.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
@@ -103,8 +126,9 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -120,7 +144,10 @@ DEPENDENCIES
   rake_gpg
   rake_ssh
   rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
   simplecov
 
 BUNDLED WITH
-   2.3.9
+   2.3.22

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -5,17 +7,20 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[
+  library:fix
+  test:unit
+]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
-      File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
-        f.write(SecureRandom.base64(36))
-      end
+      FileUtils.mkdir_p('config/secrets/ci/')
+      File.write('config/secrets/ci/encryption.passphrase',
+                 SecureRandom.base64(36))
     end
   end
 end
@@ -23,85 +28,102 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'rake_factory CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'rake_factory CI Key'
+    )
   end
 end
 
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
-    namespace: :circle_ci,
-    project_slug: 'github/infrablocks/rake_factory'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/rake_factory'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+        File.read('config/secrets/ci/encryption.passphrase')
+            .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/rake_factory',
+  namespace: :github,
+  repository: 'infrablocks/rake_factory'
 ) do |t, args|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      public_key: File.read('config/secrets/ci/ssh.public')
+    }
   ]
   t.branch_name = args.branch_name
   t.commit_message = args.commit_message
 end
 
 namespace :pipeline do
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:checkout_keys:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  desc 'Prepare CircleCI Pipeline'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 end
 
 def bump_version_for(version_type)
-  sh "gem bump --version #{version_type} " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE} [ci skip]\""
+  sh "gem bump --version #{version_type} " \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"'
 end

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "rake_factory"
+require 'bundler/setup'
+require 'rake_factory'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "rake_factory"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/rake_factory/actions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeFactory
   module Actions
     def self.included(base)
@@ -6,7 +8,7 @@ module RakeFactory
 
     def invoke_actions(args)
       self.class.actions.each do |action|
-        self.instance_exec(*[self, args].slice(0, action.arity), &action)
+        instance_exec(*[self, args].slice(0, action.arity), &action)
       end
     end
 

data/lib/rake_factory/arguments.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module RakeFactory
   module Arguments
     def initialize(*args, &configuration_block)
-      arity = self.method(:initialize).super_method.arity
+      arity = method(:initialize).super_method.arity
       super(*args.slice(0, arity), &configuration_block)
       process_arguments(args)
     end
@@ -14,9 +16,7 @@ module RakeFactory
     private
 
     def set_if_parameter(key, value)
-      if self.respond_to?("#{key}=")
-        self.send("#{key}=", value)
-      end
+      send("#{key}=", value) if respond_to?("#{key}=")
     end
   end
 end

data/lib/rake_factory/configurable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeFactory
   module Configurable
     def self.included(base)
@@ -7,7 +9,7 @@ module RakeFactory
     end
 
     def initialize(*args, &configuration_block)
-      arity = self.method(:initialize).super_method.arity
+      arity = method(:initialize).super_method.arity
       super(*args.slice(0, arity), &configuration_block)
       process_configuration_block(configuration_block)
     end
@@ -17,19 +19,18 @@ module RakeFactory
     end
 
     def invoke_configuration_block_on(target, args)
-      if configuration_block
-        params = args ? [target, args] : [target]
-        configuration_block.call(
-            *params.slice(0, configuration_block.arity))
-      end
+      return unless configuration_block
+
+      params = args ? [target, args] : [target]
+      configuration_block.call(
+        *params.slice(0, configuration_block.arity)
+      )
     end
 
     private
 
     def set_if_value_present(key, value)
-      if self.respond_to?("#{key}=") && !value.nil?
-        self.send("#{key}=", value)
-      end
+      send("#{key}=", value) if respond_to?("#{key}=") && !value.nil?
     end
   end
-end
+end

data/lib/rake_factory/defaults.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
 
@@ -15,24 +17,13 @@ module RakeFactory
       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
+          name_parameter
+          argument_names_parameter
+          prerequisites_parameter
+          order_only_prerequisites_parameter
+          description_parameter
+
+          maybe_set_default_name(inheritor)
         end
       end
 
@@ -50,13 +41,51 @@ module RakeFactory
 
       def default_order_only_prerequisites(order_only_prerequisites)
         parameter_set
-            .update_default_for(
-                :order_only_prerequisites, order_only_prerequisites)
+          .update_default_for(
+            :order_only_prerequisites, order_only_prerequisites
+          )
       end
 
       def default_description(description)
         parameter_set.update_default_for(:description, description)
       end
+
+      private
+
+      def maybe_set_default_name(inheritor)
+        return if inheritor.name.nil?
+
+        default_name inheritor.name.demodulize.underscore
+      end
+
+      def description_parameter
+        parameter(:description,
+                  configurable: false)
+      end
+
+      def order_only_prerequisites_parameter
+        parameter(:order_only_prerequisites,
+                  configurable: false,
+                  default: [])
+      end
+
+      def prerequisites_parameter
+        parameter(:prerequisites,
+                  configurable: false,
+                  default: [])
+      end
+
+      def argument_names_parameter
+        parameter(:argument_names,
+                  configurable: false,
+                  default: [])
+      end
+
+      def name_parameter
+        parameter(:name,
+                  configurable: false,
+                  transform: ->(n) { n.respond_to?(:to_sym) ? n.to_sym : n })
+      end
     end
   end
-end
+end

data/lib/rake_factory/definable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeFactory
   module Definable
     def inherited(inheritor)
@@ -9,4 +11,4 @@ module RakeFactory
       end
     end
   end
-end
+end

data/lib/rake_factory/exceptions.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module RakeFactory
   class RequiredParameterUnset < ::StandardError
   end
-end
+end

data/lib/rake_factory/kernel_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'values'
 
 module Kernel

data/lib/rake_factory/namespaceable.rb

@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 module RakeFactory
   module Namespaceable
+    # rubocop:disable Metrics/MethodLength
     def self.prepended(base)
       super(base)
       base.class_eval do
-        parameter(:namespace,
-            transform: lambda { |name|
-              name = name.to_s if name.kind_of?(Symbol)
-              name = name.to_str if name.respond_to?(:to_str)
-              unless name.kind_of?(String) || name.nil?
-                raise ArgumentError,
-                    "Expected a String or Symbol for a namespace name"
-              end
-              name
-            })
+        parameter(:namespace, transform: lambda { |name|
+          name = name.to_s if name.is_a?(Symbol)
+          name = name.to_str if name.respond_to?(:to_str)
+          unless name.is_a?(String) || name.nil?
+            raise ArgumentError,
+                  'Expected a String or Symbol for a namespace name'
+          end
+          name
+        })
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def around_define(application)
       if namespace

data/lib/rake_factory/parameter.rb

@@ -1,22 +1,19 @@
+# frozen_string_literal: true
+
 require_relative 'values'
 
 module RakeFactory
   class Parameter
-    attr_reader(
-        :name,
-        :default,
-        :required,
-        :configurable,
-        :transform)
-    attr_writer(:default)
+    attr_accessor :default
+    attr_reader :name, :required, :configurable, :transform
 
     def initialize(name, options)
       @name = name
       @default = options[:default]
       @required = options[:required] || false
-      @transform = options[:transform] || lambda { |x| x }
+      @transform = options[:transform] || ->(x) { x }
       @configurable =
-          options[:configurable].nil? ? true : !!options[:configurable]
+        options[:configurable].nil? ? true : !!options[:configurable]
     end
 
     def writer_method
@@ -35,14 +32,11 @@ module RakeFactory
       parameter = self
       klass.class_eval do
         define_method parameter.writer_method do |value|
-          instance_variable_set(parameter.instance_variable, value)
+          parameter.set(self, value)
         end
 
         define_method parameter.reader_method do
-          stored_value = instance_variable_get(parameter.instance_variable)
-          resolved_value = Values.resolve(stored_value).evaluate([self])
-          transformed_value = parameter.transform.call(resolved_value)
-          transformed_value
+          parameter.get(self)
         end
       end
     end
@@ -66,5 +60,15 @@ module RakeFactory
     def satisfied_by?(instance)
       !dissatisfied_by?(instance)
     end
+
+    def set(target, value)
+      target.instance_variable_set(instance_variable, value)
+    end
+
+    def get(target)
+      stored_value = target.instance_variable_get(instance_variable)
+      resolved_value = Values.resolve(stored_value).evaluate([target])
+      transform.call(resolved_value)
+    end
   end
-end
+end

data/lib/rake_factory/parameter_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'parameter'
 require_relative 'exceptions'
 
@@ -26,7 +28,7 @@ module RakeFactory
     end
 
     def apply_defaults_to(instance)
-      @parameter_set.values.each do |parameter|
+      @parameter_set.each_value do |parameter|
         parameter.apply_default_to(instance)
       end
     end
@@ -35,19 +37,19 @@ module RakeFactory
       dissatisfied = @parameter_set.values.reject do |parameter|
         parameter.satisfied_by?(instance)
       end
-      unless dissatisfied.empty?
-        names = dissatisfied.map(&:name)
-        names_string = names.join(',')
-        pluralisation_string = names.length > 1 ? 's' : ''
+      return if dissatisfied.empty?
+
+      names = dissatisfied.map(&:name)
+      names_string = names.join(',')
+      pluralisation_string = names.length > 1 ? 's' : ''
 
-        raise RequiredParameterUnset,
+      raise RequiredParameterUnset,
             "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)])
+        acc.merge({ key => parameter.read_from(instance) })
       end
     end
   end

data/lib/rake_factory/parameter_view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'values'
 
 module RakeFactory
@@ -5,23 +7,9 @@ module RakeFactory
     attr_reader(:task)
 
     def initialize(target, reader_class, writer_class, runtime_arguments)
-      self.instance_eval do
-        reader_class.parameter_set.each do |parameter|
-          define_singleton_method parameter.reader_method do
-            target.send(parameter.reader_method)
-          end
-        end
-        writer_class.parameter_set.each do |parameter|
-          if parameter.configurable?
-            define_singleton_method parameter.writer_method do |value|
-              if target.respond_to?(parameter.writer_method)
-                target.send(
-                    parameter.writer_method,
-                    Values.resolve(value).append_argument(runtime_arguments))
-              end
-            end
-          end
-        end
+      instance_eval do
+        define_reader_methods(target, reader_class)
+        define_writer_methods(target, writer_class, runtime_arguments)
       end
       self.class.instance_eval do
         define_singleton_method :parameter_set do
@@ -29,5 +17,38 @@ module RakeFactory
         end
       end
     end
+
+    private
+
+    def define_reader_methods(target, reader_class)
+      reader_class.parameter_set.each do |parameter|
+        define_reader_method(target, parameter)
+      end
+    end
+
+    def define_reader_method(target, parameter)
+      define_singleton_method parameter.reader_method do
+        target.send(parameter.reader_method)
+      end
+    end
+
+    def define_writer_methods(target, writer_class, runtime_arguments)
+      writer_class.parameter_set.each do |parameter|
+        define_writer_method(target, parameter, runtime_arguments)
+      end
+    end
+
+    def define_writer_method(target, parameter, runtime_arguments)
+      return unless parameter.configurable?
+
+      define_singleton_method parameter.writer_method do |value|
+        if target.respond_to?(parameter.writer_method)
+          target.send(
+            parameter.writer_method,
+            Values.resolve(value).append_argument(runtime_arguments)
+          )
+        end
+      end
+    end
   end
 end

data/lib/rake_factory/parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'parameter_set'
 
 module RakeFactory
@@ -7,7 +9,7 @@ module RakeFactory
     end
 
     def initialize(*args, &configuration_block)
-      arity = self.method(:initialize).super_method.arity
+      arity = method(:initialize).super_method.arity
       super(*args.slice(0, arity), &configuration_block)
       setup_parameter_defaults
     end

data/lib/rake_factory/task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/tasklib'
 
 require_relative 'parameters'
@@ -21,21 +23,9 @@ module RakeFactory
     def define_on(application)
       creator = self
 
-      @task = application.define_task(
-          Rake::Task,
-          name,
-          argument_names => prerequisites,
-          order_only: order_only_prerequisites
-      ) do |_, args|
-        view = ParameterView.new(self, self.class, self.class, args)
-        invoke_configuration_block_on(view, args)
-        check_parameter_requirements
-        invoke_actions(args)
-      end
-      @task.add_description(description)
-      @task.instance_eval do
-        define_singleton_method(:creator) { creator }
-      end
+      define_task(application)
+      add_description
+      add_creator(creator)
 
       self
     end
@@ -47,5 +37,38 @@ module RakeFactory
         super(method, *args, &block)
       end
     end
+
+    def respond_to_missing?(method, include_private = false)
+      @task.respond_to?(method) || super
+    end
+
+    private
+
+    def parameter_view(args)
+      ParameterView.new(self, self.class, self.class, args)
+    end
+
+    def define_task(application)
+      @task = application.define_task(
+        Rake::Task,
+        name,
+        argument_names => prerequisites,
+        order_only: order_only_prerequisites
+      ) do |_, args|
+        invoke_configuration_block_on(parameter_view(args), args)
+        check_parameter_requirements
+        invoke_actions(args)
+      end
+    end
+
+    def add_description
+      @task.add_description(description)
+    end
+
+    def add_creator(creator)
+      @task.instance_eval do
+        define_singleton_method(:creator) { creator }
+      end
+    end
   end
 end

data/lib/rake_factory/task_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/tasklib'
 
 require_relative 'values'
@@ -27,19 +29,17 @@ module RakeFactory
       around_define(application) do
         self.class.tasks.each do |task_definition|
           task_definition
-              .for_task_set(self)
-              .define_on(application)
+            .for_task_set(self)
+            .define_on(application)
         end
       end
       self
     end
 
-    def around_define(application)
+    def around_define(_application)
       yield
     end
 
-    private
-
     class TaskArguments
       attr_reader :arguments, :task_set
 
@@ -53,21 +53,21 @@ module RakeFactory
       end
 
       def parameter_hash
-        arguments.first.is_a?(Hash) ?
-            arguments.first :
-            {}
+        if arguments.first.is_a?(Hash)
+          arguments.first
+        else
+          {}
+        end
       end
 
       def resolve
-        if arguments.empty?
-          return [parameter_overrides]
-        end
+        return [parameter_overrides] if arguments.empty?
 
         if arguments.first.is_a?(Hash)
           return [
-              parameter_overrides
-                  .merge(process_parameter_hash(arguments.first)),
-              *arguments.drop(1)
+            parameter_overrides
+                 .merge(process_parameter_hash(arguments.first)),
+            *arguments.drop(1)
           ]
         end
 
@@ -108,9 +108,10 @@ module RakeFactory
       end
 
       def define_on(application)
-        if should_define?
-          klass.new(*resolve_arguments, &resolve_block).define_on(application)
-        end
+        return unless should_define?
+
+        klass.new(*resolve_arguments, &resolve_block)
+             .define_on(application)
       end
 
       private
@@ -120,9 +121,11 @@ module RakeFactory
       end
 
       def should_define?
-        task_arguments.parameter_hash.include?(:define_if) ?
-            task_arguments.parameter_hash[:define_if].call(task_set) :
-            true
+        if task_arguments.parameter_hash.include?(:define_if)
+          task_arguments.parameter_hash[:define_if].call(task_set)
+        else
+          true
+        end
       end
 
       def resolve_arguments
@@ -130,16 +133,24 @@ module RakeFactory
       end
 
       def resolve_block
-        lambda do |t, args|
-          if block.respond_to?(:call)
-            block.call(*[task_set, t, args].slice(0, block.arity))
-          end
-          if task_set.configuration_block.respond_to?(:call)
-            view = ParameterView.new(t, t.class, task_set.class, args)
-            task_set.invoke_configuration_block_on(view, args)
-          end
+        lambda do |task, args|
+          maybe_call_block(task, args)
+          maybe_call_configuration_block(task, args)
         end
       end
+
+      def maybe_call_configuration_block(task, args)
+        return unless task_set.configuration_block.respond_to?(:call)
+
+        view = ParameterView.new(task, task.class, task_set.class, args)
+        task_set.invoke_configuration_block_on(view, args)
+      end
+
+      def maybe_call_block(task, args)
+        return unless block.respond_to?(:call)
+
+        block.call(*[task_set, task, args].slice(0, block.arity))
+      end
     end
 
     private_constant :TaskArguments

data/lib/rake_factory/values.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeFactory
   module Values
     def self.resolve(value)
@@ -28,11 +30,15 @@ module RakeFactory
     end
 
     def prepend_argument(argument)
-      self.class.new([argument, *@pre_arguments], @post_arguments, &@block)
+      self.class.new(
+        [argument, *@pre_arguments], @post_arguments, &@block
+      )
     end
 
     def append_argument(argument)
-      self.class.new(@pre_arguments, [*@post_arguments, argument], &@block)
+      self.class.new(
+        @pre_arguments, [*@post_arguments, argument], &@block
+      )
     end
 
     def evaluate(arguments)

data/lib/rake_factory/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeFactory
-  VERSION = '0.30.0.pre.5'
+  VERSION = '0.30.0.pre.6'
 end

data/lib/rake_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory/version'
 require 'rake_factory/task'
 require 'rake_factory/task_set'

data/rake_factory.gemspec

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rake_factory/version'
+
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  rake_factory.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
+Gem::Specification.new do |spec|
+  spec.name = 'rake_factory'
+  spec.version = RakeFactory::VERSION
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
+
+  spec.summary =
+    'Base classes and modules to aid in creating custom rake tasks.'
+  spec.description =
+    'Provides base classes and modules to allow declarative definition of ' \
+    'rake tasks.'
+  spec.homepage = 'https://github.com/infrablocks/rake_factory'
+  spec.license = 'MIT'
+
+  spec.files = `git ls-files -z`.split("\x0").select do |f|
+    f.match(/^(#{files.map { |g| Regexp.escape(g) }.join('|')})/)
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.7'
+
+  spec.add_dependency 'activesupport', '>= 4'
+  spec.add_dependency 'rake', '~> 13.0'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'fakefs'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_github'
+  spec.add_development_dependency 'rake_gpg'
+  spec.add_development_dependency 'rake_ssh'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
+
+  spec.metadata['rubygems_mfa_required'] = 'false'
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rake_factory
 version: !ruby/object:Gem::Version
-  version: 0.30.0.pre.5
+  version: 0.30.0.pre.6
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -25,21 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +179,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -211,10 +253,12 @@ files:
 - lib/rake_factory/task_set.rb
 - lib/rake_factory/values.rb
 - lib/rake_factory/version.rb
+- rake_factory.gemspec
 homepage: https://github.com/infrablocks/rake_factory
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []
 require_paths: