git_pr 0.0.3.beta1 → 0.0.3.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658d65e69d1e82754cf3a52a1dbc2acb6f7e6c7f
-  data.tar.gz: e4755905156ddc6de7dde59f8cdc244daeec8258
+  metadata.gz: f007a6246a5d8188043fa4f245f508ff49346647
+  data.tar.gz: 6dba6dd1e4fe153a0b7258af176dc901d2d9750b
 SHA512:
-  metadata.gz: 076c502311bb4c1cd68c82a22dadd5cbffa3ee7df1f5cafb1e638f64293707281b58f7e8532aefc57fde4a96f8971c8439717339464931e94b463ab87b3d1a3c
-  data.tar.gz: 78e4a335f11d88519db214dfeaabf1a824fbd97a4070b4242bf3edda6131346f7b067d765d7e11f94c3c8ec1cad27b4ce015553694d790744ca311bd6a83f056
+  metadata.gz: 8fc6a3bc87581d4d6f761a3436e00ff5eaf1910eeecfa64e3ca7906f9c9b3693aee52ee2aeffd7ad3d6a4687e91bcf09dfa7b9661ce36dd9820585567f32a50b
+  data.tar.gz: da8fcf7f4e3e23e3dc98240103d4923910ef6842e6d6acfe09105c88f00ec27ae36b82d3ee83d095e309dfa6cb9b2fe718878af12eb8503db33742ec97156037

data/bin/git-pr

@@ -18,9 +18,11 @@ require 'ostruct'
 require 'pp'
 
 $verbose = false
+$default_remotes = ["origin", "upstream"]
+
 options = OpenStruct.new(:help => false,
                          :verbose => false,
-                         :project => "origin",
+                         :project => nil,
                          :pull_request => nil,
                          :diff => OpenStruct.new(),
                          :difftool => OpenStruct.new(),
@@ -40,8 +42,8 @@ eos
   opts.on("-p",
           "--project [REMOTE|PROJECT]",
           "The GitHub project to access. Can be a named remote, or a GitHub project in",
-          "<user>/<project> form. Defaults to the GitHub project that the \"origin\" remote",
-          "points to.") do |project|
+          "<user>/<project> form. Defaults to the GitHub project that the \"origin\"",
+          "or \"upstream\" remote points to.") do |project|
     options.project = project
   end
   opts.on("-h", "--help", "Show help") do
@@ -153,7 +155,7 @@ def pull_summary(pull)
 end
 
 # Figure out what GitHub project we're dealing with.
-github_project = GitPr::GitHub.determine_project_name_from_command_line git, options.project
+github_project = GitPr::GitHub.determine_project_name_from_command_line git, options.project, $default_remotes
 
 case command
 

data/lib/git_pr/github.rb

@@ -78,14 +78,18 @@ module GitPr
       end
     end
 
-    def self.determine_project_name_from_command_line git, project_name
+    def self.determine_project_name_from_command_line git, project_name, default_remotes
       # Figure out what GitHub project we're dealing with. First, did they pass us a name of
       # an existing remote, or did they pass a GitHub project?
-      project_remote = git.remotes.find { |x| x.name == project_name }
+      if project_name
+        project_remote = git.remotes.find { |x| x.name == project_name }
+      else
+        project_remote = git.remotes.find { |x| default_remotes.include? x.name }
+      end
       if project_remote
         url_match = project_remote.url.match "^git@github.com:(.*).git"
         unless url_match
-          puts "Specified project '#{options.project}' is not a GitHub remote.".red
+          puts "Specified remote '#{project_remote}' is not a GitHub remote.".red
           exit -1
         end
         github_project = url_match[1]

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.3.beta1"
+  VERSION = "0.0.3.beta2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.3.beta1
+  version: 0.0.3.beta2
 platform: ruby
 authors:
 - Brian Sharon