knife-changelog 0.5.18 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865493e8e31f53f3a6a58d6152ed4a2d368ee58f
-  data.tar.gz: 2abad52c61b91567c540515fd328b18429dc91fb
+  metadata.gz: 7f5cdeee5d1cffb63b524ec79a1bdcfcfb154a74
+  data.tar.gz: e68caccf393dab3d26ce0324b84cc7394fb38744
 SHA512:
-  metadata.gz: 698f53fb122cfde4efcbc3c207a4dbd0fc02594f9344ca59bafccb40173c9561997b9bf7aee30a8a1404b52c744d9ecc8e902243c82890403c7c39c464b8b6be
-  data.tar.gz: 578ebed4f499d2ca7db090a319d474394c83217ab18284750a30805e3b60485645d44fed2b74e8b039457a549d3726a64b334a08aa0dd3ed03dec3510ec33f66
+  metadata.gz: 0b79c827c13afa739ebfd008527155a93abf70aef63767802a8ce2ed391432e8127b4f8e2dbb096401757d671eba38d707c13f49fa7b5565781a33156668ff86
+  data.tar.gz: aae9c4b834f21b0d7879c225664aae9203348457456d34fa5f000a7e2aa54225c151d9670b7961297b01d22898e51f323413f63c2511bf5a009c25e36070e08a

data/lib/chef/knife/changelog.rb

@@ -1,6 +1,3 @@
-require "knife/changelog/version"
-require "knife/changelog/changelog"
-require "berkshelf"
 require 'chef/knife'
 require 'mixlib/shellout'
 
@@ -10,6 +7,12 @@ class Chef
 
       banner 'knife changelog COOKBOOK [COOKBOOK ...]'
 
+      deps do
+        require "knife/changelog/version"
+        require "knife/changelog/changelog"
+        require "berkshelf"
+      end
+
       def initialize(options)
         super
         berksfile = Berkshelf::Berksfile.from_options({})

data/lib/knife/changelog/changelog.rb

@@ -3,11 +3,11 @@ require 'chef/log'
 require 'chef/knife'
 require 'rest-client'
 require 'json'
-require 'berkshelf'
 
 class KnifeChangelog
   class Changelog
     def initialize(locked_versions, config = {}, sources=[])
+      require 'berkshelf'
       @tmp_prefix = 'knife-changelog'
       @locked_versions = locked_versions
       @config   = config
@@ -119,13 +119,21 @@ class KnifeChangelog
       end
         .compact
         .map { |json| JSON.parse(json) }
+        .sort_by { |ck| cookbook_highest_version(ck) }
         .map { |ck| ck['source_url'] || ck ['external_url'] }
-        .first
+        .last
         .tap do |source|
           raise "Cannot find any changelog source for #{name}" unless source
         end
     end
 
+    def cookbook_highest_version(json)
+      json['versions']
+        .map { |version_url| Chef::Version.new(version_url.gsub(/.*\//, '')) }
+        .sort
+        .last
+    end
+
     def handle_source(name, dep)
       url = get_from_supermarket_sources(name)
       raise "No source found in supermarket for cookbook '#{name}'" unless url
@@ -155,7 +163,7 @@ class KnifeChangelog
       unless revision_exists?(dir, rev)
         prefixed_rev = 'v' + rev
         return prefixed_rev if revision_exists?(dir, prefixed_rev)
-        fail "#{rev} is not a valid revision (#{name})"
+        fail "#{rev} is not an existing revision (#{name}), not a tag/commit/branch name."
       end
       rev
     end
@@ -235,6 +243,7 @@ class KnifeChangelog
     end
 
     def shallow_clone(tmp_prefix, uri)
+      Chef::Log.debug "Cloning #{uri} in #{tmp_prefix}"
       dir = Dir.mktmpdir(tmp_prefix)
       @tmp_dirs << dir
       clone = Mixlib::ShellOut.new("git clone --bare #{uri} bare-clone", :cwd => dir)

data/lib/knife/changelog/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Changelog
-    VERSION = "0.5.18"
+    VERSION = "0.5.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.20
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Facilitate access to cookbooks changelog