gemsmith 19.8.0 → 20.0.0

data/lib/gemsmith/cli/shell.rb

@@ -1,50 +1,46 @@
 # frozen_string_literal: true
 
-require "core"
+require "sod"
 
 module Gemsmith
   module CLI
     # The main Command Line Interface (CLI) object.
     class Shell
-      include Actions::Import[
-        :build,
-        :config,
-        :edit,
-        :install,
-        :kernel,
-        :logger,
-        :publish,
-        :specification,
-        :view
-      ]
-
-      def initialize(parser: Parser.new, **)
+      include Import[:defaults_path, :xdg_config, :specification]
+
+      def initialize(context: Sod::Context, dsl: Sod, **)
         super(**)
-        @parser = parser
+        @context = context
+        @dsl = dsl
       end
 
-      def call arguments = Core::EMPTY_ARRAY
-        act_on parser.call(arguments)
-      rescue OptionParser::ParseError => error
-        logger.error { error.message }
-      end
+      def call(...) = cli.call(...)
 
       private
 
-      attr_reader :parser
-
-      def act_on configuration
-        case configuration
-          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 kernel.puts specification.labeled_version
-          else kernel.puts parser.to_s
+      attr_reader :context, :dsl
+
+      # :reek:TooManyStatements
+      # rubocop:todo Metrics/MethodLength
+      def cli
+        context = build_context
+
+        dsl.new :gemsmith, banner: specification.banner do
+          on(Sod::Prefabs::Commands::Config, context:)
+          on Commands::Build
+          on Actions::Install
+          on Actions::Publish
+          on Actions::Edit
+          on Actions::View
+          on(Sod::Prefabs::Actions::Version, context:)
+          on Sod::Prefabs::Actions::Help, self
         end
       end
+      # rubocop:enable Metrics/MethodLength
+
+      def build_context
+        context[defaults_path:, xdg_config:, version_label: specification.labeled_version]
+      end
     end
   end
 end

data/lib/gemsmith/container.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
-require "dry/container"
+require "cogger"
+require "dry-container"
+require "etcher"
 require "open3"
+require "runcom"
 require "spek"
 
 module Gemsmith
@@ -9,15 +12,36 @@ module Gemsmith
   module Container
     extend Dry::Container::Mixin
 
-    # TODO: Remove once Rubysmith and Gemsmith configurations can coexist together.
-    config.registry = -> container, key, value, _options { container[key.to_s] = value }
+    register :configuration do
+      self[:defaults].add_loader(Etcher::Loaders::YAML.new(self[:xdg_config].active))
+                     .then { |registry| Etcher.call registry }
+    end
 
-    merge Rubysmith::Container
+    register :defaults do
+      registry = Etcher::Registry.new contract: Rubysmith::Configuration::Contract,
+                                      model: Rubysmith::Configuration::Model
 
-    register(:configuration) { Gemsmith::Configuration::Loader.call }
+      registry.add_loader(Etcher::Loaders::YAML.new(self[:defaults_path]))
+              .add_transformer(Rubysmith::Configuration::Transformers::CurrentTime)
+              .add_transformer(Rubysmith::Configuration::Transformers::GitHubUser.new)
+              .add_transformer(Rubysmith::Configuration::Transformers::GitEmail.new)
+              .add_transformer(Rubysmith::Configuration::Transformers::GitUser.new)
+              .add_transformer(Rubysmith::Configuration::Transformers::TemplateRoot.new)
+              .add_transformer(
+                Rubysmith::Configuration::Transformers::TemplateRoot.new(
+                  Pathname(__dir__).join("templates")
+                )
+              )
+              .add_transformer(Rubysmith::Configuration::Transformers::TargetRoot)
+    end
+
+    register(:input, memoize: true) { self[:configuration].dup }
+    register(:defaults_path) { Rubysmith::Container[:defaults_path] }
+    register(:xdg_config) { Runcom::Config.new "gemsmith/configuration.yml" }
     register(:specification) { Spek::Loader.call "#{__dir__}/../../gemsmith.gemspec" }
     register(:environment) { ENV }
     register(:executor) { Open3 }
     register(:kernel) { Kernel }
+    register(:logger) { Cogger.new formatter: :emoji }
   end
 end

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

@@ -36,25 +36,31 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> <%= RUBY_VERSION[/\d+\.\d+/] %>"
   <% if configuration.build_cli %>
-    spec.add_dependency "cogger", "~> 0.8"
+    spec.add_dependency "cogger", "~> 0.10"
   <% end %>
   <% if configuration.build_cli %>
-    spec.add_dependency "core", "~> 0.1"
+    spec.add_dependency "dry-container", "~> 0.11"
   <% end %>
   <% if configuration.build_cli %>
-    spec.add_dependency "dry-container", "~> 0.11"
+    spec.add_dependency "dry-monads", "~> 1.6"
+  <% end %>
+  <% if configuration.build_cli %>
+    spec.add_dependency "etcher", "~> 0.2"
   <% end %>
   <% if configuration.build_cli %>
-    spec.add_dependency "infusible", "~> 1.0"
+    spec.add_dependency "infusible", "~> 2.0"
   <% end %>
   <% if configuration.build_refinements %>
-    spec.add_dependency "refinements", "~> 10.0"
+    spec.add_dependency "refinements", "~> 11.0"
+  <% end %>
+  <% if configuration.build_cli %>
+    spec.add_dependency "runcom", "~> 10.0"
   <% end %>
   <% if configuration.build_cli %>
-    spec.add_dependency "runcom", "~> 9.0"
+    spec.add_dependency "sod", "~> 0.0"
   <% end %>
   <% if configuration.build_cli %>
-    spec.add_dependency "spek", "~> 1.1"
+    spec.add_dependency "spek", "~> 2.0"
   <% end %>
   <% if configuration.build_zeitwerk %>
     spec.add_dependency "zeitwerk", "~> 2.6"

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

@@ -1,33 +1,36 @@
-require "core"
+require "sod"
 
 <% namespace do %>
   module CLI
     # The main Command Line Interface (CLI) object.
     class Shell
-      include Actions::Import[:config, :kernel, :logger, :specification]
+      include Import[:defaults_path, :xdg_config, :specification]
 
-      def initialize(parser: Parser.new, **)
+      def initialize(context: Sod::Context, dsl: Sod, **)
         super(**)
-        @parser = parser
+        @context = context
+        @dsl = dsl
       end
 
-      def call arguments = Core::EMPTY_ARRAY
-        act_on parser.call(arguments)
-      rescue OptionParser::ParseError => error
-        logger.error { error.message }
-      end
+      def call(...) = cli.call(...)
 
       private
 
-      attr_reader :parser
+      attr_reader :context, :dsl
+
+      def cli
+        context = build_context
 
-      def act_on configuration
-        case configuration
-          in action_config: Symbol => action then config.call action
-          in action_version: true then kernel.puts specification.labeled_version
-          else kernel.puts parser.to_s
+        dsl.new <%= configuration.project_levels.positive? ? configuration.project_name.inspect : configuration.project_name.to_sym.inspect %>, banner: specification.banner do
+          on(Sod::Prefabs::Commands::Config, context:)
+          on(Sod::Prefabs::Actions::Version, context:)
+          on Sod::Prefabs::Actions::Help, self
         end
       end
+
+      def build_context
+        context[defaults_path:, xdg_config:, version_label: specification.labeled_version]
+      end
     end
   end
 <% end %>

data/lib/gemsmith/templates/%project_name%/lib/%project_path%/configuration/contract.rb.erb

@@ -0,0 +1,9 @@
+require "dry/schema"
+
+Dry::Schema.load_extensions :monads
+
+<% namespace do %>
+  module Configuration
+    Contract = Dry::Schema.Params
+  end
+<% end %>

data/lib/gemsmith/templates/%project_name%/lib/%project_path%/configuration/model.rb.erb

@@ -0,0 +1,6 @@
+<% namespace do %>
+  module Configuration
+    # Defines the configuration model for use throughout the gem.
+    Model = Data.define
+  end
+<% end %>

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

@@ -1,5 +1,7 @@
 require "cogger"
 require "dry/container"
+require "etcher"
+require "runcom"
 require "spek"
 
 <% namespace do %>
@@ -7,7 +9,18 @@ require "spek"
   module Container
     extend Dry::Container::Mixin
 
-    register(:configuration) { Configuration::Loader.call }
+    register :configuration do
+      self[:defaults].add_loader(Etcher::Loaders::YAML.new(self[:xdg_config].active))
+                     .then { |registry| Etcher.call registry }
+    end
+
+    register :defaults do
+      Etcher::Registry.new(contract: Configuration::Contract, model: Configuration::Model)
+                      .add_loader(Etcher::Loaders::YAML.new(self[:defaults_path]))
+    end
+
+    register(:defaults_path) { Pathname(__dir__).join("configuration/defaults.yml") }
+    register(:xdg_config) { Runcom::Config.new "<%= configuration.project_path %>/configuration.yml" }
     register(:specification) { Spek::Loader.call "#{__dir__}/<%= Array.new(2 + configuration.project_levels, "../").join %><%= configuration.project_name %>.gemspec" }
     register(:kernel) { Kernel }
     register(:logger) { Cogger.new formatter: :emoji }

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

@@ -8,39 +8,24 @@ RSpec.describe <%= configuration.project_namespaced_class %>::CLI::Shell do
 
   include_context "with application dependencies"
 
-  before { <%= configuration.project_namespaced_class %>::CLI::Actions::Import.stub configuration:, kernel:, logger: }
+  before { Sod::Import.stub kernel:, logger: }
 
-  after { <%= configuration.project_namespaced_class %>::CLI::Actions::Import.unstub :configuration, :kernel, :logger }
+  after { Sod::Import.unstub :kernel, :logger }
 
   describe "#call" do
-    it "edits configuration" do
-      shell.call %w[--config edit]
-      expect(kernel).to have_received(:system).with("$EDITOR ")
-    end
-
-    it "views configuration" do
-      shell.call %w[--config view]
-      expect(kernel).to have_received(:system).with("cat ")
+    it "prints configuration usage" do
+      shell.call %w[config]
+      expect(kernel).to have_received(:puts).with(/Manage configuration.+/m)
     end
 
     it "prints version" do
       shell.call %w[--version]
-      expect(kernel).to have_received(:puts).with(/<%= configuration.project_label %>\s\d+\.\d+\.\d+/)
+      expect(kernel).to have_received(:puts).with(/<%= configuration.project_label.gsub(" ", "\\s") %>\s\d+\.\d+\.\d+/)
     end
 
-    it "prints help (usage)" do
+    it "prints help" do
       shell.call %w[--help]
-      expect(kernel).to have_received(:puts).with(/<%= configuration.project_label %>.+USAGE.+/m)
-    end
-
-    it "prints usage when no options are given" do
-      shell.call
-      expect(kernel).to have_received(:puts).with(/<%= configuration.project_label %>.+USAGE.+/m)
-    end
-
-    it "prints error with invalid option" do
-      shell.call %w[--bogus]
-      expect(logger.reread).to match(/🛑.+invalid option.+bogus/)
+      expect(kernel).to have_received(:puts).with(/<%= configuration.project_label.gsub(" ", "\\s") %>.+USAGE.+/m)
     end
   end
 end

data/lib/gemsmith/templates/%project_name%/spec/support/shared_contexts/application_dependencies.rb.erb

@@ -2,16 +2,14 @@ require "dry/container/stub"
 require "infusible/stub"
 
 RSpec.shared_context "with application dependencies" do
-  using Refinements::Structs
   using Infusible::Stub
 
-  include_context "with temporary directory"
-
-  let(:configuration) { <%= configuration.project_namespaced_class %>::Configuration::Loader.with_defaults.call }
+  let(:configuration) { Etcher.new(<%= configuration.project_namespaced_class %>::Container[:defaults]).call.bind(&:dup) }
+  let(:xdg_config) { Runcom::Config.new <%= configuration.project_namespaced_class %>::Container[:defaults_path] }
   let(:kernel) { class_spy Kernel }
-  let(:logger) { Cogger.new io: StringIO.new, formatter: :emoji }
+  let(:logger) { Cogger.new io: StringIO.new, level: :debug, formatter: :emoji }
 
-  before { <%= configuration.project_namespaced_class %>::Import.stub configuration:, kernel:, logger: }
+  before { <%= configuration.project_namespaced_class %>::Import.stub configuration:, xdg_config:, kernel:, logger: }
 
-  after { <%= configuration.project_namespaced_class %>::Import.unstub :configuration, :kernel, :logger }
+  after { <%= configuration.project_namespaced_class %>::Import.unstub :configuration, :xdg_config, :kernel, :logger }
 end

data/lib/gemsmith/tools/versioner.rb

@@ -5,23 +5,23 @@ require "milestoner"
 
 module Gemsmith
   module Tools
-    # Versions (tags) current project (local and remote).
+    # Versions (tags: local and remote) current project.
     class Versioner
       include Import[:configuration]
       include Dry::Monads[:result]
 
       def initialize(
-        client: Milestoner::Tags::Publisher.new,
-        content: Milestoner::Configuration::Content,
+        publisher: Milestoner::Tags::Publisher.new,
+        model: Milestoner::Configuration::Model,
         **
       )
         super(**)
-        @client = client
-        @content = content
+        @publisher = publisher
+        @model = model
       end
 
       def call specification
-        client.call settings(specification)
+        publisher.call settings(specification)
         Success specification
       rescue Milestoner::Error => error
         Failure error.message
@@ -29,10 +29,10 @@ module Gemsmith
 
       private
 
-      attr_reader :client, :content
+      attr_reader :publisher, :model
 
       def settings specification
-        content[
+        model[
           documentation_format: configuration.extensions_milestoner_documentation_format,
           prefixes: configuration.extensions_milestoner_prefixes,
           version: specification.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemsmith
 version: !ruby/object:Gem::Version
-  version: 19.8.0
+  version: 20.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -35,7 +35,7 @@ cert_chain:
   3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
   gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
   -----END CERTIFICATE-----
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: core
   requirement: !ruby/object:Gem::Requirement
@@ -93,104 +93,146 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: etcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: infusible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: milestoner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.3'
+        version: '16.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.3'
+        version: '16.0'
 - !ruby/object:Gem::Dependency
   name: refinements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rubysmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.9'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.9'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: sod
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: spek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: versionaire
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -228,43 +270,26 @@ files:
 - lib/gemsmith/builders/git/ignore.rb
 - lib/gemsmith/builders/rspec/helper.rb
 - lib/gemsmith/builders/specification.rb
-- lib/gemsmith/cli/actions/build.rb
-- lib/gemsmith/cli/actions/config.rb
-- lib/gemsmith/cli/actions/container.rb
+- lib/gemsmith/cli/actions/cli.rb
 - lib/gemsmith/cli/actions/edit.rb
-- lib/gemsmith/cli/actions/import.rb
 - lib/gemsmith/cli/actions/install.rb
 - lib/gemsmith/cli/actions/publish.rb
 - lib/gemsmith/cli/actions/view.rb
-- lib/gemsmith/cli/parser.rb
-- lib/gemsmith/cli/parsers/build.rb
-- lib/gemsmith/cli/parsers/core.rb
+- lib/gemsmith/cli/commands/build.rb
 - lib/gemsmith/cli/shell.rb
-- lib/gemsmith/configuration/loader.rb
 - lib/gemsmith/container.rb
 - lib/gemsmith/import.rb
 - lib/gemsmith/templates/%project_name%/%project_name%.gemspec.erb
 - lib/gemsmith/templates/%project_name%/exe/%project_name%.erb
-- lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/actions/config.rb.erb
-- lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/actions/container.rb.erb
-- lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/actions/import.rb.erb
-- lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/parser.rb.erb
-- lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/parsers/core.rb.erb
 - lib/gemsmith/templates/%project_name%/lib/%project_path%/cli/shell.rb.erb
-- lib/gemsmith/templates/%project_name%/lib/%project_path%/configuration/content.rb.erb
+- lib/gemsmith/templates/%project_name%/lib/%project_path%/configuration/contract.rb.erb
 - lib/gemsmith/templates/%project_name%/lib/%project_path%/configuration/defaults.yml.erb
-- lib/gemsmith/templates/%project_name%/lib/%project_path%/configuration/loader.rb.erb
+- lib/gemsmith/templates/%project_name%/lib/%project_path%/configuration/model.rb.erb
 - lib/gemsmith/templates/%project_name%/lib/%project_path%/container.rb.erb
 - lib/gemsmith/templates/%project_name%/lib/%project_path%/identity.rb.erb
 - lib/gemsmith/templates/%project_name%/lib/%project_path%/import.rb.erb
-- lib/gemsmith/templates/%project_name%/spec/lib/%project_path%/cli/actions/config_spec.rb.erb
-- lib/gemsmith/templates/%project_name%/spec/lib/%project_path%/cli/parser_spec.rb.erb
-- lib/gemsmith/templates/%project_name%/spec/lib/%project_path%/cli/parsers/core_spec.rb.erb
 - lib/gemsmith/templates/%project_name%/spec/lib/%project_path%/cli/shell_spec.rb.erb
-- lib/gemsmith/templates/%project_name%/spec/lib/%project_path%/configuration/content_spec.rb.erb
-- lib/gemsmith/templates/%project_name%/spec/lib/%project_path%/configuration/loader_spec.rb.erb
 - lib/gemsmith/templates/%project_name%/spec/support/shared_contexts/application_dependencies.rb.erb
-- lib/gemsmith/templates/%project_name%/spec/support/shared_examples/a_parser.rb.erb
 - lib/gemsmith/tools/cleaner.rb
 - lib/gemsmith/tools/editor.rb
 - lib/gemsmith/tools/installer.rb
@@ -300,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: A command line interface for smithing Ruby gems.