pragmater 10.3.1 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5284cb9d791cfcc1d19fbefe8ccc8bcb956f3e4762d62351d5a281243078e6c0
-  data.tar.gz: e6a8431dae7394313394ed39ecdbb25e6cad0dce6f2e8e7c85a114edc4bac0d4
+  metadata.gz: d021a7fae626bd79a5b4bdfb262485521118f8de0bfcaecd6639d7c0d6a8d83a
+  data.tar.gz: a30562c36228973dca573c35c4d4f4945c4b89fbcdafeee9a7dc81d206329cc4
 SHA512:
-  metadata.gz: d5e0f46386f5ee817fdd813b9f7471359d5994074abe12fecc4fed855ab68b7e4b9bc81ef9c0d9829a34fa62f84aff12505fdfb622509fb5ec26eb29cc20166f
-  data.tar.gz: 3f3c71546dc4cc46e473c94a386d53b59d42b4bc127b6185b0d67cbe2b6a4a61106909fe570166257d4a707f35d78f8cf303b22a47e9345664af0461a7391e59
+  metadata.gz: eb21ad7bba61e71a2a99fbef23d124fb46dfe8fbb6088442f993b4ce3f4eb904549493b06fe0c7e765412a2d0238c88acfa40d75752af67d24f349ed3caaaa64
+  data.tar.gz: 81f04639e7f187ec4c052d9639c5c953f972f9598083a7b32aac2a3ce305c8ab22bf02060ecd79e19ec316d0aced14a2e0572959b7d01de644e972ecc430c25a

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

@@ -5,9 +5,11 @@ module Pragmater
     module Actions
       # Handles the config action.
       class Config
-        def initialize client: Configuration::Loader::CLIENT, container: Container
+        include Pragmater::Import[:kernel, :logger]
+
+        def initialize client: Configuration::Loader::CLIENT, **dependencies
+          super(**dependencies)
           @client = client
-          @container = container
         end
 
         def call selection
@@ -20,15 +22,11 @@ module Pragmater
 
         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/pragmater/cli/actions/container.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "dry/container"
+
+module Pragmater
+  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 Pragmater::Container
+
+        register(:config) { Config.new }
+        register(:run) { Run.new }
+      end
+    end
+  end
+end

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

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

data/lib/pragmater/cli/actions/run.rb

@@ -5,18 +5,18 @@ module Pragmater
     module Actions
       # Handles insert or remove actions.
       class Run
-        def initialize runner: Runner.new, container: Container
+        include Pragmater::Import[:logger]
+
+        def initialize runner: Runner.new, **dependencies
+          super(**dependencies)
           @runner = runner
-          @container = container
         end
 
         def call(configuration) = runner.call(configuration) { |path| logger.info { path } }
 
         private
 
-        attr_reader :runner, :container
-
-        def logger = container[__method__]
+        attr_reader :runner
       end
     end
   end

data/lib/pragmater/cli/parser.rb

@@ -6,26 +6,29 @@ module Pragmater
   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::Flag].freeze # Order is important.
+      SECTIONS = [Parsers::Core, Parsers::Flag].freeze # Order matters.
 
-      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/pragmater/cli/parsers/core.rb

@@ -7,16 +7,18 @@ module Pragmater
     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 = []
@@ -29,7 +31,7 @@ module Pragmater
 
         private
 
-        attr_reader :configuration, :client, :container
+        attr_reader :configuration, :client
 
         def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
 
@@ -67,8 +69,6 @@ module Pragmater
         end
 
         def root_dir = configuration.root_dir
-
-        def specification = container[__method__]
       end
     end
   end

data/lib/pragmater/cli/shell.rb

@@ -4,12 +4,11 @@ module Pragmater
   module CLI
     # The main Command Line Interface (CLI) object.
     class Shell
-      ACTIONS = {config: Actions::Config.new, run: Actions::Run.new}.freeze
+      include Actions::Import[:config, :run, :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 = []
@@ -20,26 +19,16 @@ module Pragmater
 
       private
 
-      attr_reader :parser, :actions, :container
+      attr_reader :parser
 
       def perform configuration
         case configuration
-          in action_config: Symbol => action then config action
-          in {action_insert: true} | {action_remove: true} then run configuration
+          in action_config: Symbol => action then config.call action
+          in {action_insert: true} | {action_remove: true} then run.call configuration
           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 run(configuration) = actions.fetch(__method__).call(configuration)
-
-      def usage = logger.unknown(parser.to_s)
-
-      def specification = container[__method__]
-
-      def logger = container[__method__]
     end
   end
 end

data/lib/pragmater/container.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
+require "cogger"
 require "dry-container"
-require "logger"
-require "pastel"
 require "spek"
 
 module Pragmater
@@ -12,28 +11,7 @@ module Pragmater
 
     register(:configuration) { Configuration::Loader.call }
     register(:specification) { Spek::Loader.call "#{__dir__}/../../pragmater.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(:logger) { Cogger::Client.new }
   end
 end

data/lib/pragmater/import.rb

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

data/lib/pragmater/runner.rb

@@ -5,14 +5,16 @@ require "refinements/pathnames"
 module Pragmater
   # Adds/removes pragma comments for files in given path.
   class Runner
+    include Import[:logger]
+
     using Refinements::Pathnames
 
-    def initialize parser: Parsers::File.new, container: Container
+    def initialize parser: Parsers::File.new, **dependencies
+      super(**dependencies)
       @parser = parser
-      @container = container
     end
 
-    def call configuration = Configuration::Loader.call
+    def call configuration = Container[:configuration]
       Pathname(configuration.root_dir).files("{#{configuration.includes.join ","}}").map do |path|
         yield path if block_given?
 
@@ -26,12 +28,10 @@ module Pragmater
 
     private
 
-    attr_reader :parser, :container
+    attr_reader :parser
 
     def write path, configuration, action
       path.write parser.call(path, configuration.comments, action:).join
     end
-
-    def logger = container[__method__]
   end
 end

data/pragmater.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "pragmater"
-  spec.version = "10.3.1"
+  spec.version = "11.0.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://www.alchemists.io/projects/pragmater"
@@ -22,8 +22,9 @@ 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.9"
-  spec.add_dependency "pastel", "~> 0.8"
   spec.add_dependency "refinements", "~> 9.2"
   spec.add_dependency "runcom", "~> 8.2"
   spec.add_dependency "spek", "~> 0.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pragmater
 version: !ruby/object:Gem::Version
-  version: 10.3.1
+  version: 11.0.0
 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,44 +20,58 @@ 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-03-04 00:00:00.000000000 Z
+date: 2022-04-09 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.9'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: cogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: refinements
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,8 @@ files:
 - exe/pragmater
 - lib/pragmater.rb
 - lib/pragmater/cli/actions/config.rb
+- lib/pragmater/cli/actions/container.rb
+- lib/pragmater/cli/actions/import.rb
 - lib/pragmater/cli/actions/run.rb
 - lib/pragmater/cli/helper.rb
 - lib/pragmater/cli/parser.rb
@@ -142,6 +158,7 @@ files:
 - lib/pragmater/formatters/general.rb
 - lib/pragmater/formatters/main.rb
 - lib/pragmater/formatters/shebang.rb
+- lib/pragmater/import.rb
 - lib/pragmater/parsers/comments.rb
 - lib/pragmater/parsers/file.rb
 - lib/pragmater/processors/handler.rb
@@ -174,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: A command line interface for managing/formatting source file pragma comments.