knife-changelog 2.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33f9c5c8b0d5cec6a862af4f16c6ba10ad50d0ec63d52c66ae6f78ad57e5edf5
-  data.tar.gz: 9122a7dc32a956d2301799efddbabe6f90f581c3d03b7bf4e9baea94aca7a3ec
+  metadata.gz: 411909df80e256eb6bd9e979757fec2380c12af929364ab6c5dc950e0ae1ad4c
+  data.tar.gz: acd53e149eed37830e7a8f1ab43f6ce43f457bce96ec0a721797a08626365dcd
 SHA512:
-  metadata.gz: bbe30f69038cacfc6da33eb097122daea229c01532a579100c47a21e3f97bd20c449f070164457f82433df42f3bd6bbdfdd76f8425375e9336145d7d64941801
-  data.tar.gz: b568f75c320ba3e6016d1e2cfa72d8d81489e2764c8e8d763c8833aa3681f73bf7085bd3c6d93c14ec3c503f54164c0e62646093e34a8a5961ed2e7f98bace7b
+  metadata.gz: 83f46649c2d333d411f6d0f6207fabd62c6c591253288df58473cd1e70f16d96f280b6693c70bc512f77d5aa1971a942cb961c9d4721b6dafefd61829ac67d7e
+  data.tar.gz: e5f843bfd021fd395c882f306caf9f716a9f1c11b95375a85fc399fb6f6a48114a2b7e75c22a6a7ca5080b2ffd9d76cf04a2ef863553f96e8fe8cced18e9c147

data/.github/workflows/ci.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.7']
+        ruby-version: ['3.1']
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

data/.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
     - name: Build
       run: gem build *.gemspec
     - name: Push on Rubygems

data/Gemfile

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

data/README.md

@@ -15,7 +15,7 @@ Options:
 - generate changelogs for some supermarket hosted cookbooks
 - generate changelogs for all git located cookbooks
 
-This plugin works in policyfile style repositories or classical repositories with a Berksfile
+This plugin works in policyfile style repositories
 
 ## Todos
 

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       = '2.0.0'
+  spec.version       = '4.0.0'
   spec.authors       = ['Gregoire Seux']
   spec.email         = ['kamaradclimber@gmail.com']
   spec.summary       = 'Facilitate access to cookbooks changelog'
@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/kamaradclimber/knife-changelog'
   spec.license       = 'MIT'
 
+  spec.required_ruby_version = '>= 3.0'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -24,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock'
 
-  spec.add_dependency  'berkshelf'
   spec.add_dependency  'chef'
   spec.add_dependency  'chef-cli'
   spec.add_dependency  'deep_merge'
   spec.add_dependency  'git'
+  spec.add_dependency  'knife'
   spec.add_dependency  'mixlib-shellout'
   spec.add_dependency  'rest-client'
 end

data/lib/chef/knife/changelog.rb

@@ -9,39 +9,9 @@ class Chef
       banner 'knife changelog COOKBOOK [COOKBOOK ...]'
 
       deps do
-        require 'knife/changelog/changelog'
-        require 'knife/changelog/berksfile'
-        require 'berkshelf'
         require 'knife/changelog/policyfile'
       end
 
-      option :linkify,
-             short: '-l',
-             long: '--linkify',
-             description: 'add markdown links where relevant',
-             boolean: true
-
-      option :markdown,
-             short: '-m',
-             long: '--markdown',
-             description: 'use markdown syntax',
-             boolean: true
-
-      option :ignore_changelog_file,
-             long: '--ignore-changelog-file',
-             description: 'Ignore changelog file presence, use git history instead',
-             boolean: true
-
-      option :allow_update_all,
-             long: '--allow-update-all',
-             description: 'If no cookbook given, check all Berksfile',
-             boolean: true,
-             default: true
-
-      option :submodules,
-             long: '--submodules SUBMODULE[,SUBMODULE]',
-             description: 'Submoduless to check for changes as well (comma separated)'
-
       option :prevent_downgrade,
              long: '--prevent-downgrade',
              description: 'Fail if knife-changelog detect a cookbook downgrade',
@@ -59,24 +29,13 @@ class Chef
              boolean: true,
              default: false
 
-      option :update,
-             long: '--update',
-             description: 'Update Berksfile'
-
       def run
         Log.info config.to_s
-        if config[:policyfile] && File.exist?(config[:policyfile])
-          puts PolicyChangelog.new(
-            @name_args,
-            config[:policyfile],
-            config[:with_dependencies]
-          ).generate_changelog
-        else
-          berksfile = Berkshelf::Berksfile.from_options({})
-          puts KnifeChangelog::Changelog::Berksfile
-            .new(berksfile, config)
-            .run(@name_args)
-        end
+        puts PolicyChangelog.new(
+          @name_args,
+          config[:policyfile],
+          config[:with_dependencies]
+        ).generate_changelog(config[:prevent_downgrade])
       end
     end
   end

data/lib/knife/changelog/policyfile.rb

@@ -147,7 +147,7 @@ class PolicyChangelog
     existing_ref = possible_refs.find do |ref|
       begin
         repo.checkout(ref)
-      rescue ::Git::GitExecuteError
+      rescue ::Git::Error
         false
       end
     end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require 'knife/changelog/changelog'
-require 'knife/changelog/berksfile'
 require 'knife/changelog/policyfile'
 
+require 'rexml/document'
 require 'webmock/rspec'
 
 WebMock.disable_net_connect!(allow_localhost: true)

data/spec/unit/policyfile_spec.rb

@@ -92,35 +92,6 @@ RSpec.describe PolicyChangelog do
     end
   end
 
-  describe '#linkify' do
-    subject { KnifeChangelog::Changelog.new(config) }
-    let(:config) { double('config') }
-    let(:changelog) do
-      ['9363423 Leverage criteo-flavor 3.11 to benefit from labels']
-    end
-    context 'when url is gitlab style' do
-      let(:url) { 'https://gitlab.com/chef-cookbooks/criteo-rackguru.git' }
-
-      it 'creates a gitlab style link' do
-        expect(subject.linkify(url, changelog).first).to match(%r{https://gitlab.com/chef-cookbooks/criteo-rackguru/commit/9363423})
-      end
-    end
-
-    context 'when url is github style' do
-      let(:url) { 'https://github.com/chef-cookbooks/criteo-rackguru.git' }
-      it 'creates a github style link' do
-        expect(subject.linkify(url, changelog).first).to match(%r{https://github.com/chef-cookbooks/criteo-rackguru/commit/9363423})
-      end
-    end
-
-    context 'when url has no known style' do
-      let(:url) { 'https://review.mycompany.com/chef-cookbooks/criteo-rackguru.git' }
-      it 'creates a gerrit style link' do
-        expect(subject.linkify(url, changelog).first).to match(%r{https://review.mycompany.com/#/q/9363423})
-      end
-    end
-  end
-
   describe '#versions' do
     context 'when type is current' do
       it 'returns correct current versions' do
@@ -229,7 +200,7 @@ RSpec.describe PolicyChangelog do
 
     context 'when tag valid' do
       it 'returns correct git tag' do
-        allow(repo).to receive(:checkout).with('v1.0.0').and_raise(::Git::GitExecuteError)
+        allow(repo).to receive(:checkout).with('v1.0.0').and_raise(::Git::Error)
         allow(repo).to receive(:checkout).with('1.0.0').and_return(true)
 
         expect(changelog.git_ref('1.0.0', repo)).to eq('1.0.0')
@@ -238,13 +209,13 @@ 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('1.0.0').and_raise(::Git::GitExecuteError)
+        allow(repo).to receive(:checkout).with('1.0.0').and_raise(::Git::Error)
 
         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)
+            allow(repo).to receive(:checkout).with(invalid_result).and_raise(::Git::Error)
           end
           expect(changelog.git_ref('1.0.0', repo, 'cookbook_name')).to eq valid_result
         end
@@ -254,7 +225,7 @@ RSpec.describe PolicyChangelog do
     context 'when tags invalid and unable to correct' do
       it 'raises exception' do
         allow(repo).to receive(:remote).and_return(double('remote', url: 'url.com'))
-        allow(repo).to receive(:checkout).with(any_args).and_raise(::Git::GitExecuteError)
+        allow(repo).to receive(:checkout).with(any_args).and_raise(::Git::Error)
 
         expect { changelog.git_ref('1.0.0', repo) }
           .to raise_error(RuntimeError, /Impossible to find existing/)
@@ -297,7 +268,7 @@ RSpec.describe PolicyChangelog do
     end
     context 'when data is nil' do
       it 'raises an exception' do
-        expect { changelog.reject_version_filter(nil) }.to raise_error
+        expect { changelog.reject_version_filter(nil) }.to raise_error(RuntimeError)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: berkshelf
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: chef-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chef-cli
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: knife
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,22 +195,15 @@ files:
 - Rakefile
 - knife-changelog.gemspec
 - lib/chef/knife/changelog.rb
-- 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
-- spec/data/Berksfile
-- spec/data/Berksfile.lock
 - spec/data/Policyfile.lock.json
 - spec/data/Policyfile.rb
 - spec/data/Policyfile_git.lock.json
 - spec/data/Policyfile_git.rb
 - spec/data/updated/Policyfile.lock.json
 - spec/spec_helper.rb
-- spec/unit/changelog_spec.rb
 - spec/unit/policyfile_spec.rb
 homepage: https://github.com/kamaradclimber/knife-changelog
 licenses:
@@ -224,25 +217,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Facilitate access to cookbooks changelog
 test_files:
-- spec/data/Berksfile
-- spec/data/Berksfile.lock
 - spec/data/Policyfile.lock.json
 - spec/data/Policyfile.rb
 - spec/data/Policyfile_git.lock.json
 - spec/data/Policyfile_git.rb
 - spec/data/updated/Policyfile.lock.json
 - spec/spec_helper.rb
-- spec/unit/changelog_spec.rb
 - spec/unit/policyfile_spec.rb

data/lib/knife/changelog/berksfile.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'changelog'
-
-class KnifeChangelog
-  class Changelog
-    class Berksfile < Changelog
-      def initialize(berksfile, config)
-        require 'berkshelf'
-        @locked_versions = berksfile.lockfile.locks
-        @sources = berksfile.sources
-        @berksfile = berksfile
-        super(config)
-      end
-
-      def all_cookbooks
-        @locked_versions.keys
-      end
-
-      def new_cookbook?(name)
-        ck_dep(name).nil?
-      end
-
-      # return true if cookbook is downloaded from supermarket
-      def supermarket?(name)
-        # here is berkshelf "expressive" way to say cookbook
-        # comes from supermarket
-        ck_dep(name).location.is_a?(NilClass)
-      end
-
-      # return true if cookbook is downloaded from git
-      def git?(name)
-        ck_dep(name).location.is_a?(Berkshelf::GitLocation)
-      end
-
-      # return true if cookbook is downloaded from local path
-      def local?(name)
-        ck_dep(name).location.is_a?(Berkshelf::PathLocation)
-      end
-
-      # return a Changelog::Location for this cookbook
-      def git_location(name)
-        raise "#{name} has not a git location" unless git?(name)
-        Location.from_berk_git_location(ck_dep(name).location)
-      end
-
-      # return a list of supermarket uri for a given cookbook
-      # example: [ 'https://supermarket.chef.io' ]
-      def supermarkets_for(_name)
-        @sources.map(&:uri)
-      end
-
-      def guess_version_for(name)
-        @locked_versions[name].locked_version.to_s
-      end
-
-      def update(cookbooks)
-        @berksfile.update(*cookbooks)
-      end
-
-      private
-
-      def ck_dep(name)
-        @locked_versions[name]
-      end
-    end
-  end
-end

data/lib/knife/changelog/changelog.rb

@@ -1,267 +0,0 @@
-# coding: utf-8
-require 'chef/log'
-require 'chef/knife'
-require 'chef/version_class'
-require 'rest-client'
-require 'json'
-require_relative 'git'
-
-class KnifeChangelog
-  class Changelog
-
-    Location = Struct.new(:uri, :revision, :rev_parse) do
-      # todo move this method to Changelog::Berkshelf
-      def self.from_berk_git_location(location)
-        Location.new(location.uri,
-                     location.revision.strip,
-                     location.instance_variable_get(:@rev_parse))
-      end
-    end
-
-    def initialize(config = {})
-      @tmp_prefix = 'knife-changelog'
-      @config   = config
-      @tmp_dirs = []
-    end
-
-    # returns a list of all cookbooks names
-    def all_cookbooks
-      raise NotImplementedError
-    end
-
-    # return true if cookbook is not already listed as dependency
-    def new_cookbook?(name)
-      raise NotImplementedError
-    end
-
-    # return true if cookbook is downloaded from supermarket
-    def supermarket?(name)
-      raise NotImplementedError
-    end
-
-    # return true if cookbook is downloaded from git
-    def git?(name)
-      raise NotImplementedError
-    end
-
-    # return true if cookbook is downloaded from local path
-    def local?(name)
-      raise NotImplementedError
-    end
-
-    # return a Changelog::Location for a given cookbook
-    def git_location(name)
-      raise NotImplementedError
-    end
-
-    # return a list of supermarket uri for a given cookbook
-    # example: [ 'https://supermarket.chef.io' ]
-    def supermarkets_for(name)
-      raise NotImplementedError
-    end
-
-    # return current locked version for a given cookbook
-    def guess_version_for(name)
-      raise NotImplementedError
-    end
-
-
-
-    def run(cookbooks)
-      changelog = []
-      begin
-        if cookbooks.empty? and @config[:allow_update_all]
-          cks = all_cookbooks
-        else
-          cks = cookbooks
-        end
-        changelog += cks.map do |cookbook|
-          Chef::Log.debug "Checking changelog for #{cookbook} (cookbook)"
-          execute cookbook
-        end
-        subs = @config[:submodules] || []
-        subs = subs.split(',') if subs.is_a? String
-        changelog += subs.map do |submodule|
-          Chef::Log.debug "Checking changelog for #{submodule} (submodule)"
-          execute(submodule, true)
-        end
-        update(cks) if @config[:update]
-      ensure
-        clean
-      end
-      changelog.compact.join("\n")
-    end
-
-    def clean
-      @tmp_dirs.each do |dir|
-        FileUtils.rm_rf dir
-      end
-    end
-
-    def handle_new_cookbook
-      stars = '**' if @config[:markdown]
-      ["#{stars}Cookbook was not in the berksfile#{stars}"]
-    end
-
-    def execute(name, submodule = false)
-      version_change, changelog = if submodule
-                                    handle_submodule(name)
-                                  elsif new_cookbook?(name)
-                                    ['', handle_new_cookbook]
-                                  else
-                                    case true
-                                    when supermarket?(name)
-                                      handle_source(name)
-                                    when git?(name)
-                                      handle_git(name, git_location(name))
-                                    when local?(name)
-                                      Chef::Log.debug "path location are always at the last version"
-                                      ['', '']
-                                    else
-                                      raise "Cannot handle #{loc.class} yet"
-                                    end
-                                  end
-      format_changelog(name, version_change, changelog)
-    end
-
-    def format_changelog(name, version_change, changelog)
-      if changelog.empty?
-        nil
-      else
-        full = ["Changelog for #{name}: #{version_change}"]
-        full << '=' * full.first.size
-        full << changelog
-        full << ''
-        full.compact.join("\n")
-      end
-    end
-
-    def get_from_supermarket_sources(name)
-      supermarkets_for(name).map do |uri|
-        begin
-          # TODO: we could call /universe endpoint once
-          # instead of calling /api/v1/cookbooks/ for each cookbook
-          RestClient::Request.execute(
-            url: "#{uri}/api/v1/cookbooks/#{name}",
-            method: :get,
-            verify_ssl: false # TODO make this configurable
-          )
-        rescue => e
-          Chef::Log.debug "Error fetching package from supermarket #{e.class.name} #{e.message}"
-          nil
-        end
-      end
-        .compact
-        .map { |json| JSON.parse(json) }
-        .sort_by { |ck| cookbook_highest_version(ck) }
-        .map { |ck| ck['source_url'] || ck ['external_url'] }
-        .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)
-      url = get_from_supermarket_sources(name)
-      raise "No source found in supermarket for cookbook '#{name}'" unless url
-      Chef::Log.debug("Using #{url} as source url")
-      # Workaround source_url not being written in a clonable way.
-      # github.com/blah/cookbook works but git clone requires github.com/blah/cookbook.git
-      if !url.end_with?('.git')
-        url = "#{url}.git"
-      end
-      location = Location.new(url, guess_version_for(name), 'HEAD')
-      handle_git(name, location)
-    end
-
-    def detect_cur_revision(name, rev, git)
-      unless git.revision_exists?(rev)
-        prefixed_rev = 'v' + rev
-        return prefixed_rev if git.revision_exists?(prefixed_rev)
-        fail "#{rev} is not an existing revision (#{name}), not a tag/commit/branch name."
-      end
-      rev
-    end
-
-    def handle_submodule(name)
-      subm_url = Mixlib::ShellOut.new("git config --list| grep ^submodule | grep ^submodule.#{name}.url")
-      subm_url.run_command
-      subm_url.error!
-      url = subm_url.stdout.lines.first.split('=')[1].chomp
-      subm_revision = Mixlib::ShellOut.new("git submodule status #{name}")
-      subm_revision.run_command
-      subm_revision.error!
-      revision = subm_revision.stdout.strip.split(' ').first
-      revision.gsub!(/^\+/, '')
-      loc = Location.new(url, revision, 'HEAD')
-      handle_git(name, loc)
-    end
-
-    # take cookbook name and Changelog::Location instance
-    def handle_git(name, location)
-      # todo: remove this compat check
-      raise "should be a location" unless location.is_a?(Changelog::Location)
-      git = Git.new(@tmp_prefix, location.uri)
-      @tmp_dirs << git.shallow_clone
-
-      rev_parse = location.rev_parse
-      cur_rev = detect_cur_revision(name, location.revision, git)
-      changelog_file = git.files(rev_parse).find { |line| line =~ /\s(changelog.*$)/i }
-      changelog = if changelog_file and !@config[:ignore_changelog_file]
-                    Chef::Log.info "Found changelog file : " + $1
-                    generate_from_changelog_file($1, cur_rev, rev_parse, git)
-                  end
-      changelog ||= generate_from_git_history(git, location, cur_rev, rev_parse)
-      ["#{cur_rev}->#{rev_parse}", changelog]
-    end
-
-    def generate_from_changelog_file(filename, current_rev, rev_parse, git)
-      ch = git.diff(filename, current_rev, rev_parse)
-              .collect { |line| $1.strip if line =~ /^{\+(.*)\+}$/ }.compact
-              .map { |line| line.gsub(/^#+(.*)$/, "\\1\n---")} # replace section by smaller header
-              .select { |line| !(line =~ /^===+/)}.compact # remove header lines
-      ch.empty? ? nil : ch
-    end
-
-    def generate_from_git_history(git, location, current_rev, rev_parse)
-      c = git.log(current_rev, rev_parse)
-      n = https_url(location)
-      c = linkify(n, c) if @config[:linkify] and n
-      c = c.map { |line| "* " + line } if @config[:markdown]
-      c = c.map { |line| line.strip } # clean end of line
-      c
-    end
-
-    GERRIT_REGEXP = %r{^(.*)/[^/]+/[^/]+(?:\.git)$}
-    def linkify(url, changelog)
-      format = case url
-               when /gitlab/, /github/
-                 "\\2 (#{url.chomp('.git')}/commit/\\1)"
-               when GERRIT_REGEXP
-                 "\\2 (#{::Regexp.last_match(1)}/#/q/\\1)"
-               end
-      format ? changelog.map { |line| line.sub(/^([a-f0-9]+) (.*)$/, format) } : changelog
-    end
-
-    def https_url(location)
-      if location.uri =~ /^\w+:\/\/(.*@)?(.*)(\.git)?/
-        "https://%s" % [ $2 ]
-      else
-        fail "Cannot guess http url from git remote url: #{location.uri}"
-      end
-    end
-
-    def short(location)
-      if location.uri =~ /([\w-]+)\/([\w-]+)(\.git)?$/
-        "%s/%s" % [$1,$2]
-      end
-    end
-  end
-end

data/lib/knife/changelog/git.rb

@@ -1,46 +0,0 @@
-class KnifeChangelog
-  class Git
-    attr_accessor :tmp_prefix, :uri
-
-    def initialize(tmp_prefix, uri)
-      @tmp_prefix = tmp_prefix
-      @uri = uri
-    end
-
-    def shallow_clone
-      Chef::Log.debug "Cloning #{uri} in #{tmp_prefix}"
-      dir = Dir.mktmpdir(tmp_prefix)
-      clone = Mixlib::ShellOut.new("git clone --bare #{uri} bare-clone", cwd: dir)
-      clone.run_command
-      clone.error!
-      @clone_dir = ::File.join(dir, 'bare-clone')
-      @clone_dir
-    end
-
-    def files(rev_parse)
-      ls_tree = Mixlib::ShellOut.new("git ls-tree -r #{rev_parse}", cwd: @clone_dir)
-      ls_tree.run_command
-      ls_tree.error!
-      ls_tree.stdout.lines.map(&:strip)
-    end
-
-    def diff(filename, current_rev, rev_parse)
-      diff = Mixlib::ShellOut.new("git diff #{current_rev}..#{rev_parse} --word-diff -- #{filename}", cwd: @clone_dir)
-      diff.run_command
-      diff.stdout.lines
-    end
-
-    def log(current_rev, rev_parse)
-      log = Mixlib::ShellOut.new("git log --no-merges --abbrev-commit --pretty=oneline #{current_rev}..#{rev_parse}", cwd: @clone_dir)
-      log.run_command
-      log.stdout.lines
-    end
-
-    def revision_exists?(revision)
-      Chef::Log.debug "Testing existence of #{revision}"
-      revlist = Mixlib::ShellOut.new("git rev-list --quiet #{revision}", cwd: @clone_dir)
-      revlist.run_command
-      !revlist.error?
-    end
-  end
-end

data/lib/knife/changelog/git_submodule.rb

@@ -1,18 +0,0 @@
-# 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/spec/data/Berksfile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://mysupermarket.io'
-source 'https://mysupermarket2.io'
-
-cookbook 'uptodate'
-cookbook 'outdated1'
-cookbook 'second_out_of_date'
-cookbook 'othercookbook'

data/spec/data/Berksfile.lock

@@ -1,11 +0,0 @@
-DEPENDENCIES
-  othercookbook
-  outdated1
-  second_out_of_date
-  uptodate
-
-GRAPH
-  othercookbook (1.0.0)
-  outdated1 (1.0.0)
-  second_out_of_date (1.0.0)
-  uptodate (1.0.0)

data/spec/unit/changelog_spec.rb

@@ -1,125 +0,0 @@
-# frozen_string_literal: true
-
-require 'berkshelf'
-require 'spec_helper'
-
-RSpec.shared_examples 'changelog generation' do
-  # this supposes that "changelog" is an instance of KnifeChangelog::Changelog
-  it 'detects basic changelog' do
-    mock_git('second_out_of_date', <<-EOH)
-        aaaaaa commit in second_out_of_date
-        bbbbbb bugfix in second_out_of_date
-    EOH
-    mock_git('outdated1', <<-EOH)
-        aaaaaa commit in outdated1
-        bbbbbb bugfix in outdated1
-    EOH
-    mock_git('uptodate', '')
-
-    changelog_txt = changelog.run(%w[new_cookbook uptodate outdated1 second_out_of_date])
-    expect(changelog_txt).to match(/commit in outdated1/)
-    expect(changelog_txt).to match(/commit in second_out_of_date/)
-    expect(changelog_txt).not_to match(/uptodate/)
-    expect(changelog_txt).to match(/new_cookbook: \n.*\nCookbook was not/)
-  end
-end
-
-describe KnifeChangelog::Changelog do
-  before(:each) do
-    stub_request(:get, %r{https://mysupermarket.io/api/v1/cookbooks/})
-      .to_return(status: 404, body: '{}')
-
-    mock_supermarket('uptodate', %w[1.0.0])
-    mock_supermarket('outdated1', %w[1.0.0 1.1.0])
-    # TODO: we should make second_out_of_date a git location
-    mock_supermarket('second_out_of_date', %w[1.0.0 1.2.0])
-
-    mock_universe('https://mysupermarket2.io', uptodate: %w[1.0.0], outdated1: %w[1.0.0 1.1.0], second_out_of_date: %w[1.0.0 1.2.0])
-    mock_universe('https://mysupermarket.io', {})
-  end
-
-  def mock_git(name, changelog)
-    expect(KnifeChangelog::Git).to receive(:new)
-      .with(anything, /#{name}(.git|$)/)
-      .and_return(double(name,
-    shallow_clone: '/tmp/randomdir12345',
-    revision_exists?: true,
-    files: [],
-    log: changelog.split("\n")))
-  end
-
-  def mock_supermarket(name, versions)
-    stub_request(:get, %r{https://mysupermarket2.io/api/v1/cookbooks/#{name}})
-      .to_return(status: 200, body: supermarket_versions(name, versions))
-  end
-
-  def supermarket_versions(name, versions)
-    {
-      name: name,
-      maintainer: 'Linus',
-      description: 'small project on the side',
-      category: 'Operating System',
-      source_url: "https://github.com/chef-cookbooks/#{name}",
-      versions: []
-    }.tap do |json|
-      versions.each do |v|
-        json[:versions] << "https://source.io/#{name}/#{v}"
-      end
-    end.to_json
-  end
-
-  def mock_universe(supermarket_url, cookbooks)
-    universe = cookbooks.transform_values do |versions|
-      versions.map do |v|
-        [v, {
-          location_type: 'opscode',
-          location_path: "#{supermarket_url}/api/v1",
-          download_url: "#{supermarket_url}/api/v1/cookbooks/insertnamehere/versions/#{v}/download",
-          dependencies: {}
-        }]
-      end.to_h
-    end
-    stub_request(:get, "#{supermarket_url}/universe")
-      .to_return(status: 200, body: universe.to_json)
-  end
-
-  context 'in Berksfile mode' do
-    let(:berksfile) do
-      Berkshelf::Berksfile.from_options(
-        berksfile: File.join(File.dirname(__FILE__), '../data/Berksfile')
-      )
-    end
-
-    let(:options) do
-      {}
-    end
-
-    let(:changelog) do
-      KnifeChangelog::Changelog::Berksfile.new(berksfile, options)
-    end
-
-    include_examples 'changelog generation'
-
-    context 'with --update' do
-      let(:options) do
-        { update: true }
-      end
-      it 'updates Berksfile' do
-        mock_git('outdated1', <<-EOH)
-          aaaaaa commit in outdated1
-          bbbbbb bugfix in outdated1
-        EOH
-        expect(berksfile).to receive(:update).with('outdated1')
-        changelog.run(%w[outdated1])
-      end
-    end
-  end
-end
-
-class Hash
-  unless Chef::Version.new(RUBY_VERSION) >= Chef::Version.new('2.4')
-    def transform_values
-      map { |k, v| [k, (yield v)] }.to_h
-    end
-  end
-end