git-review 1.1.5 → 1.1.6

data/lib/git-review.rb

@@ -7,6 +7,11 @@ require 'time'
 # tempfile is used to create a temporary file containing PR's title and body.
 # This file is going to be edited by the system editor.
 require 'tempfile'
+# This file provides the OAuthHelper module which is used to create a oauth token/
+require_relative 'oauth_helper'
+# Setting class
+require_relative 'settings'
+
 
 # A custom error to raise, if we know we can't go on.
 class UnprocessableState < StandardError
@@ -14,6 +19,7 @@ end
 
 
 class GitReview
+  include OAuthHelper
 
   ## COMMANDS ##
 
@@ -190,8 +196,8 @@ class GitReview
       update
       potential_new_request = @current_requests.find { |req| req['title'] == title }
       if potential_new_request and potential_new_request['number'] > last_request_id
-        puts "Successfully created new request ##{potential_new_request['number']}" \
-             "(#{File.join("https://github.com", target_repo, "pull", potential_new_request['number'].to_s)})."
+        puts "Successfully created new request ##{potential_new_request['number']}"
+        puts File.join("https://github.com", target_repo, "pull", potential_new_request['number'].to_s)
       end
       # Return to the user's original branch.
       git_call "checkout #{@original_branch}"
@@ -512,26 +518,21 @@ class GitReview
 
   # Uses Octokit to access GitHub.
   def configure_github_access
-    if git_config['github.login'] and git_config['github.password']
+    if Settings.instance.oauth_token
       @github = Octokit::Client.new(
-          :login => git_config['github.login'],
-          :password => git_config['github.password']
+        :login       => Settings.instance.username,
+        :oauth_token => Settings.instance.oauth_token
       )
-      true
       @github.login
     else
-      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.password your_github_password_1234567890'
-      puts
-      false
+      configure_oauth
+      configure_github_access
     end
   end
 
 
   def debug_mode
-    git_config['review.mode'] == 'debug'
+    Settings.instance.review_mode == 'debug'
   end
 
 

data/lib/oauth_helper.rb

@@ -0,0 +1,63 @@
+require 'net/http'
+require 'net/https'
+require 'json'
+# Required to hide password
+require 'io/console'
+# Used to retrieve hostname
+require 'socket'
+
+module OAuthHelper
+  def configure_oauth(chosen_description = nil)
+    puts "Requesting a OAuth token for git-review."
+    puts "This procedure will grant access to your public and private repositories."
+    puts "You can revoke this authorization by visiting the following page: " +
+      "https://github.com/settings/applications"
+    print "Plese enter your GitHub's username: "
+    username = STDIN.gets.chomp
+    print "Plese enter your GitHub's password (it won't be stored anywhere): "
+    password = STDIN.noecho(&:gets).chomp
+    print "\n"
+
+    if chosen_description
+      description = chosen_description
+    else
+      description = "git-review - #{Socket.gethostname}"
+      puts "Please enter a descriptiont to associate to this token, it will " +
+        "make easier to find it inside of github's application page."
+      puts "Press enter to accept the proposed description"
+      print "Description [#{description}]:"
+      user_description = STDIN.gets.chomp
+      description = user_description.empty? ? description : user_description
+    end
+
+    uri = URI("https://api.github.com/authorizations")
+
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true
+
+    req =Net::HTTP::Post.new(uri.request_uri)
+    req.basic_auth username, password
+    req.body = {
+      "scopes" => ["repo"],
+      "note"   => description
+    }.to_json
+
+    response = http.request req
+
+    if response.code == '401'
+      warn "You provided the wrong username/password, please try again."
+      configure_oauth(description)
+    elsif response.code == '201'
+      parser_response      = JSON.parse(response.body)
+      settings             = Settings.instance
+      settings.oauth_token = parser_response['token']
+      settings.username    = username
+      settings.save!
+      puts "OAuth token successfully created"
+    else
+      warn "Something went wrong: #{response.body}"
+      exit 1
+    end
+  end
+
+end

data/lib/settings.rb

@@ -0,0 +1,47 @@
+require 'fileutils'
+require 'singleton'
+require 'yaml'
+
+class Settings
+  include Singleton
+
+  def initialize
+    @config_file = File.join(
+      Dir.home,
+      '.git_review.yml'
+    )
+
+    @config = if File.exists?(@config_file)
+      YAML.load_file(@config_file) || {}
+    else
+      {}
+    end
+  end
+
+  def save!
+    File.open(@config_file, 'w') do |file|
+      file.write(YAML.dump(@config))
+    end
+  end
+
+  def review_mode
+    @config['review_mode']
+  end
+
+  def oauth_token
+    @config['oauth_token']
+  end
+
+  def oauth_token=(token)
+    @config['oauth_token'] = token
+  end
+
+  def username
+    @config['username']
+  end
+
+  def username=(username)
+    @config['username'] = username
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-review
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -83,7 +83,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- lib/settings.rb
 - lib/git-review.rb
+- lib/oauth_helper.rb
 - bin/git-review
 homepage: http://github.com/b4mboo/git-review
 licenses: []