changes_since 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e424db5e79783a8dac24b5322e62abb6eb170fb4
-  data.tar.gz: ae1b5d68e1280f49bf8360c0827a296a95eb2de3
+  metadata.gz: 7905ff2ff3853d73c2af20d6437613cf816f87e6
+  data.tar.gz: 5d568661ae3872052038b0b138e1a9c4359bafc9
 SHA512:
-  metadata.gz: 1dae5b200c93682a878605203d02be7d167d448c5672f143bb8fa5d4932cf5575d8f3ae95408721b865035e5dfd122272fdca483aa8000f9ae9cc09f2182cdc6
-  data.tar.gz: 7b007f54f5cd34b8609d077449c29774fe171b134de607709659f62e9cbf05c46ca541642ccf023caf65997b32c7a4a9a9475d00ba1cf5932b675ece9720f4cd
+  metadata.gz: 6fd0894a4e7f79ca610c344c68f4848d9e5c8df3be18a9973f610de3f8284c61872bc32d88b26be4876379a0c487bdbed545c2c84e8261269fef899afd382b18
+  data.tar.gz: 6efd92684c8ef27822425a18ad91d2c333057c3dfa46a1a72e064472d84e1b5e0eaa82ee06fa0aeb3e2339f140c8922d78f0df54cee50bf26f0effa3721adc84

data/.travis.yml

@@ -0,0 +1 @@
+language: ruby

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/hashwin/changes_since.svg?branch=master)](https://travis-ci.org/hashwin/changes_since)
+
 changes_since
 =============
 A Changelog tool that helps you display a neat changelog of all pull requests merged since a certain tag.

data/Rakefile

@@ -1,8 +1,8 @@
-require "bundler/gem_tasks"
-
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new
-
-task :default => :spec
-task :test => :spec
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+desc "Run tests"
+task :default => :test

data/changes_since.gemspec

@@ -21,5 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", '10.1.1'
   spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'shoulda'
   spec.add_dependency "git"
 end

data/lib/changes_since/changelog_printer.rb

@@ -1,89 +1,99 @@
-class ChangesSince::ChangelogPrinter
-  attr_reader :teams, :options, :repo
+module ChangesSince
+  class ChangelogPrinter
+    attr_reader :teams, :options, :repo
 
-  TAGS = {
-    :public   => 'Public',
-    :bug      => 'Bugs',
-    :internal => 'Internal'
-  }
+    TAGS = {
+      :public   => 'Public',
+      :bug      => 'Bugs',
+      :internal => 'Internal'
+    }
 
-  def initialize(commits, teams, options, repo)
-    @commits = commits
-    @teams   = teams
-    @options = options
-    @repo    = repo
-  end
+    def initialize(commits, teams, options, repo)
+      @commits = commits
+      @teams   = teams
+      @options = options
+      @repo    = repo
+    end
 
-  def print!
-    if teams
-      print_team_commits!
-    else
-      print_commits!(@commits)
+    def print!
+      if teams
+        print_team_commits!
+      else
+        print_commits!(@commits)
+      end
+      return
     end
-    return
-  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
+    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
+        print_team_name(team)
+        print_commits!(team_commits)
       end
-      next if team_commits.empty?
-      @commits -= team_commits
+
+      return if @commits.empty?
+      print_team_name("Other")
+      print_commits!(@commits)
+    end
+
+    def print_team_name(name)
       if options[:markdown]
-        puts "||*#{team}*||Author||PR||#{"Commit" if options[:sha]}"
+        row = "||*#{name}*||Author||PR||"
+        row << "Commit||" if options[:sha]
+        row << "Risks||" if options[:risks]
+        puts row
       else
-        puts "\n*#{team}*\n"
+        puts "\n*#{name}*\n"
       end
-      print_commits!(team_commits)
     end
 
-    return if @commits.empty?
-    puts "\n*Other*\n\n"
-    @commits.each { |commit| print_message(commit, nil) }
-  end
-
-  def print_commits!(output_commits)
-    output_commits.sort! { |a, b| a.author.name <=> b.author.name }
+    def print_commits!(output_commits)
+      output_commits.sort! { |a, b| a.author.name <=> b.author.name }
 
-    if options[:tags]
-      TAGS.each do |type, title|
-        tagged_commits = output_commits.select { |commit| commit.message.include?("##{type}") }
-        next if tagged_commits.empty?
+      if options[:tags]
+        TAGS.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) }
-        output_commits -= tagged_commits
+          puts "\n#{title}:\n\n"
+          tagged_commits.each { |commit| print_message(commit, type) }
+          output_commits -= tagged_commits
+        end
+        return if output_commits.empty?
+        puts "\nUnclassified:\n\n"
       end
-      return if output_commits.empty?
-      puts "\nUnclassified:\n\n"
-    end
 
-    output_commits.each { |commit| print_message(commit, nil) }
-  end
-
-  def print_message(commit, type)
-    message_lines = commit.message.split("\n\n")
-    if message_lines.first =~ /Merge pull request/
-      title = message_lines.last
-      pr    = message_lines.first.split(" from ").first.split("#").last
-    else
-      title = message_lines.first
+      output_commits.each { |commit| print_message(commit) }
     end
-    title.gsub!("##{type}", "") if type
-    branch_author = commit.author.name
-    sha = commit.sha[0..9] if options[:sha]
-    if options[:markdown]
-      text = "|#{title}|"
-      text << "#{branch_author}|"
-      text << "[##{pr}|#{@repo}/pull/#{pr}]|" if @repo
-      text << "[#{sha}|#{@repo}/commit/#{sha}]|" if sha
-    else
-      text = "* #{title} (#{branch_author}) #{options[:sha] ? commit.sha[0..9] : ''}"
+
+    def print_message(commit, tag=nil)
+      message_lines = commit.message.split("\n\n")
+      if message_lines.first =~ /Merge pull request/
+        title = message_lines.last
+        pr    = message_lines.first.split(" from ").first.split("#").last
+      else
+        title = message_lines.first
+        sha   = options[:sha] ? commit.sha[0..9] : ''
+      end
+      title.gsub!("##{tag}", "") if tag
+      branch_author = commit.author.name
+      if options[:markdown]
+        text = "|#{title}|"
+        text << "#{branch_author}|"
+        text << "[##{pr}|#{@repo}/pull/#{pr}]|" if @repo && pr
+        text << "[#{sha}|#{@repo}/commit/#{sha}]|" if sha
+        text << "|" if options[:risks]
+      else
+        text = "* #{title} (#{branch_author})"
+      end
+      puts text
     end
-    puts text
   end
 end

data/lib/changes_since/commit_parser.rb

@@ -1,56 +1,58 @@
-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
+module ChangesSince
+  class 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
+    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
+      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
+      linked_commits.uniq! do |commit|
+        commit.message[link_re,1]
+      end
 
-    interesting = interesting + linked_commits
+      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
+      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
+      remaining_commits.each do |commit|
+        if commit.message =~ interesting_re
+          interesting << commit
+        end
       end
+      commits = interesting.to_a
     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
+    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
+      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
-    commits
   end
 end

data/lib/changes_since/version.rb

@@ -1,3 +1,3 @@
 module ChangesSince
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/changes_since.rb

@@ -1,13 +1,8 @@
-#!/usr/bin/env ruby
-
-# Usage: To get all merged pull requests since v1.37.0
-#        script/changes_since v1.37.0
-
 require 'git'
 require 'optparse'
 require 'set'
 
-class ChangesSince
+module ChangesSince
   def self.fetch(tag, teams=nil, repo=nil)
     options = parse_options
     parser  = CommitParser.new(tag, options)

data/test/changes_since/changelog_printer_test.rb

@@ -0,0 +1,150 @@
+require File.expand_path("../../helper", __FILE__)
+
+class ChangelogPrinterTest < Test::Unit::TestCase
+
+  def stub_commits
+    [
+      stub(:author => stub(:name => "Rajesh", :email => "rajesh@gmail.com"), :message => "abcd"),
+      stub(:author => stub(:name => "Rajesh", :email => "rajesh@gmail.com"), :message => "def #bug"),
+      stub(:author => stub(:name => "Ankita", :email => "ankita@gmail.com"), :message => "sad #internal"),
+      stub(:author => stub(:name => "Rajesh", :email => "rajesh@gmail.com"), :message => "dasd"),
+      stub(:author => stub(:name => "Susan",  :email => "susan@gmail.com"),  :message => "aaaa" ),
+      stub(:author => stub(:name => "Rajesh", :email => "rajesh@gmail.com"), :message => "dsss"),
+      stub(:author => stub(:name => "Ankita", :email => "ankita@gmail.com"), :message => "ver"),
+      stub(:author => stub(:name => "Rajesh", :email => "rajesh@gmail.com"), :message => "sdfs #public"),
+      stub(:author => stub(:name => "Derek",  :email => "derek@gmail.com"),  :message => "sds"),
+      stub(:author => stub(:name => "Bob",    :email => "bob@gmail.com"),    :message => "bbbb")
+    ]
+  end
+
+  def stub_teams
+    {
+      "Team 1" => ["Bob", "Ankita"],
+      "Team 2" => ["Rajesh", "susan@gmail.com"]
+    }
+  end
+
+  context "ChangelogPrinter" do
+
+    context 'initialization' do
+      should "setup instance variables" do
+        commits = stub
+        teams   = stub
+        options = stub
+        repo    = stub
+        printer = ChangesSince::ChangelogPrinter.new(commits, teams, options, repo)
+        assert_equal printer.instance_variable_get('@commits'), commits
+        assert_equal printer.instance_variable_get('@teams'), teams
+        assert_equal printer.instance_variable_get('@options'), options
+        assert_equal printer.instance_variable_get('@repo'), repo
+      end
+    end
+
+    context 'print!' do
+      should "print team commits if present" do
+        commits = stub
+        teams   = stub
+        printer = ChangesSince::ChangelogPrinter.new(commits, teams, stub, stub)
+        printer.expects(:print_team_commits!)
+        printer.print!
+      end
+
+      should "print commits if no teams present" do
+        commits = stub
+        printer = ChangesSince::ChangelogPrinter.new(commits, nil, stub, stub)
+        printer.expects(:print_commits!)
+        printer.print!
+      end
+    end
+
+    context "print_team_commits!" do
+      setup do
+        @commits = stub_commits
+        @teams = stub_teams
+        @team_commits = {
+          "Team 1" => @commits.select { |commit|
+            [commit.author.name, commit.author.email].any? { |str| str =~ /Bob|Ankita/i }
+          },
+          "Team 2" => @commits.select { |commit|
+            [commit.author.name, commit.author.email].any? { |str| str =~ /Rajesh|susan@gmail.com/i }
+          },
+          "Other"  => @commits.select { |commit|
+            [commit.author.name, commit.author.email].any? { |str| str =~ /Derek/ }
+          }
+        }
+      end
+
+      should "divide by teams and call print commits" do
+        printer = ChangesSince::ChangelogPrinter.new(@commits, @teams, stub, stub)
+        @team_commits.each do |name, commit_set|
+          printer.expects(:print_team_name).with(name)
+          printer.expects(:print_commits!).with(commit_set)
+        end
+        printer.print_team_commits!
+      end
+
+      should "not print other if no commits are present" do
+        @commits.reject! { |commit| commit.author.name == "Derek" }
+        @team_commits.delete("Other")
+        printer = ChangesSince::ChangelogPrinter.new(@commits, @teams, stub, stub)
+        @team_commits.each do |name, commit_set|
+          printer.expects(:print_team_name).with(name)
+          printer.expects(:print_commits!).with(commit_set)
+        end
+        printer.expects(:print_team_name).with("Other").never
+        printer.print_team_commits!
+      end
+    end
+
+    context "print_commits!" do
+      should "call print message for each commit" do
+        commits = stub_commits
+        options = {}
+        printer = ChangesSince::ChangelogPrinter.new(commits, stub, options, stub)
+        commits.each { |commit| printer.expects(:print_message).with(commit) }
+        printer.print_commits!(commits)
+      end
+
+      should "call print message for each commit when tags are enabled" do
+        commits = stub_commits
+        options = { :tags => true }
+        printer = ChangesSince::ChangelogPrinter.new(commits, stub, options, stub)
+        tagged_commits = commits.select { |commit| commit.message =~ /public|bug|internal/ }
+        tagged_commits.each { |commit|
+          tag = commit.message.slice(commit.message.index("#") + 1, commit.message.length).to_sym
+          printer.expects(:print_message).with(commit, tag)
+        }
+        untagged_commits = commits - tagged_commits
+        untagged_commits.each { |commit| printer.expects(:print_message).with(commit) }
+        printer.expects(:puts).with("\nPublic:\n\n")
+        printer.expects(:puts).with("\nBugs:\n\n")
+        printer.expects(:puts).with("\nInternal:\n\n")
+        printer.expects(:puts).with("\nUnclassified:\n\n")
+        printer.print_commits!(commits)
+      end
+    end
+
+    context "print_team_name" do
+      should "print the team name" do
+        printer = ChangesSince::ChangelogPrinter.new(stub, stub, {}, stub)
+        printer.expects(:puts).with("\n*abc*\n")
+        printer.print_team_name("abc")
+      end
+
+      should "print the team name with markdown" do
+        printer = ChangesSince::ChangelogPrinter.new(stub, stub, { :markdown => true }, stub)
+        printer.expects(:puts).with("||*abc*||Author||PR||")
+        printer.print_team_name("abc")
+      end
+
+      should "print the team name with markdown and risks" do
+        printer = ChangesSince::ChangelogPrinter.new(stub, stub, { :markdown => true, :risks => true }, stub)
+        printer.expects(:puts).with("||*abc*||Author||PR||Risks||")
+        printer.print_team_name("abc")
+      end
+    end
+
+    context "print_message" do
+    end
+  end
+end

data/test/changes_since_test.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'changes_since'
+require File.expand_path("../helper", __FILE__)
 
 class ChangesSinceTest < Test::Unit::TestCase
 

data/test/helper.rb

@@ -0,0 +1,6 @@
+require 'bundler'
+require 'test/unit'
+require 'mocha'
+require 'mocha/test_unit'
+require 'shoulda'
+require 'changes_since'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: changes_since
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ashwin Hegde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,7 +113,9 @@ files:
 - lib/changes_since/changelog_printer.rb
 - lib/changes_since/commit_parser.rb
 - lib/changes_since/version.rb
+- test/changes_since/changelog_printer_test.rb
 - test/changes_since_test.rb
+- test/helper.rb
 homepage: http://rubygems.org/gems/changes_since
 licenses:
 - MIT
@@ -110,4 +141,6 @@ signing_key:
 specification_version: 4
 summary: Git Changes since a tag
 test_files:
+- test/changes_since/changelog_printer_test.rb
 - test/changes_since_test.rb
+- test/helper.rb