knife-changelog 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86dbce0b63b7c41f34366f494d98c4d98c3276c237a952558a88db0b259b5df8
-  data.tar.gz: 56f786a8cf798e7bd03e8340ed36079b559f0e880504e6d5b0dd09ca40d2f173
+  metadata.gz: 611393857429ed8e5091d457a902862327d2f336222629a8d1242a276c9b553f
+  data.tar.gz: 2f1d638388d31c667ae0d6c22313e53c56c42cd0ffbb8d38706c4819f83395e6
 SHA512:
-  metadata.gz: 20006e01c5ddee8a8a9a6fbe980840bfcc8b94ac65fdae3e0254b82e03fedf915719f20f09cb72ee653cfc2c66b3e87523fffdcb7ea8981a3ebc0fdd71b5698a
-  data.tar.gz: 5f745773984fcc7cddf037c0c78847604994252cdf1dec9626683acf63f6da6f3f28e303a2daaecf49ca1bcc96d3e4b14b88522db71d94156a352a82cbe34030
+  metadata.gz: e9ebf4ae12169de498bd4933bfa0a71579b83db669a4f7e4c8bfd2d4c19689c5b8a732db9355fc3165b215abbb7e433f330f6a9e3b802540babad50f52de0c28
+  data.tar.gz: b7d3b7140e41ee4b7b5912580913471bb16be2113aaa69675ef70c33420ff5573ebf2481c8532398d90d586db204c8878160021ff825cc05aace5337eecc16e5

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.2.1'
+  spec.version       = '1.2.2'
   spec.authors       = ['Gregoire Seux']
   spec.email         = ['kamaradclimber@gmail.com']
   spec.summary       = 'Facilitate access to cookbooks changelog'

data/lib/knife/changelog/policyfile.rb

@@ -58,7 +58,11 @@ class PolicyChangelog
     raise 'Cookbook locks empty or nil' if locks.nil? or locks.empty?
     cookbooks = {}
     locks.each do |name, data|
-      cookbooks[name] = { "#{type}_version" => data['version'] }
+      cookbooks[name] = if data['source_options'].keys.include?('git')
+                          { "#{type}_version" => data['source_options']['revision'] }
+                        else
+                          { "#{type}_version" => data['version'] }
+                        end
     end
     cookbooks
   end

data/spec/data/Policyfile_git.lock.json

@@ -0,0 +1,61 @@
+{
+  "revision_id": "9335ba14e000b8026fbf7d1e862aa6d26fd1139c08a56776a253be10d24bf4cc",
+  "name": "test_policy",
+  "run_list": [
+    "recipe[users::default]",
+    "recipe[sudo::default]"
+  ],
+  "included_policy_locks": [
+
+  ],
+  "cookbook_locks": {
+    "sudo": {
+      "version": "5.4.0",
+      "identifier": "541cc137ce19b303fe7e2e7aaa387e9b1e39dbd1",
+      "dotted_decimal_identifier": "23675514234214835.1124242829257272.139204692138961",
+      "cache_key": "sudo-2bbebd0aea219047754a11eacc0763b92eb07113",
+      "origin": "https://github.com/chef-cookbooks/sudo.git",
+      "source_options": {
+        "git": "https://github.com/chef-cookbooks/sudo.git",
+        "revision": "2bbebd0aea219047754a11eacc0763b92eb07113"
+      }
+    },
+    "users": {
+      "version": "5.3.1",
+      "identifier": "41c2bf84fe2476bbbe2dbe79362e6726a3ea47c7",
+      "dotted_decimal_identifier": "18510001311982710.52844924323313198.113415656458183",
+      "cache_key": "users-5.3.1-supermarket.chef.io",
+      "origin": "https://supermarket.chef.io:443/api/v1/cookbooks/users/versions/5.3.1/download",
+      "source_options": {
+        "artifactserver": "https://supermarket.chef.io:443/api/v1/cookbooks/users/versions/5.3.1/download",
+        "version": "5.3.1"
+      }
+    }
+  },
+  "default_attributes": {
+
+  },
+  "override_attributes": {
+
+  },
+  "solution_dependencies": {
+    "Policyfile": [
+      [
+        "sudo",
+        ">= 0.0.0"
+      ],
+      [
+        "users",
+        "= 5.3.1"
+      ]
+    ],
+    "dependencies": {
+      "sudo (5.4.0)": [
+
+      ],
+      "users (5.3.1)": [
+
+      ]
+    }
+  }
+}

data/spec/data/Policyfile_git.rb

@@ -0,0 +1,10 @@
+name 'test_policy'
+
+run_list [
+  'recipe[users]',
+  'recipe[sudo]',
+]
+
+default_source :supermarket, "https://supermarket.chef.io"
+
+cookbook 'sudo', git: 'https://github.com/chef-cookbooks/sudo.git'

data/spec/unit/policyfile_spec.rb

@@ -115,6 +115,15 @@ RSpec.describe PolicyChangelog do
         expect { changelog.versions(nil, 'current') }.to raise_error(RuntimeError)
       end
     end
+
+    context 'when cookbook is sourced by git' do
+      let(:lock_current) do
+        JSON.parse(File.read(File.join(pf_dir, 'Policyfile_git.lock.json')))
+      end
+      it 'returns git commit as version' do
+        expect(changelog.versions(lock_current['cookbook_locks'], 'target')['sudo']).to include('target_version' => '2bbebd0aea219047754a11eacc0763b92eb07113')
+      end
+    end
   end
 
   describe '#get_source_url' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,6 +218,8 @@ files:
 - 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
@@ -251,6 +253,8 @@ test_files:
 - 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