git_pr 0.0.14.beta15 → 0.0.14.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af4b86e0e341d7d744ae5afa8d4e74302e19272
-  data.tar.gz: 0a4ac4c9e319ddee330a21780a45a6c5ae3ae4be
+  metadata.gz: 463df327553555157135caff5296bc1122e9c825
+  data.tar.gz: a73047b070d3f1c55621b42b8d881beb8c35a55f
 SHA512:
-  metadata.gz: a7ee12e83f1a3a567fcd692532bd47c2285defa6b7dc00f72ffd5c992e1d637625877a50d198e2412b337b126e24ea509730f1bd848fdd7fdf67cf5d8d75d8e1
-  data.tar.gz: 56bc28a766236be23ac16c98ee31493bbd024d5c9e41a2e07bb3866f9f7861bd288b3b759d1e2737d4e49292c8ab519baa03d63e806fe2463716cad51c06008c
+  metadata.gz: e3647056e5e1f455ca712df9e7bdb2a801e66558ebc1e824f8d4c4786a44ae4d890d8b67715709737ca9df90f2abf3cc6a48ce0c9dd575e5bdf6e2c3e236d34d
+  data.tar.gz: cc5759c5aabdd35ce5a7fddf8225004f035706669fc85f054c070ffd04509e6eb4eab44306e5bafb6e878089c0ec489599a2f6ff56f5d189b9bc164931fa326b

data/bin/git-pr

@@ -247,10 +247,13 @@ case command
 
 when "merge"
   unless options.merge.additional_arguments.empty?
-    pull_request = options.merge.additional_arguments.shift.to_i
+    argument = options.merge.additional_arguments.shift
   end
   # Load a pull request
-  pull = GitPr::GitHub.find_or_prompt_for_pull_request github_project, pull_request
+  pull = find_pull_request_from_command_line_argument(git, github_project, argument)
+  unless pull
+    pull = GitPr::GitHub.find_or_prompt_for_pull_request(github_project, argument.to_i)
+  end
   GitPr::merge_pull_cleanly git, pull, options.merge
 
 when "list"

data/lib/git_pr/github.rb

@@ -146,7 +146,7 @@ module GitPr
         puts "No open pull requests found for '#{github_project}'.".yellow
         exit
       end
-      if pull_request
+      if pull_request > 0
         pull_request = pull_request
         pull = pulls.find { |p| p.number == pull_request }
         unless pull

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.14.beta15"
+  VERSION = "0.0.14.beta16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.14.beta15
+  version: 0.0.14.beta16
 platform: ruby
 authors:
 - Brian Sharon