milestoner 13.3.0 → 14.0.1

data/lib/milestoner/cli/actions/status.rb

@@ -5,12 +5,14 @@ module Milestoner
     module Actions
       # Handles listing project status of untagged commit history.
       class Status
+        include Milestoner::Import[:logger]
+
         def initialize presenter: Presenters::Commit,
                        categorizer: Commits::Categorizer.new,
-                       container: Container
+                       **dependencies
+          super(**dependencies)
           @presenter = presenter
           @categorizer = categorizer
-          @container = container
         end
 
         def call
@@ -22,11 +24,9 @@ module Milestoner
 
         private
 
-        attr_reader :presenter, :categorizer, :container
+        attr_reader :presenter, :categorizer
 
         def info(message) = logger.info { message }
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/milestoner/cli/parser.rb

@@ -6,26 +6,30 @@ module Milestoner
   module CLI
     # Assembles and parses all Command Line Interface (CLI) options.
     class Parser
+      include Import[:configuration]
+
       CLIENT = OptionParser.new nil, 40, "  "
-      SECTIONS = [Parsers::Core, Parsers::Security].freeze # Order is important.
+      SECTIONS = [Parsers::Core].freeze
+
+      def initialize sections: SECTIONS, client: CLIENT, **dependencies
+        super(**dependencies)
 
-      def initialize sections: SECTIONS, client: CLIENT, container: Container
         @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/milestoner/cli/parsers/core.rb

@@ -11,14 +11,16 @@ module Milestoner
 
       # Handles parsing of Command Line Interface (CLI) core options.
       class Core
+        include Import[:specification]
+
         def self.call(...) = new(...).call
 
-        def initialize configuration = Configuration::Loader.call,
+        def initialize configuration = Container[:configuration],
                        client: Parser::CLIENT,
-                       container: Container
+                       **dependencies
+          super(**dependencies)
           @configuration = configuration
           @client = client
-          @container = container
         end
 
         def call arguments = []
@@ -31,7 +33,7 @@ module Milestoner
 
         private
 
-        attr_reader :configuration, :client, :container
+        attr_reader :configuration, :client
 
         def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
 
@@ -74,8 +76,6 @@ module Milestoner
             configuration.merge! action_help: true
           end
         end
-
-        def specification = container[__method__]
       end
     end
   end

data/lib/milestoner/cli/shell.rb

@@ -4,16 +4,11 @@ module Milestoner
   module CLI
     # The main Command Line Interface (CLI) object.
     class Shell
-      ACTIONS = {
-        config: Actions::Config.new,
-        publish: Actions::Publish.new,
-        status: Actions::Status.new
-      }.freeze
+      include Actions::Import[:config, :publish, :status, :specification, :logger]
 
-      def initialize parser: Parser.new, actions: ACTIONS, container: Container
+      def initialize parser: Parser.new, **dependencies
+        super(**dependencies)
         @parser = parser
-        @actions = actions
-        @container = container
       end
 
       def call arguments = []
@@ -24,29 +19,17 @@ module Milestoner
 
       private
 
-      attr_reader :parser, :actions, :container
+      attr_reader :parser
 
       def perform configuration
         case configuration
-          in action_config: Symbol => action then config action
-          in action_publish: true then publish configuration
-          in action_status: true then status
+          in action_config: Symbol => action then config.call action
+          in action_publish: true then publish.call configuration
+          in action_status: true then status.call
           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 publish(configuration) = actions.fetch(__method__).call(configuration)
-
-      def status = actions.fetch(__method__).call
-
-      def usage = logger.unknown { parser.to_s }
-
-      def specification = container[__method__]
-
-      def logger = container[__method__]
     end
   end
 end

data/lib/milestoner/commits/categorizer.rb

@@ -6,12 +6,14 @@ module Milestoner
   module Commits
     # Retrieves and categorizes Git repository commit tagged or untagged history.
     class Categorizer
-      def initialize expression: Regexp, container: Container
+      include Import[:repository]
+
+      def initialize expression: Regexp, **dependencies
+        super(**dependencies)
         @expression = expression
-        @container = container
       end
 
-      def call configuration = Configuration::Loader.call
+      def call configuration = Container[:configuration]
         prefixes = configuration.prefixes
 
         prefixes.reduce({}) { |group, prefix| group.merge prefix => [] }
@@ -25,7 +27,7 @@ module Milestoner
 
       private
 
-      attr_reader :expression, :container
+      attr_reader :expression
 
       def group_by_prefix prefixes, groups
         computed_commits.each.with_object groups do |commit, collection|
@@ -44,8 +46,6 @@ module Milestoner
       def tagged_commits = repository.commits("#{repository.tag_last}..HEAD")
 
       def saved_commits = repository.commits
-
-      def repository = container[__method__]
     end
   end
 end

data/lib/milestoner/configuration/content.rb

@@ -13,7 +13,6 @@ module Milestoner
       :action_help,
       :documentation_format,
       :prefixes,
-      :sign,
       :version,
       keyword_init: true
     ) do

data/lib/milestoner/configuration/defaults.yml

@@ -1,9 +1,8 @@
 :documentation:
-  :format: "md"
+  :format: "adoc"
 :prefixes:
   - Fixed
   - Added
   - Updated
   - Removed
   - Refactored
-:sign: false

data/lib/milestoner/container.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
+require "cogger"
 require "dry-container"
 require "git_plus"
-require "logger"
-require "pastel"
 require "spek"
 
 module Milestoner
@@ -13,30 +12,8 @@ module Milestoner
 
     register(:configuration) { Configuration::Loader.call }
     register(:specification) { Spek::Loader.call "#{__dir__}/../../milestoner.gemspec" }
-    register(:colorizer) { Pastel.new enabled: $stdout.tty? }
-    register(:kernel) { Kernel }
-
-    register :log_colors do
-      {
-        "DEBUG" => self[:colorizer].white.detach,
-        "INFO" => self[:colorizer].green.detach,
-        "WARN" => self[:colorizer].yellow.detach,
-        "ERROR" => self[:colorizer].red.detach,
-        "FATAL" => self[:colorizer].white.bold.on_red.detach,
-        "ANY" => self[:colorizer].white.bold.detach
-      }
-    end
-
-    register :logger do
-      Logger.new $stdout,
-                 level: Logger.const_get(ENV.fetch("LOG_LEVEL", "INFO")),
-                 formatter: (
-                   lambda do |severity, _at, _name, message|
-                     self[:log_colors][severity].call "#{message}\n"
-                   end
-                 )
-    end
-
     register(:repository) { GitPlus::Repository.new }
+    register(:kernel) { Kernel }
+    register(:logger) { Cogger::Client.new }
   end
 end

data/lib/milestoner/import.rb

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

data/lib/milestoner/presenters/commit.rb

@@ -7,23 +7,25 @@ module Milestoner
   module Presenters
     # Wraps the Git Kit Commit for presentation purposes.
     class Commit
+      include Import[:configuration]
+
       extend Forwardable
 
       delegate [*GitPlus::Commit.members, :fixup?, :squash?] => :record
 
-      def initialize record, container: Container
+      def initialize record, **dependencies
+        super(**dependencies)
         @record = record
-        @container = container
       end
 
       def line_item(delimiter: " - ") = "#{bullet}#{subject}#{delimiter}#{author_name}"
 
       private
 
-      attr_reader :record, :container
+      attr_reader :record
 
       def bullet
-        case container[:configuration].documentation_format
+        case configuration.documentation_format
           when "md" then "- "
           when "adoc" then "* "
           else ""

data/lib/milestoner/tags/creator.rb

@@ -7,52 +7,46 @@ module Milestoner
   module Tags
     # Handles the creation of project repository tags.
     class Creator
+      include Import[:repository, :logger]
+
       using Versionaire::Cast
 
       def initialize categorizer: Commits::Categorizer.new,
                      presenter: Presenters::Commit,
-                     container: Container
-
+                     **dependencies
+        super(**dependencies)
         @categorizer = categorizer
         @presenter = presenter
-        @container = container
       end
 
-      def call configuration = CLI::Configuration::Loader.call
+      def call configuration = Container[:configuration]
         return false if local? configuration
         fail Error, "Unable to tag without commits." if categorizer.call.empty?
 
-        sign configuration
+        create configuration
       rescue Versionaire::Error, GitPlus::Error => error
         raise Error, error.message
       end
 
       private
 
-      attr_reader :categorizer, :presenter, :container
+      attr_reader :categorizer, :presenter
 
       def local? configuration
         version = Version configuration.version
 
         if repository.tag_local? version
-          logger.warn "Local tag exists: #{version}. Skipped."
+          logger.warn { "Local tag exists: #{version}. Skipped." }
           true
         else
           false
         end
       end
 
-      def sign configuration
-        version = configuration.version
-        content = message configuration
-
-        if configuration.sign
-          repository.tag_sign version, content
-        else
-          repository.tag_unsign version, content
-        end
-
-        logger.debug "Local tag created: #{version}."
+      def create configuration
+        label = configuration.version
+        repository.tag_version label, message(configuration)
+        logger.debug { "Local tag created: #{label}." }
       end
 
       def message configuration
@@ -62,10 +56,6 @@ module Milestoner
                      %(Version #{configuration.version}\n\n#{line_items.join "\n"}\n\n)
                    end
       end
-
-      def repository = container[__method__]
-
-      def logger = container[__method__]
     end
   end
 end

data/lib/milestoner/tags/publisher.rb

@@ -4,13 +4,15 @@ module Milestoner
   module Tags
     # Handles the tagging and pushing of a tag to a remote repository.
     class Publisher
-      def initialize tagger: Tags::Creator.new, pusher: Tags::Pusher.new, container: Container
+      include Import[:logger]
+
+      def initialize tagger: Tags::Creator.new, pusher: Tags::Pusher.new, **dependencies
+        super(**dependencies)
         @tagger = tagger
         @pusher = pusher
-        @container = container
       end
 
-      def call configuration = CLI::Configuration::Loader.call
+      def call configuration = Container[:configuration]
         tagger.call configuration
         pusher.call configuration
         logger.info { "Published: #{configuration.version}!" }
@@ -18,9 +20,7 @@ module Milestoner
 
       private
 
-      attr_reader :tagger, :pusher, :container
-
-      def logger = container[__method__]
+      attr_reader :tagger, :pusher
     end
   end
 end

data/lib/milestoner/tags/pusher.rb

@@ -6,13 +6,11 @@ module Milestoner
   module Tags
     # Handles publishing of tags to a remote repository.
     class Pusher
-      using Versionaire::Cast
+      include Import[:repository, :logger]
 
-      def initialize container: Container
-        @container = container
-      end
+      using Versionaire::Cast
 
-      def call configuration = CLI::Configuration::Loader.call
+      def call configuration = Container[:configuration]
         version = Version configuration.version
 
         fail Error, "Remote repository not configured." unless repository.config_origin?
@@ -24,17 +22,11 @@ module Milestoner
 
       private
 
-      attr_reader :container
-
       def push
         repository.tag_push.then do |_stdout, stderr, status|
           status.success? && stderr.match?(/[new tag]/)
         end
       end
-
-      def repository = container[__method__]
-
-      def logger = container[__method__]
     end
   end
 end

data/milestoner.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |spec|
   spec.name = "milestoner"
-  spec.version = "13.3.0"
+  spec.version = "14.0.1"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://www.alchemists.io/projects/milestoner"
   spec.summary = "A command line interface for crafting Git semantically versioned repository tags."
-  spec.license = "Hippocratic-3.0"
+  spec.license = "Hippocratic-2.1"
 
   spec.metadata = {
     "bug_tracker_uri" => "https://github.com/bkuhlmann/milestoner/issues",
@@ -22,12 +22,13 @@ Gem::Specification.new do |spec|
   spec.cert_chain = [Gem.default_cert_path]
 
   spec.required_ruby_version = "~> 3.1"
+  spec.add_dependency "auto_injector", "~> 0.4"
+  spec.add_dependency "cogger", "~> 0.0"
   spec.add_dependency "dry-container", "~> 0.8"
-  spec.add_dependency "git_plus", "~> 1.1"
-  spec.add_dependency "pastel", "~> 0.8"
+  spec.add_dependency "git_plus", "~> 1.3"
   spec.add_dependency "refinements", "~> 9.2"
   spec.add_dependency "runcom", "~> 8.2"
-  spec.add_dependency "spek", "~> 0.0"
+  spec.add_dependency "spek", "~> 0.2"
   spec.add_dependency "versionaire", "~> 10.0"
   spec.add_dependency "zeitwerk", "~> 2.5"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 13.3.0
+  version: 14.0.1
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -10,9 +10,9 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIC/jCCAeagAwIBAgIBBDANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBpicm9v
-  a2UvREM9YWxjaGVtaXN0cy9EQz1pbzAeFw0yMTAzMTkxMjQ4MDZaFw0yMjAzMTkx
-  MjQ4MDZaMCUxIzAhBgNVBAMMGmJyb29rZS9EQz1hbGNoZW1pc3RzL0RDPWlvMIIB
+  MIIC/jCCAeagAwIBAgIBBTANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBpicm9v
+  a2UvREM9YWxjaGVtaXN0cy9EQz1pbzAeFw0yMjAzMTkxNzI0MzJaFw0yMzAzMTkx
+  NzI0MzJaMCUxIzAhBgNVBAMMGmJyb29rZS9EQz1hbGNoZW1pc3RzL0RDPWlvMIIB
   IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6l1qpXTiomH1RfMRloyw7MiE
   xyVx/x8Yc3EupdH7uhNaTXQGyORN6aOY//1QXXMHIZ9tW74nZLhesWMSUMYy0XhB
   brs+KkurHnc9FnEJAbG7ebGvl/ncqZt72nQvaxpDxvuCBHgJAz+8i5wl6FhLw+oT
@@ -20,46 +20,46 @@ cert_chain:
   D5vkU0YlAm1r98BymuJlcQ1qdkVEI1d48ph4kcS0S0nv1RiuyVb6TCAR3Nu3VaVq
   3fPzZKJLZBx67UvXdbdicWPiUR75elI4PXpLIic3xytaF52ZJYyKZCNZJhNwfQID
   AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU0nzow9vc
-  2CdikiiE3fJhP/gY4ggwDQYJKoZIhvcNAQELBQADggEBAEjpaOXHHp8s/7GL2qCb
-  YAs7urOLv9VHSPfQWAwaTMVnSsIf3Sw4xzISOP/mmfEPBPXtz61K5esrE/uTFtgb
-  FyjxQk2H0sEWgrRXGGNHBWQRhhEs7LP/TByoC15A0br++xLxRz4r7HBLGAWQQDpg
-  66BJ2TBVjxS6K64tKbq7+ACyrOZGgTfNHACh4M076y0x0oRf/rwBrU39/KRfuhbb
-  cm+nNCEtO35gTmZ2bVDHLGvWazi3gJt6+huQjfXTCUUG2YYBxwhu+GPdAGQPxpf9
-  lkHilIrX69jq8wMPpBhlaw2mRmeSL50Wv5u6xVBvOHhXFSP1crXM95vfLhLyRYod
-  W2A=
+  2CdikiiE3fJhP/gY4ggwDQYJKoZIhvcNAQELBQADggEBAJbbNyWzFjqUNVPPCUCo
+  IMrhDa9xf1xkORXNYYbmXgoxRy/KyNbUr+jgEEoWJAm9GXlcqxxWAUI6pK/i4/Qi
+  X6rPFEFmeObDOHNvuqy8Hd6AYsu+kP94U/KJhe9wnWGMmGoNKJNU3EkW3jM/osSl
+  +JRxiH5t4WtnDiVyoYl5nYC02rYdjJkG6VMxDymXTqn7u6HhYgZkGujq1UPar8x2
+  hNIWJblDKKSu7hA2d6+kUthuYo13o1sg1Da/AEDg0hoZSUvhqDEF5Hy232qb3pDt
+  CxDe2+VuChj4I1nvIHdu+E6XoEVlanUPKmSg6nddhkKn2gC45Kyzh6FZqnzH/CRp
+  RFE=
   -----END CERTIFICATE-----
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: auto_injector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: git_plus
+  name: cogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: git_plus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: refinements
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: versionaire
   requirement: !ruby/object:Gem::Requirement
@@ -157,11 +171,12 @@ files:
 - exe/milestoner
 - lib/milestoner.rb
 - lib/milestoner/cli/actions/config.rb
+- lib/milestoner/cli/actions/container.rb
+- lib/milestoner/cli/actions/import.rb
 - lib/milestoner/cli/actions/publish.rb
 - lib/milestoner/cli/actions/status.rb
 - lib/milestoner/cli/parser.rb
 - lib/milestoner/cli/parsers/core.rb
-- lib/milestoner/cli/parsers/security.rb
 - lib/milestoner/cli/shell.rb
 - lib/milestoner/commits/categorizer.rb
 - lib/milestoner/configuration/content.rb
@@ -169,6 +184,7 @@ files:
 - lib/milestoner/configuration/loader.rb
 - lib/milestoner/container.rb
 - lib/milestoner/error.rb
+- lib/milestoner/import.rb
 - lib/milestoner/presenters/commit.rb
 - lib/milestoner/tags/creator.rb
 - lib/milestoner/tags/publisher.rb
@@ -176,7 +192,7 @@ files:
 - milestoner.gemspec
 homepage: https://www.alchemists.io/projects/milestoner
 licenses:
-- Hippocratic-3.0
+- Hippocratic-2.1
 metadata:
   bug_tracker_uri: https://github.com/bkuhlmann/milestoner/issues
   changelog_uri: https://www.alchemists.io/projects/milestoner/versions
@@ -199,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: A command line interface for crafting Git semantically versioned repository