git-review 0.8.3 → 0.8.4

data/lib/git-review.rb

@@ -136,20 +136,26 @@ class GitReview
   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}'"
-    # 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 = '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_call "checkout #{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
+    unless git_call("cherry #{target_branch}").empty?
+      # 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}'"
+      # 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 = '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_call "checkout #{target_branch}"
+      update
+      potential_new_request = @pending_requests.find{ |req| req['title'] == title }
+      if potential_new_request and potential_new_request['number'] > last_request_id
+        puts 'Successfully created new request.'
+      end
+    else
+      "Nothing to push to remote yet. Commit something first."
+    end
   end
 
   # Start a console session (used for debugging).
@@ -226,9 +232,8 @@ class GitReview
       repo = req['head']['repository']
       "#{repo['owner']}/#{repo['name']}" unless repo.nil?
     end
-    host = URI.parse(github_endpoint).host
     repos.uniq.compact.each do |repo|
-      git_call("fetch git@#{host}:#{repo}.git +refs/heads/*:refs/pr/#{repo}/*")
+      git_call("fetch git@github.com:#{repo}.git +refs/heads/*:refs/pr/#{repo}/*")
     end
   end
 
@@ -323,28 +328,23 @@ class GitReview
 
   # Uses Octokit to access GitHub.
   def configure_github_access
-    if git_config['github.login'] and git_config['github.token']
+    if git_config['github.login'] and git_config['github.password']
       Octokit.configure do |config|
+        config.api_version = 2
         config.login = git_config['github.login']
-        config.token = git_config['github.token']
-        config.endpoint = github_endpoint
+        config.password = git_config['github.password']
       end
       true
     else
-      puts 'Please update your git config and provide your GitHub login and token.'
+      puts 'Please update your git config and provide your GitHub login and password.'
       puts
       puts '  git config --global github.login your_github_login_1234567890'
-      puts '  git config --global github.token your_github_token_1234567890'
+      puts '  git config --global github.password your_github_password_1234567890'
       puts
       false
     end
   end
 
-  # Determine GitHub endpoint (defaults to 'https://github.com/').
-  def github_endpoint
-    git_config['github.endpoint'] || 'https://github.com/'
-  end
-
   def debug_mode
     git_config['review.mode'] == 'debug'
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Dominik Bamberger, Cristian Messel
@@ -38,14 +38,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
         - 0
-        - 5
-        - 1
-        version: 0.5.1
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency