knife-changelog 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 252d5d072881aadc96d75fa2e59756ed4c4cc8c8a7b7cf02113ae6bd48f19aca
-  data.tar.gz: 0d53698a58d1a881e0062b5dba606d9be724913718e031f9b1d79e18ef1d018f
+  metadata.gz: 6427a7cfa99765ab6a02df18e9695630b841647d09844d8ac56b72a6bb1dfb6a
+  data.tar.gz: f44ddf5ff9e5f5be024ee151d76e547c08dd4d7245a837c63142d493b1a6ce80
 SHA512:
-  metadata.gz: 8e3fe30b5b8cd44dca34f2312fad8f9aba9b1dc12569690391771a8d80b755630c089a15079914ed6c74a9b991f42037ec637b813cb5160fdd3741dda02d14fa
-  data.tar.gz: 076e3d39b26f3f1301cd398c1c9a3dc464f89426dbbf14adfe262455cba3b943f8983bc8e7727b863e4758db19e86e875ed03333bb7b9ab6488623992a13d9ce
+  metadata.gz: c285457809139a674fe3337aaba0d462adeab532209bdc4a6fc73f88d4d11775c83e873869ea99ac132408cf9401c1d535e829026a0f600e37625bce1ee95209
+  data.tar.gz: d009ca6842b5e0974978fe6b0e4759cebb8bae8351343dd72f3e88363591f8ef7dd5ec98a0016fc88df276f32173b36b818f8cfbc6df88cbd77aa8afd4a54012

data/lib/knife/changelog/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Changelog
-    VERSION = '1.0.9'.freeze
+    VERSION = '1.0.10'.freeze
   end
 end

data/lib/policyfile.rb

@@ -145,7 +145,22 @@ class PolicyChangelog
   # @param repo [Git::Base] Git repository object
   # @return [String] Git tag versioning type
   def tag_format(repo)
-    repo.tags.last.name[/^v/] ? 'v' : ''
+    sort_by_version(repo.tags).last.name[/^v/] ? 'v' : ''
+  end
+
+  # Sort tags by version and filter out invalid version tags
+  #
+  # @param tags [Array<Git::Object::Tag>] git tags
+  # @return [Array] git tags sorted by version
+  def sort_by_version(tags)
+    tags.sort_by do |t|
+      begin
+        Gem::Version.new(t.name.gsub(/^v/, ''))
+      rescue ArgumentError => e
+        # Skip tag if version is not valid (i.e. a String)
+        Gem::Version.new(nil) if e.to_s.include?('Malformed version number string')
+      end
+    end
   end
 
   # Formats commit changelog to be more readable

data/spec/unit/policyfile_spec.rb

@@ -40,6 +40,18 @@ RSpec.describe PolicyChangelog do
 
   let(:url) { 'https://supermarket.chef.io/api/v1/cookbooks/users' }
 
+  let(:tags) do
+    [
+      double(name: '1.0.0'),
+      double(name: '0.9.1'),
+      double(name: 'v1.0.5'),
+      double(name: 'v1.1.1'),
+      double(name: 'invalid'),
+      double(name: '5.2.1'),
+      double(name: 'v0.1.1')
+    ]
+  end
+
   before(:each) do
     stub_request(:get, 'https://supermarket.chef.io/api/v1/cookbooks/users').to_return(
       status: 200,
@@ -209,16 +221,28 @@ RSpec.describe PolicyChangelog do
 
       it 'detects type for regular tag' do
         allow(repo).to receive_message_chain(:tags, :last, :name).and_return('1.0.0')
+        allow(changelog).to receive(:sort_by_version).and_return(repo.tags)
         expect(changelog.tag_format(repo)).to eq('')
       end
 
       it 'detects type for v-tag' do
         allow(repo).to receive_message_chain(:tags, :last, :name).and_return('v1.0.0')
+        allow(changelog).to receive(:sort_by_version).and_return(repo.tags)
         expect(changelog.tag_format(repo)).to eq('v')
       end
     end
   end
 
+  describe '#sort_by_version' do
+    context 'when sorting' do
+      it 'sorts' do
+        expect(changelog.sort_by_version(tags).map(&:name)).to eq(
+          %w[invalid v0.1.1 0.9.1 1.0.0 v1.0.5 v1.1.1 5.2.1]
+        )
+      end
+    end
+  end
+
   describe '#reject_version_filter' do
     context 'when current equal to target' do
       it 'returns true' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Facilitate access to cookbooks changelog