gemsmith 17.0.0 → 18.0.1

data/lib/gemsmith/builders/circle_ci.rb

@@ -19,7 +19,8 @@ module Gemsmith
         return configuration unless configuration.build_circle_ci
 
         builder.call(configuration.merge(template_path: "%project_name%/.circleci/config.yml.erb"))
-               .replace("Gemfile.lock", "#{configuration.project_name}.gemspec")
+               .replace %({{checksum "Gemfile.lock"}}),
+                        %({{checksum "Gemfile"}}-{{checksum "#{project_name}.gemspec"}})
 
         configuration
       end
@@ -27,6 +28,8 @@ module Gemsmith
       private
 
       attr_reader :configuration, :builder
+
+      def project_name = configuration.project_name
     end
   end
 end

data/lib/gemsmith/builders/cli.rb

@@ -47,16 +47,24 @@ module Gemsmith
                CONTENT
       end
 
-      def render_library
+      def render_configuration
         [
-          "%project_name%/lib/%project_path%/cli/actions/config.rb.erb",
-          "%project_name%/lib/%project_path%/cli/parser.rb.erb",
-          "%project_name%/lib/%project_path%/cli/parsers/core.rb.erb",
-          "%project_name%/lib/%project_path%/cli/shell.rb.erb",
           "%project_name%/lib/%project_path%/configuration/content.rb.erb",
           "%project_name%/lib/%project_path%/configuration/defaults.yml.erb",
           "%project_name%/lib/%project_path%/configuration/loader.rb.erb",
-          "%project_name%/lib/%project_path%/container.rb.erb"
+          "%project_name%/lib/%project_path%/container.rb.erb",
+          "%project_name%/lib/%project_path%/import.rb.erb"
+        ].each { |path| builder.call(configuration.merge(template_path: path)).render }
+      end
+
+      def render_cli
+        [
+          "%project_name%/lib/%project_path%/cli/actions/config.rb.erb",
+          "%project_name%/lib/%project_path%/cli/actions/container.rb.erb",
+          "%project_name%/lib/%project_path%/cli/actions/import.rb.erb",
+          "%project_name%/lib/%project_path%/cli/parser.rb.erb",
+          "%project_name%/lib/%project_path%/cli/parsers/core.rb.erb",
+          "%project_name%/lib/%project_path%/cli/shell.rb.erb"
         ].each { |path| builder.call(configuration.merge(template_path: path)).render }
       end
 
@@ -77,7 +85,7 @@ module Gemsmith
         return unless configuration.build_rspec
 
         [
-          "%project_name%/spec/support/shared_contexts/application_container.rb.erb",
+          "%project_name%/spec/support/shared_contexts/application_dependencies.rb.erb",
           "%project_name%/spec/support/shared_examples/a_parser.rb.erb"
         ].each { |path| builder.call(configuration.merge(template_path: path)).render }
       end

data/lib/gemsmith/builders/git/commit.rb

@@ -5,12 +5,15 @@ module Gemsmith
     module Git
       # Builds project skeleton initial Git commit message.
       class Commit
+        include Import[:specification]
+
         def self.call(...) = new(...).call
 
-        def initialize configuration, builder: Rubysmith::Builder, container: Container
+        def initialize configuration, builder: Rubysmith::Builder, **dependencies
+          super(**dependencies)
+
           @configuration = configuration
           @builder = builder
-          @container = container
         end
 
         def call
@@ -28,7 +31,7 @@ module Gemsmith
 
         private
 
-        attr_reader :configuration, :builder, :container
+        attr_reader :configuration, :builder
 
         def body
           <<~CONTENT
@@ -38,8 +41,6 @@ module Gemsmith
         end
 
         def project_name = configuration.project_name
-
-        def specification = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/actions/config.rb

@@ -5,9 +5,12 @@ module Gemsmith
     module Actions
       # Handles the config action.
       class Config
-        def initialize client: Configuration::Loader::CLIENT, container: Container
+        include Gemsmith::Import[:kernel, :logger]
+
+        def initialize client: Configuration::Loader::CLIENT, **dependencies
+          super(**dependencies)
+
           @client = client
-          @container = container
         end
 
         def call selection
@@ -20,15 +23,11 @@ module Gemsmith
 
         private
 
-        attr_reader :client, :container
+        attr_reader :client
 
         def edit = kernel.system("$EDITOR #{client.current}")
 
         def view = kernel.system("cat #{client.current}")
-
-        def kernel = container[__method__]
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/actions/container.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "dry/container"
+
+module Gemsmith
+  module CLI
+    module Actions
+      # Provides a single container with application and action specific dependencies.
+      module Container
+        extend Dry::Container::Mixin
+
+        config.registry = ->(container, key, value, _options) { container[key.to_s] = value }
+
+        merge Gemsmith::Container
+
+        register(:config) { Config.new }
+        register(:build) { Build.new }
+        register(:install) { Install.new }
+        register(:publish) { Publish.new }
+        register(:edit) { Edit.new }
+        register(:view) { View.new }
+      end
+    end
+  end
+end

data/lib/gemsmith/cli/actions/edit.rb

@@ -8,12 +8,14 @@ module Gemsmith
     module Actions
       # Handles the edit action for editing an installed gem.
       class Edit
+        include Gemsmith::Import[:kernel, :logger]
         include Dry::Monads[:result]
 
-        def initialize picker: Spek::Picker, editor: Tools::Editor.new, container: Container
+        def initialize picker: Spek::Picker, editor: Tools::Editor.new, **dependencies
+          super(**dependencies)
+
           @picker = picker
           @editor = editor
-          @container = container
         end
 
         def call gem_name
@@ -26,13 +28,9 @@ module Gemsmith
 
         private
 
-        attr_reader :picker, :editor, :container
+        attr_reader :picker, :editor
 
         def error(&) = logger.error(&)
-
-        def kernel = container[__method__]
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/actions/import.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "auto_injector"
+
+module Gemsmith
+  module CLI
+    module Actions
+      Import = AutoInjector[Container]
+    end
+  end
+end

data/lib/gemsmith/cli/actions/install.rb

@@ -8,12 +8,14 @@ module Gemsmith
     module Actions
       # Handles the install action.
       class Install
+        include Gemsmith::Import[:logger]
         include Dry::Monads[:result]
 
-        def initialize installer: Tools::Installer.new, loader: Spek::Loader, container: Container
+        def initialize installer: Tools::Installer.new, loader: Spek::Loader, **dependencies
+          super(**dependencies)
+
           @installer = installer
           @loader = loader
-          @container = container
         end
 
         def call configuration
@@ -26,11 +28,9 @@ module Gemsmith
 
         private
 
-        attr_reader :installer, :loader, :container
+        attr_reader :installer, :loader
 
         def error(&) = logger.error(&)
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/actions/publish.rb

@@ -8,12 +8,14 @@ module Gemsmith
     module Actions
       # Handles the publish action.
       class Publish
+        include Gemsmith::Import[:logger]
         include Dry::Monads[:result]
 
-        def initialize publisher: Tools::Publisher.new, loader: Spek::Loader, container: Container
+        def initialize publisher: Tools::Publisher.new, loader: Spek::Loader, **dependencies
+          super(**dependencies)
+
           @publisher = publisher
           @loader = loader
-          @container = container
         end
 
         def call configuration
@@ -26,11 +28,9 @@ module Gemsmith
 
         private
 
-        attr_reader :publisher, :loader, :container
+        attr_reader :publisher, :loader
 
         def error(&) = logger.error(&)
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/actions/view.rb

@@ -8,12 +8,14 @@ module Gemsmith
     module Actions
       # Handles the view action for viewing an installed gem in default browser.
       class View
+        include Gemsmith::Import[:kernel, :logger]
         include Dry::Monads[:result]
 
-        def initialize picker: Spek::Picker, viewer: Tools::Viewer.new, container: Container
+        def initialize picker: Spek::Picker, viewer: Tools::Viewer.new, **dependencies
+          super(**dependencies)
+
           @picker = picker
           @viewer = viewer
-          @container = container
         end
 
         def call gem_name
@@ -26,13 +28,9 @@ module Gemsmith
 
         private
 
-        attr_reader :picker, :viewer, :container
+        attr_reader :picker, :viewer
 
         def error(&) = logger.error(&)
-
-        def kernel = container[__method__]
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/parser.rb

@@ -6,28 +6,32 @@ module Gemsmith
   module CLI
     # Assembles and parses all Command Line Interface (CLI) options.
     class Parser
+      include Import[:configuration]
+
       CLIENT = OptionParser.new nil, 40, "  "
 
       # Order is important.
       SECTIONS = [Parsers::Core, Rubysmith::CLI::Parsers::Build, Parsers::Build].freeze
 
-      def initialize sections: SECTIONS, client: CLIENT, container: Container
+      def initialize sections: SECTIONS, client: CLIENT, **dependencies
+        super(**dependencies)
+
         @sections = sections
         @client = client
-        @configuration = container[:configuration].dup
+        @configuration_duplicate = configuration.dup
       end
 
       def call arguments = []
-        sections.each { |section| section.call configuration, client: }
+        sections.each { |section| section.call configuration_duplicate, client: }
         client.parse arguments
-        configuration.freeze
+        configuration_duplicate.freeze
       end
 
       def to_s = client.to_s
 
       private
 
-      attr_reader :sections, :client, :configuration
+      attr_reader :sections, :client, :configuration_duplicate
     end
   end
 end

data/lib/gemsmith/cli/parsers/build.rb

@@ -7,16 +7,20 @@ module Gemsmith
     module Parsers
       # Handles parsing of Command Line Interface (CLI) build options.
       class Build
+        include Import[:colorizer]
+
         using Refinements::Structs
 
         def self.call(...) = new(...).call
 
         def initialize configuration = Container[:configuration],
                        client: Parser::CLIENT,
-                       container: Container
+                       **dependencies
+
+          super(**dependencies)
+
           @configuration = configuration
           @client = client
-          @container = container
         end
 
         def call arguments = []
@@ -27,7 +31,7 @@ module Gemsmith
 
         private
 
-        attr_reader :configuration, :client, :container
+        attr_reader :configuration, :client
 
         def add_cli
           client.on(
@@ -46,8 +50,6 @@ module Gemsmith
                 .then { |boolean| boolean ? colorizer.green(boolean) : colorizer.red(boolean) }
                 .then { |colored_boolean| "Default: #{colored_boolean}" }
         end
-
-        def colorizer = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/parsers/core.rb

@@ -8,16 +8,19 @@ module Gemsmith
     module Parsers
       # Handles parsing of Command Line Interface (CLI) core options.
       class Core
+        include Import[:specification]
+
         using Refinements::Structs
 
         def self.call(...) = new(...).call
 
         def initialize configuration = Container[:configuration],
                        client: Parser::CLIENT,
-                       container: Container
+                       **dependencies
+          super(**dependencies)
+
           @configuration = configuration
           @client = client
-          @container = container
         end
 
         def call arguments = []
@@ -30,7 +33,7 @@ module Gemsmith
 
         private
 
-        attr_reader :configuration, :client, :container
+        attr_reader :configuration, :client
 
         def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
 
@@ -86,8 +89,6 @@ module Gemsmith
             configuration.merge! action_help: true
           end
         end
-
-        def specification = container[__method__]
       end
     end
   end

data/lib/gemsmith/cli/shell.rb

@@ -4,19 +4,20 @@ module Gemsmith
   module CLI
     # The main Command Line Interface (CLI) object.
     class Shell
-      ACTIONS = {
-        config: Actions::Config.new,
-        build: Actions::Build.new,
-        install: Actions::Install.new,
-        publish: Actions::Publish.new,
-        edit: Actions::Edit.new,
-        view: Actions::View.new
-      }.freeze
-
-      def initialize parser: Parser.new, actions: ACTIONS, container: Container
+      include Actions::Import[
+        :config,
+        :build,
+        :install,
+        :publish,
+        :edit,
+        :view,
+        :specification,
+        :logger
+      ]
+
+      def initialize parser: Parser.new, **dependencies
+        super(**dependencies)
         @parser = parser
-        @actions = actions
-        @container = container
       end
 
       def call arguments = []
@@ -27,40 +28,20 @@ module Gemsmith
 
       private
 
-      attr_reader :parser, :actions, :container
+      attr_reader :parser
 
       def perform configuration
         case configuration
-          in action_config: Symbol => action then config action
-          in action_build: true then build configuration
-          in action_install: true then install configuration
-          in action_publish: true then publish configuration
-          in action_edit: String => gem_name then edit gem_name
-          in action_view: String => gem_name then view gem_name
+          in action_config: Symbol => action then config.call action
+          in action_build: true then build.call configuration
+          in action_install: true then install.call configuration
+          in action_publish: true then publish.call configuration
+          in action_edit: String => gem_name then edit.call gem_name
+          in action_view: String => gem_name then view.call gem_name
           in action_version: true then logger.info { specification.labeled_version }
-          else usage
+          else logger.any { parser.to_s }
         end
       end
-
-      def config(action) = actions.fetch(__method__).call(action)
-
-      def build(configuration) = actions.fetch(__method__).call(configuration)
-
-      def install(configuration) = actions.fetch(__method__).call(configuration)
-
-      def publish(configuration) = actions.fetch(__method__).call(configuration)
-
-      def edit(gem_name) = actions.fetch(__method__).call(gem_name)
-
-      def view(gem_name) = actions.fetch(__method__).call(gem_name)
-
-      def usage = logger.unknown { parser.to_s }
-
-      def logger = container[__method__]
-
-      def specification = container[__method__]
-
-      def process = container[__method__]
     end
   end
 end

data/lib/gemsmith/container.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry-container"
+require "dry/container"
 require "open3"
 require "spek"
 

data/lib/gemsmith/import.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "auto_injector"
+
+module Gemsmith
+  Import = AutoInjector[Container]
+end

data/lib/gemsmith/templates/%project_name%/%project_name%.gemspec.erb

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> <%= RUBY_VERSION[/\d+\.\d+/] %>"
   <% if configuration.build_cli %>
-    spec.add_dependency "dry-container", "~> 0.9"
+    spec.add_dependency "auto_injector", "~> 0.4"
   <% end %>
   <% if configuration.build_cli %>
-    spec.add_dependency "pastel", "~> 0.8"
+    spec.add_dependency "dry-container", "~> 0.9"
   <% end %>
   <% if configuration.build_refinements %>
     spec.add_dependency "refinements", "~> 9.2"
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency "runcom", "~> 8.2"
   <% end %>
   <% if configuration.build_cli %>
-    spec.add_dependency "spek", "~> 0.0"
+    spec.add_dependency "spek", "~> 0.2"
   <% end %>
   <% if configuration.build_zeitwerk %>
     spec.add_dependency "zeitwerk", "~> 2.5"

data/lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/actions/config.rb.erb

@@ -1,13 +1,14 @@
-# frozen_string_literal: true
-
 <% namespace do %>
   module CLI
     module Actions
       # Handles the config action.
       class Config
-        def initialize client: Configuration::Loader::CLIENT, container: Container
+        include <%= configuration.project_class %>::Import[:kernel, :logger]
+
+        def initialize client: Configuration::Loader::CLIENT, **dependencies
+          super(**dependencies)
+
           @client = client
-          @container = container
         end
 
         def call selection
@@ -20,15 +21,11 @@
 
         private
 
-        attr_reader :client, :container
+        attr_reader :client
 
         def edit = kernel.system("$EDITOR #{client.current}")
 
         def view = kernel.system("cat #{client.current}")
-
-        def kernel = container[__method__]
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/actions/container.rb.erb

@@ -0,0 +1,18 @@
+require "dry/container"
+
+<% namespace do %>
+  module CLI
+    module Actions
+      # Provides a single container of application and action specific dependencies.
+      module Container
+        extend Dry::Container::Mixin
+
+        config.registry = ->(container, key, value, _options) { container[key.to_s] = value }
+
+        merge <%= configuration.project_namespaced_class %>::Container
+
+        register(:config) { Config.new }
+      end
+    end
+  end
+<% end %>

data/lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/actions/import.rb.erb

@@ -0,0 +1,9 @@
+require "auto_injector"
+
+<% namespace do %>
+  module CLI
+    module Actions
+      Import = AutoInjector[Container]
+    end
+  end
+<% end %>

data/lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/parser.rb.erb

@@ -4,28 +4,32 @@ require "optparse"
   module CLI
     # Assembles and parses all Command Line Interface (CLI) options.
     class Parser
+      include Import[:configuration]
+
       CLIENT = OptionParser.new nil, 40, "  "
 
       # Order is important.
       SECTIONS = [Parsers::Core].freeze
 
-      def initialize sections: SECTIONS, client: CLIENT, container: Container
+      def initialize sections: SECTIONS, client: CLIENT, **dependencies
+        super(**dependencies)
+
         @sections = sections
         @client = client
-        @configuration = container[:configuration].dup
+        @configuration_duplicate = configuration.dup
       end
 
       def call arguments = []
-        sections.each { |section| section.call configuration, client: }
+        sections.each { |section| section.call configuration_duplicate, client: }
         client.parse arguments
-        configuration.freeze
+        configuration_duplicate.freeze
       end
 
       def to_s = client.to_s
 
       private
 
-      attr_reader :sections, :client, :configuration
+      attr_reader :sections, :client, :configuration_duplicate
     end
   end
 <% end %>

data/lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/parsers/core.rb.erb

@@ -5,16 +5,19 @@ require "refinements/structs"
     module Parsers
       # Handles parsing of Command Line Interface (CLI) core options.
       class Core
+        include Import[:specification]
+
         using Refinements::Structs
 
         def self.call(...) = new(...).call
 
         def initialize configuration = Container[:configuration],
                        client: Parser::CLIENT,
-                       container: Container
+                       **dependencies
+
+          super(**dependencies)
           @configuration = configuration
           @client = client
-          @container = container
         end
 
         def call arguments = []
@@ -27,7 +30,7 @@ require "refinements/structs"
 
         private
 
-        attr_reader :configuration, :client, :container
+        attr_reader :configuration, :client
 
         def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
 
@@ -51,8 +54,6 @@ require "refinements/structs"
             configuration.merge! action_help: true
           end
         end
-
-        def specification = container[__method__]
       end
     end
   end