rubysmith 4.0.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab5b0e11cc7a26ae44d9bfb2f28b5a582a2b785c3e5140cb959d0dba1248492
-  data.tar.gz: b6c20fa6f3bb6e5b1c9f893519ea57a61b20e3a7cba22c273bada97c760615b9
+  metadata.gz: 4cfa93891b2aab52dafc35ded6689a9b1ab0238392a77fb00792921509688a81
+  data.tar.gz: fe6ad94812bfcf65510f5d003adcdb1343108eeab217b000ecd52ede786918c9
 SHA512:
-  metadata.gz: 6d4fc06bbee40a3ec061f572e2380260bc851420a3a6a101a0d0d685b4cc99e84505c3bcbc09376ed7d1dcf70bea6b56af4332e75f32142cd07834ff59b884f3
-  data.tar.gz: 8af8cb102523d0ee51e5f74748b8d2bab01a858c02c72d98477870fed7ac2465f7bf470f232bc3ece2543fecd5ba77f6db3059458a4d72ee885f79a110bd0f0e
+  metadata.gz: a452d09d13d5f9531c0f524a7562b352ed1b3e4c24c2b8f8cadccfe05ee8c9eae60aed31da16b7b2125fdc95e3034f88a364b7188c6721073177635ba67ba602
+  data.tar.gz: d88f49c8805a2f9730d29a741a399075c3a30c88bbcb987bd70647de3b68d859ebe05ab8d91b5563566cb80c39202494d63f5f89ea2861a3816edf88895d306c

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/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", "TODO"
+        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,27 +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", "TODO")
-             .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/lib/rubysmith/templates/%project_name%/Gemfile.erb

@@ -20,7 +20,7 @@ group :code_quality do
     gem "reek", "~> 6.1"
   <% end %>
   <% if configuration.build_simple_cov %>
-    gem "simplecov", "~> 0.21", require: false
+    gem "simplecov", "~> 0.22", require: false
   <% end %>
 end
 

data/lib/rubysmith/templates/%project_name%/spec/spec_helper.rb.erb

@@ -6,8 +6,9 @@ require "simplecov"
 
 unless ENV["NO_COVERAGE"]
   SimpleCov.start do
-    enable_coverage :branch
     add_filter %r(^/spec/)
+    enable_coverage :branch
+    enable_coverage_for_eval
     minimum_coverage_by_file line: 95, branch: 95
   end
 end

data/rubysmith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "rubysmith"
-  spec.version = "4.0.1"
+  spec.version = "4.2.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://github.com/bkuhlmann/rubysmith"
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-container", "~> 0.11"
   spec.add_dependency "gitt", "~> 1.0"
   spec.add_dependency "infusible", "~> 1.0"
-  spec.add_dependency "milestoner", "~> 15.0"
+  spec.add_dependency "milestoner", "~> 15.1"
   spec.add_dependency "pastel", "~> 0.8"
   spec.add_dependency "pragmater", "~> 12.0"
   spec.add_dependency "refinements", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysmith
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.2.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-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger
@@ -92,14 +92,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: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -260,10 +260,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
@@ -306,7 +308,6 @@ files:
 - lib/rubysmith/templates/%project_name%/lib/%project_path%.rb.erb
 - lib/rubysmith/templates/%project_name%/spec/spec_helper.rb.erb
 - lib/rubysmith/templates/%project_name%/spec/support/shared_contexts/temp_dir.rb.erb
-- lib/rubysmith/templates/.DS_Store
 - lib/rubysmith/text/inserter.rb
 - rubysmith.gemspec
 homepage: https://github.com/bkuhlmann/rubysmith