milestoner 10.4.0 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d5b0fb8d1d2b22dd34a890fca4e1c9e5457517522c19345f60c2fe626805ed
-  data.tar.gz: bafe01b14f43e42e2521359b3767aded738c3bc5e937337884ee99fd6fd3f989
+  metadata.gz: 5152a1a412828716c3e01a280e473011f66335cb0cb007d18603a7fe973fa298
+  data.tar.gz: 325015f1de0b136f8d817c3f24ec96f7b429b8c5bf1847551fdb5cc0cdde420d
 SHA512:
-  metadata.gz: e7c0cf919317aac53ebbabc7b6e709258ae4d850c385d1fde6a62ed8114a1205fc59386edd8f3534f0253197898dc594c913e8ae95b6e8b519fff0fa84499cc5
-  data.tar.gz: b2538300101f1e0661a4b4ef1c2677ed1a4adf4599467bb6fdfeaa86dd02f88a27182cb7a49c3bb61e1aced9863a0a0c48bc5ea0288922d80a36d76c0db05e56
+  metadata.gz: dc1808ca74a11de0ed5e751faa47832e2c2cbebfcd544c99a045886b004f00bb29c9d80c078fe0b043a802f492e2afddbef289f5c028ac60072a940f14d3d978
+  data.tar.gz: 444fce8423e259ec58ea353464c204a2d94eb4d3de51f04d2ab3bb7cf71f358962ff670c979c2bef354848a6944f75d58e966262d17b304cf518001643b24cd3

data/README.adoc

@@ -30,11 +30,8 @@ toc::[]
 ** Updated
 ** Removed
 ** Refactored
-* Ensures Git commit merge messages are excluded.
 * Ensures Git commit messages are alphabetically sorted.
 * Ensures duplicate Git commit messages are removed (if any).
-* Ensures Git commit messages are sanitized by removing extra spaces and `+[ci skip]+` text within
-  each Git tag message.
 * Provides optional security for signing Git tags with https://www.gnupg.org[GnuPG] signing key.
 
 == Screencasts

data/lib/milestoner.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
+require "git_plus"
 require "milestoner/identity"
 require "milestoner/errors/base"
 require "milestoner/errors/duplicate_tag"
 require "milestoner/errors/git"
-require "milestoner/git/config"
-require "milestoner/git/kit"
+require "milestoner/commit"
 require "milestoner/tagger"
 require "milestoner/pusher"
 require "milestoner/publisher"

data/lib/milestoner/cli.rb

@@ -46,7 +46,7 @@ module Milestoner
                   default: false
     def tag version
       tagger.create version, sign: sign_tag?(options[:sign])
-      say "Repository tagged: #{tagger.version}."
+      say "Repository tagged: #{version}."
     rescue StandardError => error
       say_status :error, error.message, :red
     end
@@ -69,7 +69,7 @@ module Milestoner
                   default: false
     def publish version
       publisher.publish version, sign: sign_tag?(options[:sign])
-      say_status :info, "Repository tagged and pushed: #{tagger.version}.", :green
+      say_status :info, "Repository tagged and pushed: #{version}.", :green
       say_status :info, "Milestone published!", :green
     rescue StandardError => error
       say_status :error, error.message, :red

data/lib/milestoner/commit.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Milestoner
+  # Wraps the Git Kit Commit for presentation purposes.
+  class Commit
+    extend Forwardable
+
+    delegate [*GitPlus::Commit.members, :fixup?, :squash?] => :source
+
+    def initialize source
+      @source = source
+    end
+
+    def subject_author delimiter: " - "
+      "#{subject}#{delimiter}#{author_name}"
+    end
+
+    private
+
+    attr_reader :source
+  end
+end

data/lib/milestoner/identity.rb

@@ -5,7 +5,7 @@ module Milestoner
   module Identity
     NAME = "milestoner"
     LABEL = "Milestoner"
-    VERSION = "10.4.0"
+    VERSION = "11.0.0"
     VERSION_LABEL = "#{LABEL} #{VERSION}"
   end
 end

data/lib/milestoner/pusher.rb

@@ -3,26 +3,32 @@
 module Milestoner
   # Handles publishing of Git tags to remote repository.
   class Pusher
-    def initialize git: Git::Kit.new
-      @git = git
+    def initialize repository: GitPlus::Repository.new
+      @repository = repository
     end
 
     def push version
       version = Versionaire::Version version
 
-      fail Errors::Git, "Remote repository not configured." unless git.remote?
+      fail Errors::Git, "Remote repository not configured." unless repository.config_remote?
       fail Errors::Git, "Remote tag exists: #{version}." if tag_exists? version
-      return if git.push_tags.empty?
+      return if push_tags
 
       fail Errors::Git, "Tags could not be pushed to remote repository."
     end
 
     private
 
-    attr_reader :git, :version
+    attr_reader :repository, :version
 
     def tag_exists? version
-      git.tag_remote? version
+      repository.tag_remote? version
+    end
+
+    def push_tags
+      repository.tag_push.then do |_stdout, stderr, status|
+        status.success? && stderr.match?(/[new tag]/)
+      end
     end
   end
 end

data/lib/milestoner/tagger.rb

@@ -1,115 +1,88 @@
 # frozen_string_literal: true
 
-require "open3"
 require "thor"
 require "versionaire"
-require "tempfile"
 
 module Milestoner
   # Handles the tagging of a project repository.
-  # :reek:TooManyMethods
-  # :reek:InstanceVariableAssumption
+  # :reek:TooManyInstanceVariables
   class Tagger
-    attr_reader :version, :commit_prefixes
+    attr_reader :commit_prefixes
 
-    def initialize commit_prefixes: [], git: Git::Kit.new
+    def initialize commit_prefixes: [], repository: GitPlus::Repository.new, presenter: Commit
       @commit_prefixes = commit_prefixes
-      @git = git
+      @repository = repository
+      @presenter = presenter
       @shell = Thor::Shell::Color.new
     end
 
     def commit_prefix_regex
-      return Regexp.new "" if commit_prefixes.empty?
-
-      Regexp.union commit_prefixes
+      commit_prefixes.empty? ? Regexp.new("") : Regexp.union(commit_prefixes)
     end
 
     def commits
       groups = build_commit_prefix_groups
       group_by_commit_prefix groups
-      groups.each_value(&:sort!)
-      groups.values.flatten.uniq
+      groups.each_value { |commits| commits.sort_by!(&:subject) }
+      groups.values.flatten.uniq(&:subject)
     end
 
     def commit_list
-      commits.map { |commit| "- #{commit}" }
+      commits.map { |source| presenter.new source }
+             .map { |commit| "- #{commit.subject_author}" }
     end
 
     # :reek:BooleanParameter
+    # :reek:ControlParameter
+    # :reek:TooManyStatements
     def create version, sign: false
-      @version = Versionaire::Version version
-      fail Errors::Git, "Unable to tag without commits." unless git.commits?
-      return if existing_tag?
+      version = Versionaire::Version version
+      fail Errors::Git, "Unable to tag without commits." if repository.commits.empty?
+      return if exists? version
 
-      git_tag sign: sign
+      content = message version
+      sign ? repository.tag_sign(version, content) : repository.tag_unsign(version, content)
     end
 
     private
 
-    attr_reader :git, :shell
-
-    def git_log_command
-      "git log --oneline --no-merges --format='%s'"
-    end
+    attr_reader :repository, :presenter, :shell
 
-    def git_tag_command
-      "$(git describe --abbrev=0 --tags --always)..HEAD"
+    def saved_commits
+      repository.commits
     end
 
-    def git_commits_command
-      return "#{git_log_command} #{git_tag_command}" if git.tagged?
-
-      git_log_command
+    def tagged_commits
+      repository.commits "#{repository.tag_last}..HEAD"
     end
 
-    def raw_commits
-      `#{git_commits_command}`.split "\n"
+    def computed_commits
+      (repository.tagged? ? tagged_commits : saved_commits)
     end
 
     def build_commit_prefix_groups
-      groups = commit_prefixes.map.with_object({}) { |prefix, group| group.merge! prefix => [] }
-      groups.merge! "Other" => []
+      commit_prefixes.map
+                     .with_object({}) { |prefix, group| group.merge! prefix => [] }
+                     .merge! "Other" => []
     end
 
     def group_by_commit_prefix groups = {}
-      raw_commits.each do |commit|
-        prefix = commit[commit_prefix_regex]
+      computed_commits.each do |commit|
+        prefix = commit.subject[commit_prefix_regex]
         key = groups.key?(prefix) ? prefix : "Other"
-        groups[key] << commit.gsub(/\[ci\sskip\]/, "").squeeze(" ").strip
+        groups[key] << commit
       end
     end
 
-    def git_message
-      %(Version #{@version}\n\n#{commit_list.join "\n"}\n\n)
+    def message version
+      %(Version #{version}\n\n#{commit_list.join "\n"}\n\n)
     end
 
-    # :reek:BooleanParameter
-    # :reek:ControlParameter
-    def git_options message_file, sign: false
-      options = %(--sign --annotate "#{@version}" ) +
-                %(--cleanup verbatim --file "#{message_file.path}")
-      return options.gsub "--sign ", "" unless sign
+    def exists? version
+      return false unless repository.tag_local? version
 
-      options
-    end
-
-    def existing_tag?
-      return false unless git.tag_local? @version
-
-      shell.say_status :warn, "Local tag exists: #{@version}. Skipped.", :yellow
+      shell.say_status :warn, "Local tag exists: #{version}. Skipped.", :yellow
       true
     end
-
-    # :reek:BooleanParameter
-    # :reek:TooManyStatements
-    def git_tag sign: false
-      message_file = Tempfile.new Identity::NAME
-      File.open(message_file, "w") { |file| file.write git_message }
-      status = system "git tag #{git_options message_file, sign: sign}"
-      fail Errors::Git, "Unable to create tag: #{@version}." unless status
-    ensure
-      message_file.close
-      message_file.unlink
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 10.4.0
+  version: 11.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -28,246 +28,78 @@ cert_chain:
   2XV8FRa7/JimI07sPLC13eLY3xd/aYTi85Z782KIA4j0G8XEEWAX0ouBhlXPocZv
   QWc=
   -----END CERTIFICATE-----
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: runcom
+  name: git_plus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: refinements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: versionaire
+  name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.4'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.4'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: bundler-leak
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: climate_control
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0.20'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: versionaire
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
-  type: :development
+        version: '9.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '9.0'
 description:
 email:
 - brooke@alchemists.io
@@ -283,11 +115,10 @@ files:
 - bin/milestoner
 - lib/milestoner.rb
 - lib/milestoner/cli.rb
+- lib/milestoner/commit.rb
 - lib/milestoner/errors/base.rb
 - lib/milestoner/errors/duplicate_tag.rb
 - lib/milestoner/errors/git.rb
-- lib/milestoner/git/config.rb
-- lib/milestoner/git/kit.rb
 - lib/milestoner/identity.rb
 - lib/milestoner/publisher.rb
 - lib/milestoner/pusher.rb
@@ -308,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A command line interface for crafting Git repository milestones.

data/lib/milestoner/git/config.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require "open3"
-
-module Milestoner
-  module Git
-    # A lightweight Git Config wrapper.
-    class Config
-      def initialize shell: Open3
-        @shell = shell
-      end
-
-      def get key
-        shell.capture3 "git config --get #{key}"
-      end
-
-      def set key, value
-        shell.capture3 %(git config --add #{key} "#{value}")
-      end
-
-      def value key
-        get(key).first.chomp
-      end
-
-      private
-
-      attr_reader :shell
-    end
-  end
-end

data/lib/milestoner/git/kit.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Milestoner
-  module Git
-    # A lightweight Git wrapper.
-    class Kit
-      def initialize
-        @git_dir = File.join Dir.pwd, ".git"
-      end
-
-      def supported?
-        File.exist? git_dir
-      end
-
-      def commits?
-        !shell("git log").empty?
-      end
-
-      def push_tags
-        shell "git push --tags"
-      end
-
-      def tagged?
-        !shell("git tag").empty?
-      end
-
-      def tag_local? tag
-        shell("git tag --list #{tag}").match?(/\A#{tag}\Z/)
-      end
-
-      def tag_remote? tag
-        shell("git ls-remote --tags origin #{tag}").match?(%r(.+tags/#{tag}\Z))
-      end
-
-      def remote?
-        !shell("git config remote.origin.url").empty?
-      end
-
-      private
-
-      attr_reader :git_dir
-
-      def shell command
-        String `#{command}`
-      end
-    end
-  end
-end