milestoner 10.0.2 → 11.0.0

data/lib/milestoner/identity.rb

@@ -3,20 +3,9 @@
 module Milestoner
   # Gem identity information.
   module Identity
-    def self.name
-      "milestoner"
-    end
-
-    def self.label
-      "Milestoner"
-    end
-
-    def self.version
-      "10.0.2"
-    end
-
-    def self.version_label
-      "#{label} #{version}"
-    end
+    NAME = "milestoner"
+    LABEL = "Milestoner"
+    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,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 11.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIC/jCCAeagAwIBAgIBAjANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBpicm9v
-  a2UvREM9YWxjaGVtaXN0cy9EQz1pbzAeFw0xOTAyMTcxNjAxMTFaFw0yMDAyMTcx
-  NjAxMTFaMCUxIzAhBgNVBAMMGmJyb29rZS9EQz1hbGNoZW1pc3RzL0RDPWlvMIIB
+  MIIC/jCCAeagAwIBAgIBAzANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBpicm9v
+  a2UvREM9YWxjaGVtaXN0cy9EQz1pbzAeFw0yMDAzMTUxNDQ1MzJaFw0yMTAzMTUx
+  NDQ1MzJaMCUxIzAhBgNVBAMMGmJyb29rZS9EQz1hbGNoZW1pc3RzL0RDPWlvMIIB
   IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6l1qpXTiomH1RfMRloyw7MiE
   xyVx/x8Yc3EupdH7uhNaTXQGyORN6aOY//1QXXMHIZ9tW74nZLhesWMSUMYy0XhB
   brs+KkurHnc9FnEJAbG7ebGvl/ncqZt72nQvaxpDxvuCBHgJAz+8i5wl6FhLw+oT
@@ -20,46 +20,32 @@ cert_chain:
   D5vkU0YlAm1r98BymuJlcQ1qdkVEI1d48ph4kcS0S0nv1RiuyVb6TCAR3Nu3VaVq
   3fPzZKJLZBx67UvXdbdicWPiUR75elI4PXpLIic3xytaF52ZJYyKZCNZJhNwfQID
   AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU0nzow9vc
-  2CdikiiE3fJhP/gY4ggwDQYJKoZIhvcNAQELBQADggEBANgfX7kPZkJvsbdWMvbe
-  DUUYxRTqTUzCDpLd2p3sQvgLMKjTNSKt6CFq/kh+98b6RCgO6DqiVfxvOEq02dvf
-  ebMN/ylQqan2FgiAs1rpP0/D4C0MlBjoDktsT+2IyLol1KmkDB20ExJ4Sf1GRNdA
-  hpWOtcgqHtmrc7xzgB6BuyoYufrKKUlCO3ewTM4C375D2qO7hIdKuMOO3CdPMtSk
-  OrWpbzCL+nbbXqeoqiHgZaUvcyyQrGj5sQRxMTzuMXzzQxtHnuTuKrcz16HMTX/O
-  dKvURM+1PwDCzC5tvRwjhUJIizau6+MtkFCvJHmaAj1aZL3odcPejHj5Hxt/0CUW
-  y84=
+  2CdikiiE3fJhP/gY4ggwDQYJKoZIhvcNAQELBQADggEBAIHhAlD3po4sTYqacXaQ
+  XI9jIhrfMy//2PgbHWcETtlJPBeNUbbSNBABcllUHKqYsVDlSvSmss034KSWNR8F
+  bF1GcloicyvcCC4y6IoW4it0COAcdeaaxkxiBSgKdQFpff9REnDlIKK4uQ9lLxIo
+  Y2G5xubiziKZkyfWFuSr67PIjW3Bu673D1JVBArhA1qbgQmYQcy1CkGOjo+iO8Nf
+  7u/QSfBHb+r/bXhKscDgPpnKwbUmvgO2+94zJG9KsrmIydlzYfsD09aXKx0t6Xy4
+  2XV8FRa7/JimI07sPLC13eLY3xd/aYTi85Z782KIA4j0G8XEEWAX0ouBhlXPocZv
+  QWc=
   -----END CERTIFICATE-----
-date: 2020-02-01 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.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: versionaire
+  name: refinements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -73,247 +59,79 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !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: gemsmith
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '14.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '14.0'
-- !ruby/object:Gem::Dependency
-  name: git-cop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !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.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !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: '5.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.6'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.79'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.79'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
+  name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
+        version: '7.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.37'
-  type: :development
+        version: '0.20'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.37'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: versionaire
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
+        version: '9.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-description: 
+        version: '9.0'
+description:
 email:
 - brooke@alchemists.io
 executables:
 - milestoner
 extensions: []
 extra_rdoc_files:
-- README.md
-- LICENSE.md
+- README.adoc
+- LICENSE.adoc
 files:
-- LICENSE.md
-- README.md
+- LICENSE.adoc
+- README.adoc
 - 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
 - lib/milestoner/tagger.rb
-homepage: https://github.com/bkuhlmann/milestoner
+homepage: https://www.alchemists.io/projects/milestoner
 licenses:
 - Apache-2.0
 metadata:
-  source_code_uri: https://github.com/bkuhlmann/milestoner
-  changelog_uri: https://github.com/bkuhlmann/milestoner/blob/master/CHANGES.md
   bug_tracker_uri: https://github.com/bkuhlmann/milestoner/issues
-post_install_message: 
+  changelog_uri: https://www.alchemists.io/projects/milestoner/changes.html
+  documentation_uri: https://www.alchemists.io/projects/milestoner
+  source_code_uri: https://github.com/bkuhlmann/milestoner
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -321,15 +139,15 @@ 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.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A command line interface for crafting Git repository milestones.
 test_files: []