git_pr 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd812898dce3ddc1a3640e6e2313f0e825c61c2
-  data.tar.gz: 2f94a7acbf7ee95099dfc834256300d981dd4bb2
+  metadata.gz: 011c22bbbb24143c1bab09ee5d53aff9446fd4ac
+  data.tar.gz: 3ff6bef6c765bed54291f933d6a47a664b302eac
 SHA512:
-  metadata.gz: 06cb3c21ac7e1fd42d1b34756099615641ff2aeddc82060bee1c293dbbc16f2b73e35ea36ae54892bf98898a4a528fd3a58a4d8f09e075fbaf104e3327b93967
-  data.tar.gz: f9888e80c161f5eba816f81cf3f8425ee41db36d8ec8cff205f9ac95083c3595cfd7d1169a10696fec87c3b40da424153e5bd11eb5fe385258a09fec9a815308
+  metadata.gz: f0d4b63380be765e9e2201ff436bdf34c9779fb5eda138902a4f1641ce17bdeccfeaf85f096a4e968b77c8e1cbfb051d58bb14fe0f99eaf14d7c93b33e9277ba
+  data.tar.gz: 4fd93b31cc3fe78d3b93b2ac9e7f5f20a279a6610194faaec6f4c47f6e9a8fed04d8a51e24d9288296782bcaf19812bdb3884e3c778001324b9c98f850271206

data/bin/git-pr

@@ -234,7 +234,7 @@ when "open"
   # We didn't find a matching pull request, so let's try to open the "create
   # pull request" page.
   source = source
-  if not git.is_local_branch? source
+  if not git.is_local_branch_fast? source
     puts "Unknown branch '#{source}'.".red
     exit -1
   end
@@ -250,8 +250,8 @@ when "open"
   # https://github.com/FiftyThree/Studio/compare/FiftyThree:master...floatplane:blobstore
   # So I need to: get the upstream for the named branch. Extract the github project owner.
   github_target_owner, github_target_project = github_project.split "/"
-  remote_source_branch = git.branches.remote.find { |b| b.name == source }
-  remote_url = remote_source_branch ? remote_source_branch.remote.url : nil
+  remote = git.find_remote_for_local_branch source
+  remote_url = remote ? remote.url : nil
   unless remote_url and remote_url.match /github\.com/
     puts "Branch '#{source}' has never been pushed to GitHub."
     exit -1

data/lib/git_pr/git.rb

@@ -0,0 +1,24 @@
+require 'git'
+
+# Add some methods to the git class that operate a lot faster than the defaults
+class Git::Base
+
+  # Default implementation of is_local_branch? will create O(N) Git::Branch
+  # objects for all branches, local *and* remote. All we care about is
+  # existence, so we don't need all that.
+  def is_local_branch_fast?(branch)
+    self.chdir do
+      local_branches = `git branch`.split.map { |b| b.gsub('*', '').strip }
+      local_branches.include? branch
+    end
+  end
+
+  # Shortcut to create a remote for a particular branch, if the branch has an upstream. 
+  def find_remote_for_local_branch(branch)
+    self.chdir do
+      remote_name = `git for-each-ref --format='%(upstream:short)' refs/heads/#{branch}`.strip.sub(/\/#{branch}$/, '')
+      remote_name.empty? ? nil : Git::Remote.new(self, remote_name)
+    end
+  end
+
+end

data/lib/git_pr/github.rb

@@ -43,11 +43,11 @@ module GitPr
 
       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
+        hostname = `hostname`.strip!
+        auth = client.create_authorization(:scopes => ["user", "repo"],
+                                           :note => "#{AUTH_KEY_NAME} (#{hostname})",
+                                           :fingerprint => "#{hostname} #{Time.now}",
+                                           :headers => headers)
       rescue Octokit::Unauthorized
         puts "Invalid username or password."
         return false

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/git_pr.rb

@@ -1,3 +1,4 @@
+require "git_pr/git"
 require "git_pr/github"
 require "git_pr/pull_request"
 require "git_pr/version"

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -130,7 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -139,6 +139,7 @@ files:
 - git_pr.gemspec
 - lib/git_pr.rb
 - lib/git_pr/diff.rb
+- lib/git_pr/git.rb
 - lib/git_pr/github.rb
 - lib/git_pr/merge.rb
 - lib/git_pr/pull_request.rb
@@ -153,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A tool for listing and merging GitHub pull requests.