git-review 1.0.7 → 1.1.1

data/lib/git-review.rb

@@ -107,7 +107,7 @@ class GitReview
   def approve
     return unless request_exists?
     comment = 'Reviewed and approved.'
-    response = Octokit.add_comment source_repo, @current_request['number'], comment
+    response = @github.add_comment source_repo, @current_request['number'], comment
     if response[:body] == comment
       puts 'Successfully approved request.'
     else
@@ -118,7 +118,7 @@ class GitReview
   # Close a specified request.
   def close
     return unless request_exists?
-    Octokit.close_issue(source_repo, @current_request['number'])
+    @github.close_issue source_repo, @current_request['number']
     puts 'Successfully closed request.' unless request_exists?('open', @current_request['number'])
   end
 
@@ -170,7 +170,7 @@ class GitReview
       # 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)
+      @github.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
@@ -273,7 +273,7 @@ class GitReview
     @current_request = @current_requests.find{ |req| req['number'] == request_id }
     unless @current_request
       # Additional try to get an older request from Github by specifying the number.
-      request = Octokit.pull_request(source_repo, request_id)
+      request = @github.pull_request source_repo, request_id
       @current_request = request if request.state == state
     end
     if @current_request
@@ -287,7 +287,7 @@ class GitReview
 
   # Get latest changes from GitHub.
   def update(state = 'open')
-    @current_requests = Octokit.pull_requests(source_repo, state)
+    @current_requests = @github.pull_requests source_repo, state
     repos = @current_requests.collect do |req|
       repo = req['head']['repository']
       "#{repo['owner']}/#{repo['name']}" unless repo.nil?
@@ -384,14 +384,12 @@ class GitReview
     output
   end
 
-  # Convenience method that uses Octokit to access a repo through Github's API.
-  def repo_call(method, path, options = {})
-    Octokit.send(method, "/repos/#{Octokit::Repository.new(source_repo)}/#{path}", options, 3)
-  end
-
   # Show current discussion for @current_request.
   def discussion
-    request = Octokit.pull_request(source_repo, @current_request['number'])
+    request = @github.pull_request source_repo, @current_request['number']
+    # FIXME:
+    puts 'This needs to be updated to work with API v3.'
+    return
     result = request['discussion'].collect do |entry|
       user = entry['user'] || entry['author']
       name = user['login'].empty? ? user['name'] : user['login']
@@ -455,7 +453,7 @@ class GitReview
   # Returns a string that specifies the target branch.
   def target_branch
     # TODO: Enable possibility to manually override this and set arbitrary branches.
-    'master'
+    ENV['TARGET_BRANCH'] || 'master'
   end
 
   # Returns a string consisting of target repo and branch.
@@ -476,12 +474,12 @@ class GitReview
   # Uses Octokit to access GitHub.
   def configure_github_access
     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.password = git_config['github.password']
-      end
+      @github = Octokit::Client.new(
+        :login => git_config['github.login'],
+        :password => git_config['github.password']
+      )
       true
+      @github.login
     else
       puts 'Please update your git config and provide your GitHub login and password.'
       puts

metadata

@@ -1,110 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-review
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.1.1
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
 platform: ruby
-authors: 
+authors:
 - Dominik Bamberger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: launchy
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: octokit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 6
-        - 5
-        version: 0.6.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage review workflow for projects hosted on GitHub (using pull requests).
 email: bamberger.dominik@gmail.com
-executables: 
+executables:
 - git-review
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - lib/git-review.rb
 - bin/git-review
 homepage: http://github.com/b4mboo/git-review
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: facilitates GitHub code reviews
 test_files: []
-