gergich 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cef81a3c65bdd0fc840a4d528f2e53226d53e92e
-  data.tar.gz: 40df25850f29562ad41d343634b14f57d400a9a9
+  metadata.gz: dc6e202255732bf23a6df2c75e18250897744e99
+  data.tar.gz: 1942f228ae335675740fa7ae626a92204ce7e7a5
 SHA512:
-  metadata.gz: aa63ad319d840a44e9fa108d613171584f155adffae2d3499401f18552f22cefdc8956a9e3e5934a4b0040f3440761eb5ef2cabe98341d3cdfb9a4aeb999a30f
-  data.tar.gz: d3b7c367fde6d1dab7214c373a11d167e81ea84c44291cb4899102a808a676262fac3cac3348725616770f2fc9e7fe03b32ccf99ed995ec3afa25d36fbc4a4ca
+  metadata.gz: 88c9113246e2e97fda409346032d88de432c910c360ec72c28b368e33e9bb34606663f2588601ef2be3e4bdab18644eac6498cc94749404dc941a373b0865238
+  data.tar.gz: d3266350ace476809d572e191275a7a18dab184d48954f8e3407680f8ec2b3e5840524c3c626d98ea6f7bd970ca21fa7a46108c67894d6e75153de430ef9ce28

data/lib/gergich.rb

@@ -81,7 +81,7 @@ module Gergich
 
     def change_id
       if info[:project] && info[:branch]
-        ERB::Util.url_encode "#{info[:project]}~#{info[:branch]}~#{info[:change_id]}"
+        "#{info[:project]}~#{ERB::Util.url_encode info[:branch]}~#{info[:change_id]}"
       else
         info[:change_id]
       end
@@ -147,8 +147,11 @@ module Gergich
         return
       end
 
+      info = commit.info
+      puts "Project: #{info[:project]}"
+      puts "Branch: #{info[:branch]}"
+      puts "Revision: #{info[:revision_id]} (##{commit.revision_number})"
       puts "ChangeId: #{commit.change_id}"
-      puts "Revision: #{commit.revision_id}"
       puts "Files:"
       puts "  #{commit.files.join("\n  ")}"
 
@@ -306,7 +309,7 @@ module Gergich
         if ret.sub!(/\A\)\]\}'\n/, "") && ret =~ /\A("|\[|\{)/
           JSON.parse("[#{ret}]")[0] # array hack so we can parse a string literal
         elsif ret =~ /Not found: (?<change_id>.*)/i
-          raise("Cannot find Change-Id: #{Regexp.last_match[:change_id]}.\n"\
+          raise("Cannot find Change-Id: #{Regexp.last_match[:change_id]} at #{url}.\n"\
                 "This is most likely due to this"\
                 " Change-Id already being used"\
                 " by an ABANDONED change.\n"\

data/spec/gergich_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe Gergich::Commit do
       allow(ENV).to receive(:[]).with("GERRIT_CHANGE_ID").and_return("dummychangeset")
 
       expect(described_class.new.change_id) # %2F = / and %7E = ~
-        .to match("spec-project%7Ereleases%2F2017.11.17%7Edummychangeset")
+        .to match("spec-project~releases%2F2017.11.17~dummychangeset")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gergich
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jon Jensen