git_pr 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8cc6ae5ee1b8542c6604e93b867b02f2ad50b3b
-  data.tar.gz: 2c5cba47012e107e6abcfded23dfeaf2854b7d75
+  metadata.gz: 7dd812898dce3ddc1a3640e6e2313f0e825c61c2
+  data.tar.gz: 2f94a7acbf7ee95099dfc834256300d981dd4bb2
 SHA512:
-  metadata.gz: 932da4da4bdc06625caa8a4db56343a703e0e06bb4418e6643d08b2acb1a28e7b8426ad9ef839d500eb239ae8bd8ba0b43b501762672fb709eade05d91ab89e9
-  data.tar.gz: f4cdb8e73c7e3eae5375186f9f4eefd1df25ed02c31e3213456df13577b956e41f3c8cab376dd80e8408ac2c1c2bf3b681b839301f6730fb3eab3e93b73587c5
+  metadata.gz: 06cb3c21ac7e1fd42d1b34756099615641ff2aeddc82060bee1c293dbbc16f2b73e35ea36ae54892bf98898a4a528fd3a58a4d8f09e075fbaf104e3327b93967
+  data.tar.gz: f9888e80c161f5eba816f81cf3f8425ee41db36d8ec8cff205f9ac95083c3595cfd7d1169a10696fec87c3b40da424153e5bd11eb5fe385258a09fec9a815308

data/lib/git_pr/github.rb

@@ -97,9 +97,12 @@ module GitPr
         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"
+        # Regex comment: match the github_user/repository non-greedily (.*?), and
+        # accept an optional .git at the end, but don't capture it (?:\.git).
+        url_match = project_remote.url.match /^git@github.com:(.*?)(?:\.git)?$/
         unless url_match
           puts "Specified remote '#{project_remote}' is not a GitHub remote.".red
+          puts "Remote URL: #{project_remote.url}".red if $verbose
           exit -1
         end
         github_project = url_match[1]

data/lib/git_pr/merge.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module GitPr
 
   def self.ensure_remotes_for_pull_request git, pull
@@ -103,7 +105,7 @@ module GitPr
     # merge commit is created.
     puts "Merging changes from '#{rebase_branch}' to '#{target_branch}'"
     GitPr.run_command "git checkout -q #{target_branch}"
-    GitPr.run_command "git merge --no-ff #{rebase_branch} -m 'Merge #{pull_summary(pull)}'"
+    GitPr.run_command "git merge --no-ff #{rebase_branch} -m #{Shellwords.escape("Merge " + pull_summary(pull))}"
 
     # Print a log of the merge with branch structure visible. Jump through hoops to
     # get the right branch to start the log revision range with. If origin/develop

data/lib/git_pr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize