rubysmith 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbc9d9406cccf11b2508d5c27370906bf7f13b18e8506638ddc29a9ce003df4
-  data.tar.gz: 64beedf46aea4a1768e98790c9c3e96acca2d274fe12805721588338584fb390
+  metadata.gz: 4bf7aff137172ca7f7959152c9a6550f1453ae79c9f0947048b3f829ae118b5c
+  data.tar.gz: 97a5b9c2fcf8204aa77b84bd159888f93808aa0dcc7693547d0aa3104cb226b2
 SHA512:
-  metadata.gz: 3e22613cee83158a67415a51e128603d5bea8ad9fb052c679520669c01e933fbd14c850efaddb0a30144ccca4515f7a96c45104b503e975b44f344fb2bbfd64f
-  data.tar.gz: 5054c72f1a820e90cf414aa110246bb0d404737f13c61ea2117818474ff42316ea40217e8f19fd113316e994a67ed6878be64abcf444165a8216b49b8eda9ceb
+  metadata.gz: cfbbafd5a69876cd04a2d6d980c3ffccf95efe7a70d595983953bf62efcd557e49433f34dc954069b135e90372f601837c9b9f7ee50534fb0c0b61c2b73c86b9
+  data.tar.gz: 520c7dccfd4bde72ceb2678fbc6e7ceb1d5a246c17261858d22577b92965463998968dbf3cf50e44847c64484aff1fee4795d220364ceeef749fb4bee967450e

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

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
 
 require "dry/monads"
-require "gitt"
 
 module Rubysmith
   module Configuration
-    # Dynamically adds Git email if defined.
     module Transformers
-      include Dry::Monads[:result]
+      # Dynamically adds Git email if defined.
+      class GitEmail
+        include Import[:git]
+        include Dry::Monads[:result]
 
-      GitEmail = lambda do |content, git: Gitt::Repository.new|
-        return Dry::Monads::Success content if content[:author_email]
+        def call content
+          return Success content if content[:author_email]
 
-        git.get("user.email").fmap { |email| content.merge! author_email: email }
+          git.get("user.email").fmap { |email| content.merge! author_email: email }
+        end
       end
     end
   end

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

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
 
 require "dry/monads"
-require "gitt"
 
 module Rubysmith
   module Configuration
-    # Dynamically adds GitHub user if user is defined.
     module Transformers
-      include Dry::Monads[:result]
+      # Dynamically adds GitHub user if user is defined.
+      class GitHubUser
+        include Import[:git]
+        include Dry::Monads[:result]
 
-      GitHubUser = lambda do |content, git: Gitt::Repository.new|
-        return Dry::Monads::Success content if content[:git_hub_user]
+        def call content
+          return Success content if content[:git_hub_user]
 
-        git.get("github.user").fmap { |user| content.merge! git_hub_user: user }
+          git.get("github.user").fmap { |user| content.merge! git_hub_user: user }
+        end
       end
     end
   end

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

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 require "dry/monads"
-require "gitt"
 
 module Rubysmith
   module Configuration
-    # Dynamically adds Git user if defined.
     module Transformers
-      include Dry::Monads[:result]
+      # Dynamically adds Git user if defined.
+      class GitUser
+        include Import[:git]
+        include Dry::Monads[:result]
+
+        def call content
+          return Success content if content[:author_given_name] || content[:author_family_name]
 
-      GitUser = lambda do |content, git: Gitt::Repository.new|
-        if content[:author_given_name] || content[:author_family_name]
-          Dry::Monads::Success content
-        else
           git.get("user.name").fmap do |name|
             first, last = String(name).split
             content.merge author_given_name: first, author_family_name: last

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

@@ -5,17 +5,27 @@ require "refinements/arrays"
 
 module Rubysmith
   module Configuration
-    # Prepends template roots to existing content.
     module Transformers
-      include Dry::Monads[:result]
+      # Appends custom content to default template roots.
+      class TemplateRoot
+        include Dry::Monads[:result]
 
-      using Refinements::Arrays
+        using Refinements::Arrays
 
-      TemplateRoot = lambda do |content, overrides: Pathname(__dir__).join("../../templates")|
-        Array(overrides).map { |path| Pathname path }
+        def initialize default = Pathname(__dir__).join("../../templates")
+          @default = default
+        end
+
+        def call content
+          Array(default).map { |path| Pathname path }
                         .including(content[:template_roots])
                         .compact
-                        .then { |paths| Dry::Monads::Success content.merge!(template_roots: paths) }
+                        .then { |paths| Success content.merge!(template_roots: paths) }
+        end
+
+        private
+
+        attr_reader :default
       end
     end
   end

data/lib/rubysmith/container.rb

@@ -3,6 +3,7 @@
 require "cogger"
 require "dry-container"
 require "etcher"
+require "gitt"
 require "runcom"
 require "spek"
 
@@ -20,10 +21,10 @@ module Rubysmith
       Etcher::Registry.new(contract: Configuration::Contract, model: Configuration::Model)
                       .add_loader(Etcher::Loaders::YAML.new(self[:defaults_path]))
                       .add_transformer(Configuration::Transformers::CurrentTime)
-                      .add_transformer(Configuration::Transformers::GitHubUser)
-                      .add_transformer(Configuration::Transformers::GitEmail)
-                      .add_transformer(Configuration::Transformers::GitUser)
-                      .add_transformer(Configuration::Transformers::TemplateRoot)
+                      .add_transformer(Configuration::Transformers::GitHubUser.new)
+                      .add_transformer(Configuration::Transformers::GitEmail.new)
+                      .add_transformer(Configuration::Transformers::GitUser.new)
+                      .add_transformer(Configuration::Transformers::TemplateRoot.new)
                       .add_transformer(Configuration::Transformers::TargetRoot)
     end
 
@@ -31,6 +32,7 @@ module Rubysmith
     register(:defaults_path) { Pathname(__dir__).join("configuration/defaults.yml") }
     register(:xdg_config) { Runcom::Config.new "rubysmith/configuration.yml" }
     register(:specification) { Spek::Loader.call "#{__dir__}/../../rubysmith.gemspec" }
+    register(:git) { Gitt::Repository.new }
     register(:kernel) { Kernel }
     register(:logger) { Cogger.new formatter: :emoji }
   end

data/rubysmith.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "rubysmith"
-  spec.version = "5.0.1"
+  spec.version = "5.1.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://github.com/bkuhlmann/rubysmith"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysmith
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -35,7 +35,7 @@ cert_chain:
   3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
   gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
   -----END CERTIFICATE-----
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cogger