milestoner 17.4.0 → 17.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9b717a5ef863756907665e0d7ced3e2512e1770644e8de790debf422f04b08
-  data.tar.gz: 1c2c42b44a900ab35e1a8d7b7aa0a7148aa31a780803c49caa40bb780789d570
+  metadata.gz: 73e28707596b9a5a610632108ac373ae2984e1633a60d35cb9872feb8a74de3e
+  data.tar.gz: 2d33c22077971f71e777940357c03c2b718c459d5afee825eda5e63bd8b487c6
 SHA512:
-  metadata.gz: 3fc74df04d95b4d3a3633202fdb3e721fbdce48da99ee40ed423771c168e1796f2de496fbbe6967243bca3e3bb0335bdaa41e899120393bddb22328942b91e71
-  data.tar.gz: c67517754b2cde0cf367f66361f4f11bd46e11332dfa9c562bc5c8ae95840f83a1ff887725932036cc5863f660df487a813c92328da483a94fe18326aab6b751
+  metadata.gz: a576d44498a17dfa4e970f08d7a5d3daa2d4e74d63947eadf7d2ba217e22a5b3b6128156d8358116741582c04689ea1039c379f28b794df43b11dd44fade2691
+  data.tar.gz: 50e1485b233665729c633bec2be2a3301772b136abe9dba8098a6e3734354048938f4ea835d8db99ff4c82af5d733b78621a7e768191a08420bd35d7e69e79ef

data/README.adoc

@@ -146,6 +146,7 @@ commit:
 generator:
   label:
   uri:
+  version:
 profile:
   domain: https://github.com
   uri: "%<domain>s/%<id>s"
@@ -185,6 +186,7 @@ The above can be customized as follows:
 * `generator`: Manages generator information.
 ** `label`: Required. The label of the generator used for all software milestones. Default: Milestoner.
 ** `uri`: Required. The URI of the generator used for all software milestones. Defaults to Milestoner's homepage URL as provided by the {gem_specification_link} of this project.
+** `version`: Required. The version of the generator used for all software milestones. Defaults to Milestoner's current version as provided by the {gem_specification_link} of this project.
 * `profile`: Manages team member profile information.
 ** `domain`: Required. The domain of your {git_link} repository. Default: GitHub.
 ** `uri`: Required. The URI format for linking to profiles as formatted using {string_formats_link}. The `id` is dynamically calculated via the `handle` of the user stored in the {lode_link} cache. Default: GitHub.

data/lib/milestoner/builders/ascii_doc.rb

@@ -14,17 +14,15 @@ module Milestoner
         super(**)
       end
 
-      def call at: Time.now.utc
-        input.build_root.join("index.adoc").make_ancestors.tap { |path| write path, at }
-      end
+      def call = input.build_root.join("index.adoc").make_ancestors.tap { |path| write path }
 
       private
 
       attr_reader :view, :enricher
 
-      def write path, at
+      def write path
         enricher.call.fmap do |commits|
-          path.write view.call commits:, at:, layout: input.build_layout, format: :adoc
+          path.write view.call commits:, layout: input.build_layout, format: :adoc
         end
       end
     end

data/lib/milestoner/builders/container.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require "dry-container"
+require "containable"
 
 module Milestoner
   module Builders
     # Registers all builders for injection.
     module Container
-      extend Dry::Container::Mixin
+      extend Containable
 
-      register(:ascii_doc, memoize: true) { ASCIIDoc.new }
-      register(:markdown, memoize: true) { Markdown.new }
-      register(:stream, memoize: true) { Stream.new }
-      register(:web, memoize: true) { Web.new }
+      register(:ascii_doc) { ASCIIDoc.new }
+      register(:markdown) { Markdown.new }
+      register(:stream) { Stream.new }
+      register(:web) { Web.new }
     end
   end
 end

data/lib/milestoner/builders/import.rb

@@ -4,6 +4,6 @@ require "infusible"
 
 module Milestoner
   module Builders
-    Import = Infusible.with Container
+    Import = Infusible[Container]
   end
 end

data/lib/milestoner/builders/markdown.rb

@@ -14,17 +14,15 @@ module Milestoner
         super(**)
       end
 
-      def call at: Time.now.utc
-        input.build_root.join("index.md").make_ancestors.tap { |path| write path, at }
-      end
+      def call = input.build_root.join("index.md").make_ancestors.tap { |path| write path }
 
       private
 
       attr_reader :view, :enricher
 
-      def write path, at
+      def write path
         enricher.call.fmap do |commits|
-          path.write view.call commits:, at:, layout: input.build_layout, format: :md
+          path.write view.call commits:, layout: input.build_layout, format: :md
         end
       end
     end

data/lib/milestoner/commits/enricher.rb

@@ -42,7 +42,7 @@ module Milestoner
       def record_for(commit) = model.for(commit, **build_attributes(commit))
 
       def build_attributes commit
-        infused_names.each.with_object({}) do |command, attributes|
+        infused_keys.each.with_object({}) do |command, attributes|
           attributes[command] = __send__(command).call commit
         end
       end

data/lib/milestoner/commits/enrichers/container.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
-require "dry-container"
+require "containable"
 
 module Milestoner
   module Commits
     module Enrichers
       # Registers all enrichers for injection.
       module Container
-        extend Dry::Container::Mixin
+        extend Containable
 
-        register(:author, memoize: true) { Author.new }
-        register(:body, memoize: true) { Body.new }
-        register(:collaborators, memoize: true) { Colleague.new key: "Co-authored-by" }
-        register(:format, memoize: true) { Format.new }
-        register(:issue, memoize: true) { Issue.new }
+        register(:author) { Author.new }
+        register(:body) { Body.new }
+        register(:collaborators) { Colleague.new key: "Co-authored-by" }
+        register(:format) { Format.new }
+        register(:issue) { Issue.new }
         register(:milestone) { Milestone.new }
-        register(:notes, memoize: true) { Note.new }
-        register(:review, memoize: true) { Review.new }
-        register(:signers, memoize: true) { Colleague.new key: "Signed-off-by" }
-        register(:uri, memoize: true) { URI.new }
+        register(:notes) { Note.new }
+        register(:review) { Review.new }
+        register(:signers) { Colleague.new key: "Signed-off-by" }
+        register(:uri) { URI.new }
       end
     end
   end

data/lib/milestoner/commits/enrichers/import.rb

@@ -5,7 +5,7 @@ require "infusible"
 module Milestoner
   module Commits
     module Enrichers
-      Import = Infusible.with Container
+      Import = Infusible[Container]
     end
   end
 end

data/lib/milestoner/configuration/contract.rb

@@ -25,6 +25,7 @@ module Milestoner
       required(:commit_uri).filled :string
       required(:generator_label).filled :string
       required(:generator_uri).filled :string
+      required(:generator_version).filled Etcher::Types::Version
       required(:profile_domain).filled :string
       required(:profile_uri).filled :string
       required(:project_author).filled :string

data/lib/milestoner/configuration/model.rb

@@ -15,6 +15,7 @@ module Milestoner
                        :commit_uri,
                        :generator_label,
                        :generator_uri,
+                       :generator_version,
                        :profile_domain,
                        :profile_uri,
                        :project_author,

data/lib/milestoner/configuration/transformers/generator/label.rb

@@ -17,7 +17,7 @@ module Milestoner
           end
 
           def call content
-            content.fetch(key) { specification.labeled_version }
+            content.fetch(key) { specification.label }
                    .then { |value| Success content.merge!(key => value) }
           end
 

data/lib/milestoner/configuration/transformers/generator/version.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "dry/monads"
+
+module Milestoner
+  module Configuration
+    module Transformers
+      module Generator
+        # Conditionally updates generator version based on gem specification.
+        class Version
+          include Import[:specification]
+          include Dry::Monads[:result]
+
+          def initialize(key = :generator_version, **)
+            @key = key
+            super(**)
+          end
+
+          def call content
+            content.fetch(key) { specification.version }
+                   .then { |value| Success content.merge!(key => value) }
+          end
+
+          private
+
+          attr_reader :key
+        end
+      end
+    end
+  end
+end

data/lib/milestoner/container.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "cogger"
-require "dry-container"
+require "containable"
 require "etcher"
 require "gitt"
 require "lode"
@@ -12,14 +12,14 @@ require "spek"
 module Milestoner
   # Provides a global gem container for injection into other objects.
   module Container
-    extend Dry::Container::Mixin
+    extend Containable
 
     namespace :xdg do
-      register(:cache, memoize: true) { Runcom::Cache.new "milestoner/database.store" }
-      register(:config, memoize: true) { Runcom::Config.new "milestoner/configuration.yml" }
+      register(:cache) { Runcom::Cache.new "milestoner/database.store" }
+      register(:config) { Runcom::Config.new "milestoner/configuration.yml" }
     end
 
-    register :cache, memoize: true do
+    register :cache do
       # :nocov:
       Lode.new self["xdg.cache"].passive do |config|
         config.mode = :max
@@ -28,12 +28,12 @@ module Milestoner
       end
     end
 
-    register :configuration, memoize: true do
+    register :configuration do
       self[:defaults].add_loader(Etcher::Loaders::YAML.new(self["xdg.config"].active))
                      .then { |registry| Etcher.call registry }
     end
 
-    register :defaults, memoize: true do
+    register :defaults do
       Etcher::Registry.new(contract: Configuration::Contract, model: Configuration::Model)
                       .add_loader(Etcher::Loaders::YAML.new(self[:defaults_path]))
                       .add_transformer(Configuration::Transformers::Build::Root)
@@ -50,6 +50,7 @@ module Milestoner
                       .add_transformer(Configuration::Transformers::Project::Version.new)
                       .add_transformer(Configuration::Transformers::Generator::Label.new)
                       .add_transformer(Configuration::Transformers::Generator::URI.new)
+                      .add_transformer(Configuration::Transformers::Generator::Version.new)
                       .add_transformer(Configuration::Transformers::URI::Avatar)
                       .add_transformer(Configuration::Transformers::URI::Commit)
                       .add_transformer(Configuration::Transformers::URI::Profile)
@@ -57,19 +58,13 @@ module Milestoner
                       .add_transformer(Configuration::Transformers::URI::Tracker)
     end
 
-    register :specification, memoize: true do
-      self[:spec_loader].call "#{__dir__}/../../milestoner.gemspec"
-    end
-
-    register :sanitizer, memoize: true do
-      -> content { Sanitize.fragment content, Sanitize::Config::BASIC }
-    end
-
-    register(:spec_loader, memoize: true) { Spek::Loader.new }
-    register(:git, memoize: true) { Gitt::Repository.new }
-    register(:input, memoize: true) { self[:configuration].dup }
-    register(:defaults_path, memoize: true) { Pathname(__dir__).join("configuration/defaults.yml") }
-    register(:logger, memoize: true) { Cogger.new id: :milestoner }
+    register(:specification) { self[:spec_loader].call "#{__dir__}/../../milestoner.gemspec" }
+    register(:sanitizer) { -> content { Sanitize.fragment content, Sanitize::Config::BASIC } }
+    register(:spec_loader) { Spek::Loader.new }
+    register(:git) { Gitt::Repository.new }
+    register(:input) { self[:configuration].dup }
+    register(:defaults_path) { Pathname(__dir__).join("configuration/defaults.yml") }
+    register(:logger) { Cogger.new id: :milestoner }
     register :kernel, Kernel
   end
 end

data/lib/milestoner/import.rb

@@ -3,5 +3,5 @@
 require "infusible"
 
 module Milestoner
-  Import = Infusible.with Container
+  Import = Infusible[Container]
 end

data/lib/milestoner/templates/layouts/page.adoc.erb

@@ -1,2 +1,2 @@
 <%= yield %>
-_Generated by link:<%= generator_uri %>[<%= generator_label %>]._
+_Generated by link:<%= generator_uri %>[<%= generator_label %> <%= generator_version %>]._

data/lib/milestoner/templates/layouts/page.html.erb

@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="<%= project_description %>">
     <meta name="author" content="<%= project_author %>">
-    <meta name="generator" content="<%= generator_label %>">
+    <meta name="generator" content="<%= generator_label %> <%= generator_version %>">
 
     <link title="<%= project_label %>: Favorite Icon"
           rel="icon"
@@ -30,7 +30,7 @@
 
     <footer class="footer">
       <p class="generator">
-        Generated by <a href="<%= generator_uri %>" class="link"><%= generator_label %></a>.
+        Generated by <a href="<%= generator_uri %>" class="link"><%= generator_label %> <%= generator_version %></a>.
       </p>
     </footer>
   </body>

data/lib/milestoner/templates/layouts/page.md.erb

@@ -1,2 +1,2 @@
 <%= yield %>
-*Generated by [<%= generator_label %>](<%= generator_uri %>).*
+*Generated by [<%= generator_label %> <%= generator_version %>](<%= generator_uri %>).*

data/lib/milestoner/templates/layouts/page.stream.erb

@@ -1,2 +1,2 @@
 <%= yield %>
-Generated by <%= generator_label %>.
+Generated by <%= generator_label %> <%= generator_version %>.

data/lib/milestoner/templates/milestones/show.adoc.erb

@@ -1,8 +1,10 @@
-= <%= project_label %> <%= project_version %> (<%= date %>)
-
 <% if commits.empty? %>
+= <%= project_label %> (<%= date %>)
+
 *<%= total_commits %>. <%= total_files %>. <%= total_deletions %>. <%= total_insertions %>.*
 <% else %>
+= <%= project_label %> <%= project_version %> (<%= date %>)
+
 <% commits.each do |commit| %><%= commit.render :commit %><% end %>
 
 *<%= total_commits %>. <%= total_files %>. <%= total_deletions %>. <%= total_insertions %>.*

data/lib/milestoner/templates/milestones/show.html.erb

@@ -2,7 +2,10 @@
   <header class="header">
     <h1 class="title">
       <a href="<%= uri %>" class="label"><%= project_label %></a>
-      <span class="version"><%= project_version %></span>
+
+      <% if commits.any? %>
+        <span class="version"><%= project_version %></span>
+      <% end %>
     </h1>
 
     <time datetime="<%= datetime %>" class="date"><%= date %></time>
@@ -13,11 +16,8 @@
   <% else %>
     <section class="body" x-data="{open: false}">
       <div class="actions">
-        <button class="toggle"
-                x-on:click="open = !open"
-                x-text="open ? 'Collapse' : 'Expand'">
-          Expand
-        </button>
+        <button class="toggle" x-on:click="open = true">Expand</button>
+        <button class="toggle" x-on:click="open = false">Collapse</button>
       </div>
 
       <div class="columns">

data/lib/milestoner/templates/milestones/show.md.erb

@@ -1,8 +1,10 @@
-# <%= project_label %> <%= project_version %> (<%= date %>)
-
 <% if commits.empty? %>
+# <%= project_label %> (<%= date %>)
+
 **<%= total_commits %>. <%= total_files %>. <%= total_deletions %>. <%= total_insertions %>.**
 <% else %>
+# <%= project_label %> <%= project_version %> (<%= date %>)
+
 <% commits.each do |commit| %><%= commit.render :commit %><% end %>
 
 **<%= total_commits %>. <%= total_files %>. <%= total_deletions %>. <%= total_insertions %>.**

data/lib/milestoner/templates/milestones/show.stream.erb

@@ -1,8 +1,10 @@
-<%= project_label %> <%= project_version %> (<%= date %>)
-
 <% if commits.empty? %>
+<%= project_label %> (<%= date %>)
+
 <%= total_commits %>. <%= total_files %>. <%= total_deletions %>. <%= total_insertions %>.
 <% else %>
+<%= project_label %> <%= project_version %> (<%= date %>)
+
 <% commits.each do |commit| %><%= commit.render :commit %><% end %>
 
 <%= total_commits %>. <%= total_files %>. <%= total_deletions %>. <%= total_insertions %>.

data/lib/milestoner/templates/public/page.css.erb

@@ -48,18 +48,24 @@
   .actions {
     display: flex;
     justify-content: flex-end;
+    gap: 0.5rem;
     margin-bottom: 0.5rem;
   }
 
   .toggle {
     background-color: var(--color-white);
-    border: 0.1rem solid var(--color-sea);
+    border: 0.13rem solid var(--color-carbon);
     border-radius: 0.5rem;
-    color: var(--color-sea);
+    color: var(--color-black);
     cursor: pointer;
     padding: 0.2rem;
     font-size: 0.9rem;
     width: 5rem;
+    transition: border-color .2s ease-in;
+
+    &:hover {
+      border-color: var(--color-black);
+    }
   }
 
   .normal {

data/lib/milestoner/views/context.rb

@@ -14,13 +14,18 @@ module Milestoner
       delegate %i[
         generator_label
         generator_uri
+        generator_version
         project_author
         project_description
         project_generator
         project_label
+        project_name
+        project_uri
         project_version
       ] => :input
 
+      def project_slug = [project_name, project_version].compact.join("_").tr ".", ""
+
       def project_title = [project_label, project_version].compact.join " "
     end
   end

data/milestoner.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "milestoner"
-  spec.version = "17.4.0"
+  spec.version = "17.6.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/milestoner"
@@ -26,19 +26,19 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0"
   spec.add_dependency "cff", "~> 1.1"
   spec.add_dependency "cogger", "~> 0.16"
-  spec.add_dependency "dry-container", "~> 0.11"
+  spec.add_dependency "containable", "~> 0.0"
   spec.add_dependency "dry-monads", "~> 1.6"
   spec.add_dependency "dry-schema", "~> 1.13"
-  spec.add_dependency "etcher", "~> 1.0"
+  spec.add_dependency "etcher", "~> 1.3"
   spec.add_dependency "gitt", "~> 3.2"
-  spec.add_dependency "hanami-view", "~> 2.1.0.rc2"
-  spec.add_dependency "infusible", "~> 3.4"
+  spec.add_dependency "hanami-view", "~> 2.1"
+  spec.add_dependency "infusible", "~> 3.5"
   spec.add_dependency "lode", "~> 1.0"
   spec.add_dependency "redcarpet", "~> 3.6"
   spec.add_dependency "refinements", "~> 12.1"
   spec.add_dependency "runcom", "~> 11.0"
   spec.add_dependency "sanitize", "~> 6.1"
-  spec.add_dependency "sod", "~> 0.4"
+  spec.add_dependency "sod", "~> 0.8"
   spec.add_dependency "spek", "~> 3.0"
   spec.add_dependency "versionaire", "~> 13.0"
   spec.add_dependency "zeitwerk", "~> 2.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 17.4.0
+  version: 17.6.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -35,7 +35,7 @@ cert_chain:
   3n5C8/6Zh9DYTkpcwPSuIfAga6wf4nXc9m6JAw8AuMLaiWN/r/2s4zJsUHYERJEu
   gZGm4JqtuSg8pYjPeIJxS960owq+SfuC+jxqmRA54BisFCv/0VOJi7tiJVY=
   -----END CERTIFICATE-----
-date: 2024-03-09 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -80,19 +80,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: containable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: gitt
   requirement: !ruby/object:Gem::Requirement
@@ -155,28 +155,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc2
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0.rc2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: infusible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: lode
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +253,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: spek
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +365,7 @@ files:
 - lib/milestoner/configuration/transformers/gems/uri.rb
 - lib/milestoner/configuration/transformers/generator/label.rb
 - lib/milestoner/configuration/transformers/generator/uri.rb
+- lib/milestoner/configuration/transformers/generator/version.rb
 - lib/milestoner/configuration/transformers/project/author.rb
 - lib/milestoner/configuration/transformers/project/generator.rb
 - lib/milestoner/configuration/transformers/project/label.rb
@@ -433,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A command line interface for managing Git repository milestones.