milestoner 19.7.0 → 19.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e052991b66b9fb5fe54eacca376a7be855f8ee22eba3a74514c33da7031f734
-  data.tar.gz: 11e0b6d61e85dedff552bf3ce892fc0f5e6cd29c81995a208ed698f7a62f1e39
+  metadata.gz: 598330664be3b7f14d771c22ff8fc790eff94bd2b91a655724b7c6f5cfd9887a
+  data.tar.gz: a32407b5c1d405ceab1c70bd2fb1c5cb3212709c7f28cff61e19f8c4b1ad64c9
 SHA512:
-  metadata.gz: d88bd2ab8e29c670ae12243a3227a2cca677e65e953a08df0c6e40664e69705978e3307484e0b69868cf17966ad8a6f5f01c5775ce8301aaa8b99fc46ddf9d7a
-  data.tar.gz: 5a2f1048221418f32662db8da687aa9d517811b94d45ab798543306ed183b2b783211232db4964d97ee87998c7a9bb28fb240ada005d46454978f9fbf01d6742
+  metadata.gz: e91e5a636d3a2466273565462bdbfabe1ce7040e53c73cb6417b7dfbb390f75af4c15f898377604d57c8030f9cf4d30d64eac747ceb9ac5784fb82e12ee1dd62
+  data.tar.gz: 2496b6691182133f355c7af89ddc755f617b2af8e9815613f30be20b57043f5978b04825e9bca0322027bbec3bdde3be5be11fd2371a5090f2b106c97d5f2bea

data/lib/milestoner/builders/syndication/builder.rb

@@ -8,7 +8,6 @@ module Milestoner
   module Builders
     module Syndication
       # Builds feed in Atom format.
-      # :reek:DataClump
       class Builder
         include Milestoner::Dependencies[:settings]
         include Dry::Monads[:result]

data/lib/milestoner/commits/categorizer.rb

@@ -19,7 +19,6 @@ module Milestoner
         @pattern = labels.empty? ? // : Regexp.union(labels)
       end
 
-      # :reek:NestedIterators
       def call min: Collector::MIN, max: Collector::MAX
         collect(min, max).each_value { |commits| commits.sort_by! { |_, commit| commit.subject } }
                          .values

data/lib/milestoner/models/commit.rb

@@ -48,6 +48,8 @@ module Milestoner
         super
         freeze
       end
+
+      def contributors = [author, *collaborators, *signers].sort_by!(&:name)
     end
   end
 end

data/lib/milestoner/models/tag.rb

@@ -3,6 +3,6 @@
 module Milestoner
   module Models
     # Represents a Git tag comprised of multiple commits.
-    Tag = Struct.new :author, :commits, :committed_at, :sha, :signature, :version
+    Tag = Struct.new :author, :commits, :committed_at, :contributors, :sha, :signature, :version
   end
 end

data/lib/milestoner/tags/enricher.rb

@@ -8,6 +8,7 @@ require "versionaire"
 module Milestoner
   module Tags
     # Builds a collection of enriched tags and associated commits.
+    # :reek:TooManyMethods
     class Enricher
       include Milestoner::Dependencies[:git, :settings, :logger]
       include Commits::Enrichers::Dependencies[author_enricher: :author]
@@ -78,6 +79,7 @@ module Milestoner
           author: author(tag),
           commits:,
           committed_at: committed_at(tag.committed_at),
+          contributors: contributors(commits),
           sha: tag.sha,
           signature: tag.signature,
           version: Version(tag.version || settings.project_version)
@@ -94,6 +96,7 @@ module Milestoner
             author: commits.last.author,
             commits:,
             committed_at: Time.now,
+            contributors: [],
             version: settings.project_version
           ]
         ]
@@ -103,6 +106,13 @@ module Milestoner
         author_enricher.call tag.with(author_name: tag.author_name || settings.project_author)
       end
 
+      # :reek:UtilityFunction
+      def contributors commits
+        commits.reduce([]) { |all, commit| all.append(*commit.contributors) }
+               .uniq
+               .sort_by(&:name)
+      end
+
       def committed_at(at) = at ? Time.at(at.to_i) : settings.loaded_at
     end
   end

data/lib/milestoner/tags/manifest.rb

@@ -39,7 +39,6 @@ module Milestoner
 
       attr_reader :name
 
-      # :reek:FeatureEnvy
       def content_for tags
         generator.merge latest: tags.last.version, versions: tags.map(&:version)
       end

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

@@ -30,19 +30,19 @@
           href="<%= stylesheet_uri %>.css"
           type="text/css">
 
-    <script src="https://unpkg.com/alpinejs@3.14.9"
-            integrity="sha384-9Ax3MmS9AClxJyd5/zafcXXjxmwFhZCdsT6HJoJjarvCaAkJlk5QDzjLJm+Wdx5F"
+    <script src="https://unpkg.com/alpinejs@3.15.0"
+            integrity="sha384-ZzplbkDNw4d2hjWc+D9EcDIgXEUybwPr2Slhix4BTtvQO3JbK60Av543BvQT9gTu"
             crossorigin="anonymous"
             defer>
     </script>
 
-    <script src="https://unpkg.com/htmx.org@2.0.6"
-            integrity="sha384-Akqfrbj/HpNVo8k11SXBb6TlBWmXXlYQrCSqEWmyKJe+hDm3Z/B2WVG4smwBkRVm"
+    <script src="https://unpkg.com/htmx.org@2.0.7"
+            integrity="sha384-ZBXiYtYQ6hJ2Y0ZNoYuI+Nq5MqWBr+chMrS/RkXpNzQCApHEhOt2aY8EJgqwHLkJ"
             crossorigin="anonymous">
     </script>
 
-    <script src="https://unpkg.com/htmx-select@0.5.0"
-            integrity="sha384-tV9hAXjvOXRR0ov0OzoGh67dwFQXv2ZLHWs3ev8cz6e0zquAJwavfSE6ab6UoFXS"
+    <script src="https://unpkg.com/htmx-select@0.8.0"
+            integrity="sha384-KMC31xzp4MoFILGxlftLhiqi68jrjw66Ygqa4O5zidGWkqWgvkKxCwKOJ82C6Fme"
             crossorigin="anonymous">
     </script>
   </head>

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

@@ -1 +1 @@
-image:<%= user.avatar_url %>[<%= user.image_alt %>,24,24]
+image:<%= user.avatar_url %>[<%= user.image_alt %>,<%= locals.fetch :width, 24 %>,<%= locals.fetch :height, 24 %>]

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

@@ -1,6 +1,6 @@
 <img src="<%= user.avatar_url %>"
      alt="<%= user.image_alt %>"
      class="avatar"
-     width="24"
-     height="24"
+     width="<%= locals.fetch :width, 24 %>"
+     height="<%= locals.fetch :height, 24 %>"
      loading="lazy">

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

@@ -1 +1 @@
-<img src="<%= user.avatar_url %>" alt="<%= user.image_alt %>" width="24" height="24" loading="lazy">
+<img src="<%= user.avatar_url %>" alt="<%= user.image_alt %>" width="<%= locals.fetch :width, 24 %>" height="<%= locals.fetch :height, 24 %>" loading="lazy">

data/lib/milestoner/templates/milestones/_avatar.xml.erb

@@ -1 +1,6 @@
-<img src="<%= user.avatar_url %>" alt="<%= user.image_alt %>" width="24" height="24" loading="lazy">
+<img src="<%= user.avatar_url %>"
+     alt="<%= user.image_alt %>"
+     width="<%= locals.fetch :width, 24 %>"
+     height="<%= locals.fetch :height, 24 %>"
+     loading="lazy"
+     style="border-radius: 50%;">

data/lib/milestoner/templates/milestones/_commit.xml.erb

@@ -15,7 +15,6 @@
   <%= scope(:content, content: commit.safe_notes).call %>
 
   <h4>Author</h4>
-
   <p><%= render :user, user: commit.author %></p>
 
   <h4>Collaborators</h4>

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

@@ -0,0 +1,7 @@
+<figure class="profile">
+  <%= render :avatar, user:, width: 50, height: 50 %>
+
+  <figcaption>
+    <%= render :profile, user: %>
+  </figcaption>
+</figure>

data/lib/milestoner/templates/milestones/_contributor.xml.erb

@@ -0,0 +1,7 @@
+<figure style="display: inline-flex; align-items: center; flex-direction: column;">
+  <%= render :avatar, user:, width: 50, height: 50 %>
+
+  <figcaption>
+    <%= render :profile, user: %>
+  </figcaption>
+</figure>

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

@@ -0,0 +1,7 @@
+<ul class="contributors">
+  <% contributors.each do |contributor| %>
+    <li class="contributor">
+      <%= render :contributor, user: contributor %>
+    </li>
+  <% end %>
+</ul>

data/lib/milestoner/templates/milestones/_contributors.xml.erb

@@ -0,0 +1,5 @@
+<div style="display: inline-flex; flex-wrap: wrap; gap: 1.5rem;">
+  <% contributors.each do |contributor| %>
+    <%= render :contributor, user: contributor %>
+  <% end %>
+</div>

data/lib/milestoner/templates/milestones/_user.xml.erb

@@ -1 +1,4 @@
-<%= render :avatar, user: %> <%= render :profile, user: %>
+<span style="display: inline-flex; align-items: center; gap: 0.5rem;">
+  <%= render :avatar, user: %>
+  <%= render :profile, user: %>
+</span>

data/lib/milestoner/templates/milestones/_users.xml.erb

@@ -1,6 +1,6 @@
-<ul>
+<ul style="list-style: none; margin: 0; padding: 0;">
   <% users.each do |user| %>
-    <li style="display: inline-flex; align-items: center; gap: 0.5rem;">
+    <li>
       <%= render :user, user: %>
     </li>
   <% end %>

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

@@ -13,5 +13,7 @@
 *<%= tag.total_commits %>. <%= tag.total_files %>. <%= tag.total_deletions %>. <%= tag.total_insertions %>.* +
 *<%= tag.total_duration %>.*
 
+Thanks to all who contributed to this release: <%= tag.contributor_names %>.
+
 link:../<%= past.version %>/[Previous (<%= past.version %>)] | link:../<%= future.version %>/[Next (<%= future.version %>)]
 <% end %>

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

@@ -31,6 +31,21 @@
     <time datetime="<%= tag.committed_datetime %>" class="date"><%= tag.committed_date %></time>
   </header>
 
+  <button class="help" popovertarget="po-shortcuts">ℹ️</button>
+
+  <div id="po-shortcuts" class="popover" popover="auto">
+    <h2 class="label">Keyboard Shortcuts</h2>
+
+    <ul class="shortcuts">
+      <li class="shortcut"><kbd class="key">v</kbd>: View versions.</li>
+      <li class="shortcut"><kbd class="key">TAB</kbd>: Move to next commit.</li>
+      <li class="shortcut"><kbd class="key">⇧ + TAB</kbd>: Move to previous commit.</li>
+      <li class="shortcut"><kbd class="key">ENTER</kbd>: Open or close a commit.</li>
+      <li class="shortcut"><kbd class="key">←</kbd>: View previous version.</li>
+      <li class="shortcut"><kbd class="key">→</kbd>: View next version.</li>
+    </ul>
+  </div>
+
   <% if tag.empty? %>
     <p class="dormant"></p>
   <% else %>
@@ -75,6 +90,11 @@
       <span class="duration"><%= tag.total_duration %>.</span>
     </p>
 
+    <section class="contributions">
+      <p class="message">Thanks to all who contributed to this release:</p>
+      <%= render "contributors", contributors: tag.contributors %>
+    </section>
+
     <ul class="actions">
       <li class="fragment">
         <a href="../<%= past.version %>/"
@@ -94,20 +114,6 @@
         <div class="previous spinner htmx-indicator"></div>
       </li>
 
-      <li>
-        <button class="help" popovertarget="po-shortcuts">ℹ️</button>
-
-        <div id="po-shortcuts" class="popover" popover="auto">
-          <h2 class="label">Keyboard Shortcuts</h2>
-
-          <ul>
-            <li class="shortcut"><kbd class="key">v</kbd>: View versions.</li>
-            <li class="shortcut"><kbd class="key">←</kbd>: View previous version.</li>
-            <li class="shortcut"><kbd class="key">→</kbd>: View next version.</li>
-          </ul>
-        </div>
-      </li>
-
       <li class="fragment">
         <div class="next spinner htmx-indicator"></div>
 

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

@@ -12,5 +12,7 @@
 **<%= tag.total_commits %>. <%= tag.total_files %>. <%= tag.total_deletions %>. <%= tag.total_insertions %>.**
 **<%= tag.total_duration %>.**
 
+Thanks to all who contributed to this release: <%= tag.contributor_names %>.
+
 [Previous (<%= past.version %>)](../<%= past.version %>/) | [Next (<%= future.version %>)](../<%= future.version %>/)
 <% end %>

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

@@ -15,3 +15,5 @@
 <%= tag.total_commits %>. <%= tag.total_files %>. <%= tag.colored_total_deletions %>. <%= tag.colored_total_insertions %>.
 <%= tag.total_duration %>.
 <% end %>
+
+Thanks to all who contributed to this release: <%= tag.contributor_names %>.

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

@@ -19,4 +19,8 @@
   </p>
 
   <p><strong><%= tag.total_duration %>.</strong></p>
+
+  <p>Thanks to all who contributed to this release:</p>
+
+  <%= render "contributors", contributors: tag.contributors %>
 </section>

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

@@ -3,6 +3,16 @@
   100% { transform: rotate(360deg); }
 }
 
+*, *::after, *::before {
+  box-sizing: border-box;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  :where(html) {
+    interpolate-size: allow-keywords;
+  }
+}
+
 /* Rouge (https://rouge.jneen.net) */
 .rouge.highlight {
   --color-berry: hsl(240, 18%, 40%);
@@ -364,6 +374,10 @@
     }
   }
 
+  figcaption {
+    text-align: center;
+  }
+
   :not(pre) > code {
     background-color: var(--color-night);
     border-radius: 0.3rem;
@@ -482,6 +496,10 @@
       font-size: 1rem;
       margin: 0 0 1rem 0;
     }
+
+    .shortcut {
+      margin: 0.5rem 0;
+    }
   }
 
   .spinner {
@@ -602,6 +620,13 @@
       }
     }
 
+    .help {
+      align-self: center;
+      background: none;
+      border: none;
+      font-size: 1rem;
+    }
+
     .overview {
       align-items: center;
       display: grid;
@@ -656,16 +681,23 @@
     }
 
     .row {
+      padding: 0.3em 0;
+
+      &[open] {
+        height: auto;
+        overflow: clip;
+      }
+
+      &[open] > .summary::before {
+        content: "\25BC";
+        width: 0.5rem;
+      }
+
       .label {
         font-weight: 600;
       }
     }
 
-    .row[open] > .summary::before {
-      content: "\25BC";
-      width: 0.5rem;
-    }
-
     .summary {
       align-items: center;
       border-radius: 0.5rem;
@@ -675,8 +707,11 @@
       grid-template-areas:
         "toggle icon subject subject subject subject subject subject"
         "toggle icon author files lines issue review review";
-      padding: 0.15rem 0;
-      margin: 0.25rem 0 0 0;
+
+      @media (width >= 700px) {
+        grid-template: 1fr / auto auto 4.6fr repeat(5, 1fr);
+        grid-template-areas: "toggle icon subject author files lines issue review";
+      }
 
       &::-webkit-details-marker {
         display: none;
@@ -715,10 +750,6 @@
         border-radius: 0.5rem;
       }
 
-      @media (width >= 700px) {
-        grid-template: 1fr / auto auto 5fr repeat(5, 1fr);
-        grid-template-areas: "toggle icon subject author files lines issue review";
-      }
 
       .icon {
         grid-area: icon;
@@ -899,6 +930,8 @@
     }
 
     .footer {
+      margin-top: 1rem;
+
       .totals {
         align-items: center;
         display: flex;
@@ -920,14 +953,36 @@
         }
       }
 
-      .help {
-        background: none;
-        border: none;
-        font-size: 1rem;
+      .contributions {
+        align-items: center;
+        display: flex;
+        flex-direction: column;
+        gap: 1rem;
+        justify-content: center;
+        margin: 3rem 0;
+
+        .message {
+          font-style: italic;
+          margin: 0;
+        }
       }
 
-      .shortcut {
-        margin: 0.5rem 0;
+      .contributors {
+        align-items: center;
+        display: flex;
+        flex-wrap: wrap;
+        gap: 1.5rem;
+        justify-content: center;
+        list-style: none;
+        margin: 0;
+        padding: 0;
+      }
+
+      .profile {
+        align-items: center;
+        display: flex;
+        flex-direction: column;
+        margin: 0;
       }
 
       .actions {

data/lib/milestoner/views/parts/commit.rb

@@ -7,7 +7,6 @@ module Milestoner
   module Views
     module Parts
       # The commit presentation logic.
-      # :reek:RepeatedConditional
       class Commit < Hanami::View::Part
         include Dependencies[:settings, :sanitizer, :color]
 
@@ -81,7 +80,6 @@ module Milestoner
 
         def total_deletions = format "%d", -deletions
 
-        # :reek:FeatureEnvy
         def total_insertions
           insertions.then { |total| total.positive? ? "+#{total}" : total.to_s }
         end

data/lib/milestoner/views/parts/tag.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "hanami/view"
+require "refinements/array"
 require "refinements/string"
 
 module Milestoner
@@ -10,10 +11,12 @@ module Milestoner
       class Tag < Hanami::View::Part
         include Dependencies[:settings, :color, :durationer]
 
+        using Refinements::Array
         using Refinements::String
 
         decorate :commits
         decorate :author, as: :user
+        decorate :contributors, as: :user
 
         def colored_total_deletions(*custom)
           custom.push :green if custom.empty?
@@ -35,6 +38,8 @@ module Milestoner
 
         def committed_datetime = committed_at.strftime "%Y-%m-%dT%H:%M:%S%z"
 
+        def contributor_names = contributors.map(&:name).to_sentence
+
         def deletion_count = commits.sum(&:deletions)
 
         def duration

data/milestoner.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "milestoner"
-  spec.version = "19.7.0"
+  spec.version = "19.8.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/milestoner"
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "infusible", "~> 4.0"
   spec.add_dependency "lode", "~> 2.0"
   spec.add_dependency "redcarpet", "~> 3.6"
-  spec.add_dependency "refinements", "~> 13.3"
+  spec.add_dependency "refinements", "~> 13.5"
   spec.add_dependency "rouge", "~> 4.5"
   spec.add_dependency "rss", "~> 0.3"
   spec.add_dependency "runcom", "~> 12.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 19.7.0
+  version: 19.8.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -223,14 +223,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.3'
+        version: '13.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.3'
+        version: '13.5'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -486,6 +486,10 @@ files:
 - lib/milestoner/templates/milestones/_content.adoc.erb
 - lib/milestoner/templates/milestones/_content.html.erb
 - lib/milestoner/templates/milestones/_content.xml.erb
+- lib/milestoner/templates/milestones/_contributor.html.erb
+- lib/milestoner/templates/milestones/_contributor.xml.erb
+- lib/milestoner/templates/milestones/_contributors.html.erb
+- lib/milestoner/templates/milestones/_contributors.xml.erb
 - lib/milestoner/templates/milestones/_logo.adoc.erb
 - lib/milestoner/templates/milestones/_logo.html.erb
 - lib/milestoner/templates/milestones/_logo.md.erb
@@ -553,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A command line interface for automated Git repository milestones.
 test_files: []