knife-changelog 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afbea7c14cdeabf23ea4f20db0af330eff3cad96f1239ded017e125182fb1ffb
-  data.tar.gz: 7cb891e33b24d3d99c0822d509af3f2c50ae9fb40cb6dde74bf83c1b21fc5075
+  metadata.gz: 8fc579c229163b128ddd103ce2781f9b9ade76c5652d5cee2b35be4aa0300a9f
+  data.tar.gz: 542377730e977eb8d8cd4fb89cbb23e47db92380986e2679c03fa380b7792eb0
 SHA512:
-  metadata.gz: 56b42d01d1246064e7d74812cbccb51be231aea9603a0364046a1dde153127d6ee0eb24bede748c6af660dc0131f4bd1b20858b3fc2b0057ac6e86206918c75f
-  data.tar.gz: 1840e41083d1167cb803590b9151b543ed6df478d89e12a8ca81e921359eb6383ac340a847d87f99d91a91e17e2eefc5fd0bca338e970cd86a45cf6834045d1a
+  metadata.gz: 160785af9a8e1d0702fe055c10acbbb857a405ea6d4303cd592d57073d00f7ebb8bcc0fa08700dbae4277dcf415dbf4eed8b402e98c4f43edbf52e1e94846783
+  data.tar.gz: c74421eccbddb0cf7bdb55585e237c9d7f4fb3cf01a1e98cac7f73b58d7ac194e6a8a497115bea7b61ae93b529d50f81d4dc46dba23f874aefc8ab5d88f8b7c9

data/knife-changelog.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'knife-changelog'
-  spec.version       = '1.2.5'
+  spec.version       = '1.3.0'
   spec.authors       = ['Gregoire Seux']
   spec.email         = ['kamaradclimber@gmail.com']
   spec.summary       = 'Facilitate access to cookbooks changelog'

data/lib/knife/changelog/changelog.rb

@@ -239,10 +239,15 @@ class KnifeChangelog
       c
     end
 
+    GERRIT_REGEXP = %r{^(.*)/[^/]+/[^/]+(?:\.git)$}
     def linkify(url, changelog)
-      changelog.map do |line|
-        line.gsub(/^([a-f0-9]+) (.*)$/, '\2 (%s/commit/\1) ' % [url.chomp('.git')])
-      end
+      format = case url
+               when /gitlab/, /github/
+                 "\\2 (#{url.chomp('.git')}/commit/\\1)"
+               when GERRIT_REGEXP
+                 "\\2 (#{::Regexp.last_match(1)}/#/q/\\1)"
+               end
+      format ? changelog.map { |line| line.sub(/^([a-f0-9]+) (.*)$/, format) } : changelog
     end
 
     def https_url(location)

data/spec/unit/policyfile_spec.rb

@@ -92,6 +92,35 @@ RSpec.describe PolicyChangelog do
     end
   end
 
+  describe '#linkify' do
+    subject { KnifeChangelog::Changelog.new(config) }
+    let(:config) { double('config') }
+    let(:changelog) do
+      ['9363423 Leverage criteo-flavor 3.11 to benefit from labels']
+    end
+    context 'when url is gitlab style' do
+      let(:url) { 'https://gitlab.com/chef-cookbooks/criteo-rackguru.git' }
+
+      it 'creates a gitlab style link' do
+        expect(subject.linkify(url, changelog).first).to match(%r{https://gitlab.com/chef-cookbooks/criteo-rackguru/commit/9363423})
+      end
+    end
+
+    context 'when url is github style' do
+      let(:url) { 'https://github.com/chef-cookbooks/criteo-rackguru.git' }
+      it 'creates a github style link' do
+        expect(subject.linkify(url, changelog).first).to match(%r{https://github.com/chef-cookbooks/criteo-rackguru/commit/9363423})
+      end
+    end
+
+    context 'when url has no known style' do
+      let(:url) { 'https://review.mycompany.com/chef-cookbooks/criteo-rackguru.git' }
+      it 'creates a gerrit style link' do
+        expect(subject.linkify(url, changelog).first).to match(%r{https://review.mycompany.com/#/q/9363423})
+      end
+    end
+  end
+
   describe '#versions' do
     context 'when type is current' do
       it 'returns correct current versions' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler