git_pr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c87ac91486e6a5273bc76ffdd29e36669010d56f
-  data.tar.gz: 7503626a0aa947362e5f12c15c40818e3320244f
+  metadata.gz: e177f1696787c1c00a2f32b1434b622513690951
+  data.tar.gz: e8fd9ce384e2c11d7db089a587b73ecc657ada12
 SHA512:
-  metadata.gz: 2f2710728e24a9ce6c7d5aaedfbc39cd2d948a21ed1e58f37adfc9c9b37b3024ef11d2341dc8404ea848f1f02524fe84f8ff091e675283f873cf3d26b431d6ad
-  data.tar.gz: c5026497f74f7a8979dccf51e54375c1d00b817f7521466ad5d49b63f4f1a535aa42adbcacbad7b27f0b7c75e8e67db95c141a9aa6ede2b1e3b0e22a9562c3c9
+  metadata.gz: 12174ea2522aee16ccaf1e7941dea8395996558a878409c670661c57c72d96f466a9de8590ea7e969142b87f5b0668879c6417a158fb70a084da697ca15e6b65
+  data.tar.gz: d7ccc87a980d5e36af33f799a52d188231b8035b05a9427963392e05342a4f421673cd8b7c888dda34767b8c5282b42610bfc54d4006d407bc4568e98f8f3003

data/bin/git-pr

@@ -11,7 +11,6 @@ require 'colorize'
 require 'git'
 require 'highline/import'
 require 'io/console'
-require 'netrc'
 require 'octokit'
 require 'optparse'
 require 'pp'
@@ -127,9 +126,6 @@ if command == "merge" and !options.merge.additional_arguments.empty?
   options.merge.pr = options.merge.additional_arguments.shift.to_i
 end
 
-AUTH_KEY_NAME = "git-merge-pull"
-NETRC_KEY = "#{AUTH_KEY_NAME}.api.github.com"
-
 def run(cmd, args = { :failure => lambda {} })
   puts cmd.green
   puts `#{cmd}`
@@ -144,62 +140,6 @@ def run_test_output_empty(cmd)
   "" == `#{cmd}`
 end
 
-def test_github_credentials
-  n = Netrc.read
-  user, oauth_token = n[NETRC_KEY]
-  client = Octokit::Client.new :access_token => oauth_token
-  begin
-    client.user
-  rescue
-    n.delete NETRC_KEY
-    n.save
-    return false
-  end
-  return true
-end
-
-def prompt_for_github_credentials(args = {})
-  user = args[:user]
-  pass = args[:pass]
-  needs_otp = args[:needs_otp]
-  headers = {}
-
-  unless user
-    print "Enter your github username: "
-    user = STDIN.gets.chomp!
-    print "Password: "
-    pass = STDIN.noecho(&:gets).chomp!
-    puts "\n"
-  end
-
-  if needs_otp
-    print "Enter an OTP code: "
-    otp = STDIN.gets.chomp!
-    headers = { "X-GitHub-OTP" => "#{otp}" }
-  end
-
-  client = Octokit::Client.new :login => user, :password => pass
-  begin
-    authorizations = client.authorizations :headers => headers
-    auth = authorizations.find { |x| x[:app][:name].match "^#{AUTH_KEY_NAME}" }
-    unless auth
-      auth = client.create_authorization(:scopes => ["user", "repo"], :note => AUTH_KEY_NAME, :headers => headers)
-    end
-  rescue Octokit::Unauthorized
-    puts "Invalid username or password."
-    return false
-  rescue Octokit::OneTimePasswordRequired
-    # Come back through this method, prompting for an OTP
-    return prompt_for_github_credentials :user => user, :pass => pass, :needs_otp => true
-  end
-
-  n = Netrc.read
-  n[NETRC_KEY] = user, auth[:token]
-  n.save
-
-  return true
-end
-
 def pull_summary(pull)
   return "##{pull[:number]} from #{pull[:user][:login]}: \"#{pull[:title]}\""
 end
@@ -217,30 +157,30 @@ def query_for_pull_to_merge(pulls)
   return pull_to_merge
 end
 
-if not test_github_credentials and not prompt_for_github_credentials
+if not GitPr::GitHub.test_credentials and not GitPr::GitHub.prompt_for_credentials
   exit -1
 end
 
+GitPr::GitHub.initialize_octokit
+
 # Get local Git object pointed at our repo root
 git = Git.open `git rev-parse --show-toplevel`.chomp!
 
 # Find the target repository that we'll merge the pull request into
-# TODO: could read off command line instead
 target_remote = git.remotes.find { |x| x.name == options.merge.remote }
 url_match = target_remote.url.match "^git@github.com:(.*)/(.*).git"
 organization = url_match[1]
 repository = url_match[2]
 
-n = Netrc.read
-user, oauth_token = n[NETRC_KEY]
-Octokit.configure do |c|
-  c.access_token = oauth_token
-end
-
 github_repo = Octokit.repo "#{organization}/#{repository}"
 # pp github_repo
 
 pulls = Octokit.pulls "#{organization}/#{repository}/pulls"
+unless pulls.length > 0
+  puts "No open pull requests found for #{organization}/#{repository}.".yellow
+  exit
+end
+
 if options.merge.pr
   pull = pulls.find { |p| p[:number] == options.merge.pr }
   unless pull
@@ -251,6 +191,7 @@ else
   pull = query_for_pull_to_merge pulls
 end
 
+
 pull_number = pull[:number]
 source_branch = pull[:head][:ref]
 source_repo_ssh_url = pull[:head][:repo][:git_url]

data/lib/git_pr/github.rb

@@ -0,0 +1,84 @@
+require 'io/console'
+require 'octokit'
+require 'netrc'
+
+module GitPr
+  module GitHub
+
+    AUTH_KEY_NAME = "git-merge-pull"
+    NETRC_KEY = "#{AUTH_KEY_NAME}.api.github.com"
+
+    def self.test_credentials
+      n = Netrc.read
+      user, oauth_token = n[NETRC_KEY]
+      client = Octokit::Client.new :access_token => oauth_token
+      begin
+        client.user
+      rescue
+        n.delete NETRC_KEY
+        n.save
+        return false
+      end
+      return true
+    end
+
+    def self.prompt_for_credentials(args = {})
+      user = args[:user]
+      pass = args[:pass]
+      needs_otp = args[:needs_otp]
+      headers = {}
+
+      unless user
+        print "Enter your github username: "
+        user = STDIN.gets.chomp!
+        print "Password: "
+        pass = STDIN.noecho(&:gets).chomp!
+        puts "\n"
+      end
+
+      if needs_otp
+        print "Enter an OTP code: "
+        otp = STDIN.gets.chomp!
+        headers = { "X-GitHub-OTP" => "#{otp}" }
+      end
+
+      client = Octokit::Client.new :login => user, :password => pass
+      begin
+        authorizations = client.authorizations :headers => headers
+        auth = authorizations.find { |x| x[:app][:name].match "^#{AUTH_KEY_NAME}" }
+        unless auth
+          auth = client.create_authorization(:scopes => ["user", "repo"], :note => AUTH_KEY_NAME, :headers => headers)
+        end
+      rescue Octokit::Unauthorized
+        puts "Invalid username or password."
+        return false
+      rescue Octokit::OneTimePasswordRequired
+        # Clients that receive OTP codes via SMS won't get one when we do a get request to client.authorizations
+        # We have to make a post to the authorizations endpoint to trigger the sending of the SMS code.
+        # https://github.com/github/hub/commit/3d29989
+        begin
+          result = client.post "authorizations"
+        rescue Octokit::OneTimePasswordRequired
+        end
+
+        # Come back through this method, prompting for an OTP
+        return prompt_for_credentials :user => user, :pass => pass, :needs_otp => true
+      end
+
+      n = Netrc.read
+      n[NETRC_KEY] = user, auth[:token]
+      n.save
+
+      return true
+    end
+
+    def self.initialize_octokit
+      n = Netrc.read
+      user, oauth_token = n[NETRC_KEY]
+      Octokit.configure do |c|
+        c.access_token = oauth_token
+      end
+    end
+
+  end
+end

data/lib/git_pr/pull_request.rb

@@ -0,0 +1,9 @@
+module GitPr
+
+  class PullRequest
+    def initialize(pull)
+      @pull = pull
+    end
+  end
+
+end

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/git_pr.rb

@@ -1,3 +1,5 @@
+require "git_pr/github"
+require "git_pr/pull_request"
 require "git_pr/version"
 
 module GitPr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -138,6 +138,8 @@ files:
 - bin/git-pr
 - git_pr.gemspec
 - lib/git_pr.rb
+- lib/git_pr/github.rb
+- lib/git_pr/pull_request.rb
 - lib/git_pr/version.rb
 homepage: ''
 licenses: