changes_since 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39bc4c5dc04b94e8773d704713ab40d216100f9
-  data.tar.gz: bc2eebddd12321f76f7af0ef7d34e8f332939ab9
+  metadata.gz: 58dbfae216849c9d71e1b9412efdfea498cbf590
+  data.tar.gz: fd0c521d8e5b971ff6378bf179db54edd0f48927
 SHA512:
-  metadata.gz: f890c5f385bceec241ed631a3d51e378f25d154514256294f1b3c04ff4baabd55f2c4c34e22c574a45a6a186384655a0ae7262978fb9b0362f99b44b1e5f0219
-  data.tar.gz: a716fc67cf602982f3942e5a880f2098129199818a264504ce7e355063ef02d2419ee8bb1d8dc875e88fffbb3aa453f76e20697eb81aebfb7dd132f44f1b6ad6
+  metadata.gz: c1554eada1ae9543f946de6cf25cb62435da6ebfb81c362ab393c458f23c75e3112d2df82ffd1298b82462dceb3438f98bc3056f002180c66fa343f990460ed5
+  data.tar.gz: 5f442359a1517abd7a1bdae26f86a65da77d16962f498532f99587ec7762a07c2ce6156a0795424b2425bfc25e94c962e605628b0cfb0632d98af2502235b4eb

data/lib/changes_since/changelog_printer.rb

@@ -0,0 +1,67 @@
+class ChangesSince::ChangelogPrinter
+  attr_reader :teams, :options
+
+  def initialize(commits, teams, options)
+    @commits = commits
+    @teams   = teams
+    @options = options
+  end
+
+  def print!
+    if teams
+      print_team_commits!
+    else
+      print_all_commits!
+    end
+  end
+
+  def print_team_commits!
+    teams.each do |team, members|
+      author_re = /#{members.join("|")}/i
+      team_commits = @commits.select do |commit|
+        [commit.author.name, commit.author.email].any? do |str|
+          str =~ author_re
+        end
+      end
+      next if team_commits.empty?
+      @commits -= team_commits
+      puts "\n*#{team}*\n"
+      print_commits!(team_commits)
+    end
+
+    return if @commits.empty?
+    puts "\n*Other*\n\n"
+    @commits.each { |commit| print_message(commit, nil, options) }
+  end
+
+  def print_commits!(output_commits)
+    output_commits.sort! { |a, b| a.author.name <=> b.author.name }
+    {
+      public: 'Public',
+      bug: 'Bugs',
+      internal: 'Internal'
+    }.each do |type, title|
+      tagged_commits = output_commits.select { |commit| commit.message.include?("##{type}") }
+      next if tagged_commits.empty?
+
+      puts "\n#{title}:\n\n"
+      tagged_commits.each { |commit| print_message(commit, type, options) }
+      output_commits -= tagged_commits
+    end
+
+    puts "\nUnclassified:\n\n"
+    output_commits.each { |commit| print_message(commit, nil, options) }
+  end
+
+  def print_message(commit, type, options)
+    message_lines = commit.message.split("\n\n")
+    if message_lines.first =~ /Merge pull request/
+      title = message_lines.last
+    else
+      title = message_lines.first
+    end
+    title.gsub!("##{type}", "") if type
+    branch_author = commit.author.name
+    puts "* #{title} (#{branch_author}) #{options[:sha] ? commit.sha[0..9] : ''}"
+  end
+end

data/lib/changes_since/commit_parser.rb

@@ -0,0 +1,56 @@
+class ChangesSince::CommitParser
+  attr_reader :log, :options
+
+  def initialize(tag, options)
+    git  = Git.open(Dir.pwd)
+    @log = git.log(100000).between(tag)
+    @options = options
+  end
+
+  def parse_all_commits
+    interesting = Set.new
+    all_commits = log.to_a
+
+    link_re = /^\s*\[(.*?)\]/m
+    linked_commits, remaining_commits = all_commits.partition do |commit|
+      commit.message =~ link_re
+    end
+
+    linked_commits.uniq! do |commit|
+      commit.message[link_re,1]
+    end
+
+    interesting = interesting + linked_commits
+
+    interesting_re = /
+      (?:\#(bug|public|internal)) | # anything explicitly tagged
+      (?:closes\s\#\d+) | # a squash-merge commit closing the linked PR
+      (?:Merge\spull\srequest) # a straight PR merge
+    /xmi
+
+    remaining_commits.each do |commit|
+      if commit.message =~ interesting_re
+        interesting << commit
+      end
+    end
+    commits = interesting.to_a
+  end
+
+  def parse
+    commits = if options[:all]
+      parse_all_commits
+    else
+      log.select { |commit| commit.message =~ /Merge pull request/ }
+    end
+
+    if options[:author_filter]
+      author_re = /#{options[:author_filter].join("|")}/i
+      commits = commits.select do |commit|
+        [commit.author.name, commit.author.email].any? do |str|
+          str =~ author_re
+        end
+      end
+    end
+    commits
+  end
+end

data/lib/changes_since.rb

@@ -15,3 +15,6 @@ class ChangesSince
     printer.print!
   end
 end
+
+require 'changes_since/commit_parser'
+require 'changes_since/changelog_printer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: changes_since
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ashwin Hegde
@@ -18,6 +18,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/changes_since/changelog_printer.rb
+- lib/changes_since/commit_parser.rb
 - lib/changes_since.rb
 homepage: http://rubygems.org/gems/changes_since
 licenses: