sublime_text_kit 12.3.2 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaea22a9a42626c43cb59c48cdf80f875336e9ae116ef8e17d50d09f4faafd23
-  data.tar.gz: 25aea598137ddabe35c16f69649fa75353a8db9e9956afae4a3c0d312a5da891
+  metadata.gz: b06454b8e8a8f1beb6e5b093b094f2b30345055b501b802fe0626930257d9597
+  data.tar.gz: 1a36ef68cd7ec415be40e175ce47de7f8f6044a063b49bf2f01db682400ac0c4
 SHA512:
-  metadata.gz: 87dc53110bd71150c03e01a1685c6ba4e28968adee492e1875d386a4f57f32667ba269ce39177c38895298f25687fcc42a2cdb4193656cf47a3fd5f4c0070c9e
-  data.tar.gz: f8cdd7955e7c611866003c507a734d7ce3c36993950b1607ebea64c5bbf4cfff014c2b19aeb7a215a9f343ee75be727b7db4c4c0c09f873a51d359d0243fdf57
+  metadata.gz: 381bc7bf3a0dfebae84c38fc7795a3377fb8c2e51d2f3c7df1872d2d857661f535f024554b2369d950afe2429524a7edb925263b4c0c16ec50e720858917fbe0
+  data.tar.gz: 93a7ebe7006e32913e58b6422884b5890d2568ab145ed62470ce11f5d8ded734194961097f5fdf08227df468d3487c577a1b6a6a2913b8057bb906156665ee1b

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

@@ -5,9 +5,11 @@ module SublimeTextKit
     module Actions
       # Handles gem configuration action.
       class Config
-        def initialize configuration: Configuration::Loader::CLIENT, container: Container
+        include SublimeTextKit::Import[:kernel, :logger]
+
+        def initialize configuration: Configuration::Loader::CLIENT, **dependencies
+          super(**dependencies)
           @configuration = configuration
-          @container = container
         end
 
         def call action
@@ -20,15 +22,11 @@ module SublimeTextKit
 
         private
 
-        attr_reader :configuration, :container
+        attr_reader :configuration
 
         def edit = kernel.system("$EDITOR #{configuration.current}")
 
         def view = kernel.system("cat #{configuration.current}")
-
-        def kernel = container[__method__]
-
-        def logger = container[__method__]
       end
     end
   end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "dry/container"
+
+module SublimeTextKit
+  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 SublimeTextKit::Container
+
+        register(:config) { Actions::Config.new }
+        register(:metadata) { Actions::Metadata.new }
+        register(:session) { Actions::Session.new }
+        register(:snippets) { Actions::Snippets.new }
+        register(:update) { Actions::Update.new }
+      end
+    end
+  end
+end

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

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

data/lib/sublime_text_kit/cli/actions/metadata.rb

@@ -7,11 +7,14 @@ module SublimeTextKit
     module Actions
       # Handles metadata action.
       class Metadata
+        include SublimeTextKit::Import[:configuration, :logger]
+
         using Refinements::Pathnames
 
-        def initialize handler: SublimeTextKit::Metadata::Handler, container: Container
+        def initialize handler: SublimeTextKit::Metadata::Handler, **dependencies
+          super(**dependencies)
+
           @handler = handler
-          @container = container
         end
 
         def call kind
@@ -25,7 +28,7 @@ module SublimeTextKit
 
         private
 
-        attr_reader :handler, :container
+        attr_reader :handler
 
         def create
           logger.info "Creating metadata in #{metadata_dir}..."
@@ -53,10 +56,6 @@ module SublimeTextKit
         end
 
         def metadata_dir = Pathname(configuration.metadata_dir).expand_path
-
-        def configuration = container[__method__]
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/sublime_text_kit/cli/actions/session.rb

@@ -5,9 +5,12 @@ module SublimeTextKit
     module Actions
       # Handles session action.
       class Session
-        def initialize rebuilder: Sessions::Rebuilder.new, container: Container
+        include SublimeTextKit::Import[:logger]
+
+        def initialize rebuilder: Sessions::Rebuilder.new, **dependencies
+          super(**dependencies)
+
           @rebuilder = rebuilder
-          @container = container
         end
 
         def call
@@ -17,9 +20,7 @@ module SublimeTextKit
 
         private
 
-        attr_reader :rebuilder, :container
-
-        def logger = container[__method__]
+        attr_reader :rebuilder
       end
     end
   end

data/lib/sublime_text_kit/cli/actions/snippets.rb

@@ -5,31 +5,24 @@ module SublimeTextKit
     module Actions
       # Handles snippets action.
       class Snippets
-        PRINTERS = {
-          ascii_doc: SublimeTextKit::Snippets::Printers::ASCIIDoc.new,
-          markdown: SublimeTextKit::Snippets::Printers::Markdown.new
-        }.freeze
+        include SublimeTextKit::Import[:configuration, :logger]
 
-        def initialize printers: PRINTERS, container: Container
-          @printers = printers
-          @container = container
+        def initialize printer: SublimeTextKit::Snippets::Printer.new, **dependencies
+          super(**dependencies)
+          @printer = printer
         end
 
         def call kind
-          printers.fetch(kind).call
-        rescue KeyError
-          logger.error { "Invalid snippet format: #{kind}. Use #{formats}." }
+          case kind
+            when :ascii_doc then printer.call "*"
+            when :markdown then printer.call "-"
+            else logger.error { "Invalid snippet format: #{kind}. Use ascii_doc or markdown." }
+          end
         end
 
         private
 
-        attr_reader :printers, :container
-
-        def formats = printers.keys.join(" or ")
-
-        def configuration = container[__method__]
-
-        def logger = container[__method__]
+        attr_reader :printer
       end
     end
   end

data/lib/sublime_text_kit/cli/actions/update.rb

@@ -5,12 +5,16 @@ module SublimeTextKit
     module Actions
       # Handles update action.
       class Update
+        include SublimeTextKit::Import[:configuration, :logger]
+
         def initialize metadata: SublimeTextKit::Metadata::Handler,
                        session: Sessions::Rebuilder.new,
-                       container: Container
+                       **dependencies
+
+          super(**dependencies)
+
           @metadata = metadata
           @session = session
-          @container = container
         end
 
         def call
@@ -22,7 +26,7 @@ module SublimeTextKit
 
         private
 
-        attr_reader :metadata, :session, :container
+        attr_reader :metadata, :session
 
         def create_metadata
           configuration.project_dirs.each do |directory|
@@ -32,10 +36,6 @@ module SublimeTextKit
         end
 
         def metadata_dir = Pathname(configuration.metadata_dir).expand_path
-
-        def configuration = container[__method__]
-
-        def logger = container[__method__]
       end
     end
   end

data/lib/sublime_text_kit/cli/parser.rb

@@ -6,27 +6,30 @@ module SublimeTextKit
   module CLI
     # Assembles and parses all Command Line Interface (CLI) options.
     class Parser
+      include Import[:configuration]
+
       CLIENT = OptionParser.new nil, 40, "  "
 
-      def initialize configuration = Container[:configuration],
-                     section: Parsers::Core,
-                     client: CLIENT
-        @configuration = configuration.dup
+      def initialize section: Parsers::Core,
+                     client: CLIENT,
+                     **dependencies
+        super(**dependencies)
         @section = section
         @client = client
+        @configuration_duplicate = configuration.dup
       end
 
       def call arguments = []
-        section.call configuration, client: client
+        section.call configuration_duplicate, client: client
         client.parse arguments
-        configuration.freeze
+        configuration_duplicate.freeze
       end
 
       def to_s = client.to_s
 
       private
 
-      attr_reader :configuration, :section, :client
+      attr_reader :section, :client, :configuration_duplicate
     end
   end
 end

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

@@ -7,16 +7,20 @@ module SublimeTextKit
     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 +33,7 @@ module SublimeTextKit
 
         private
 
-        attr_reader :configuration, :client, :container
+        attr_reader :configuration, :client
 
         def collate = private_methods.sort.grep(/add_/).each { |method| __send__ method }
 
@@ -96,8 +100,6 @@ module SublimeTextKit
         end
 
         def snippets_format = configuration.snippets_format
-
-        def specification = container[__method__]
       end
     end
   end

data/lib/sublime_text_kit/cli/shell.rb

@@ -4,18 +4,19 @@ module SublimeTextKit
   module CLI
     # The main Command Line Interface (CLI) object.
     class Shell
-      ACTIONS = {
-        config: Actions::Config.new,
-        metadata: Actions::Metadata.new,
-        session: Actions::Session.new,
-        snippets: Actions::Snippets.new,
-        update: Actions::Update.new
-      }.freeze
-
-      def initialize parser: Parser.new, actions: ACTIONS, container: Container
+      include Actions::Import[
+        :specification,
+        :logger,
+        :config,
+        :metadata,
+        :session,
+        :snippets,
+        :update
+      ]
+
+      def initialize parser: Parser.new, **dependencies
+        super(**dependencies)
         @parser = parser
-        @actions = actions
-        @container = container
       end
 
       def call arguments = []
@@ -26,35 +27,21 @@ module SublimeTextKit
 
       private
 
-      attr_reader :parser, :actions, :container
+      attr_reader :parser
 
       def perform configuration
         case configuration
-          in action_config: Symbol => action then config action
-          in action_metadata: Symbol => kind then metadata kind
-          in action_session: true then session
-          in action_snippets: true then snippets configuration
-          in action_update: true then update
+          in action_config: Symbol => action then config.call action
+          in action_metadata: Symbol => kind then metadata.call kind
+          in action_session: true then session.call
+          in action_snippets: true then snippets.call configuration.snippets_format
+          in action_update: true then update.call
           in action_version: true then logger.info { specification.labeled_version }
           else usage
         end
       end
 
-      def config(action) = actions.fetch(__method__).call(action)
-
-      def metadata(kind) = actions.fetch(__method__).call(kind)
-
-      def session = actions.fetch(__method__).call
-
-      def snippets(configuration) = actions.fetch(__method__).call(configuration.snippets_format)
-
-      def update = actions.fetch(__method__).call
-
-      def usage = logger.unknown { parser.to_s }
-
-      def specification = container[__method__]
-
-      def logger = container[__method__]
+      def usage = logger.any { parser.to_s }
     end
   end
 end

data/lib/sublime_text_kit/container.rb

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

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module SublimeTextKit
+  Import = AutoInjector[Container]
+end

data/lib/sublime_text_kit/sessions/rebuilder.rb

@@ -7,11 +7,9 @@ module SublimeTextKit
   module Sessions
     # Manages the rebuilding of session information.
     class Rebuilder
-      using Refinements::Pathnames
+      include Import[:configuration]
 
-      def initialize container: Container
-        @container = container
-      end
+      using Refinements::Pathnames
 
       def call
         session = read
@@ -28,8 +26,6 @@ module SublimeTextKit
 
       private
 
-      attr_reader :container
-
       def read = source_path.exist? ? JSON(source_path.read) : {}
 
       def write(json) = JSON.dump(json).then { |content| source_path.write content }
@@ -37,8 +33,6 @@ module SublimeTextKit
       def metadata_dir = configuration.metadata_dir
 
       def source_path = configuration.session_path
-
-      def configuration = container[__method__]
     end
   end
 end

data/lib/sublime_text_kit/snippets/collector.rb

@@ -6,11 +6,13 @@ module SublimeTextKit
   module Snippets
     # Collects and loads all snippets into memory for further processing.
     class Collector
+      include Import[:configuration]
+
       using Refinements::Pathnames
 
-      def initialize reader: Reader.new, container: Container
+      def initialize reader: Reader.new, **dependencies
+        super(**dependencies)
         @reader = reader
-        @container = container
       end
 
       def call
@@ -22,9 +24,7 @@ module SublimeTextKit
 
       private
 
-      def configuration = container[__method__]
-
-      attr_reader :reader, :container
+      attr_reader :reader
     end
   end
 end

data/lib/sublime_text_kit/snippets/printer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module SublimeTextKit
+  module Snippets
+    # Prints snippets as a list.
+    class Printer
+      include Import[:logger]
+
+      def initialize collector: Collector.new, **dependencies
+        super(**dependencies)
+        @collector = collector
+      end
+
+      def call bullet
+        collector.call.each do |snippet|
+          logger.info "#{bullet} #{snippet.description} - `#{snippet.trigger}`"
+        end
+      end
+
+      private
+
+      attr_reader :collector
+    end
+  end
+end

data/sublime_text_kit.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "sublime_text_kit"
-  spec.version = "12.3.2"
+  spec.version = "13.0.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://www.alchemists.io/projects/sublime_text_kit"
@@ -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: sublime_text_kit
 version: !ruby/object:Gem::Version
-  version: 12.3.2
+  version: 13.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -28,36 +28,50 @@ cert_chain:
   CxDe2+VuChj4I1nvIHdu+E6XoEVlanUPKmSg6nddhkKn2gC45Kyzh6FZqnzH/CRp
   RFE=
   -----END CERTIFICATE-----
-date: 2022-03-20 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/sublime_text_kit
 - lib/sublime_text_kit.rb
 - lib/sublime_text_kit/cli/actions/config.rb
+- lib/sublime_text_kit/cli/actions/container.rb
+- lib/sublime_text_kit/cli/actions/import.rb
 - lib/sublime_text_kit/cli/actions/metadata.rb
 - lib/sublime_text_kit/cli/actions/session.rb
 - lib/sublime_text_kit/cli/actions/snippets.rb
@@ -140,6 +156,7 @@ files:
 - lib/sublime_text_kit/configuration/defaults.yml
 - lib/sublime_text_kit/configuration/loader.rb
 - lib/sublime_text_kit/container.rb
+- lib/sublime_text_kit/import.rb
 - lib/sublime_text_kit/metadata/handler.rb
 - lib/sublime_text_kit/metadata/pathway.rb
 - lib/sublime_text_kit/metadata/serializers/project.rb
@@ -147,8 +164,7 @@ files:
 - lib/sublime_text_kit/sessions/rebuilder.rb
 - lib/sublime_text_kit/snippets/collector.rb
 - lib/sublime_text_kit/snippets/model.rb
-- lib/sublime_text_kit/snippets/printers/ascii_doc.rb
-- lib/sublime_text_kit/snippets/printers/markdown.rb
+- lib/sublime_text_kit/snippets/printer.rb
 - lib/sublime_text_kit/snippets/reader.rb
 - sublime_text_kit.gemspec
 homepage: https://www.alchemists.io/projects/sublime_text_kit
@@ -176,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: A command line interface for managing Sublime Text metadata.

data/lib/sublime_text_kit/snippets/printers/ascii_doc.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module SublimeTextKit
-  module Snippets
-    module Printers
-      # Prints snippets in ASCII Doc format.
-      class ASCIIDoc
-        def initialize collector: Collector.new, container: Container
-          @collector = collector
-          @container = container
-        end
-
-        def call
-          collector.call.each do |snippet|
-            logger.info "* #{snippet.description} - `#{snippet.trigger}`"
-          end
-        end
-
-        private
-
-        attr_reader :collector, :container
-
-        def logger = container[__method__]
-      end
-    end
-  end
-end

data/lib/sublime_text_kit/snippets/printers/markdown.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module SublimeTextKit
-  module Snippets
-    module Printers
-      # Prints snippets in Markdown format.
-      class Markdown
-        def initialize collector: Collector.new, container: Container
-          @collector = collector
-          @container = container
-        end
-
-        def call
-          collector.call.each do |snippet|
-            logger.info "- #{snippet.description} - `#{snippet.trigger}`"
-          end
-        end
-
-        private
-
-        attr_reader :collector, :container
-
-        def logger = container[__method__]
-      end
-    end
-  end
-end