changes_since 0.0.10 → 0.1.1

data/README.md

@@ -11,8 +11,6 @@ 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)
@@ -26,7 +24,7 @@ Unclassified:
 ...
 ```
 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.
+The 'Unclassified' would then change to Bug, Internal or Public respectively, adding the option :tags => true.
 
 There are some additional options you can use
 
@@ -34,8 +32,6 @@ 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)
@@ -62,15 +58,11 @@ Example:
 ```
 *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)

data/changes_since.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'shoulda'
   spec.add_dependency "git"
+  spec.add_dependency "octokit"
 end

data/lib/changes_since.rb

@@ -1,13 +1,14 @@
-require 'git'
 require 'optparse'
-require 'set'
+require 'io/console'
 
 module ChangesSince
-  def self.fetch(tag, teams=nil, repo=nil)
+  def self.fetch(teams=nil)
     options = parse_options
+    puts "Enter tag:"
+    tag     = gets.chomp
     parser  = CommitParser.new(tag, options)
     commits = parser.parse
-    printer = ChangelogPrinter.new(commits, teams, options, repo)
+    printer = ChangelogPrinter.new(commits, teams, options)
     printer.print!
   end
 
@@ -20,10 +21,6 @@ module ChangesSince
         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
@@ -32,13 +29,10 @@ module ChangesSince
         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
@@ -46,3 +40,4 @@ end
 
 require 'changes_since/commit_parser'
 require 'changes_since/changelog_printer'
+require 'changes_since/api_client'

data/lib/changes_since/api_client.rb

@@ -0,0 +1,69 @@
+require 'git'
+require 'octokit'
+
+module ChangesSince
+  class ApiClient
+
+    attr_reader :access_token, :client, :repo
+
+    def initialize
+      puts "Please enter your Github credentials:"
+      print "Username:"
+      username = gets.chomp
+      print "Password:"
+      password = STDIN.noecho(&:gets).chomp
+      puts
+
+      @client = Octokit::Client.new(
+        :login => username,
+        :password => password
+      )
+
+      begin
+        fetch_authorization
+      rescue Octokit::OneTimePasswordRequired => e
+        puts "Enter two factor auth token:"
+        otp_token = gets.chomp
+        fetch_authorization(otp_token)
+      end
+
+      @client = Octokit::Client.new(:access_token => access_token)
+      git = Git.open(Dir.pwd)
+      @repo = git.remote.url.split(/[:.]/)[-2]
+    end
+
+    def fetch_authorization(otp_token=nil)
+      options = { :scopes => ["repo"], :note => "Changes Since" }
+
+      headers = {}
+      if otp_token
+        headers = { "X-GitHub-OTP" => otp_token }
+        options.merge!(:headers => headers)
+      end
+
+      begin
+        @access_token = client.create_authorization(options)
+      rescue Octokit::UnprocessableEntity => e
+        authorizations = client.authorizations(:headers => headers)
+        @access_token = authorizations.find { |a| a.note == "Changes Since" }.token
+      end
+    end
+
+    def pull_request_risks(number)
+      pr = client.pull_request(repo, number)
+      body = pr.body
+      if pr.body.include?("Risks")
+        body = body[pr.body.index("Risks") + 5, body.size]
+      elsif pr.body.include?("Risk")
+        body = body[pr.body.index("Risk") + 4, body.size]
+      else
+        return " "
+      end
+      body = body.strip
+      if index = body.index(/\r\n\r\n/)
+        body = body[0, index]
+      end
+      body
+    end
+  end
+end

data/lib/changes_since/changelog_printer.rb

@@ -1,6 +1,6 @@
 module ChangesSince
   class ChangelogPrinter
-    attr_reader :teams, :options, :repo
+    attr_reader :teams, :options, :repo, :api_client
 
     TAGS = {
       :public   => 'Public',
@@ -8,11 +8,15 @@ module ChangesSince
       :internal => 'Internal'
     }
 
-    def initialize(commits, teams, options, repo)
+    def initialize(commits, teams, options)
       @commits = commits
       @teams   = teams
       @options = options
-      @repo    = repo
+      git = Git.open(Dir.pwd)
+      @repo = "https://github.com/" << git.remote.url.split(/[:.]/)[-2]
+      if options[:markdown]
+        @api_client = ApiClient.new
+      end
     end
 
     def print!
@@ -29,7 +33,7 @@ module ChangesSince
         author_re = /#{members.join("|")}/i
         team_commits = @commits.select do |commit|
           [commit.author.name, commit.author.email].any? do |str|
-            str =~ author_re
+            str.force_encoding(Encoding::UTF_8) =~ author_re
           end
         end
         next if team_commits.empty?
@@ -45,9 +49,7 @@ module ChangesSince
 
     def print_team_name(name)
       if options[:markdown]
-        row = "||*#{name}*||Author||PR||"
-        row << "Commit||" if options[:sha]
-        row << "Risk||" if options[:risk]
+        row = "||*#{name}*||Author||PR||Risk||"
         puts row
       else
         puts "\n*#{name}*\n"
@@ -80,7 +82,6 @@ module ChangesSince
         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
@@ -88,8 +89,7 @@ module ChangesSince
         text = "|#{title}|"
         text << "#{branch_author}|"
         text << "[##{pr}|#{@repo}/pull/#{pr}]|" if @repo && pr
-        text << "[#{sha}|#{@repo}/commit/#{sha}]|" if sha
-        text << " |" if options[:risk]
+        text << "#{api_client.pull_request_risks(pr)}|"
       else
         text = "* #{title} (#{branch_author})"
       end

data/lib/changes_since/commit_parser.rb

@@ -1,3 +1,5 @@
+require 'git'
+
 module ChangesSince
   class CommitParser
     attr_reader :log, :options

data/lib/changes_since/version.rb

@@ -1,3 +1,3 @@
 module ChangesSince
-  VERSION = "0.0.10"
+  VERSION = "0.1.1"
 end

data/test/changes_since/changelog_printer_test.rb

@@ -160,16 +160,9 @@ class ChangelogPrinterTest < Test::Unit::TestCase
           printer.print_message(commit)
         end
 
-        should "print out the title, branch author PR and sha" do
-          printer = ChangesSince::ChangelogPrinter.new(stub, stub, { :markdown => true, :sha => true }, "repo")
-          commit  = stub(:author => stub(:name => "NAME"), :message => "MESSAGE", :sha => "123")
-          printer.expects(:puts).with('|MESSAGE|NAME|[123|repo/commit/123]|')
-          printer.print_message(commit)
-        end
-
         should "allow a column for risk" do
           printer = ChangesSince::ChangelogPrinter.new(stub, stub, { :markdown => true, :risk => true }, "repo")
-          commit  = stub(:author => stub(:name => "NAME"), :message => "MESSAGE", :sha => "123")
+          commit  = stub(:author => stub(:name => "NAME"), :message => "MESSAGE")
           printer.expects(:puts).with('|MESSAGE|NAME|[|repo/commit/]| |')
           printer.print_message(commit)
         end

metadata

@@ -1,107 +1,134 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: changes_since
-version: !ruby/object:Gem::Version
-  version: 0.0.10
+version: !ruby/object:Gem::Version 
+  hash: 25
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
-authors:
+authors: 
 - Ashwin Hegde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-07-17 00:00:00 +00:00
+default_executable: 
+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:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    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
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 73
+        segments: 
+        - 10
+        - 1
+        - 1
         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
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: test-unit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
   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'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: shoulda
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: octokit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Shows you all the merged pull requests since a certain git tag in a nice
-  format
-email:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+description: Shows you all the merged pull requests since a certain git tag in a nice format
+email: 
 - ahegde@zendesk.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -110,37 +137,48 @@ files:
 - Rakefile
 - changes_since.gemspec
 - lib/changes_since.rb
+- lib/changes_since/api_client.rb
 - 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
+has_rdoc: true
 homepage: http://rubygems.org/gems/changes_since
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Git Changes since a tag
-test_files:
+test_files: 
 - test/changes_since/changelog_printer_test.rb
 - test/changes_since_test.rb
 - test/helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7f54efccb749c5d03ec76172fcbb188f3b343dd1
-  data.tar.gz: 9175935cca08e5e61cfc6ce0bc885a2b257b3626
-SHA512:
-  metadata.gz: 6726da3ef54fba175e143243a70e7b7092d9dd4768203b0d3a1497e69ee1f9f698169fcbab6118f143bcb78884ffd0174988c0d0d860df990cc1c44ee3189ff9
-  data.tar.gz: 23bfce2003de71382f2f400df579a923e1c3cfcc7ac1d646db0c58eeea0f65dd2f59c78b7e673edfae962826c47b08a6767361b1c5f3e1f12f488c73acfcd1aa