git-review 0.7.3 → 0.7.6

data/lib/git-review.rb

@@ -100,10 +100,39 @@ class GitReview
     puts 'Successfully closed request.' unless request_exists?(@pending_request['number'])
   end
 
+  # Prepare local repository to create a new request.
+  # Sets @local_branch.
+  def prepare
+    # People should work on local branches, but especially for single commit changes,
+    # more often than not, they don't. Therefore we create a branch for them,
+    # to be able to use code review the way it is intended.
+    if source_branch == target_branch
+      # Unless a branch name is already provided, ask for one.
+      if (branch_name = @args.shift).nil?
+        puts 'Please provide a name for the branch:'
+        branch_name = gets.chomp.gsub(/\W+/, '_').downcase
+      end
+      # Create the new branch (as a copy of the current one).
+      @local_branch = "review_#{Time.now.strftime("%y%m%d")}_#{branch_name}"
+      git_call "checkout -b #{@local_branch}"
+      if source_branch == @local_branch
+        # Go back to master and get rid of pending commits (as these are now on the new branch).
+        git_call "checkout #{target_branch}"
+        git_call "reset --hard origin/#{target_branch}"
+        git_call "checkout #{@local_branch}"
+      end
+    else
+      @local_branch = source_branch
+    end
+  end
+
   # Create a new request.
   # TODO: Support creating requests to other repositories and branches (like the original repo, this has been forked from).
   def create
+    # Prepare @local_branch.
     prepare
+    # Push latest commits to the remote branch (and by that, create it if necessary).
+    git_call "push --set-upstream origin #{@local_branch}"
     # Gather information.
     last_request_id = @pending_requests.collect{|req| req['number'] }.sort.last.to_i
     title = "[Review] Request from '#{git_config['github.login']}' @ '#{source}'"
@@ -160,6 +189,7 @@ class GitReview
     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 '  prepare                   Creates a new local branch for a request.'
     puts '  create                    Create a new request.'
   end
 
@@ -167,7 +197,8 @@ class GitReview
   def request_exists?(request_id = nil)
     # NOTE: If request_id is set explicitly we might need to update to get the
     # latest changes from GitHub, as this is called from within another method.
-    update unless request_id.nil?
+    automated = !request_id.nil?
+    update if automated
     request_id ||= @args.shift.to_i
     if request_id == 0
       puts 'Please specify a valid ID.'
@@ -175,7 +206,8 @@ class GitReview
     end
     @pending_request = @pending_requests.find{ |req| req['number'] == request_id }
     if @pending_request.nil?
-      puts "Request '#{request_id}' does not exist."
+      # No output for automated checks.
+      puts "Request '#{request_id}' does not exist." unless automated
       return false
     end
     true
@@ -194,33 +226,6 @@ class GitReview
     end
   end
 
-  # Get local and remote branches ready to create a new request.
-  def prepare
-    # People should work on local branches, but especially for single commit changes,
-    # more often than not, they don't. Therefore we create a branch for them,
-    # to be able to use code review the way it is intended.
-    if source_branch == target_branch
-      # Unless a branch name is already provided, ask for one.
-      if (branch_name = @args.shift).nil?
-        puts 'Please provide a name for the branch:'
-        branch_name = gets.chomp.gsub(/\W+/, '_').downcase
-      end
-      # Create the new branch (as a copy of the current one).
-      local_branch = "review_#{Time.now.strftime("%y%m%d")}_#{branch_name}"
-      git_call "checkout -b #{local_branch}"
-      if source_branch == local_branch
-        # Go back to master and get rid of pending commits (as these are now on the new branch).
-        git_call "checkout #{target_branch}"
-        git_call "reset --hard origin/#{target_branch}"
-        git_call "checkout #{local_branch}"
-      end
-    else
-      local_branch = source_branch
-    end
-    # Push latest commits to the remote branch (and by that, create it if necessary).
-    git_call "push --set-upstream origin #{local_branch}"
-  end
-
   # System call to 'git'.
   def git_call(command, verbose = debug_mode)
     if verbose

metadata

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