rubysmith 4.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800b586dd843e166d9fc97e0034b4929111ee1f9dc0cb9e02ce294d512cfb227
-  data.tar.gz: 984327cfa351cd57aa103cbfc94e09a060afe4611d49504e61263cc5a6ff776a
+  metadata.gz: 20400688d18009b8693a50e2aaf540091135655cf7b44a447ad2299f2fccea46
+  data.tar.gz: 0f7d4d8121b57dce5dbd25f17bd76366269d74856ff8cdcd1000908d6d8d9a08
 SHA512:
-  metadata.gz: e6012f65fb94be8bd2a515d3647c51b905bb591a3d4f5e692e53e502bc9ac573cf753de33d041639d21e10f2668258d3cfb9cb4c620365a04098dc6f7da1bbff
-  data.tar.gz: e226baccb45c568d104bd4775672573509bdd6d5d03f478b61b4c125bbc056ed21803949771a542fd975687782f3bed90a06bfc1f694b333e569f4963d0b8c35
+  metadata.gz: cacd542dcdb79197f4db085021d4756f38e71017d88dd2aa1db55e43e1e60f80818d1da2f19841de58e5e0d8b903ce9343c3fce4dc1d70fcad2c97ece9abf323
+  data.tar.gz: d2aed19508d58fbe8def647ae99e9e6d9a3ad504b08de531439c6a8a8ec7a10924ab9256b12755800e4416271e53b3a517813f8c034c02e8ad6ecd67f591ca1f

data/lib/rubysmith/builders/core.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "core"
 require "refinements/strings"
 require "refinements/structs"
 
@@ -31,7 +32,7 @@ module Rubysmith
 
       private
 
-      def indentation = "".indent configuration.project_levels
+      def indentation = ::Core::EMPTY_STRING.indent configuration.project_levels
 
       def module_name = configuration.project_class
 

data/lib/rubysmith/builders/git/commit.rb

@@ -34,10 +34,8 @@ module Rubysmith
         attr_reader :configuration, :builder
 
         def body
-          <<~CONTENT
-            Generated with [#{specification.label}](#{specification.homepage_url})
-            #{specification.version}.
-          CONTENT
+          "Generated with [#{specification.label}](#{specification.homepage_url}) " \
+          "#{specification.version}."
         end
 
         def project_name = configuration.project_name

data/lib/rubysmith/cli/parser.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "core"
 require "optparse"
 
 module Rubysmith
@@ -18,7 +19,7 @@ module Rubysmith
         @configuration_duplicate = configuration.dup
       end
 
-      def call arguments = []
+      def call arguments = Core::EMPTY_ARRAY
         sections.each { |section| section.call configuration_duplicate, client: }
         client.parse arguments
         configuration_duplicate.freeze

data/lib/rubysmith/cli/parsers/build.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "core"
 require "refinements/structs"
 
 module Rubysmith
@@ -21,7 +22,7 @@ module Rubysmith
           @client = client
         end
 
-        def call arguments = []
+        def call arguments = ::Core::EMPTY_ARRAY
           client.separator "\nBUILD OPTIONS:\n"
           collate
           client.parse arguments

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "core"
 require "refinements/structs"
 
 module Rubysmith
@@ -21,7 +22,7 @@ module Rubysmith
           @client = client
         end
 
-        def call arguments = []
+        def call arguments = ::Core::EMPTY_ARRAY
           client.banner = specification.labeled_summary
           client.separator "\nUSAGE:\n"
           collate

data/lib/rubysmith/cli/shell.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "core"
 require "milestoner"
 
 module Rubysmith
@@ -13,7 +14,7 @@ module Rubysmith
         @parser = parser
       end
 
-      def call arguments = []
+      def call arguments = Core::EMPTY_ARRAY
         perform parser.call(arguments)
       rescue OptionParser::ParseError, Milestoner::Error => error
         logger.error { error.message }

data/lib/rubysmith/configuration/content.rb

@@ -82,25 +82,21 @@ module Rubysmith
       :project_version,
       :target_root,
       :template_path,
-      :template_roots,
-      keyword_init: true
+      :template_roots
     ) do
       using Refinements::Arrays
       using Refinements::Strings
       using Refinements::Structs
 
-      def initialize *arguments
+      def initialize target_root: Pathname.pwd, template_roots: [], **arguments
         super
-
-        self[:template_roots] ||= [Pathname(__dir__).join("../templates")]
-        self[:target_root] ||= Pathname.pwd
         freeze
       end
 
-      def add_template_roots paths
-        Array(paths).map { |path| Pathname path }
-                    .including(template_roots)
-                    .then { |roots| dup.merge! template_roots: roots }
+      def add_template_roots *paths
+        paths.map { |path| Pathname path }
+             .including(template_roots)
+             .then { |roots| dup.merge! template_roots: roots }
       end
 
       def maximize = update_build_options(true)

data/lib/rubysmith/configuration/enhancers/container.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "dry/container"
+
+module Rubysmith
+  module Configuration
+    module Enhancers
+      # Provides a container of enhancers for injection into other objects.
+      module Container
+        extend Dry::Container::Mixin
+
+        register(:current_time) { Enhancers::CurrentTime }
+        register(:git_hub_user) { Enhancers::GitHubUser }
+        register(:git_email) { Enhancers::GitEmail }
+        register(:git_user) { Enhancers::GitUser }
+        register(:template_root) { Enhancers::TemplateRoot }
+      end
+    end
+  end
+end

data/lib/rubysmith/configuration/enhancers/current_time.rb

@@ -4,21 +4,11 @@ require "refinements/structs"
 
 module Rubysmith
   module Configuration
+    # Adds current time to content.
     module Enhancers
-      # Adds current time to content.
-      class CurrentTime
-        using Refinements::Structs
+      using Refinements::Structs
 
-        def initialize now = Time.now
-          @now = now
-        end
-
-        def call(content) = content.merge(now:)
-
-        private
-
-        attr_reader :now
-      end
+      CurrentTime = -> content, at: Time.now { content.merge(now: at) }
     end
   end
 end

data/lib/rubysmith/configuration/enhancers/git_email.rb

@@ -6,25 +6,15 @@ require "refinements/structs"
 
 module Rubysmith
   module Configuration
+    # Dynamically adds Git email if defined.
     module Enhancers
-      # Dynamically adds Git email if defined.
-      class GitEmail
-        using Refinements::Strings
-        using Refinements::Structs
+      using Refinements::Strings
+      using Refinements::Structs
 
-        def initialize git: Gitt::Repository.new
-          @git = git
-        end
+      GitEmail = lambda do |content, git: Gitt::Repository.new|
+        return content unless String(content.author_email).blank?
 
-        def call content
-          String(content.author_email).blank? ? content.merge(author_email: email) : content
-        end
-
-        private
-
-        attr_reader :git
-
-        def email = git.get("user.email").value_or("")
+        content.merge author_email: git.get("user.email").value_or("")
       end
     end
   end

data/lib/rubysmith/configuration/enhancers/git_hub_user.rb

@@ -6,25 +6,15 @@ require "refinements/structs"
 
 module Rubysmith
   module Configuration
+    # Dynamically adds GitHub user if user is defined.
     module Enhancers
-      # Dynamically adds GitHub user if user is defined.
-      class GitHubUser
-        using Refinements::Strings
-        using Refinements::Structs
+      using Refinements::Strings
+      using Refinements::Structs
 
-        def initialize git: Gitt::Repository.new
-          @git = git
-        end
+      GitHubUser = lambda do |content, git: Gitt::Repository.new|
+        return content unless String(content.git_hub_user).blank?
 
-        def call content
-          String(content.git_hub_user).blank? ? content.merge(git_hub_user: user) : content
-        end
-
-        private
-
-        attr_reader :git
-
-        def user = git.get "github.user"
+        content.merge git_hub_user: git.get("github.user").value_or("default")
       end
     end
   end

data/lib/rubysmith/configuration/enhancers/git_user.rb

@@ -6,28 +6,19 @@ require "refinements/structs"
 
 module Rubysmith
   module Configuration
+    # Dynamically adds Git user if defined.
     module Enhancers
-      # Dynamically adds Git user if defined.
-      class GitUser
-        using Refinements::Strings
-        using Refinements::Structs
+      using Refinements::Strings
+      using Refinements::Structs
 
-        def initialize git: Gitt::Repository.new
-          @git = git
-        end
+      GitUser = lambda do |content, git: Gitt::Repository.new|
+        return content unless String(content.author_name).blank?
 
-        def call(content) = String(content.author_name).blank? ? content.merge(**user) : content
-
-        private
-
-        attr_reader :git
-
-        def user
-          git.get("user.name")
-             .value_or("")
-             .then { |name| String(name).split }
-             .then { |first, last| {author_given_name: first, author_family_name: last} }
-        end
+        git.get("user.name")
+           .value_or("")
+           .then { |name| String(name).split }
+           .then { |first, last| {author_given_name: first, author_family_name: last} }
+           .then { |user| content.merge(**user) }
       end
     end
   end

data/lib/rubysmith/configuration/enhancers/template_root.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rubysmith
+  module Configuration
+    module Enhancers
+      # Prepends template roots to existing content.
+      TemplateRoot = lambda do |content, overrides: Pathname(__dir__).join("../../templates")|
+        content.add_template_roots(*Array(overrides))
+      end
+    end
+  end
+end

data/lib/rubysmith/configuration/loader.rb

@@ -16,32 +16,28 @@ module Rubysmith
       DEFAULTS = YAML.load_file(Pathname(__dir__).join("defaults.yml")).freeze
       CLIENT = Runcom::Config.new "rubysmith/configuration.yml", defaults: DEFAULTS
 
-      ENHANCERS = [
-        Enhancers::CurrentTime.new,
-        Enhancers::GitEmail.new,
-        Enhancers::GitHubUser.new,
-        Enhancers::GitUser.new
-      ].freeze
-
       def self.call(...) = new(...).call
 
-      def self.with_defaults = new(client: DEFAULTS, enhancers: [])
+      def self.with_defaults = new(client: DEFAULTS, enhancers: {})
 
-      def initialize content: Content.new, client: CLIENT, enhancers: ENHANCERS
+      def initialize content: Content.new, client: CLIENT, enhancers: Enhancers::Container
         @content = content
         @client = client
         @enhancers = enhancers
       end
 
       def call
-        enhancers.reduce(preload_content) { |preload, enhancer| enhancer.call preload }
+        enhancers.each
+                 .reduce(preload_content) { |preload, (_key, enhancer)| enhancer.call preload }
                  .freeze
       end
 
-      private
+      protected
 
       attr_reader :content, :client, :enhancers
 
+      private
+
       def preload_content = content.merge(**client.to_h.flatten_keys)
     end
   end

data/rubysmith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "rubysmith"
-  spec.version = "4.1.0"
+  spec.version = "4.3.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://github.com/bkuhlmann/rubysmith"
@@ -24,17 +24,18 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 3.2"
   spec.add_dependency "cogger", "~> 0.5"
+  spec.add_dependency "core", "~> 0.1"
   spec.add_dependency "dry-container", "~> 0.11"
-  spec.add_dependency "gitt", "~> 1.0"
+  spec.add_dependency "gitt", "~> 1.1"
   spec.add_dependency "infusible", "~> 1.0"
-  spec.add_dependency "milestoner", "~> 15.0"
+  spec.add_dependency "milestoner", "~> 15.2"
   spec.add_dependency "pastel", "~> 0.8"
-  spec.add_dependency "pragmater", "~> 12.0"
+  spec.add_dependency "pragmater", "~> 12.1"
   spec.add_dependency "refinements", "~> 10.0"
   spec.add_dependency "rubocop", "~> 1.41"
   spec.add_dependency "runcom", "~> 9.0"
   spec.add_dependency "spek", "~> 1.0"
-  spec.add_dependency "tocer", "~> 15.0"
+  spec.add_dependency "tocer", "~> 15.1"
   spec.add_dependency "zeitwerk", "~> 2.6"
 
   spec.bindir = "exe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysmith
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -28,7 +28,7 @@ cert_chain:
   CxDe2+VuChj4I1nvIHdu+E6XoEVlanUPKmSg6nddhkKn2gC45Kyzh6FZqnzH/CRp
   RFE=
   -----END CERTIFICATE-----
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: infusible
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '15.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '15.2'
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: refinements
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '15.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '15.1'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -260,10 +274,12 @@ files:
 - lib/rubysmith/cli/shell.rb
 - lib/rubysmith/configuration/content.rb
 - lib/rubysmith/configuration/defaults.yml
+- lib/rubysmith/configuration/enhancers/container.rb
 - lib/rubysmith/configuration/enhancers/current_time.rb
 - lib/rubysmith/configuration/enhancers/git_email.rb
 - lib/rubysmith/configuration/enhancers/git_hub_user.rb
 - lib/rubysmith/configuration/enhancers/git_user.rb
+- lib/rubysmith/configuration/enhancers/template_root.rb
 - lib/rubysmith/configuration/loader.rb
 - lib/rubysmith/container.rb
 - lib/rubysmith/extensions/bundler.rb
@@ -334,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: A command line interface for smithing Ruby projects.