milestoner 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f6d4ae3cad5d263731f769567b7ea089dd6b01
-  data.tar.gz: 32d6f0cc922a456c84c0428450d06b9e36863652
+  metadata.gz: a383b5ca439d263af13d3a99df04900c5cf9af6d
+  data.tar.gz: 7bbeabe417fa74b1ea2de76f98ca4ad5cbc02468
 SHA512:
-  metadata.gz: 237f10aa51dccebe908b0ccbea8de79cb33bb7dbb6e48d589a8460923a2aff576715ac86442deda9442acb03063ca26dee4eac8c99fbaec53289cd77ff33b972
-  data.tar.gz: 059b456ca8328cb62c923ddd11df136ea022bfb99262549fedceeecb9a540d912aef8202b3c977cbe275a718d3ae0e295259b592fd43a2362dd937f80b508c63
+  metadata.gz: 203b4857ce7f978e63560a760ed56369853cad84405bfadb8b83e0b1f459023f495a44a0bd7b196ae4a17c14da44ab17cd6f6fe0b156b7d72047e442a28db62e
+  data.tar.gz: 87add04071261e77f5964cf8202a914891228af308b3f90bf65c66ea94f585c3671b903a2a488dd6c1d6e92eb63e9003ec303dcaeb05c177625ac75637ac42b9

data/README.md

@@ -28,10 +28,15 @@ A tool for automating and releasing Git repository milestones.
 
 # Features
 
-- Provides [Semantic Versioning](http://semver.org) for Git repositories in the form of `v<major>.<minor>.</maintenance>` tags.
-  Example: `v0.1.0`.
-- Provides optional support for signing tags using GPG signing key.
+- Provides [Semantic Versioning](http://semver.org) for Git repositories in the form of
+  `v<major>.<minor>.</maintenance>` tags. Example: `v0.1.0`.
+- Provides optional security for signing tags using GPG signing key.
 - Automatically includes commits since last tag (or HEAD if no tags exist) within each tag message.
+- Groups commit messages by consistent prefixes in order defined: "Fixed", "Added", "Updated", "Removed", "Refactored".
+  Otherwise, they are alphabetically sorted.
+- Alphabetically sorts commit messages within each prefix group.
+- Ensures duplicate commit messages are removed (if any).
+- Sanitizes commit messages by removing extra spaces and `[ci skip]` text.
 
 # Requirements
 
@@ -58,6 +63,7 @@ For an insecure install, type the following (not recommended):
 From the command line, type: milestoner help
 
     milestoner -P, [--publish=PUBLISH]  # Tag and push to remote repository.
+    milestoner -c, [--commits]          # Show tag message commits for next milestone.
     milestoner -h, [--help=HELP]        # Show this message or get help for a command.
     milestoner -p, [--push]             # Push tags to remote repository.
     milestoner -t, [--tag=TAG]          # Tag local repository with new version.

data/lib/milestoner/cli.rb

@@ -15,6 +15,14 @@ module Milestoner
       super args, options, config
     end
 
+    desc "-c, [--commits]", "Show tag message commits for next milestone."
+    map %w(-c --commits) => :commits
+    def commits version
+      tagger = Milestoner::Tagger.new version
+      say "Milestone #{version} Commits:"
+      tagger.commit_list.each { |commit| say commit }
+    end
+
     desc "-t, [--tag=TAG]", "Tag local repository with new version."
     map %w(-t --tag) => :tag
     method_option :sign, aliases: "-s", desc: "Sign tag with GPG key.", type: :boolean, default: false

data/lib/milestoner/identity.rb

@@ -10,7 +10,7 @@ module Milestoner
     end
 
     def self.version
-      "0.2.0"
+      "0.3.0"
     end
 
     def self.label_version

data/lib/milestoner/tagger.rb

@@ -39,12 +39,25 @@ module Milestoner
     def commits
       groups = build_commit_prefix_groups
       group_by_commit_prefix! groups
-      groups.values.flatten
+      sort_by_commit_prefix! groups
+      groups.values.flatten.uniq
+    end
+
+    def commit_list
+      commits.map { |commit| "- #{commit}" }
     end
 
     def create sign: false
       fail(DuplicateTagError, "Duplicate tag exists: #{version_label}.") if duplicate?
-      `git tag #{tag_options sign: sign}`
+
+      begin
+        message_file = Tempfile.new Milestoner::Identity.name
+        File.open(message_file, "w") { |file| file.write tag_message }
+        `git tag #{tag_options message_file, sign: sign}`
+      ensure
+        message_file.close
+        message_file.unlink
+      end
     end
 
     def destroy
@@ -68,27 +81,32 @@ module Milestoner
     end
 
     def build_commit_prefix_groups
-      groups = self.class.commit_prefixes.map.with_object({}) do |prefix, group|
-        group.merge! prefix => []
-      end
+      groups = self.class.commit_prefixes.map.with_object({}) { |prefix, group| group.merge! prefix => [] }
       groups.merge! "Other" => []
     end
 
+    def sanitize_commit commit
+      commit.gsub(/\[ci\sskip\]/, "").squeeze(" ").strip
+    end
+
     def group_by_commit_prefix! groups = {}
       raw_commits.each do |commit|
         prefix = commit[self.class.commit_prefix_regex]
         key = groups.key?(prefix) ? prefix : "Other"
-        groups[key] << commit
+        groups[key] << sanitize_commit(commit)
       end
     end
 
+    def sort_by_commit_prefix! groups = {}
+      groups.each { |_, values| values.sort! }
+    end
+
     def tag_message
-      commit_list = commits.map { |commit| "- #{commit}\n" }
-      %(#{version_message}\n\n#{commit_list.join})
+      %(#{version_message}\n\n#{commit_list.join "\n"})
     end
 
-    def tag_options sign: false
-      options = %(--sign --annotate "#{version_label}" --message "#{tag_message}")
+    def tag_options message_file, sign: false
+      options = %(--sign --annotate "#{version_label}" --file "#{message_file.path}")
       return options.gsub("--sign ", "") unless sign
       options
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milestoner
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -30,7 +30,7 @@ cert_chain:
   aSif+qBc6oHD7EQWPF5cZkzkIURuwNwPBngZGxIKaMAgRhjGFXzUMAaq++r59cS9
   xTfQ4k6fglKEgpnLAXiKdo2c8Ym+X4rIKFfedQ==
   -----END CERTIFICATE-----
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor