pennyworth 11.2.2 → 12.1.0

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

@@ -5,7 +5,7 @@ module Pennyworth
     module Actions
       # Handles the configuration action.
       class Config
-        def initialize configuration: Configuration::Loader::HANDLER, container: Container
+        def initialize configuration: Configuration::Loader::CLIENT, container: Container
           @configuration = configuration
           @container = container
         end

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

@@ -10,7 +10,7 @@ module Pennyworth
           @container = container
         end
 
-        def call = processor.call.to_json.then { |json| logger.info json }
+        def call = processor.call.to_json.then { |json| logger.info { json } }
 
         private
 

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

@@ -13,7 +13,7 @@ module Pennyworth
         def call endpoint
           processor.call(endpoint)
                    .to_json
-                   .then { |json| logger.info json }
+                   .then { |json| logger.info { json } }
         end
 
         private

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

@@ -10,7 +10,7 @@ module Pennyworth
           @container = container
         end
 
-        def call = processor.call.to_json.then { |json| logger.info json }
+        def call = processor.call.to_json.then { |json| logger.info { json } }
 
         private
 

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

@@ -13,7 +13,7 @@ module Pennyworth
         def call endpoint
           processor.call(endpoint)
                    .to_json
-                   .then { |json| logger.info json }
+                   .then { |json| logger.info { json } }
         end
 
         private

data/lib/pennyworth/cli/actions/system/errors.rb

@@ -11,7 +11,7 @@ module Pennyworth
             @container = container
           end
 
-          def call = processor.call.to_json.then { |json| logger.info json }
+          def call = processor.call.to_json.then { |json| logger.info { json } }
 
           private
 

data/lib/pennyworth/cli/actions/system/signals.rb

@@ -11,7 +11,7 @@ module Pennyworth
             @container = container
           end
 
-          def call = processor.call.to_json.then { |json| logger.info json }
+          def call = processor.call.to_json.then { |json| logger.info { json } }
 
           private
 

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

@@ -10,7 +10,7 @@ module Pennyworth
           @container = container
         end
 
-        def call(content) = processor.call(content).to_json.then { |json| logger.info json }
+        def call(content) = processor.call(content).to_json.then { |json| logger.info { json } }
 
         private
 

data/lib/pennyworth/cli/parser.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+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 = Configuration::Loader.call,
+                     sections: SECTIONS,
+                     client: CLIENT
+        @configuration = configuration.dup
+        @sections = sections
+        @client = client
+      end
+
+      def call arguments = []
+        sections.each { |parser| parser.call configuration, client: }
+        client.parse arguments
+        configuration.freeze
+      end
+
+      def to_s = client.to_s
+
+      private
+
+      attr_reader :configuration, :client, :sections
+    end
+  end
+end

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

@@ -12,21 +12,25 @@ module Pennyworth
       class Core
         def self.call(...) = new(...).call
 
-        def initialize configuration = Configuration::Loader.call, client: CLIENT
+        def initialize configuration = Configuration::Loader.call,
+                       client: Parser::CLIENT,
+                       container: Container
           @configuration = configuration
           @client = client
+          @container = container
         end
 
         def call arguments = []
-          client.banner = "#{Identity::LABEL} - #{Identity::SUMMARY}"
+          client.banner = "Pennyworth - #{specification.summary}"
           client.separator "\nUSAGE:\n"
           collate
-          arguments.empty? ? arguments : client.parse!(arguments)
+          client.parse arguments
+          configuration
         end
 
         private
 
-        attr_reader :configuration, :client
+        attr_reader :configuration, :client, :container
 
         def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
 
@@ -85,7 +89,7 @@ module Pennyworth
 
         def add_version
           client.on "-v", "--version", "Show gem version." do
-            configuration.action_version = Identity::VERSION_LABEL
+            configuration.action_version = true
           end
         end
 
@@ -94,6 +98,8 @@ module Pennyworth
             configuration.action_help = true
           end
         end
+
+        def specification = container[__method__]
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Pennyworth
 
         def self.call(...) = new(...).call
 
-        def initialize configuration = Configuration::Loader.call, client: CLIENT
+        def initialize configuration = Configuration::Loader.call, client: Parser::CLIENT
           @configuration = configuration
           @client = client
         end
@@ -19,7 +19,8 @@ module Pennyworth
         def call arguments = []
           client.separator "\nGITHUB OPTIONS:\n"
           private_methods.sort.grep(/add_/).each { |method| __send__ method }
-          arguments.empty? ? arguments : client.parse!(arguments)
+          client.parse arguments
+          configuration
         end
 
         private

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

@@ -7,7 +7,7 @@ module Pennyworth
       class RubyGems
         def self.call(...) = new(...).call
 
-        def initialize configuration = Configuration::Loader.call, client: CLIENT
+        def initialize configuration = Configuration::Loader.call, client: Parser::CLIENT
           @configuration = configuration
           @client = client
         end
@@ -15,7 +15,8 @@ module Pennyworth
         def call arguments = []
           client.separator "\nRUBYGEMS OPTIONS:\n"
           add_owner
-          arguments.empty? ? arguments : client.parse!(arguments)
+          client.parse arguments
+          configuration
         end
 
         private

data/lib/pennyworth/cli/shell.rb

@@ -15,7 +15,7 @@ module Pennyworth
         text: Actions::Text.new
       }.freeze
 
-      def initialize parser: Parsers::Assembler.new, actions: ACTIONS, container: Container
+      def initialize parser: Parser.new, actions: ACTIONS, container: Container
         @parser = parser
         @actions = actions
         @container = container
@@ -24,7 +24,7 @@ module Pennyworth
       def call arguments = []
         perform parser.call(arguments)
       rescue OptionParser::ParseError, KeyError => error
-        logger.error error.message
+        logger.error { error.message }
       end
 
       private
@@ -43,7 +43,7 @@ module Pennyworth
           in action_system_signals: true then system_signals
           in action_system_errors: true then system_errors
           in action_text: String => content then text content
-          in action_version: String => version then logger.info version
+          in action_version: true then logger.info { "Pennyworth #{specification.version}" }
           else usage
         end
       end
@@ -75,6 +75,8 @@ module Pennyworth
 
       def usage = logger.unknown { parser.to_s }
 
+      def specification = container[__method__]
+
       def logger = container[__method__]
     end
   end

data/lib/pennyworth/configuration/content.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Pennyworth
+  module Configuration
+    # Defines configuration content as the primary source of truth for use throughout the gem.
+    Content = Struct.new(
+      :action_encodings,
+      :action_git_hub,
+      :action_http_statuses,
+      :action_ruby_gems,
+      :action_system_errors,
+      :action_system_signals,
+      :action_text,
+      :action_config,
+      :action_version,
+      :action_help,
+      :alfred_preferences,
+      :inflections,
+      :git_hub_api_url,
+      :git_hub_organization,
+      :git_hub_user,
+      :http_statuses_url,
+      :ruby_gems_api_url,
+      :ruby_gems_owner,
+      keyword_init: true
+    ) do
+      def initialize *arguments
+        super
+        freeze
+      end
+    end
+  end
+end

data/lib/pennyworth/configuration/loader.rb

@@ -0,0 +1,35 @@
+# 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

data/lib/pennyworth/container.rb

@@ -10,7 +10,10 @@ module Pennyworth
   module Container
     extend Dry::Container::Mixin
 
-    register(:configuration) { CLI::Configuration::Loader.call }
+    SPEC_PATH = "#{__dir__}/../../pennyworth.gemspec".freeze
+
+    register(:configuration) { Configuration::Loader.call }
+    register(:specification) { Gem::Specification.load SPEC_PATH }
     register(:environment) { ENV }
     register(:kernel) { Kernel }
     register(:http) { HTTP }

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(CLI::Configuration::Loader.call.inflections).reduce({}, :merge)
+    DEFAULTS = Array(Configuration::Loader.call.inflections).reduce({}, :merge)
 
     def initialize overrides = DEFAULTS
       @overrides = overrides

data/lib/pennyworth/integrations/git_hub/client.rb

@@ -20,7 +20,7 @@ module Pennyworth
         end
 
         def get endpoint, parameters: {}
-          paginate ->(page) { sole_get endpoint, parameters: parameters.merge(page: page) }
+          paginate ->(page) { sole_get endpoint, parameters: parameters.merge(page:) }
         end
 
         private

data/lib/pennyworth/loaders/http_statuses.rb

@@ -8,14 +8,14 @@ module Pennyworth
     class HTTPStatuses
       def initialize codes: Rack::Utils::HTTP_STATUS_CODES,
                      model: Models::HTTPStatus,
-                     configuration: CLI::Configuration::Loader.call
+                     configuration: Configuration::Loader.call
         @codes = codes
         @model = model
         @configuration = configuration
       end
 
       def call _omit = nil
-        codes.map { |(code, label)| model[code: code, label: label, url: "#{url}/#{code}"] }
+        codes.map { |(code, label)| model[code:, label:, url: "#{url}/#{code}"] }
       end
 
       private

data/lib/pennyworth/loaders/system/signals.rb

@@ -10,7 +10,7 @@ module Pennyworth
           @model = model
         end
 
-        def call(_omit = nil) = list.map { |name, number| model[number: number, name: name] }
+        def call(_omit = nil) = list.map { |name, number| model[number:, name:] }
 
         private
 

data/lib/pennyworth/presenters/gem.rb

@@ -34,10 +34,15 @@ module Pennyworth
 
       def source_url = record.fetch(:source_code_uri)
 
-      def changes_url = record.fetch(:changelog_uri)
+      def changes_url
+        warn "[DEPRECATION]: #changes_url is deprecated, use #versions_url instead."
+        versions_url
+      end
 
       def issues_url = record.fetch(:bug_tracker_uri)
 
+      def versions_url = record.fetch(:changelog_uri)
+
       def updated_at = record.fetch(:version_created_at)
 
       private

data/lib/pennyworth/presenters/repository.rb

@@ -23,10 +23,15 @@ module Pennyworth
 
       def source_url = record.fetch(:html_url)
 
-      def changes_url = "#{site_url}/changes.html"
+      def changes_url
+        warn "[DEPRECATION]: #changes_url is deprecated, use #versions_url instead."
+        versions_url
+      end
 
       def issues_url = "#{source_url}/issues"
 
+      def versions_url = "#{site_url}/versions"
+
       private
 
       attr_reader :record, :inflector

data/lib/pennyworth/serializers/project.rb

@@ -26,9 +26,9 @@ module Pennyworth
 
       def modifications
         {
-          control: modification(presenter.changes_url, "View changes."),
           alt: modification(presenter.source_url, "View source."),
-          cmd: modification(presenter.issues_url, "View issues.")
+          cmd: modification(presenter.issues_url, "View issues."),
+          control: modification(presenter.versions_url, "View versions.")
         }
       end
 

data/pennyworth.gemspec

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name = "pennyworth"
+  spec.version = "12.1.0"
+  spec.platform = Gem::Platform::RUBY
+  spec.authors = ["Brooke Kuhlmann"]
+  spec.email = ["brooke@alchemists.io"]
+  spec.homepage = "https://www.alchemists.io/projects/pennyworth"
+  spec.summary = "A command line interface that augments Alfred workflows."
+  spec.license = "Hippocratic-3.0"
+
+  spec.metadata = {
+    "bug_tracker_uri" => "https://github.com/bkuhlmann/pennyworth/issues",
+    "changelog_uri" => "https://www.alchemists.io/projects/pennyworth/versions",
+    "documentation_uri" => "https://www.alchemists.io/projects/pennyworth",
+    "label" => "Pennyworth",
+    "rubygems_mfa_required" => "true",
+    "source_code_uri" => "https://github.com/bkuhlmann/pennyworth"
+  }
+
+  spec.signing_key = Gem.default_key_path
+  spec.cert_chain = [Gem.default_cert_path]
+
+  spec.required_ruby_version = "~> 3.1"
+  spec.add_dependency "dry-container", "~> 0.8"
+  spec.add_dependency "http", "~> 5.0"
+  spec.add_dependency "pastel", "~> 0.8"
+  spec.add_dependency "rack", "~> 2.2"
+  spec.add_dependency "refinements", "~> 9.1"
+  spec.add_dependency "runcom", "~> 8.0"
+  spec.add_dependency "zeitwerk", "~> 2.5"
+
+  spec.bindir = "exe"
+  spec.executables << "pennyworth"
+  spec.extra_rdoc_files = Dir["README*", "LICENSE*"]
+  spec.files = Dir["*.gemspec", "lib/**/*"]
+  spec.require_paths = ["lib"]
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennyworth
 version: !ruby/object:Gem::Version
-  version: 11.2.2
+  version: 12.1.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -28,7 +28,7 @@ cert_chain:
   lkHilIrX69jq8wMPpBhlaw2mRmeSL50Wv5u6xVBvOHhXFSP1crXM95vfLhLyRYod
   W2A=
   -----END CERTIFICATE-----
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.5'
+        version: '9.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.5'
+        version: '9.1'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -150,17 +150,15 @@ files:
 - lib/pennyworth/cli/actions/system/errors.rb
 - lib/pennyworth/cli/actions/system/signals.rb
 - lib/pennyworth/cli/actions/text.rb
-- lib/pennyworth/cli/configuration/content.rb
-- lib/pennyworth/cli/configuration/defaults.yml
-- lib/pennyworth/cli/configuration/loader.rb
-- lib/pennyworth/cli/parsers.rb
-- lib/pennyworth/cli/parsers/assembler.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/defaults.yml
+- lib/pennyworth/configuration/loader.rb
 - lib/pennyworth/container.rb
-- lib/pennyworth/identity.rb
 - lib/pennyworth/inflector.rb
 - lib/pennyworth/integrations/git_hub/client.rb
 - lib/pennyworth/integrations/git_hub/response.rb
@@ -190,13 +188,15 @@ files:
 - lib/pennyworth/serializers/system/error.rb
 - lib/pennyworth/serializers/system/signal.rb
 - lib/pennyworth/serializers/text.rb
+- pennyworth.gemspec
 homepage: https://www.alchemists.io/projects/pennyworth
 licenses:
-- Apache-2.0
+- Hippocratic-3.0
 metadata:
   bug_tracker_uri: https://github.com/bkuhlmann/pennyworth/issues
-  changelog_uri: https://www.alchemists.io/projects/pennyworth/changes.html
+  changelog_uri: https://www.alchemists.io/projects/pennyworth/versions
   documentation_uri: https://www.alchemists.io/projects/pennyworth
+  label: Pennyworth
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/bkuhlmann/pennyworth
 post_install_message:
@@ -207,14 +207,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: A command line interface that augments Alfred workflows.

data/lib/pennyworth/cli/configuration/content.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Pennyworth
-  module CLI
-    module Configuration
-      # Defines configuration content as the primary source of truth for use throughout the gem.
-      Content = Struct.new :action_encodings,
-                           :action_git_hub,
-                           :action_http_statuses,
-                           :action_ruby_gems,
-                           :action_system_errors,
-                           :action_system_signals,
-                           :action_text,
-                           :action_config,
-                           :action_version,
-                           :action_help,
-                           :alfred_preferences,
-                           :inflections,
-                           :git_hub_api_url,
-                           :git_hub_organization,
-                           :git_hub_user,
-                           :http_statuses_url,
-                           :ruby_gems_api_url,
-                           :ruby_gems_owner,
-                           keyword_init: true
-    end
-  end
-end

data/lib/pennyworth/cli/configuration/loader.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require "pathname"
-require "refinements/hashes"
-require "refinements/structs"
-require "runcom"
-require "yaml"
-
-module Pennyworth
-  module CLI
-    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
-        HANDLER = Runcom::Config.new "#{Identity::NAME}/configuration.yml", defaults: DEFAULTS
-
-        def self.call = new.call
-
-        def self.with_defaults = new(handler: DEFAULTS)
-
-        def initialize content: Content.new, handler: HANDLER
-          @content = content
-          @handler = handler
-        end
-
-        def call = content.merge(**handler.to_h.flatten_keys)
-
-        private
-
-        attr_reader :content, :handler
-      end
-    end
-  end
-end