git-chlog 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0252df630af5256b8188c00be555ecd264e9fb07
-  data.tar.gz: 426a0cc5da377b2ec0d793a9cd7e7d50019a05a9
+  metadata.gz: dd4344829226d0ef8ee4b1114eaa0e51f42f28d0
+  data.tar.gz: c8bca581e886d709df04b2381dbf8936f3548424
 SHA512:
-  metadata.gz: d645e2fed6de7f9eb9ef5d5b55476537b787d5c7b6c33837733a538eff54cd79469717516a7c3aa1491636fca36960ff6c9bbe650b0d90fea1bf4b108af8dd46
-  data.tar.gz: 5c3d28ec847c5667a765a5006b8b0141ac2e7695ef04b381c280990b12c2a40177045932746942b6a34cb3f77114b2020220e7025503405be0237fdf395572f9
+  metadata.gz: d933a5420529b961a21f04dabeb35aeef17216f807df696d5a9e6f21f2aa5429119909b6aac78597a73e8ab8a34be5af5fdf1e822ce69f657cb05c16a780e2c9
+  data.tar.gz: e05b442fbdb33afed083aa6e3eafbf4ec4a73f9aadb018becc1845a26e79dd172dbd724e27d90480cc0c30923dddf52359af6d07592df05e83b6fe30ac406b4f

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
+## [v0.2.0](https://github.com/teohm/git-chlog/tree/v0.2.0)
+
+[Full Changelog](https://github.com/teohm/git-chlog/compare/v0.1.0...v0.2.0)
+*  2017-11-02 - Fix GitRepo#prev_tag to handle HEAD release  [#5](https://github.com/teohm/git-chlog/pull/5)
+*  2017-11-02 - Add --prepare-release to include unreleased merges when prepare release  [#4](https://github.com/teohm/git-chlog/pull/4)
+
 ## [v0.1.0](https://github.com/teohm/git-chlog/tree/v0.1.0)
-Released on 2017-11-01
 
 [Full Changelog](https://github.com/teohm/git-chlog/compare/6bcc2fb6e...v0.1.0)
 *  2017-11-01 - fix :allowed_push_host metadata in gemspec  [#3](https://github.com/teohm/git-chlog/pull/3)

data/exe/git-chlog

@@ -74,12 +74,18 @@ module CodeHosting
 end
 
 class Release
-  attr_reader :tag, :date
+  attr_reader :tag, :git_ref, :label, :date
   attr_accessor :prev_tag
 
-  def initialize(tag:, date:)
+  def self.build_head(tag:, label:)
+    Release.new(tag: tag, date: Time.now, git_ref: "HEAD", label: label)
+  end
+
+  def initialize(tag:, date:, git_ref: nil, label: nil)
     @tag = tag
-    @date = Time.parse(date)
+    @git_ref = git_ref || tag
+    @label = label || tag
+    @date = Time.parse(date.to_s)
   end
 
   def version_number
@@ -91,16 +97,22 @@ class Release
   end
 end
 
-module GitRepo
-  def self.origin_remote_url
+class GitRepo
+  attr_reader :options
+
+  def initialize(options = {})
+    @options = options.dup
+  end
+
+  def origin_remote_url
     `git remote get-url origin`.strip
   end
 
-  def self.first_commit_sha
+  def first_commit_sha
     `git rev-list --max-parents=0 HEAD`.strip[0...9]
   end
 
-  def self.prev_tag(current_tag)
+  def prev_tag(current_tag)
     `git log --format="%D" #{current_tag}~1`
       .split("\n")
       .select { |line| line.start_with?("tag:") }
@@ -108,36 +120,50 @@ module GitRepo
       &.match(/tag: ([^,]+)/)&.captures&.first
   end
 
-  def self.load_releases
-    LoadReleases.new(git_repo: self).call
+  def load_releases
+    LoadReleases.new(
+      git_repo: self,
+      head_release_tag: options[:prepare_release]
+    ).call
   end
 
-  def self.load_merged_requests(release, code_hosting)
+  def load_merged_requests(release, code_hosting)
     LoadMergedRequests.new(
       release: release, code_hosting: code_hosting
     ).call
   end
 
   class LoadReleases
-    attr_reader :git_repo
+    attr_reader :git_repo, :head_release_tag
 
-    def initialize(git_repo:)
+    def initialize(git_repo:, head_release_tag:)
       @git_repo = git_repo
+      @head_release_tag = head_release_tag
     end
 
     def call
       raw_git_tag_data
         .map { |release_params| Release.new(release_params) }
+        .sort
+        .reverse
+        .unshift(head_release)
+        .compact
         .map { |release|
-          release.prev_tag = git_repo.prev_tag(release.tag)
+          release.prev_tag = git_repo.prev_tag(release.git_ref)
           release
         }
-        .sort
-        .reverse
     end
 
     private
 
+      def head_release
+        if head_release_tag
+          Release.build_head(tag: head_release_tag, label: head_release_tag)
+        else
+          nil
+        end
+      end
+
       def raw_git_tag_data
         `git tag --format='%(refname:short)|%(creatordate:iso8601)'`
           .split("\n")
@@ -169,7 +195,7 @@ module GitRepo
       end
 
       def tag_range
-        [release.tag, release.prev_tag].compact.join("...")
+        [release.git_ref, release.prev_tag].compact.join("...")
       end
 
       def is_merge_request?(raw_commit)
@@ -229,8 +255,7 @@ class PrintChangeLog
   private
 
     def print_release_heading(out, release)
-      out.puts("## [#{release.tag}](#{code_hosting.tag_url(release.tag)})")
-      out.puts("Released on #{format_date(release.date)}")
+      out.puts("## [#{release.label}](#{code_hosting.tag_url(release.tag)})")
     end
 
     def print_full_changelog_link(out, release)
@@ -272,8 +297,29 @@ class PrintChangeLog
     end
 end
 
+options = {
+  prepare_release: false
+}
+
+require 'optparse'
+OptionParser.new do |opts|
+  opts.banner = "Usage: git chlog [options]"
+
+  opts.on(
+    "--prepare-release=[TAG]",
+    "Add unreleased changes when preparing new release") do |tag|
+    options[:prepare_release] = tag || "HEAD"
+  end
+
+  opts.on("-h", "--help", "Prints this help") do
+    puts opts
+    exit
+  end
+end.parse!
+
+git_repo = GitRepo.new(options)
 PrintChangeLog.new(
-  code_hosting: CodeHosting.build(GitRepo.origin_remote_url),
-  git_repo: GitRepo,
+  code_hosting: CodeHosting.build(git_repo.origin_remote_url),
+  git_repo: git_repo,
   issue_tracker: IssueTracker::PivotalTracker
 ).call

data/lib/git/chlog/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Chlog
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-chlog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Huiming Teo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler