knife-changelog 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6427a7cfa99765ab6a02df18e9695630b841647d09844d8ac56b72a6bb1dfb6a
-  data.tar.gz: f44ddf5ff9e5f5be024ee151d76e547c08dd4d7245a837c63142d493b1a6ce80
+  metadata.gz: d77470d3d495c0e512053d6c4a9ccca7584f9b0f2d8fc2cd3ff15c21436ec39b
+  data.tar.gz: 2217ba60bde8435019511858cc2f356ad6f588079343ec473faf76f0a2121131
 SHA512:
-  metadata.gz: c285457809139a674fe3337aaba0d462adeab532209bdc4a6fc73f88d4d11775c83e873869ea99ac132408cf9401c1d535e829026a0f600e37625bce1ee95209
-  data.tar.gz: d009ca6842b5e0974978fe6b0e4759cebb8bae8351343dd72f3e88363591f8ef7dd5ec98a0016fc88df276f32173b36b818f8cfbc6df88cbd77aa8afd4a54012
+  metadata.gz: 6dad4972d1a93fe7b50950051f909cc16623e8ea3d4ba3a4a16e61818da437a55da552de07effc58ff455b0d760b7051093576ce8710f699ff075c1bd2b54004
+  data.tar.gz: 9f804da5f9fd9cebf78b939b571f46ef3f7569aa45e0ba52f03cacd96826fffce44c35694270183fe298f43353d402a2a081fa354927133a6a451e14864137c3

data/knife-changelog.gemspec

@@ -2,11 +2,10 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'knife/changelog/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'knife-changelog'
-  spec.version       = Knife::Changelog::VERSION
+  spec.version       = '1.1.0'
   spec.authors       = ['Gregoire Seux']
   spec.email         = ['kamaradclimber@gmail.com']
   spec.summary       = 'Facilitate access to cookbooks changelog'

data/lib/chef/knife/changelog.rb

@@ -9,7 +9,6 @@ class Chef
       banner 'knife changelog COOKBOOK [COOKBOOK ...]'
 
       deps do
-        require 'knife/changelog/version'
         require 'knife/changelog/changelog'
         require 'knife/changelog/berksfile'
         require 'berkshelf'

data/lib/policyfile.rb

@@ -171,7 +171,12 @@ class PolicyChangelog
   def format_output(name, data)
     output = ["\nChangelog for #{name}: #{data['current_version']}->#{data['target_version']}"]
     output << '=' * output.first.size
-    output << git_changelog(data['source_url'], data['current_version'], data['target_version'])
+    output << if data['current_version']
+                git_changelog(data['source_url'], data['current_version'], data['target_version'])
+              else
+                'Cookbook was not in the Policyfile.lock.json'
+              end
+
     output.join("\n")
   end
 
@@ -182,9 +187,7 @@ class PolicyChangelog
   # @return [true, false]
   def reject_version_filter(data)
     raise 'Data containing versions is nil' if data.nil?
-    data['current_version'] == data['target_version'] ||
-      data['current_version'].nil? ||
-      data['target_version'].nil?
+    data['current_version'] == data['target_version'] || data['target_version'].nil?
   end
 
   # Generates Policyfile changelog
@@ -203,10 +206,18 @@ class PolicyChangelog
                           else
                             updated_cookbooks.select { |name, _data| @cookbooks_to_update.include?(name) }
                           end
-    sources = {}
-    changelog_cookbooks.each_key do |name|
-      sources[name] = get_source_url(lock_target['cookbook_locks'][name]['source_options'])
-    end
-    changelog_cookbooks.deep_merge(sources).map { |name, data| format_output(name, data) }.join("\n")
+    generate_changelog_from_versions(changelog_cookbooks)
+  end
+
+  # Generates Policyfile changelog
+  #
+  # @param cookbook_versions. Format is { 'NAME'  => { 'current_version' => 'VERSION', 'target_version' => 'VERSION' }
+  # @return [String] formatted version changelog
+  def generate_changelog_from_versions(cookbook_versions)
+    lock_current = read_policyfile_lock(@policyfile_dir)
+    sources = cookbook_versions.keys.map do |name|
+      [name, get_source_url(lock_current['cookbook_locks'][name]['source_options'])]
+    end.to_h
+    cookbook_versions.deep_merge(sources).map { |name, data| format_output(name, data) }.join("\n")
   end
 end

data/spec/unit/policyfile_spec.rb

@@ -256,12 +256,16 @@ RSpec.describe PolicyChangelog do
         expect(changelog.reject_version_filter(data)).to be false
       end
     end
-    context 'when current or target do not exist' do
+    context 'when target does not exist' do
       it 'returns true' do
-        expect(changelog.reject_version_filter('target_version' => '1.0.0')).to be true
         expect(changelog.reject_version_filter('current_version' => '1.0.0')).to be true
       end
     end
+    context 'when current does not exist but target_does' do
+      it 'returns false' do
+        expect(changelog.reject_version_filter('target_version' => '1.0.0')).to be false
+      end
+    end
     context 'when data is nil' do
       it 'raises an exception' do
         expect { changelog.reject_version_filter(nil) }.to raise_error
@@ -269,6 +273,28 @@ RSpec.describe PolicyChangelog do
     end
   end
 
+  describe '#generate_changelog_from_versions' do
+    context 'when given origin/target versions' do
+      it 'generate the right changelog' do
+        expect(changelog).not_to receive(:update_policyfile_lock)
+
+        origin_and_target = {
+          'users' => { 'current_version' => '4.0.0', 'target_version' => '5.0.0' }
+        }
+
+        allow(changelog).to receive(:git_changelog)
+          .with(instance_of(String), '4.0.0', '5.0.0')
+          .and_return('e1b971a Add test commit message')
+
+        output = "\nChangelog for users: 4.0.0->5.0.0\n" \
+          "==================================\n"         \
+          "e1b971a Add test commit message"
+
+        expect(changelog.generate_changelog_from_versions(origin_and_target)).to eq(output)
+      end
+    end
+  end
+
   describe '#generate_changelog' do
     context 'when generating a changelog' do
       it 'detects type for regular tag' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -211,7 +211,6 @@ files:
 - lib/knife/changelog/berksfile.rb
 - lib/knife/changelog/changelog.rb
 - lib/knife/changelog/git.rb
-- lib/knife/changelog/version.rb
 - lib/policyfile.rb
 - resources/Berksfile
 - resources/Berksfile.lock
@@ -243,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Facilitate access to cookbooks changelog

data/lib/knife/changelog/version.rb

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