git_reflow 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.2.1)
-      github_api (= 0.6.5)
-      gli (= 2.0.0)
+    git_reflow (0.2.2)
+      colorize (= 0.5.8)
+      github_api (= 0.7.0)
+      gli (= 2.1.0)
       highline
       httpclient
-      json_pure (= 1.7.5)
 
 GEM
   remote: http://rubygems.org/
@@ -17,9 +17,10 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    builder (3.0.0)
+    builder (3.1.3)
     childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
+    colorize (0.5.8)
     crack (0.3.1)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -33,15 +34,15 @@ GEM
     gherkin (2.11.2)
       json (>= 1.4.6)
     git (1.2.5)
-    github_api (0.6.5)
+    github_api (0.7.0)
       faraday (~> 0.8.1)
       hashie (~> 1.2.0)
       multi_json (~> 1.3)
       nokogiri (~> 1.5.2)
       oauth2
-    gli (2.0.0)
+    gli (2.1.0)
     hashie (1.2.0)
-    highline (1.6.14)
+    highline (1.6.15)
     httpauth (0.1)
     httpclient (2.2.7)
     jeweler (1.8.4)
@@ -50,7 +51,6 @@ GEM
       rake
       rdoc
     json (1.7.5)
-    json_pure (1.7.5)
     jwt (0.1.5)
       multi_json (>= 1.0)
     multi_json (1.3.6)
@@ -71,10 +71,10 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
-    webmock (1.8.9)
+    webmock (1.8.10)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
 

data/git_reflow.gemspec

@@ -23,10 +23,10 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('aruba', '~> 0.4.6')
   s.add_development_dependency('jeweler')
   s.add_development_dependency('webmock')
-  s.add_dependency('gli', '2.0.0')
-  s.add_dependency('json_pure', '1.7.5')
+  s.add_dependency('colorize', '0.5.8')
+  s.add_dependency('gli', '2.1.0')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
-  s.add_dependency('github_api', '0.6.5')
+  s.add_dependency('github_api', '0.7.0')
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"
 end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/git_reflow.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
 require 'rake'
-require 'json/pure'
 require 'open-uri'
 require "highline/import"
 require 'httpclient'
 require 'github_api'
+require 'json/pure'
+require 'colorize'
 
 module GitReflow
   extend self
@@ -39,20 +40,8 @@ module GitReflow
       error_message = e.to_s
       if error_message =~ /request already exists/i
         existing_pull_request = find_pull_request( :from => current_branch, :to => options['base'] )
-        puts "Existing pull request at: #{existing_pull_request[:html_url]}"
-
-        # check for needed lgtm's
-        pull_comments = pull_request_comments(existing_pull_request)
-        if pull_comments.any?
-          open_comment_authors = find_authors_of_open_pull_request_comments(existing_pull_request)
-          last_committed_at    = Time.parse existing_pull_request.head.repo.updated_at
-          lgtm_authors         = comment_authors_for_pull_request(existing_pull_request, :with => LGTM, :after => last_committed_at)
-          puts "[review] LGTM given by: #{lgtm_authors.join(', ')}" if lgtm_authors.any?
-          puts "[notice] You still need a LGTM from: #{open_comment_authors.join(', ')}" if open_comment_authors.any?
-        else
-          puts "[notice] No one has reviewed your pull request..."
-        end
-
+        puts "A pull request already exists for these branches:"
+        display_pull_request_summary(existing_pull_request)
         ask_to_open_in_browser(existing_pull_request.html_url)
       else
         puts error_message
@@ -78,13 +67,13 @@ module GitReflow
         if open_comment_authors.empty?
           lgtm_authors   = comment_authors_for_pull_request(existing_pull_request, :with => LGTM)
           commit_message = get_first_commit_message
-          puts "Merging pull request ##{existing_pull_request[:number]}: '#{existing_pull_request[:title]}', from '#{existing_pull_request[:head][:label]}' into '#{existing_pull_request[:base][:label]}'"
+          puts "Merging pull request ##{existing_pull_request.number}: '#{existing_pull_request.title}', from '#{existing_pull_request.head.label}' into '#{existing_pull_request.base.label}'"
 
           update_destination(options['base'])
           merge_feature_branch(:feature_branch => feature_branch,
                                :destination_branch => options['base'],
-                               :pull_request_number => existing_pull_request[:number],
-                               :message => "\nCloses ##{existing_pull_request[:number]}\n\nLGTM given by: @#{lgtm_authors.join(', @')}\n")
+                               :pull_request_number => existing_pull_request.number,
+                               :message => "\nCloses ##{existing_pull_request.number}\n\nLGTM given by: @#{lgtm_authors.join(', @')}\n")
           append_to_squashed_commit_message(commit_message)
           committed = system('git commit')
 
@@ -142,7 +131,6 @@ module GitReflow
     `git log --pretty=format:"%s" --no-merges -n 1`.strip
   end
 
-  private
 
   def set_oauth_token(oauth_token)
     `git config --global --replace-all github.oauth-token #{oauth_token}`
@@ -181,8 +169,8 @@ module GitReflow
   def find_pull_request(options)
     existing_pull_request = nil
     github.pull_requests.all(remote_user, remote_repo_name, :state => 'open') do |pull_request|
-      if pull_request[:base][:label] == "#{remote_user}:#{options[:to]}" and
-         pull_request[:head][:label] == "#{remote_user}:#{options[:from]}"
+      if pull_request.base.label == "#{remote_user}:#{options[:to]}" and
+         pull_request.head.label == "#{remote_user}:#{options[:from]}"
          existing_pull_request = pull_request
          break
       end
@@ -191,8 +179,8 @@ module GitReflow
   end
 
   def pull_request_comments(pull_request)
-    comments        = github.issues.comments.all remote_user, remote_repo_name, pull_request[:number]
-    review_comments = github.pull_requests.comments.all remote_user, remote_repo_name, pull_request[:number]
+    comments        = github.issues.comments.all remote_user, remote_repo_name, pull_request.number
+    review_comments = github.pull_requests.comments.all remote_user, remote_repo_name, pull_request.number
     comments + review_comments
   end
 
@@ -200,21 +188,26 @@ module GitReflow
     # first we'll gather all the authors that have commented on the pull request
     all_comments    = pull_request_comments(pull_request)
     comment_authors = comment_authors_for_pull_request(pull_request)
+    lgtm_authors    = []
 
     # now we need to check that all the commented authors have given a lgtm after the last commit
     all_comments.each do |comment|
       next unless comment_authors.include?(comment.user.login)
-      pull_last_committed_at = Time.parse pull_request.head.repo.updated_at
+      pull_last_committed_at = get_commited_time(pull_request.head.sha)
       comment_created_at     = Time.parse(comment.created_at)
       if comment_created_at > pull_last_committed_at
-        if comment.body =~ LGTM
-          comment_authors -= [comment.user.login]
+        if comment[:body] =~ LGTM
+          lgtm_authors << comment.user.login
         else
           comment_authors << comment.user.login unless comment_authors.include?(comment.user.login)
         end
+      else
+        comment_authors -= [comment.user.login] if comment_authors.include?(comment.user.login)
       end
     end
 
+    comment_authors -= lgtm_authors
+
     comment_authors || []
   end
 
@@ -224,13 +217,57 @@ module GitReflow
 
     all_comments.each do |comment|
       next if options[:after] and Time.parse(comment.created_at) < options[:after]
-      comment_authors << comment.user.login if !comment_authors.include?(comment.user.login) and (options[:with].nil? or comment.body =~ options[:with])
+      comment_authors << comment.user.login if !comment_authors.include?(comment.user.login) and (options[:with].nil? or comment[:body] =~ options[:with])
     end
 
     # remove the current user from the list to check
     comment_authors -= [github_user]
   end
 
+  def display_pull_request_summary(pull_request)
+    summary_data = {
+      "branches"    => "#{pull_request.head.label} -> #{pull_request.base.label}",
+      "number"      => pull_request.number,
+      "url"         => pull_request.html_url
+    }
+
+    notices = ""
+    reviewed_by = comment_authors_for_pull_request(pull_request).map {|author| author.colorize(:red) }
+
+    # check for needed lgtm's
+    pull_comments = pull_request_comments(pull_request)
+    if pull_comments.reject {|comment| comment.user.login == github_user}.any?
+      open_comment_authors = find_authors_of_open_pull_request_comments(pull_request)
+      last_committed_at    = get_commited_time(pull_request.head.sha)
+      lgtm_authors         = comment_authors_for_pull_request(pull_request, :with => LGTM, :after => last_committed_at)
+
+      summary_data.merge!("Last comment"  => pull_comments.last.body)
+
+      if lgtm_authors.any?
+        reviewed_by.map! { |author| lgtm_authors.include?(author.uncolorize) ? author.colorize(:green) : author }
+      end
+
+      notices << "[notice] You still need a LGTM from: #{open_comment_authors.join(', ')}\n" if open_comment_authors.any?
+    else
+      notices << "[notice] No one has reviewed your pull request...\n"
+    end
+
+    summary_data['reviewed by'] = reviewed_by.join(', ')
+
+    padding_size = summary_data.keys.max_by(&:size).size + 2
+    summary_data.keys.sort.each do |name|
+      string_format = "    %-#{padding_size}s %s\n"
+      printf string_format, "#{name}:", summary_data[name]
+    end
+
+    puts "\n#{notices}" if notices != ''
+  end
+
+  def get_commited_time(commit_sha)
+    last_commit = github.repos.commits.find remote_user, remote_repo_name, commit_sha
+    Time.parse last_commit.commit.author[:date]
+  end
+
   # WARNING: this currently only supports OS X and UBUNTU
   def ask_to_open_in_browser(url)
     if RUBY_PLATFORM =~ /darwin|linux/i

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rspec'
-require 'json'
+require 'multi_json'
 require 'webmock/rspec'
 require 'ruby-debug'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,13 +110,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,15 +124,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
 description: Git Reflow manages your git workflow.
 email:
 - dev@reenhanced.com
@@ -250,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1057923408803391323
+      hash: -900915323995072277
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1057923408803391323
+      hash: -900915323995072277
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24