git-review 0.6.1 → 0.6.3

data/lib/git-review.rb

@@ -11,14 +11,14 @@ class GitReview
   def help
     puts 'Usage: git review <command>'
     puts 'Manage review workflow for projects hosted on GitHub (using pull requests).'
-    puts ''
+    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 '   accept <number>           Accept a specified request by merging it into master.'
-    puts '   decline <number>          Decline and close a specified request.'
+    puts '   merge <number>            Accept a specified request by merging it into master.'
+    puts '   close <number>            Close a specified request.'
     puts '   create                    Create a new request.'
   end
 
@@ -41,7 +41,7 @@ class GitReview
       return
     end
     puts "Pending requests for '#{source}'"
-    puts 'ID      Date       Comments  Title'
+    puts 'ID      Updated    Comments  Title'
     puts output.compact
   end
 
@@ -55,15 +55,14 @@ class GitReview
     puts "Created  : #{@pending_request['created_at']}"
     puts "Votes    : #{@pending_request['votes']}"
     puts "Comments : #{@pending_request['comments']}"
-    puts ''
+    puts
     puts "Title    : #{@pending_request['title']}"
-    puts "Body     :"
-    puts ''
+    puts 'Body     :'
+    puts
     puts @pending_request['body']
-    puts ''
+    puts
     puts '------------'
-    puts ''
-    puts "cmd: git diff #{option}HEAD...#{sha}"
+    puts
     puts git("diff --color=always #{option}HEAD...#{sha}")
   end
 
@@ -74,11 +73,17 @@ class GitReview
 
   # Checkout a specified request's changes to your local repository.
   def checkout
-    git "co origin/#{@pending_request['head']['ref']}" if request_exists?
+    return unless request_exists?
+    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 "checkout origin/#{@pending_request['head']['ref']}"
   end
 
   # Accept a specified request by merging it into master.
-  def accept
+  def merge
     return unless request_exists?
     option = @args.shift
     unless @pending_request['head']['repository']
@@ -86,25 +91,28 @@ class GitReview
       user = @pending_request['head']['user']['login']
       url = @pending_request['patch_url']
       puts "Sorry, #{user} deleted the source repository, git-review doesn't support this."
-      puts "You can manually patch your repo by running:"
+      puts 'You can manually patch your repo by running:'
       puts
       puts "  curl #{url} | git am"
       puts
-      puts "Tell the contributor not to do this."
+      puts 'Tell the contributor not to do this.'
       return false
     end
     message = "Accepting request and merging into '#{target}':\n\n"
     message += "#{@pending_request['title']}\n\n"
     message += "#{@pending_request['body']}\n\n"
-    puts cmd = "git merge --no-ff #{option} -m '#{message}' #{@pending_request['head']['sha']}"
-    exec(cmd)
+    exec_cmd = "merge --no-ff #{option} -m '#{message}' #{@pending_request['head']['sha']}"
+    puts
+    puts "  git #{exec_cmd}"
+    puts
+    git(exec_cmd)
   end
 
-  # Decline and close a specified request.
-  def decline
+  # Close a specified request.
+  def close
     return unless request_exists?
     Octokit.post("issues/close/#{source_repo}/#{@pending_request['number']}")
-    puts "Successfully declined request." unless request_exists?(@pending_request['number'])
+    puts 'Successfully closed request.' unless request_exists?(@pending_request['number'])
   end
 
   # Create a new request.
@@ -115,11 +123,11 @@ class GitReview
     last_request_id = @pending_requests.collect{|req| req['number'] }.sort.last.to_i
     title = "[Review] Request from '#{github_login}' @ '#{source}'"
     # TODO: Insert commit messages (that are not yet in master) into body (since this will be displayed inside the mail that is sent out).
-    body = "You are requested to review the following changes:"
+    body = 'Please review the following changes:'
     # Create the actual pull request.
     Octokit.create_pull_request(target_repo, target_branch, source_branch, title, body)
     # Switch back to target_branch and check for success.
-    git "co #{target_branch}"
+    git "commit #{target_branch}"
     update
     potential_new_request = @pending_requests.find{ |req| req['title'] == title }
     puts 'Successfully created new request.' if potential_new_request['number'] > last_request_id
@@ -161,7 +169,7 @@ class GitReview
     update unless request_id.nil?
     request_id ||= @args.shift.to_i
     if request_id == 0
-      puts "Please specify a valid ID."
+      puts 'Please specify a valid ID.'
       return false
     end
     @pending_request = @pending_requests.find{ |req| req['number'] == request_id }
@@ -174,9 +182,7 @@ class GitReview
     @pending_requests = Octokit.pull_requests(source_repo)
     repos = @pending_requests.collect do |req|
       repo = req['head']['repository']
-      # Check if fork and commits still exist.
-      next if repo.nil? or not has_sha?(req['head']['sha'])
-      "#{repo['owner']}/#{repo['name']}"
+      "#{repo['owner']}/#{repo['name']}" unless repo.nil?
     end
     host = URI.parse(github_endpoint).host
     repos.uniq.compact.each do |repo|
@@ -185,7 +191,7 @@ class GitReview
   end
 
   # System call to 'git'.
-  def git(command, chomp=true)
+  def git(command, chomp = true)
     s = `git #{command}`
     s.chomp! if chomp
     s
@@ -228,13 +234,6 @@ class GitReview
     "#{target_repo}/#{target_branch}"
   end
 
-  # Returns a boolean stating whether a specified commit exists.
-  # TODO: Check if this is still necessary, since we don't cache anymore.
-  def has_sha?(sha)
-    git("show #{sha} 2>&1")
-    $?.exitstatus == 0
-  end
-
   # Returns a boolean stating whether a specified commit has already been merged.
   def merged?(sha)
     not git("rev-list #{sha} ^HEAD 2>&1").split("\n").size > 0
@@ -256,20 +255,21 @@ class GitReview
 
   # Get GitHub user name.
   def github_login
-    git("config --get-all github.user")
+    git('config --get-all github.user')
   end
 
   # Get GitHub token.
   def github_token
-    git("config --get-all github.token")
+    git('config --get-all github.token')
   end
 
   # Determine GitHub endpoint (defaults to 'https://github.com/').
   def github_endpoint
-    host = git("config --get-all github.host")
+    host = git('config --get-all github.host')
     host.empty? ? 'https://github.com/' : host
   end
 
+  # Returns an array consisting of information on the user and the project.
   def repo_info
     # Read config_hash from local git config.
     config_hash = {}
@@ -281,7 +281,7 @@ class GitReview
     # Extract user and project name from GitHub URL.
     url = config_hash['remote.origin.url']
     user, project = github_user_and_project(url)
-   # If there are no results yet, look for 'insteadof' substitutions in URL and try again.
+    # If there are no results yet, look for 'insteadof' substitutions in URL and try again.
     unless (user and project)
       short, base = github_insteadof_matching(config_hash, url)
       if short and base
@@ -292,6 +292,7 @@ class GitReview
     [user, project]
   end
 
+  # Looks for 'insteadof' substitutions in URL.
   def github_insteadof_matching(config_hash, url)
     first = config_hash.collect { |key,value|
       [value, /url\.(.*github\.com.*)\.insteadof/.match(key)]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Dominik Bamberger, Cristian Messel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +02:00
+date: 2011-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency