knife-changelog 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705a36f063f6249e387aa5d52cd1784cb38f1ac9
-  data.tar.gz: 521f2a3658ca50040b0f119437fb38d37111fefa
+  metadata.gz: 15f2df34a124b7b5ff0adcda1708cd7aab61b803
+  data.tar.gz: 457fa10cc15ae920422d08ecb584e8e98889f010
 SHA512:
-  metadata.gz: 6f32a1750c57c95b8dc9144c4783d95d0d6281bcd76bd2e0e77def896d0b6eaca27d88b4b0f2a5e1eb4dd4aa7ddd856f90f06a2a303b95944cb5c090f6c30898
-  data.tar.gz: 87ad561196aa635e2508eb0871f235d216fd66e5141bb12a10d334c4b72e807e349a68c88e48c24bdff0c519e4fa3d86d579792901b5ecf8c271aa2c53471056
+  metadata.gz: 51f86b089762e86f31a45587915b36ae8c94abd3c11b5b8a29dc23bf99f540368033933f0a6289132caa20c8bf159349d51e528443cfb206d0da56256fe4cb53
+  data.tar.gz: 38eb6d3b2fa6a6edf9ac17ffc809008e5685b90a89f44beefcb5a0c013548bd1024a9522e7ad09c3945a874e7b4a88ab29a0c365d5e18e93c8f25d821589e9e4

data/lib/chef/knife/changelog.rb

@@ -15,16 +15,6 @@ class Chef
         require "berkshelf"
       end
 
-      def initialize(options)
-        super
-        @changelog = if File.exists?(config[:policyfile])
-                       KnifeChangelog::Changelog::Policyfile.new(config[:policyfile], config)
-                     else
-                       berksfile = Berkshelf::Berksfile.from_options({})
-                       KnifeChangelog::Changelog::Berksfile.new(berksfile.lockfile.locks, config, berksfile.sources)
-                     end
-      end
-
       option :linkify,
         :short => '-l',
         :long  => '--linkify',
@@ -57,11 +47,20 @@ class Chef
         :description => 'Link to policyfile, defaults to Policyfile.rb',
         :default => 'Policyfile.rb'
 
+      option :update,
+        :long => '--update',
+        :description => 'Update Berksfile'
 
       def run
         Log.info config
-        changelog = @changelog.run(@name_args)
-        puts changelog
+        @changelog = if config[:policyfile] && File.exists?(config[:policyfile])
+                       KnifeChangelog::Changelog::Policyfile.new(config[:policyfile], config)
+                     else
+                       berksfile = Berkshelf::Berksfile.from_options({})
+                       KnifeChangelog::Changelog::Berksfile.new(berksfile, config)
+                     end
+        changelog_text = @changelog.run(@name_args)
+        puts changelog_text
       end
     end
 

data/lib/knife/changelog/berksfile.rb

@@ -5,10 +5,11 @@ require_relative 'changelog'
 class KnifeChangelog
   class Changelog
     class Berksfile < Changelog
-      def initialize(locked_versions, config, sources)
+      def initialize(berksfile, config)
         require 'berkshelf'
-        @locked_versions = locked_versions
-        @sources = sources
+        @locked_versions = berksfile.lockfile.locks
+        @sources = berksfile.sources
+        @berksfile = berksfile
         super(config)
       end
 
@@ -53,6 +54,10 @@ class KnifeChangelog
         @locked_versions[name].locked_version.to_s
       end
 
+      def update(cookbooks)
+        @berksfile.update(*cookbooks)
+      end
+
       private
 
       def ck_dep(name)

data/lib/knife/changelog/changelog.rb

@@ -85,6 +85,7 @@ class KnifeChangelog
           Chef::Log.debug "Checking changelog for #{submodule} (submodule)"
           execute(submodule, true)
         end
+        update(cks) if @config[:update]
       ensure
         clean
       end

data/lib/knife/changelog/policyfile.rb

@@ -55,6 +55,10 @@ class KnifeChangelog
         Location.new(spec[:git], spec[:revision], spec[:branch])
       end
 
+      def update(cookbooks)
+        raise NotImplementedError
+      end
+
       # return a list of supermarket uri for a given cookbook
       # example: [ 'https://supermarket.chef.io' ]
       def supermarkets_for(name)

data/lib/knife/changelog/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Changelog
-    VERSION = "1.0.1"
+    VERSION = "1.0.3"
   end
 end

data/spec/unit/changelog_spec.rb

@@ -9,6 +9,16 @@ WebMock.disable_net_connect!
 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/)
@@ -29,16 +39,6 @@ describe KnifeChangelog::Changelog do
 
     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', {})
-
-    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', '')
   end
 
   def mock_git(name, changelog)
@@ -93,18 +93,40 @@ describe KnifeChangelog::Changelog do
       )
     end
 
+    let(:options) do
+      {}
+    end
+
     let(:changelog) do
-      KnifeChangelog::Changelog::Berksfile.new(berksfile.lockfile.locks, {}, berksfile.sources)
+      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
 
   context 'in policyfile mode' do
     let(:policyfile_path) { File.join(File.dirname(__FILE__), '../data/Policyfile.rb') }
 
+    let(:options) do
+      {}
+    end
+
     let(:changelog) do
-      KnifeChangelog::Changelog::Policyfile.new(policyfile_path, {})
+      KnifeChangelog::Changelog::Policyfile.new(policyfile_path, options)
     end
 
     before(:each) do
@@ -112,6 +134,19 @@ describe KnifeChangelog::Changelog do
     end
 
     include_examples 'changelog generation'
+
+    context 'with --update' do
+      let(:options) do
+        { update: true }
+      end
+      it 'fails with not implemented error' do
+        mock_git('outdated1', <<-EOH)
+          aaaaaa commit in outdated1
+          bbbbbb bugfix in outdated1
+        EOH
+        expect { changelog.run(%w[outdated1]) }.to raise_error(NotImplementedError)
+      end
+    end
   end
 end
 

metadata

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