pennyworth 14.2.1 → 15.0.0

data/lib/pennyworth/container.rb

@@ -2,7 +2,9 @@
 
 require "cogger"
 require "dry/container"
+require "etcher"
 require "http"
+require "runcom"
 require "spek"
 
 module Pennyworth
@@ -10,11 +12,21 @@ module Pennyworth
   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 "pennyworth/configuration.yml" }
     register(:specification) { Spek::Loader.call "#{__dir__}/../../pennyworth.gemspec" }
-    register(:environment) { ENV }
     register(:kernel) { Kernel }
     register(:http) { HTTP }
-    register(:logger) { Cogger::Client.new }
+    register(:logger) { Cogger.new formatter: :emoji }
   end
 end

data/lib/pennyworth/inflector.rb

@@ -3,7 +3,7 @@
 module Pennyworth
   # Overrides any string to desired form if matched, otherwise answers the original string.
   class Inflector
-    DEFAULTS = Array(Configuration::Loader.call.inflections).reduce({}, :merge)
+    DEFAULTS = Array(Container[:configuration].inflections).reduce({}, :merge)
 
     def initialize overrides = DEFAULTS
       @overrides = overrides

data/lib/pennyworth/models/http_status.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Pennyworth
-  # :reek:ModuleInitialize
   module Models
     # Defines HTTP status details.
     HTTPStatus = Data.define :code, :label, :url do

data/lib/pennyworth/models/standard_error.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Pennyworth
-  # :reek:ModuleInitialize
   module Models
     # Defines a standard error.
     StandardError = Data.define :name, :file_path, :line_number do

data/pennyworth.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |spec|
   spec.name = "pennyworth"
-  spec.version = "14.2.1"
+  spec.version = "15.0.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/pennyworth"
-  spec.summary = "A command line interface that augments Alfred workflows."
+  spec.summary = "A command line interface for augmenting Alfred workflows."
   spec.license = "Hippocratic-2.1"
 
   spec.metadata = {
@@ -23,16 +23,17 @@ Gem::Specification.new do |spec|
   spec.cert_chain = [Gem.default_cert_path]
 
   spec.required_ruby_version = "~> 3.2"
-  spec.add_dependency "cogger", "~> 0.5"
-  spec.add_dependency "core", "~> 0.1"
+  spec.add_dependency "cogger", "~> 0.10"
   spec.add_dependency "dry-container", "~> 0.11"
-  spec.add_dependency "ghub", "~> 0.3"
+  spec.add_dependency "etcher", "~> 0.2"
+  spec.add_dependency "ghub", "~> 0.5"
   spec.add_dependency "http", "~> 5.1"
-  spec.add_dependency "infusible", "~> 1.0"
+  spec.add_dependency "infusible", "~> 2.0"
   spec.add_dependency "rack", "~> 3.0"
-  spec.add_dependency "refinements", "~> 10.0"
-  spec.add_dependency "runcom", "~> 9.0"
-  spec.add_dependency "spek", "~> 1.0"
+  spec.add_dependency "refinements", "~> 11.0"
+  spec.add_dependency "runcom", "~> 10.0"
+  spec.add_dependency "sod", "~> 0.0"
+  spec.add_dependency "spek", "~> 2.0"
   spec.add_dependency "zeitwerk", "~> 2.6"
 
   spec.bindir = "exe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennyworth
 version: !ruby/object:Gem::Version
-  version: 14.2.1
+  version: 15.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-03-22 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -43,56 +43,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: core
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: etcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: ghub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -113,14 +113,14 @@ dependencies:
     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: rack
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,20 @@ dependencies:
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: refinements
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -150,33 +164,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: runcom
+  name: sod
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        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.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: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -205,25 +219,19 @@ files:
 - README.adoc
 - exe/pennyworth
 - lib/pennyworth.rb
-- lib/pennyworth/cli/actions/config.rb
-- lib/pennyworth/cli/actions/container.rb
 - lib/pennyworth/cli/actions/encodings.rb
-- lib/pennyworth/cli/actions/git_hub.rb
+- lib/pennyworth/cli/actions/git_hub/organization.rb
+- lib/pennyworth/cli/actions/git_hub/user.rb
 - lib/pennyworth/cli/actions/http_statuses.rb
-- lib/pennyworth/cli/actions/import.rb
 - lib/pennyworth/cli/actions/ruby_gems.rb
 - lib/pennyworth/cli/actions/standard_errors.rb
 - lib/pennyworth/cli/actions/system/errors.rb
 - lib/pennyworth/cli/actions/system/signals.rb
 - lib/pennyworth/cli/actions/text.rb
-- lib/pennyworth/cli/parser.rb
-- lib/pennyworth/cli/parsers/core.rb
-- lib/pennyworth/cli/parsers/git_hub.rb
-- lib/pennyworth/cli/parsers/ruby_gems.rb
 - lib/pennyworth/cli/shell.rb
-- lib/pennyworth/configuration/content.rb
+- lib/pennyworth/configuration/contract.rb
 - lib/pennyworth/configuration/defaults.yml
-- lib/pennyworth/configuration/loader.rb
+- lib/pennyworth/configuration/model.rb
 - lib/pennyworth/container.rb
 - lib/pennyworth/import.rb
 - lib/pennyworth/inflector.rb
@@ -285,8 +293,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
-summary: A command line interface that augments Alfred workflows.
+summary: A command line interface for augmenting Alfred workflows.
 test_files: []

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

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Pennyworth
-  module CLI
-    module Actions
-      # Handles the configuration action.
-      class Config
-        include Pennyworth::Import[:kernel, :logger]
-
-        def initialize(configuration: Configuration::Loader::CLIENT, **)
-          super(**)
-          @configuration = configuration
-        end
-
-        def call action
-          case action
-            when :edit then edit
-            when :view then view
-            else logger.error { "Invalid configuration action: #{action}." }
-          end
-        end
-
-        private
-
-        attr_reader :configuration
-
-        def edit = kernel.system("$EDITOR #{configuration.current}")
-
-        def view = kernel.system("cat #{configuration.current}")
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/container"
-
-module Pennyworth
-  module CLI
-    module Actions
-      # Provides a single container with application and action specific dependencies.
-      module Container
-        extend Dry::Container::Mixin
-
-        merge Pennyworth::Container
-
-        register(:config) { Config.new }
-        register(:encodings) { Encodings.new }
-        register(:git_hub) { GitHub.new }
-        register(:http_statuses) { HTTPStatuses.new }
-        register(:ruby_gems) { RubyGems.new }
-        register(:standard_errors) { StandardErrors.new }
-        register(:system_errors) { System::Errors.new }
-        register(:system_signals) { System::Signals.new }
-        register(:text) { Text.new }
-      end
-    end
-  end
-end

data/lib/pennyworth/cli/actions/git_hub.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Pennyworth
-  module CLI
-    module Actions
-      # Handles the GitHub action.
-      class GitHub
-        include Pennyworth::Import[:logger]
-
-        def initialize(processor: Processor.for_projects, **)
-          super(**)
-          @processor = processor
-        end
-
-        def call endpoint
-          processor.call(endpoint)
-                   .to_json
-                   .then { |json| logger.info { json } }
-        end
-
-        private
-
-        attr_reader :processor
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "infusible"
-
-module Pennyworth
-  module CLI
-    module Actions
-      Import = Infusible.with Container
-    end
-  end
-end

data/lib/pennyworth/cli/parser.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "core"
-require "optparse"
-
-module Pennyworth
-  module CLI
-    # Assembles and parses all Command Line Interface (CLI) options.
-    class Parser
-      CLIENT = OptionParser.new nil, 40, "  "
-      SECTIONS = [Parsers::Core, Parsers::GitHub, Parsers::RubyGems].freeze # Order is important.
-
-      def initialize configuration = Container[:configuration],
-                     sections: SECTIONS,
-                     client: CLIENT
-        @configuration_duplicate = configuration.dup
-        @sections = sections
-        @client = client
-      end
-
-      def call arguments = Core::EMPTY_ARRAY
-        sections.each { |parser| parser.call configuration_duplicate, client: }
-        client.parse arguments
-        configuration_duplicate.freeze
-      end
-
-      def to_s = client.to_s
-
-      private
-
-      attr_reader :configuration_duplicate, :client, :sections
-    end
-  end
-end

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

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-require "core"
-require "refinements/structs"
-
-module Pennyworth
-  module CLI
-    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, **)
-          super(**)
-          @configuration = configuration
-          @client = client
-        end
-
-        def call arguments = ::Core::EMPTY_ARRAY
-          client.banner = specification.labeled_summary
-          client.separator "\nUSAGE:\n"
-          collate
-          client.parse arguments
-          configuration
-        end
-
-        private
-
-        attr_reader :configuration, :client
-
-        def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
-
-        def add_config
-          client.on(
-            "-c",
-            "--config ACTION",
-            %i[edit view],
-            "Manage gem configuration. Actions: edit || view."
-          ) do |action|
-            configuration.action_config = action
-          end
-        end
-
-        def add_encodings
-          client.on "--encodings", "Render Alfred encodings script filter." do
-            configuration.action_encodings = true
-          end
-        end
-
-        def add_git_hub
-          client.on "--git_hub", "Render Alfred GitHub repositories script filter." do
-            configuration.action_git_hub = true
-          end
-        end
-
-        def add_http_statuses
-          client.on "--http_statuses", "Render Alfred HTTP statuses script filter." do
-            configuration.action_http_statuses = true
-          end
-        end
-
-        def add_ruby_gems
-          client.on "--ruby_gems", "Render Alfred RubyGems script filter." do
-            configuration.action_ruby_gems = true
-          end
-        end
-
-        def add_standard_errors
-          client.on "--standard_errors", "Render Alfred standard errors script filter." do
-            configuration.action_standard_errors = true
-          end
-        end
-
-        def add_system_errors
-          client.on "--system_errors", "Render Alfred system errors script filter." do
-            configuration.action_system_errors = true
-          end
-        end
-
-        def add_system_signals
-          client.on "--system_signals", "Render Alfred system signals script filter." do
-            configuration.action_system_signals = true
-          end
-        end
-
-        def add_text
-          client.on "--text CONTENT", "Render Alfred text script filter." do |content|
-            configuration.action_text = content
-          end
-        end
-
-        def add_version
-          client.on "-v", "--version", "Show gem version." do
-            configuration.action_version = true
-          end
-        end
-
-        def add_help
-          client.on "-h", "--help", "Show this message." do
-            configuration.action_help = true
-          end
-        end
-      end
-    end
-  end
-end

data/lib/pennyworth/cli/parsers/git_hub.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require "core"
-require "refinements/structs"
-
-module Pennyworth
-  module CLI
-    module Parsers
-      # Handles parsing of Command Line Interface (CLI) GitHub options.
-      class GitHub
-        using Refinements::Structs
-
-        def self.call(...) = new(...).call
-
-        def initialize configuration = Container[:configuration], client: Parser::CLIENT
-          @configuration = configuration
-          @client = client
-        end
-
-        def call arguments = ::Core::EMPTY_ARRAY
-          client.separator "\nGITHUB OPTIONS:\n"
-          private_methods.sort.grep(/add_/).each { |method| __send__ method }
-          client.parse arguments
-          configuration
-        end
-
-        private
-
-        attr_reader :configuration, :client
-
-        def add_organization
-          client.on(
-            "--organization [HANDLE]",
-            %(Set organization. Default: "#{organization}".)
-          ) do |handle|
-            configuration.merge! action_git_hub: :organization,
-                                 git_hub_organization: handle || organization
-          end
-        end
-
-        def add_user
-          client.on "--user [HANDLE]", %(Set user. Default: "#{user}".) do |handle|
-            configuration.merge! action_git_hub: :user, git_hub_user: handle || user
-          end
-        end
-
-        def organization = configuration.git_hub_organization
-
-        def user = configuration.git_hub_user
-      end
-    end
-  end
-end

data/lib/pennyworth/cli/parsers/ruby_gems.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require "core"
-
-module Pennyworth
-  module CLI
-    module Parsers
-      # Handles parsing of Command Line Interface (CLI) RubyGems options.
-      class RubyGems
-        def self.call(...) = new(...).call
-
-        def initialize configuration = Container[:configuration], client: Parser::CLIENT
-          @configuration = configuration
-          @client = client
-        end
-
-        def call arguments = ::Core::EMPTY_ARRAY
-          client.separator "\nRUBYGEMS OPTIONS:\n"
-          add_owner
-          client.parse arguments
-          configuration
-        end
-
-        private
-
-        attr_reader :configuration, :client
-
-        def add_owner
-          client.on "--owner [HANDLE]", %(Set owner. Default: "#{owner}".) do |handle|
-            configuration.ruby_gems_owner = handle || owner
-          end
-        end
-
-        def owner = configuration.ruby_gems_owner
-      end
-    end
-  end
-end

data/lib/pennyworth/configuration/loader.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-require "refinements/hashes"
-require "refinements/structs"
-require "runcom"
-require "yaml"
-
-module Pennyworth
-  module Configuration
-    # Represents the fully assembled Command Line Interface (CLI) configuration.
-    class Loader
-      using Refinements::Hashes
-      using Refinements::Structs
-
-      DEFAULTS = YAML.load_file(Pathname(__dir__).join("defaults.yml")).freeze
-      CLIENT = Runcom::Config.new "pennyworth/configuration.yml", defaults: DEFAULTS
-
-      def self.call = new.call
-
-      def self.with_defaults = new(client: DEFAULTS)
-
-      def initialize content: Content.new, client: CLIENT
-        @content = content
-        @client = client
-      end
-
-      def call = content.merge(**client.to_h.flatten_keys)
-
-      private
-
-      attr_reader :content, :client
-    end
-  end
-end