git-review 0.7.6 → 0.7.9

data/lib/git-review.rb

@@ -17,7 +17,7 @@ class GitReview
       # still think of them as pending, as it doesn't know about local changes.
       next if merged?(pending_request['head']['sha'])
       line = format_text(pending_request['number'], 8)
-      date_string = Date.parse(pending_request['updated_at']).strftime('%d-%b-%y')
+      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)
@@ -32,14 +32,14 @@ class GitReview
     puts output.compact
   end
 
-  # Show details of a single request.
+  # Show details for a single request.
   def show
     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  : #{Time.parse(@pending_request['updated_at']).strftime('%d-%b-%y')}"
+    puts "Updated  : #{format_time(@pending_request['updated_at'])}"
     puts "Comments : #{@pending_request['comments']}"
     puts
     puts @pending_request['title']
@@ -49,6 +49,37 @@ class GitReview
     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?
+  end
+
   # Open a browser window and review a specified request.
   def browse
     Launchy.open(@pending_request['html_url']) if request_exists?
@@ -57,12 +88,13 @@ class GitReview
   # Checkout a specified request's changes to your local repository.
   def checkout
     return unless request_exists?
+    create_local_branch = @args.shift == '--branch' ? '' : 'origin/'
     puts 'Checking out changes to your local repository.'
     puts 'To get back to your original state, just run:'
     puts
     puts '  git checkout master'
     puts
-    git_call "checkout origin/#{@pending_request['head']['ref']}"
+    git_call "checkout #{create_local_branch}#{@pending_request['head']['ref']}"
   end
 
   # Accept a specified request by merging it into master.
@@ -184,11 +216,12 @@ class GitReview
     puts
     puts 'Available commands:'
     puts '  list [--reverse]          List all pending requests.'
-    puts '  show <number> [--full]    Show details of a single request.'
-    puts '  browse <number>           Open a browser window and review a specified request.'
-    puts '  checkout <number>         Checkout a specified request\'s changes to your local repository.'
-    puts '  merge <number>            Accept a specified request by merging it into master.'
-    puts '  close <number>            Close a specified request.'
+    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.'
+    puts '  close <ID>                Close a specified request.'
     puts '  prepare                   Creates a new local branch for a request.'
     puts '  create                    Create a new request.'
   end
@@ -243,6 +276,11 @@ class GitReview
     info.to_s.gsub("\n", ' ')[0, size-1].ljust(size)
   end
 
+  # Display helper to unify time output.
+  def format_time(time_string)
+    Time.parse(time_string).strftime('%d-%b-%y')
+  end
+
   # Returns a string that specifies the source repo.
   def source_repo
     "#{@user}/#{@repo}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - Dominik Bamberger, Cristian Messel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 +01:00
+date: 2011-12-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,20 @@ dependencies:
         version: 0.5.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Manage review workflow for projects hosted on GitHub (using pull requests).
 email: bamberger.dominik@gmail.com
 executables: