changes_since 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b890338bd4aada0e0e9b68b47b139e4d901b2dc3
-  data.tar.gz: ee3e6c35489896cba7d5a511d0f4c17a6318d748
+  metadata.gz: bd00ae0f3ab4d177cb56ff9618a7128792ce3022
+  data.tar.gz: 8777633088042b5d38fc646ac7e80a3122413600
 SHA512:
-  metadata.gz: 6424f13bc414ca403a439d81b5df1396da03cb2a0ab52fd019445b666aa2eed987d246cd98673f058c35bb10cf92b38223315ef6922f5f17202318da7d3c85b5
-  data.tar.gz: b951f9aa4b28fd17cb375aa10b27b9ae67cd0549efcaaecd0a7b20c34cee2634b59621a15afb8ead093ddac091687e3939fff2b2d3dd5837983fbd6fdb52fe9e
+  metadata.gz: 5023be7e52096c8fdee3a9e5859362e37cc22acc32a147de5c92473129147465c5f7e38f2582be568d6a651b0e123eb01764b88ec3d3a58ff6cac7813afcab33
+  data.tar.gz: 2d6eac7fa678b56392f443fea7057728283d02feb0ba3bc500b76a5f74a98288e500a6a206ee599e6c981a7968d63f014299f8018c2dab949de10bcce883e0b9

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in changes_since.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Ashwin Hegde
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,84 @@
+changes_since
+=============
+A Changelog tool that helps you display a neat changelog of all pull requests merged since a certain tag.
+This works well if you use a pull request based process, i.e. every commit made to master is via a pull request.
+
+Example:
+
+From https://github.com/resque/resque
+
+`ChangesSince.fetch('v1.25.2')`
+```
+Unclassified:
+
+* won't be needing rack-test as well (Dan Buch)
+* Extracted a new WorkerQueueList class out of Rescue::Worker (Einar Jonsson)
+* implementation of Backend connection with Hash (Ryan Biesemeyer)
+* update readme.md with hooks link (Ryan Biesemeyer)
+* speed up test suite (Ryan Biesemeyer)
+* Added worker_registry_tests (Ryan Biesemeyer)
+* add info about queue priority to readme (Ryan Biesemeyer)
+* Fix line and file endings. (Ryan Biesemeyer)
+* increase coverage for process coordinator (Ryan Biesemeyer)
+* Add Resque.configure documentation to README (Ryan Biesemeyer)
+...
+```
+If you want to use enhanced functionality, you can tag pull requests with #bug, #internal, or #public
+The 'Unclassified' would then change to Bug, Internal or Public respectively.
+
+There are some additional options you can use
+
+Author filter:
+
+`ChangesSince.fetch('v1.25.2', { :author_filter => ["Dan Buch", "Steve Klabnik"] })`
+```
+Unclassified:
+
+* won't be needing rack-test as well (Dan Buch)
+* Fixed typos (Steve Klabnik)
+* Make sure the filicide is justified (Steve Klabnik)
+* Spelling mistake correction. (Steve Klabnik)
+* Fix spelling of "languages" in readme (Steve Klabnik)
+* Fix daemonize option (Steve Klabnik)
+* Add wrapper for JSON encoding exceptions because yay consistency (Steve Klabnik)
+* The resque-2.0 tests are so noisy! (Steve Klabnik)
+...
+```
+
+`ChangesSince.fetch('v1.25.2', { :all => true })` - Tries to extract additional interesting commits
+
+You can also pass in some team logic.
+
+Example:
+
+`TEAMS = {
+  "Team 1" => ["Dan Buch", "Einar Jonsson"],
+  "Team 2" => ["Ryan Biesemeyer", "Steve Klabnik"]
+}`
+
+`ChangesSince.fetch('v1.25.2', {}, TEAMS)`
+```
+*Team 1*
+
+Unclassified:
+
+* won't be needing rack-test as well (Dan Buch)
+* Extracted a new WorkerQueueList class out of Rescue::Worker (Einar Jonsson)
+
+*Team 2*
+
+Unclassified:
+
+* update readme.md with hooks link (Ryan Biesemeyer)
+* speed up test suite (Ryan Biesemeyer)
+* add info about queue priority to readme (Ryan Biesemeyer)
+* Added worker_registry_tests (Ryan Biesemeyer)
+* Add Resque.configure documentation to README (Ryan Biesemeyer)
+* Typo in comment (Ryan Biesemeyer)
+* Attempt to infer queue from worker class (Ryan Biesemeyer)
+* increase coverage for process coordinator (Ryan Biesemeyer)
+* Fix line and file endings. (Ryan Biesemeyer)
+* implementation of Backend connection with Hash (Ryan Biesemeyer)
+* Feature/exits for real (Steve Klabnik)
+* Make sure the filicide is justified (Steve Klabnik)
+```

data/Rakefile

@@ -0,0 +1,8 @@
+require "bundler/gem_tasks"
+
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/changes_since.gemspec

@@ -0,0 +1,25 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'changes_since/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "changes_since"
+  spec.version       = ChangesSince::VERSION
+  spec.authors       = ["Ashwin Hegde"]
+  spec.email         = ["ahegde@zendesk.com"]
+  spec.summary       = "Git Changes since a tag"
+  spec.description   = "Shows you all the merged pull requests since a certain git tag in a nice format"
+  spec.homepage      = "http://rubygems.org/gems/changes_since"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake", '10.1.1'
+  spec.add_development_dependency 'test-unit'
+  spec.add_dependency "git"
+end

data/lib/changes_since/changelog_printer.rb

@@ -1,10 +1,17 @@
 class ChangesSince::ChangelogPrinter
-  attr_reader :teams, :options
+  attr_reader :teams, :options, :repo
 
-  def initialize(commits, teams, options)
+  TAGS = {
+    :public   => 'Public',
+    :bug      => 'Bugs',
+    :internal => 'Internal'
+  }
+
+  def initialize(commits, teams, options, repo)
     @commits = commits
     @teams   = teams
     @options = options
+    @repo    = repo
   end
 
   def print!
@@ -26,43 +33,54 @@ class ChangesSince::ChangelogPrinter
       end
       next if team_commits.empty?
       @commits -= team_commits
-      puts "\n*#{team}*\n"
+      if options[:markdown]
+        puts "||*#{team}*||Author||PR||"
+      else
+        puts "\n*#{team}*\n"
+      end
       print_commits!(team_commits)
     end
 
     return if @commits.empty?
     puts "\n*Other*\n\n"
-    @commits.each { |commit| print_message(commit, nil, options) }
+    @commits.each { |commit| print_message(commit, nil) }
   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
+    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
+      end
+      return if output_commits.empty?
+      puts "\nUnclassified:\n\n"
     end
 
-    puts "\nUnclassified:\n\n"
-    output_commits.each { |commit| print_message(commit, nil, options) }
+    output_commits.each { |commit| print_message(commit, nil) }
   end
 
-  def print_message(commit, type, options)
+  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
     end
     title.gsub!("##{type}", "") if type
     branch_author = commit.author.name
-    puts "* #{title} (#{branch_author}) #{options[:sha] ? commit.sha[0..9] : ''}"
+    if options[:markdown]
+      text = "|#{title}|#{branch_author}|"
+      text << "[##{pr}|#{@repo}/pulls/#{pr}]|" if @repo
+    else
+      text = "* #{title} (#{branch_author})"
+    end
+    puts text
   end
 end

data/lib/changes_since/commit_parser.rb

@@ -2,8 +2,8 @@ class ChangesSince::CommitParser
   attr_reader :log, :options
 
   def initialize(tag, options)
-    git  = Git.open(Dir.pwd)
-    @log = git.log(100000).between(tag)
+    git   = Git.open(Dir.pwd)
+    @log  = git.log(100000).between(tag)
     @options = options
   end
 

data/lib/changes_since/version.rb

@@ -0,0 +1,3 @@
+module ChangesSince
+  VERSION = "0.0.6"
+end

data/lib/changes_since.rb

@@ -8,12 +8,45 @@ require 'optparse'
 require 'set'
 
 class ChangesSince
-  def self.fetch(tag, options={}, teams=nil)
+  def self.fetch(tag, teams=nil, repo=nil)
+    options = parse_options
     parser  = CommitParser.new(tag, options)
     commits = parser.parse
-    printer = ChangelogPrinter.new(commits, teams, options)
+    printer = ChangelogPrinter.new(commits, teams, options, repo)
     printer.print!
   end
+
+  def self.parse_options
+    options = {}
+    OptionParser.new do |opts|
+      opts.banner = "Usage: script/changes_since TAG [options]"
+
+      opts.on("-a", "--all", "Consider all interesting commits ([AI-1234] or [ZD#1234] or #bug/public/internal), not just PR merges") do |a|
+        options[:all] = a
+      end
+
+      opts.on("-s", "--sha", "Include commit sha in the output") do |s|
+        options[:sha] = s
+      end
+
+      opts.on("-f", "--filter [authors]", "Limit to authors matching the passed string(s). Comma-separated list works.") do |authors|
+        options[:author_filter] = authors.split(",")
+      end
+
+      opts.on("-t", "--tags", "Group commits by public, internal or bugs") do |t|
+        options[:tags] = t
+      end
+
+      opts.on("-r", "--risk", "Group commits by high, medium or low risk") do |r|
+        options[:risk] = r
+      end
+
+      opts.on("-m", "--markdown", "Use tables in Atlassian as markdown") do |m|
+        options[:markdown] = m
+      end
+    end.parse!
+    options
+  end
 end
 
 require 'changes_since/commit_parser'

data/test/changes_since_test.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+require 'changes_since'
+
+class ChangesSinceTest < Test::Unit::TestCase
+
+end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: changes_since
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ashwin Hegde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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
@@ -32,9 +74,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- changes_since.gemspec
+- lib/changes_since.rb
 - lib/changes_since/changelog_printer.rb
 - lib/changes_since/commit_parser.rb
-- lib/changes_since.rb
+- lib/changes_since/version.rb
+- test/changes_since_test.rb
 homepage: http://rubygems.org/gems/changes_since
 licenses:
 - MIT
@@ -59,4 +109,5 @@ rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Git Changes since a tag
-test_files: []
+test_files:
+- test/changes_since_test.rb