knife-changelog 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac82fb7552ead5bf08e8d7340883adab40185d5098c60ab3944472b3d51555b8
-  data.tar.gz: 22f9713b7df19b7a332a1a275e3a69db6dfa0d9d59abd815d7728c22b6d7c006
+  metadata.gz: 33f9c5c8b0d5cec6a862af4f16c6ba10ad50d0ec63d52c66ae6f78ad57e5edf5
+  data.tar.gz: 9122a7dc32a956d2301799efddbabe6f90f581c3d03b7bf4e9baea94aca7a3ec
 SHA512:
-  metadata.gz: 64bed7f1436c1d8536d479673d92d7749e7a8e9d16c271f81bbeac380c24b1f305300ff77bd4e17f7698746b2545b7773897923c7cb27dd68f6266f50ae5888a
-  data.tar.gz: e7939f44aefd0b409a9e5d2a12f7bdf1cd4ad9671c6ec906b1a650f51aaddb3cd72985ec3f220a5b8f96f532ddd1735d3bf7c9948927ac3905fc2f6dfb8e97c3
+  metadata.gz: bbe30f69038cacfc6da33eb097122daea229c01532a579100c47a21e3f97bd20c449f070164457f82433df42f3bd6bbdfdd76f8425375e9336145d7d64941801
+  data.tar.gz: b568f75c320ba3e6016d1e2cfa72d8d81489e2764c8e8d763c8833aa3681f73bf7085bd3c6d93c14ec3c503f54164c0e62646093e34a8a5961ed2e7f98bace7b

data/.github/workflows/release.yml

@@ -10,9 +10,9 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7
-    - run: |
-        install -D -m 600 <(echo -e "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}") $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
+    - name: Build
+      run: gem build *.gemspec
+    - name: Push on Rubygems
+      run: gem push *.gem
       env:
-        RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'chef', '14.7.17' # Pin for now as recent Chef version does not provide knife

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.5.0'
+  spec.version       = '2.0.0'
   spec.authors       = ['Gregoire Seux']
   spec.email         = ['kamaradclimber@gmail.com']
   spec.summary       = 'Facilitate access to cookbooks changelog'
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency  'berkshelf'
   spec.add_dependency  'chef'
-  spec.add_dependency  'chef-dk'
+  spec.add_dependency  'chef-cli'
   spec.add_dependency  'deep_merge'
   spec.add_dependency  'git'
   spec.add_dependency  'mixlib-shellout'

data/lib/knife/changelog/changelog.rb

@@ -18,7 +18,7 @@ class KnifeChangelog
       end
     end
 
-    def initialize(config)
+    def initialize(config = {})
       @tmp_prefix = 'knife-changelog'
       @config   = config
       @tmp_dirs = []
@@ -177,7 +177,7 @@ class KnifeChangelog
       if !url.end_with?('.git')
         url = "#{url}.git"
       end
-      location = Location.new(url, guess_version_for(name), 'master')
+      location = Location.new(url, guess_version_for(name), 'HEAD')
       handle_git(name, location)
     end
 
@@ -200,7 +200,7 @@ class KnifeChangelog
       subm_revision.error!
       revision = subm_revision.stdout.strip.split(' ').first
       revision.gsub!(/^\+/, '')
-      loc = Location.new(url, revision, 'master')
+      loc = Location.new(url, revision, 'HEAD')
       handle_git(name, loc)
     end
 

data/lib/knife/changelog/git_submodule.rb

@@ -0,0 +1,18 @@
+# coding: utf-8
+require 'chef/log'
+require_relative 'changelog'
+
+class KnifeChangelog
+  class GitSubmodule < Changelog
+
+    def run(submodules)
+      raise ::ArgumentError, "Submodules must be an Array instead of #{submodules.inspect}" unless submodules.is_a?(::Array)
+      submodules.map do |submodule|
+        Chef::Log.debug "Checking changelog for #{submodule} (submodule)"
+        format_changelog(submodule, *handle_submodule(submodule))
+      end.compact.join("\n")
+    ensure
+      clean
+    end
+  end
+end

data/lib/knife/changelog/policyfile.rb

@@ -2,8 +2,8 @@
 
 require 'chef'
 require 'chef/knife'
-require 'chef-dk/command/update'
-require 'chef-dk/command/install'
+require 'chef-cli/command/update'
+require 'chef-cli/command/install'
 require 'deep_merge'
 require 'git'
 require 'json'
@@ -32,9 +32,9 @@ class PolicyChangelog
   def update_policyfile_lock
     backup_dir = Dir.mktmpdir
     FileUtils.cp(File.join(@policyfile_dir, 'Policyfile.lock.json'), backup_dir)
-    installer = ChefDK::Command::Install.new
+    installer = ChefCLI::Command::Install.new
     raise "Cannot install Policyfile lock #{@policyfile_path}" unless installer.run([@policyfile_relative_path]).zero?
-    updater = ChefDK::Command::Update.new
+    updater = ChefCLI::Command::Update.new
     raise "Error updating Policyfile lock #{@policyfile_path}" unless updater.run([@policyfile_path, @cookbooks_to_update].flatten).zero?
     updated_policyfile_lock = read_policyfile_lock(@policyfile_dir)
     FileUtils.cp(File.join(backup_dir, 'Policyfile.lock.json'), @policyfile_dir)

data/spec/unit/policyfile_spec.rb

@@ -347,7 +347,7 @@ RSpec.describe PolicyChangelog do
         expect(changelog.generate_changelog).to eq(output)
       end
       it 'raises an exception' do
-        allow(ChefDK::Command::Update).to receive(:new).and_return(fake_update)
+        allow(ChefCLI::Command::Update).to receive(:new).and_return(fake_update)
         allow(fake_update).to receive(:run).and_return(1)
         allow(changelog).to receive(:git_changelog)
           .and_return('e1b971a Add test commit message')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chef-dk
+  name: chef-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -198,6 +198,7 @@ files:
 - lib/knife/changelog/berksfile.rb
 - lib/knife/changelog/changelog.rb
 - lib/knife/changelog/git.rb
+- lib/knife/changelog/git_submodule.rb
 - lib/knife/changelog/policyfile.rb
 - resources/Berksfile
 - resources/Berksfile.lock