milestoner 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977b8a104feb6c918a30a96d7adf1b8aa4a09463
-  data.tar.gz: ac670db00cd0b4c9f1ee451f8c0b6b3f74eb4c95
+  metadata.gz: bad3b3fa0887d91f02df3d8b487033c18c600c90
+  data.tar.gz: 45b0ba79b7ffc1b8822c6eedab278022f7984b68
 SHA512:
-  metadata.gz: 2d6799557de5b14f4a3194334e08663043bfe42eb42e9151c75da9bdc917aedf6ca5e7362f2f394b7a3dd9be7904a62320815e595cd00d78c8a61382bbbf74df
-  data.tar.gz: 9d2315cff8c0421e477da2fd2fca26161732b44dbc04dc4fd3261915f67281bd5b073892f07476143886e97bff40f04f4372b2cb6320c1118fc3c1e556f06603
+  metadata.gz: 11e30e044729b2103f6151b3eaab9ba23b47bb0fc012a613e79e3dd2baede011241e6ab58db479c5f0f6a4ba78ade27e278fdaf089e0d311b9752ba90e3ff776
+  data.tar.gz: f08cac0b68798e0b7ac84b9040f140ca143a09b9403c8bcceaebd5e8fb34e3bfcad0e6652542edae9a20b2a8674ce6069e49b03f7edbda7caa3316601fcf4be5

data/README.md

@@ -195,9 +195,9 @@ To test, run:
 
 Read [Semantic Versioning](http://semver.org) for details. Briefly, it means:
 
-- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
-- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
 - Major (X.y.z) - Incremented for any backwards incompatible public API changes.
+- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
+- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
 
 # Code of Conduct
 

data/lib/milestoner/cli.rb

@@ -24,8 +24,7 @@ module Milestoner
     # rubocop:disable Metrics/AbcSize
     def initialize args = [], options = {}, config = {}
       super args, options, config
-      @tagger = Tagger.new self.class.configuration.to_h[:version],
-                           commit_prefixes: self.class.configuration.to_h[:git_commit_prefixes]
+      @tagger = Tagger.new commit_prefixes: self.class.configuration.to_h[:git_commit_prefixes]
       @pusher = Pusher.new
       @publisher = Publisher.new tagger: tagger, pusher: pusher
     end
@@ -54,8 +53,8 @@ module Milestoner
 
     desc "-p, [--push]", "Push local tag to remote repository."
     map %w[-p --push] => :push
-    def push
-      pusher.push
+    def push version = self.class.configuration.to_h[:version]
+      pusher.push version
       info "Tags pushed to remote repository."
     rescue StandardError => exception
       error exception.message

data/lib/milestoner/git/kit.rb

@@ -4,16 +4,44 @@ module Milestoner
   module Git
     # A lightweight Git wrapper.
     class Kit
+      def initialize
+        @git_dir = File.join Dir.pwd, ".git"
+      end
+
       def supported?
-        File.exist? File.join(Dir.pwd, ".git")
+        File.exist? git_dir
       end
 
       def commits?
-        system "git log > /dev/null 2>&1"
+        !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?
-        system "git config remote.origin.url"
+        !shell("git config remote.origin.url").empty?
+      end
+
+      private
+
+      attr_reader :git_dir
+
+      def shell command
+        String `#{command}`
       end
     end
   end

data/lib/milestoner/identity.rb

@@ -12,7 +12,7 @@ module Milestoner
     end
 
     def self.version
-      "5.0.0"
+      "5.1.0"
     end
 
     def self.version_label

data/lib/milestoner/publisher.rb

@@ -8,12 +8,10 @@ module Milestoner
       @pusher = pusher
     end
 
+    # :reek:BooleanParameter
     def publish version, sign: false
       tagger.create version, sign: sign
-      pusher.push
-    rescue Errors::Git => error
-      tagger.delete version
-      raise error.class, error.message
+      pusher.push version
     end
 
     private

data/lib/milestoner/pusher.rb

@@ -3,22 +3,25 @@
 module Milestoner
   # Handles publishing of Git tags to remote repository.
   class Pusher
-    def initialize git: Git::Kit.new, shell: Kernel
+    def initialize git: Git::Kit.new
       @git = git
-      @shell = shell
     end
 
-    def push
-      fail(Errors::Git) unless git.supported?
-      fail(Errors::Git, "Git remote repository not configured.") unless git.remote?
+    def push version
+      version = Versionaire::Version version
 
-      return if shell.system("git push --tags")
-
-      fail(Errors::Git, "Git tags could not be pushed to remote repository.")
+      fail(Errors::Git, "Remote repository not configured.") unless git.remote?
+      fail(Errors::Git, "Remote tag exists: #{version.label}.") if tag_exists?(version)
+      return if git.push_tags.empty?
+      fail(Errors::Git, "Tags could not be pushed to remote repository.")
     end
 
     private
 
-    attr_reader :git, :shell
+    attr_reader :git, :version
+
+    def tag_exists? version
+      git.tag_remote? version.label
+    end
   end
 end

data/lib/milestoner/tagger.rb

@@ -2,10 +2,12 @@
 
 require "forwardable"
 require "open3"
+require "thor"
 require "versionaire"
 
 module Milestoner
   # Handles the tagging of a project repository.
+  # :reek:TooManyMethods
   class Tagger
     extend Forwardable
 
@@ -13,10 +15,10 @@ module Milestoner
 
     def_delegator :version, :label, :version_label
 
-    def initialize version = "0.1.0", commit_prefixes: [], git: Git::Kit.new
-      @version = Versionaire::Version version
+    def initialize commit_prefixes: [], git: Git::Kit.new
       @commit_prefixes = commit_prefixes
       @git = git
+      @shell = Thor::Shell::Color.new
     end
 
     def commit_prefix_regex
@@ -24,22 +26,10 @@ module Milestoner
       Regexp.union commit_prefixes
     end
 
-    def tagged?
-      fail(Errors::Git) unless git.supported?
-      response = `git tag`
-      !(response.nil? || response.empty?)
-    end
-
-    def duplicate?
-      fail(Errors::Git) unless git.supported?
-      system "git rev-parse #{version.label} > /dev/null 2>&1"
-    end
-
     def commits
-      fail(Errors::Git) unless git.supported?
       groups = build_commit_prefix_groups
-      group_by_commit_prefix! groups
-      sort_by_commit_prefix! groups
+      group_by_commit_prefix groups
+      sort_by_commit_prefix groups
       groups.values.flatten.uniq
     end
 
@@ -47,23 +37,17 @@ module Milestoner
       commits.map { |commit| "- #{commit}" }
     end
 
-    def create raw_version = version, sign: false
-      @version = Versionaire::Version raw_version
-      fail(Errors::Git) unless git.supported?
+    # :reek:BooleanParameter
+    def create version, sign: false
+      @version = Versionaire::Version version
       fail(Errors::Git, "Unable to tag without commits.") unless git.commits?
-      fail(Errors::DuplicateTag, "Duplicate tag exists: #{version.label}.") if duplicate?
+      return if existing_tag?
       git_tag sign: sign
     end
 
-    def delete raw_version = version
-      @version = Versionaire::Version raw_version
-      fail(Errors::Git) unless git.supported?
-      Open3.capture3 "git tag --delete #{version.label}" if duplicate?
-    end
-
     private
 
-    attr_reader :git
+    attr_reader :git, :shell
 
     def git_log_command
       "git log --oneline --no-merges --format='%s'"
@@ -74,7 +58,7 @@ module Milestoner
     end
 
     def git_commits_command
-      return "#{git_log_command} #{git_tag_command}" if tagged?
+      return "#{git_log_command} #{git_tag_command}" if git.tagged?
       git_log_command
     end
 
@@ -87,11 +71,12 @@ module Milestoner
       groups.merge! "Other" => []
     end
 
+    # :reek:UtilityFunction
     def sanitize_commit commit
       commit.gsub(/\[ci\sskip\]/, "").squeeze(" ").strip
     end
 
-    def group_by_commit_prefix! groups = {}
+    def group_by_commit_prefix groups = {}
       raw_commits.each do |commit|
         prefix = commit[commit_prefix_regex]
         key = groups.key?(prefix) ? prefix : "Other"
@@ -99,7 +84,8 @@ module Milestoner
       end
     end
 
-    def sort_by_commit_prefix! groups = {}
+    # :reek:UtilityFunction
+    def sort_by_commit_prefix groups = {}
       groups.each { |_, values| values.sort! }
     end
 
@@ -107,18 +93,28 @@ module Milestoner
       %(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.label}" ) +
+      options = %(--sign --annotate "#{version_label}" ) +
                 %(--cleanup verbatim --file "#{message_file.path}")
       return options.gsub("--sign ", "") unless sign
       options
     end
 
+    def existing_tag?
+      return false unless git.tag_local?(version_label)
+      shell.say_status :warn, "Local tag exists: #{version_label}. 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.label}.") unless status
+      fail(Errors::Git, "Unable to create tag: #{version_label}.") unless status
     ensure
       message_file.close
       message_file.unlink

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZicm9v
-  a2UxGjAYBgoJkiaJk/IsZAEZFgphbGNoZW1pc3RzMRIwEAYKCZImiZPyLGQBGRYC
-  aW8wHhcNMTYxMDE5MTY0NDEzWhcNMTcxMDE5MTY0NDEzWjBBMQ8wDQYDVQQDDAZi
-  cm9va2UxGjAYBgoJkiaJk/IsZAEZFgphbGNoZW1pc3RzMRIwEAYKCZImiZPyLGQB
-  GRYCaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgryPL4/IbWDcL
-  fnqpnoJALqj+ega7hSsvvD8sac57HPNLeKcOmSafFiQLAnTmmE132ZlFc8kyZRVn
-  zmqSESowO5jd+ggFuy1ySqQJXhwgik04KedKRUjpIDZePrjw+M5UJT1qzKCKL2xI
-  nx5cOKP1fSWJ1RRu8JhaDeSloGtYMdw2c28wnKPNIsWDood4xhbLcY9IqeISft2e
-  oTAHTHandHbvt24X3/n67ceNjLBbsVZPXCC1C8C8ccjHjA4Tm2uiFoDwThMcPggg
-  90H6fh0vLFcNAobdPEchbge8tWtfmMPz2+C4yklANn81GA+ANsBS1uwx6mxJoMQU
-  BNVp0aLvAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBRS85Rn1BaqeIONByw4t46DMDMzHDAfBgNVHREEGDAWgRRicm9va2VAYWxjaGVt
-  aXN0cy5pbzAfBgNVHRIEGDAWgRRicm9va2VAYWxjaGVtaXN0cy5pbzANBgkqhkiG
-  9w0BAQUFAAOCAQEAZMb57Y4wdpbX8XxTukEO7VC1pndccUsxdbziGsAOiuHET3Aq
-  ygLvrfdYrN88/w+qxncW5bxbO3a6UGkuhIFUPM8zRSE/rh6bCcJljTJrExVt42eV
-  aYCb7WJNsx3eNXHn3uQodq3tD+lmNJzz2bFeT3smGSKEnALBjqorO/2mpDh4FJ3S
-  4CcDYsJ1ywep8LDJDBBGdKz9moL+axryzpeTpgTT/fFYFzRzWrURPyDvPOikh9TX
-  n/LUZ1dKhIHzfKx1B4+TEIefArObGfkLIDM8+Dq1RX7TF1k81Men7iu4MgE9bYBn
-  3dE+xI3FdB5gWcdWxdtgRCmWjtXeYYyb4z6NQQ==
-  -----END CERTIFICATE-----
-date: 2017-01-22 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: runcom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: versionaire
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: gemsmith
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -206,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -234,42 +226,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -328,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A command line interface for releasing Git repository milestones.

data.tar.gz.sig

@@ -1,3 +0,0 @@
-U���* ߗ
-��D,���;�V)4ajݧ���|��m`�;M���5쯻�a�2F�ޗ3�{YspX�9�I���촰:K��!wR�7��:��v��k_�X��y�ۼ}!����y��r4>�e�E�'G���C�j��|Dj辀fz��qO'a򐺂��;�m��EX�����S/�}�eɷ�!��Zm��~������؇���>�>6�M�U�q|x#����?מ�"�y
-�ݙ�-��"��1�$�