git-review 0.7.9 → 0.8.1

data/lib/git-review.rb

@@ -18,9 +18,9 @@ class GitReview
       next if merged?(pending_request['head']['sha'])
       line = format_text(pending_request['number'], 8)
       date_string = format_time(pending_request['updated_at'])
-      line += format_text(date_string, 11)
-      line += format_text(pending_request['comments'], 10)
-      line += format_text(pending_request['title'], 91)
+      line << format_text(date_string, 11)
+      line << format_text(pending_request['comments'], 10)
+      line << format_text(pending_request['title'], 91)
       line
     end
     if output.compact.empty?
@@ -37,47 +37,20 @@ class GitReview
     return unless request_exists?
     option = @args.shift == '--full' ? '' : '--stat '
     sha = @pending_request['head']['sha']
-    puts "ID       : #{@pending_request['number']}"
-    puts "Label    : #{@pending_request['head']['label']}"
-    puts "Updated  : #{format_time(@pending_request['updated_at'])}"
-    puts "Comments : #{@pending_request['comments']}"
+    puts "ID        : #{@pending_request['number']}"
+    puts "Label     : #{@pending_request['head']['label']}"
+    puts "Updated   : #{format_time(@pending_request['updated_at'])}"
+    puts "Comments  : #{@pending_request['comments']}"
     puts
     puts @pending_request['title']
     puts
     puts @pending_request['body']
     puts
     puts git_call("diff --color=always #{option}HEAD...#{sha}")
-  end
-
-  # Show current discussion for a single request.
-  def discussion
-    return unless request_exists?
-    request = Octokit.pull_request(source_repo, @pending_request['number'])
-    discussion = request['discussion'][1..-1]
-    result = discussion.collect do |entry|
-      # For now we only show comments and commits.
-      if ["IssueComment", "Commit"].include?(entry['type'])
-        output = "'#{entry["user"]["login"]}' "
-        case entry['type']
-          # Comments:
-          when "IssueComment"
-            output << "added a comment on #{format_time(entry['created_at'])}"
-            unless entry['created_at'] == entry['updated_at']
-              output << " (updated on #{format_time(entry['updated_at'])})"
-            end
-            output << ":\n#{''.rjust(output.length + 1, "-")}\n#{entry["body"]}"
-          # Commits:
-          when "Commit"
-           output << "authored a commit on #{format_time(entry['authored_date'])}"
-           unless entry['authored_date'] == entry['committed_date']
-             output << " (committed on #{format_time(entry['committed_date'])})"
-           end
-           output << ":\n#{''.rjust(output.length + 1, "-")}\n#{entry["message"]}"
-        end
-        output << "\n\n"
-      end
-    end
-    puts result.compact unless result.empty?
+    puts
+    puts "Progress  :"
+    puts
+    discussion
   end
 
   # Open a browser window and review a specified request.
@@ -182,6 +155,7 @@ class GitReview
   # Start a console session (used for debugging).
   def console
     puts 'Entering debug console.'
+    request_exists?
     require 'ruby-debug'
     Debugger.start
     debugger
@@ -217,7 +191,6 @@ class GitReview
     puts 'Available commands:'
     puts '  list [--reverse]          List all pending requests.'
     puts '  show <ID> [--full]        Show details for a single request.'
-    puts '  discussion <number>       Shows ongoing discussions for a single request.'
     puts '  browse <ID>               Open a browser window and review a specified request.'
     puts '  checkout <ID> [--branch]  Checkout a specified request\'s changes to your local repository.'
     puts '  merge <ID>                Accept a specified request by merging it into master.'
@@ -271,6 +244,36 @@ class GitReview
     output
   end
 
+  # Show current discussion for @pending_request.
+  def discussion
+    request = Octokit.pull_request(source_repo, @pending_request['number'])
+    result = request['discussion'].collect do |entry|
+      output = "\e[35m#{entry["user"]["login"]}\e[m "
+      case entry['type']
+        # Comments:
+        when "IssueComment", "CommitComment", "PullRequestReviewComment"
+          output << "added a comment"
+          output << " to \e[36m#{entry['commit_id'][0..6]}\e[m" if entry['commit_id']
+          output <<  " on #{format_time(entry['created_at'])}"
+          unless entry['created_at'] == entry['updated_at']
+            output << " (updated on #{format_time(entry['updated_at'])})"
+          end
+          output << ":\n#{''.rjust(output.length + 1, "-")}\n"
+          output << "> \e[32m#{entry['path']}:#{entry['position']}\e[m\n" if entry['path'] and entry['position']
+          output << entry['body']
+        # Commits:
+        when "Commit"
+         output << "authored commit \e[36m#{entry['id'][0..6]}\e[m on #{format_time(entry['authored_date'])}"
+         unless entry['authored_date'] == entry['committed_date']
+           output << " (committed on #{format_time(entry['committed_date'])})"
+         end
+         output << ":\n#{''.rjust(output.length + 1, "-")}\n#{entry["message"]}"
+      end
+      output << "\n\n\n"
+    end
+    puts result.compact unless result.empty?
+  end
+
   # Display helper to make output more configurable.
   def format_text(info, size)
     info.to_s.gsub("\n", ' ')[0, size-1].ljust(size)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 61
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 9
-  version: 0.7.9
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Dominik Bamberger, Cristian Messel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 +01:00
+date: 2011-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency