berkshelf 6.3.3 → 6.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c242ec6da36722632fc93da389d7f0ac4b1d798f7e9e79a76188dbd6842cfe
-  data.tar.gz: df25496b07e7b90574f82b59bfc58414162075aea162817dc5b6e630b63b1fb0
+  metadata.gz: 3c9df4c14cc793bfa87835f53787733fd32c68ed96205c1c17441d30d7c8545b
+  data.tar.gz: d4b3b61fed4139c7589e15da1ef85a23df226a67eb547d071e0651ab0098c60b
 SHA512:
-  metadata.gz: 85b0c88efa1c51a52805223f6af3eae26d5986cb585ddae8be457891e0e9a681794e33cee9956db2ccade0d12ac922788e6ba0060d51600b8cc50a221acbd463
-  data.tar.gz: 9e7408b7b1d7e0d7ed123897e2154b007b08c8ff6b93a7a7752b8e691482e8ddef961487751bed44b32403d9936603c89c1751f11df476719acabb9b8381cee0
+  metadata.gz: 1453555f84df434bf8c3a15724ea86ac87b9293a6086138dc6199ab307a4a96c843dae961f7d6280b47b4f2a1703e03a647a7057934a8c70311895d84a39bd8a
+  data.tar.gz: 68b5943e7163877c2567f7b73f794a2181ccf092724d6c53de4912689da2895f8e450ce660b2e7edddfe9e53663e7e2290564d3a066abfb327f57037905f9d50

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [6.3.4](https://github.com/berkshelf/berkshelf/tree/6.3.4) (2018-08-07)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.3.3...v6.3.4)
+
+**Merged pull requests:**
+
+- \[SHACK-295\] Kitchen generator conflicts on 'chefignore' [\#1791](https://github.com/berkshelf/berkshelf/pull/1791) ([tyler-ball](https://github.com/tyler-ball))
+
 ## [6.3.3](https://github.com/berkshelf/berkshelf/tree/6.3.3) (2018-08-03)
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v7.0.4...6.3.3)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    berkshelf (6.3.3)
+    berkshelf (6.3.4)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
       chef (>= 12.7.2, < 14.0)

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "6.3.3"
+  VERSION = "6.3.4"
 end

data/spec/unit/berkshelf/cookbook_generator_spec.rb

@@ -11,6 +11,9 @@ describe Berkshelf::CookbookGenerator do
 
   context "with default options" do
     before do
+      if defined?(Kitchen::Generator::Init)
+        expect(Kitchen::Generator::Init).to receive(:new).with(any_args()).and_return(kitchen_generator)
+      end
       capture(:stdout) do
         Berkshelf::CookbookGenerator.new([target, name],
           license:          license,
@@ -76,6 +79,9 @@ describe Berkshelf::CookbookGenerator do
   context "given a 'maintainer_email' option" do
     before do
       capture(:stdout) do
+        if defined?(Kitchen::Generator::Init)
+          expect(Kitchen::Generator::Init).to receive(:new).with(any_args()).and_return(kitchen_generator)
+        end
         Berkshelf::CookbookGenerator.new([target, name], maintainer_email: "jamie@vialstudios.com").invoke_all
       end
     end

data/spec/unit/berkshelf/init_generator_spec.rb

@@ -6,6 +6,9 @@ describe Berkshelf::InitGenerator do
   let(:kitchen_generator) { double("kitchen-generator", invoke_all: nil) }
 
   before do
+    if defined?(Kitchen::Generator::Init)
+      allow(Kitchen::Generator::Init).to receive(:new).with(any_args()).and_return(kitchen_generator)
+    end
     FileUtils.mkdir_p(target)
     File.open(File.join(target, "metadata.rb"), "w") do |f|
       f.write("name 'some_cookbook'")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 6.3.3
+  version: 6.3.4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buff-config
@@ -484,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies