knife-changelog 1.4.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac3be8ff1b8cf7b08329253913b46a0ff46f5c1d997093f00e06f2142ee9f236
-  data.tar.gz: f7ab4788ef5381e77f46ef47f3f54e194f50674e663c2b901109db0755f85ca3
+  metadata.gz: 023bd4002b877a917379e771cda46f246bf6bde1da80d980d5398b0e3d020e48
+  data.tar.gz: bb6e6831e93c34bc0896313ff01faa0935b371d1b37031213fbb075ede0cc908
 SHA512:
-  metadata.gz: b2317057716149eef467ab3ea30d6a34d58515d6dcb8af7b3309e25a238888384f4f0b44f7671df8cbb2d8f656fca1a433a06561866d70de3f5976368e36fcf5
-  data.tar.gz: f1ce18ea422aef699f9bf9475299b6324bda6bf492197aa066dd61ab2c956235d9983629395bfbc3c85130cc72723eb4c96671fe5a5bddd79b5a49bfc8f4a96e
+  metadata.gz: f0a9cb080f54d631f2e7029dcf7aa55c873c39f00f74b932ecb4a4b6f46b4dab2f437e6eb48fb6cec30efcd17dce79a2c98ab584caf0d87ac4d8385d88fce159
+  data.tar.gz: c7bcf3f6ef83c9cfcefae5bb7423daa63e2b292cbd8c2c67c72670cf4e6c7c8cab641d8016cca205bf298e76c015dd24575963f8ba122070012606582933b906

data/.github/workflows/ci.yml

@@ -0,0 +1,15 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.7']
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.github/workflows/release.yml

@@ -0,0 +1,18 @@
+name: Release
+on:
+  push:
+    tags: [ '*' ]
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - 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
+      env:
+        RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/Rakefile

@@ -1,9 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec)
 
-  task :default => :spec
-rescue LoadError
-end
+task default: :spec

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.4.1'
+  spec.version       = '1.7.0'
   spec.authors       = ['Gregoire Seux']
   spec.email         = ['kamaradclimber@gmail.com']
   spec.summary       = 'Facilitate access to cookbooks changelog'
@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/chef/knife/changelog.rb

@@ -64,7 +64,7 @@ class Chef
              description: 'Update Berksfile'
 
       def run
-        Log.info config
+        Log.info config.to_s
         if config[:policyfile] && File.exist?(config[:policyfile])
           puts PolicyChangelog.new(
             @name_args,

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

@@ -107,14 +107,30 @@ class PolicyChangelog
   # @param current [String] current cookbook version tag
   # @param target [String] target cookbook version tag
   # @return [String] changelog between tags for one cookbook
-  def git_changelog(source_url, current, target)
+  def git_changelog(source_url, current, target, cookbook = nil)
     dir = Dir.mktmpdir(TMP_PREFIX)
     repo = Git.clone(source_url, dir)
-    repo.log.between(git_ref(current, repo), git_ref(target, repo)).map do |commit|
+    cookbook_path = cookbook ? git_cookbook_path(repo, cookbook) : '.'
+    repo.log.path(cookbook_path).between(git_ref(current, repo, cookbook), git_ref(target, repo, cookbook)).map do |commit|
       "#{commit.sha[0, 7]} #{commit.message.lines.first.strip}"
     end.join("\n")
   end
 
+  # Tries to find the location of a specific cookbook in the given repo
+  #
+  # @param repo [Git::Base] Git repository object
+  # @param cookbook [String] name of the cookbook to search the location
+  # @return [String] reative location of the cookbook in the repo
+  def git_cookbook_path(repo, cookbook)
+    metadata_files = ['metadata.rb', '*/metadata.rb'].flat_map { |location| repo.ls_files(location).keys }
+    metadata_path = metadata_files.find do |path|
+      path = ::File.join(repo.dir.to_s, path)
+      ::Chef::Cookbook::Metadata.new.tap { |m| m.from_file(path) }.name == cookbook
+    end
+    raise "Impossible to find matching metadata for #{cookbook} in #{repo.remote.url}" unless metadata_path
+    ::File.dirname(metadata_path)
+  end
+
   # Tries to convert a supermarket tag to a git reference
   # if there is a difference in formatting between the two.
   # This is issue is present for the 'java' cookbook.
@@ -122,9 +138,11 @@ class PolicyChangelog
   #
   # @param ref [String] version reference
   # @param repo [Git::Base] Git repository object
+  # @param cookbook [String] name of the cookbook to ref against
   # @return [String]
-  def git_ref(myref, repo)
+  def git_ref(myref, repo, cookbook_name = nil)
     possible_refs = ['v' + myref, myref]
+    possible_refs += possible_refs.map { |ref| "#{cookbook_name}-#{ref}" } if cookbook_name
     possible_refs += possible_refs.map { |ref| ref.chomp('.0') } if myref[/\.0$/]
     existing_ref = possible_refs.find do |ref|
       begin
@@ -162,7 +180,7 @@ class PolicyChangelog
     output = ["\nChangelog for #{name}: #{data['current_version']}->#{data['target_version']}"]
     output << '=' * output.first.size
     output << if data['current_version']
-                git_changelog(data['source_url'], data['current_version'], data['target_version'])
+                git_changelog(data['source_url'], data['current_version'], data['target_version'], name)
               else
                 'Cookbook was not in the Policyfile.lock.json'
               end

data/spec/unit/policyfile_spec.rb

@@ -214,7 +214,7 @@ RSpec.describe PolicyChangelog do
         allow(changelog).to receive(:git_ref).with('1.0.0', any_args).and_return('v1.0.0')
         allow(changelog).to receive(:git_ref).with('1.0.1', any_args).and_return('v1.0.1')
         allow(changelog).to receive(:correct_tags)
-        allow(git_repo).to receive_message_chain(:log, :between)
+        allow(git_repo).to receive_message_chain(:log, :path, :between)
           .with('v1.0.0', 'v1.0.1')
           .and_return([git_commit])
 
@@ -238,11 +238,16 @@ RSpec.describe PolicyChangelog do
 
     context 'when tag invalid and able to correct' do
       it 'returns correct git tag' do
-        allow(repo).to receive(:checkout).with(/v1.0/).and_raise(::Git::GitExecuteError)
         allow(repo).to receive(:checkout).with('1.0.0').and_raise(::Git::GitExecuteError)
-        allow(repo).to receive(:checkout).with('1.0').and_return(true)
 
-        expect(changelog.git_ref('1.0.0', repo)).to eq('1.0')
+        tags = %w[v1.0.0 1.0 v1.0 cookbook_name-1.0.0 cookbook_name-1.0 cookbook_name-v1.0.0 cookbook_name-v1.0]
+        tags.each do |valid_result|
+          allow(repo).to receive(:checkout).with(valid_result).and_return(true)
+          tags.reject { |v| v == valid_result }.each do |invalid_result|
+            allow(repo).to receive(:checkout).with(invalid_result).and_raise(::Git::GitExecuteError)
+          end
+          expect(changelog.git_ref('1.0.0', repo, 'cookbook_name')).to eq valid_result
+        end
       end
     end
 
@@ -308,7 +313,7 @@ RSpec.describe PolicyChangelog do
         }
 
         allow(changelog).to receive(:git_changelog)
-          .with(instance_of(String), '4.0.0', '5.0.0')
+          .with(instance_of(String), '4.0.0', '5.0.0', 'users')
           .and_return('e1b971a Add test commit message')
 
         output = <<~COMMIT.chomp

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -199,9 +185,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -211,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
@@ -243,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Facilitate access to cookbooks changelog

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - 2.4
-deploy:
-  provider: rubygems
-  api_key:
-    secure: LAM8qxTQa6oxzKiQpWrqRlcE1czmGFj16NSj1FVgZYJLZIfXKdvSpth+DfuCk8mxG1tvDXa3ckfERrzexG3lYGNPGyZH2sjnyt900Evd3Bn8vhv0LXE7cEZb3x/uJ3RHRvKpEDnMsy4gqoVByDLWXWnI9Q/8B4AtzFeTVsTr48g=
-  gem: knife-changelog
-  on:
-    tags: true
-    repo: criteo/knife-changelog
-sudo: false # use docker based infra