chef-dk 1.2.22 → 1.3.40

data/spec/unit/command/generator_commands/app_spec.rb

@@ -15,19 +15,19 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/custom_generator_cookbook'
-require 'chef-dk/command/generator_commands/app'
+require "spec_helper"
+require "shared/custom_generator_cookbook"
+require "chef-dk/command/generator_commands/app"
 
 describe ChefDK::Command::GeneratorCommands::App do
 
-  let(:argv) { %w[new_app] }
+  let(:argv) { %w{new_app} }
 
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
 
   let(:expected_cookbook_file_relpaths) do
-    %w[
+    %w{
       .gitignore
       .kitchen.yml
       test
@@ -45,7 +45,7 @@ describe ChefDK::Command::GeneratorCommands::App do
       cookbooks/new_app/spec/unit
       cookbooks/new_app/spec/unit/recipes
       cookbooks/new_app/spec/unit/recipes/default_spec.rb
-    ]
+    }
   end
 
   let(:expected_cookbook_files) do

data/spec/unit/command/generator_commands/attribute_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/attribute'
+require "spec_helper"
+require "shared/a_file_generator"
+require "chef-dk/command/generator_commands/attribute"
 
 describe ChefDK::Command::GeneratorCommands::Attribute do
 
@@ -29,4 +29,3 @@ describe ChefDK::Command::GeneratorCommands::Attribute do
 
   end
 end
-

data/spec/unit/command/generator_commands/base_spec.rb

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require 'pry'
-require 'spec_helper'
-require 'chef-dk/command/generator_commands/base'
+require "pry"
+require "spec_helper"
+require "chef-dk/command/generator_commands/base"
 
 describe ChefDK::Command::GeneratorCommands::Base do
-  describe 'parsing Chef configuration' do
+  describe "parsing Chef configuration" do
     let(:cli_args) do
       [
         "-C", "Business Man",
@@ -33,7 +33,7 @@ describe ChefDK::Command::GeneratorCommands::Base do
       Chef::Config.reset
     end
 
-    context 'when generator configuration is defined' do
+    context "when generator configuration is defined" do
       before do
         Chef::Config.reset
         Chef::Config.chefdk.generator.copyright_holder = "This Guy"
@@ -41,17 +41,17 @@ describe ChefDK::Command::GeneratorCommands::Base do
         Chef::Config.chefdk.generator.license = "Two Thumbs License"
       end
 
-      it 'uses the defined values' do
+      it "uses the defined values" do
         cmd = ChefDK::Command::GeneratorCommands::Base.new([])
         cmd.parse_options
         cmd.setup_context
         cfg = cmd.config
-        expect(cfg[:copyright_holder]).to eq('This Guy')
-        expect(cfg[:email]).to eq('this.guy@twothumbs.net')
-        expect(cfg[:license]).to eq('Two Thumbs License')
+        expect(cfg[:copyright_holder]).to eq("This Guy")
+        expect(cfg[:email]).to eq("this.guy@twothumbs.net")
+        expect(cfg[:license]).to eq("Two Thumbs License")
       end
 
-      context 'when cli overrides are provided' do
+      context "when cli overrides are provided" do
         before do
           Chef::Config.reset
           Chef::Config.chefdk.generator.copyright_holder = "This Guy"
@@ -59,18 +59,18 @@ describe ChefDK::Command::GeneratorCommands::Base do
           Chef::Config.chefdk.generator.license = "Two Thumbs License"
         end
 
-        it 'uses the cli args' do
+        it "uses the cli args" do
           cmd = ChefDK::Command::GeneratorCommands::Base.new(cli_args)
           cmd.parse_options(cli_args)
           cmd.setup_context
           cfg = cmd.config
-          expect(cfg[:copyright_holder]).to eq('Business Man')
-          expect(cfg[:email]).to eq('business.man@corporation.com')
-          expect(cfg[:license]).to eq('Serious Business')
+          expect(cfg[:copyright_holder]).to eq("Business Man")
+          expect(cfg[:email]).to eq("business.man@corporation.com")
+          expect(cfg[:license]).to eq("Serious Business")
         end
       end
 
-      context 'when knife configuration is also defined' do
+      context "when knife configuration is also defined" do
 
         before do
           Chef::Config.reset
@@ -82,19 +82,19 @@ describe ChefDK::Command::GeneratorCommands::Base do
           Chef::Config.knife.cookbook_license = "GPLv9000"
         end
 
-        it 'uses the generator configuration' do
+        it "uses the generator configuration" do
           cmd = ChefDK::Command::GeneratorCommands::Base.new([])
           cmd.parse_options
           cmd.setup_context
           cfg = cmd.config
-          expect(cfg[:copyright_holder]).to eq('This Guy')
-          expect(cfg[:email]).to eq('this.guy@twothumbs.net')
-          expect(cfg[:license]).to eq('Two Thumbs License')
+          expect(cfg[:copyright_holder]).to eq("This Guy")
+          expect(cfg[:email]).to eq("this.guy@twothumbs.net")
+          expect(cfg[:license]).to eq("Two Thumbs License")
         end
       end
     end
 
-    context 'when knife configuration is defined' do
+    context "when knife configuration is defined" do
       before do
         Chef::Config.reset
         Chef::Config.knife.cookbook_copyright = "Knife User"
@@ -102,17 +102,17 @@ describe ChefDK::Command::GeneratorCommands::Base do
         Chef::Config.knife.cookbook_license = "GPLv9000"
       end
 
-      it 'uses the defined values' do
+      it "uses the defined values" do
         cmd = ChefDK::Command::GeneratorCommands::Base.new([])
         cmd.parse_options
         cmd.setup_context
         cfg = cmd.config
-        expect(cfg[:copyright_holder]).to eq('Knife User')
-        expect(cfg[:email]).to eq('knife.user@example.com')
-        expect(cfg[:license]).to eq('GPLv9000')
+        expect(cfg[:copyright_holder]).to eq("Knife User")
+        expect(cfg[:email]).to eq("knife.user@example.com")
+        expect(cfg[:license]).to eq("GPLv9000")
       end
 
-      context 'when cli overrides are provided' do
+      context "when cli overrides are provided" do
 
         before do
           Chef::Config.reset
@@ -121,14 +121,14 @@ describe ChefDK::Command::GeneratorCommands::Base do
           Chef::Config.knife.cookbook_license = "GPLv9000"
         end
 
-        it 'uses the cli args' do
+        it "uses the cli args" do
           cmd = ChefDK::Command::GeneratorCommands::Base.new(cli_args)
           cmd.parse_options(cli_args)
           cmd.setup_context
           cfg = cmd.config
-          expect(cfg[:copyright_holder]).to eq('Business Man')
-          expect(cfg[:email]).to eq('business.man@corporation.com')
-          expect(cfg[:license]).to eq('Serious Business')
+          expect(cfg[:copyright_holder]).to eq("Business Man")
+          expect(cfg[:email]).to eq("business.man@corporation.com")
+          expect(cfg[:license]).to eq("Serious Business")
         end
       end
     end
@@ -136,44 +136,44 @@ describe ChefDK::Command::GeneratorCommands::Base do
 
   describe '#have_git?' do
     let(:cmd) { described_class.new([]) }
-    let(:path) { 'bin_path' }
+    let(:path) { "bin_path" }
 
     before do
       allow(File).to receive(:exist?)
-      allow(ENV).to receive(:[]).with('PATH').and_return(path)
-      allow(ENV).to receive(:[]).with('PATHEXT').and_return(nil)
-      allow(RbConfig::CONFIG).to receive(:[]).with('EXEEXT').and_return('')
+      allow(ENV).to receive(:[]).with("PATH").and_return(path)
+      allow(ENV).to receive(:[]).with("PATHEXT").and_return(nil)
+      allow(RbConfig::CONFIG).to receive(:[]).with("EXEEXT").and_return("")
     end
 
-    describe 'when git executable exists' do
-      it 'returns true' do
+    describe "when git executable exists" do
+      it "returns true" do
         allow(File).to receive(:exist?).and_return(true)
         expect(cmd.have_git?).to eq(true)
       end
     end
 
-    describe 'when git executable does not exist' do
-      it 'returns false' do
+    describe "when git executable does not exist" do
+      it "returns false" do
         allow(File).to receive(:exist?).and_return(false)
         expect(cmd.have_git?).to eq(false)
       end
     end
 
-    it 'checks PATH for git executable' do
-      expect(File).to receive(:exist?).with(File.join(path, 'git'))
+    it "checks PATH for git executable" do
+      expect(File).to receive(:exist?).with(File.join(path, "git"))
       cmd.have_git?
     end
 
-    describe 'when on Windows' do
+    describe "when on Windows" do
       before do
-        allow(ENV).to receive(:[]).with('PATHEXT').and_return('.com;.exe;.bat')
-        allow(RbConfig::CONFIG).to receive(:[]).with('EXEEXT').and_return('.exe')
+        allow(ENV).to receive(:[]).with("PATHEXT").and_return(".com;.exe;.bat")
+        allow(RbConfig::CONFIG).to receive(:[]).with("EXEEXT").and_return(".exe")
       end
 
-      it 'checks PATH for git executable with an extension found in PATHEXT' do
-        expect(File).to receive(:exist?).with(File.join(path, 'git.com'))
-        expect(File).to receive(:exist?).with(File.join(path, 'git.exe'))
-        expect(File).to receive(:exist?).with(File.join(path, 'git.bat'))
+      it "checks PATH for git executable with an extension found in PATHEXT" do
+        expect(File).to receive(:exist?).with(File.join(path, "git.com"))
+        expect(File).to receive(:exist?).with(File.join(path, "git.exe"))
+        expect(File).to receive(:exist?).with(File.join(path, "git.bat"))
         cmd.have_git?
       end
     end

data/spec/unit/command/generator_commands/build_cookbook_spec.rb

@@ -15,23 +15,23 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/custom_generator_cookbook'
-require 'shared/setup_git_committer_config'
-require 'chef-dk/command/generator_commands/build_cookbook'
-require 'mixlib/shellout'
+require "spec_helper"
+require "shared/custom_generator_cookbook"
+require "shared/setup_git_committer_config"
+require "chef-dk/command/generator_commands/build_cookbook"
+require "mixlib/shellout"
 
 describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
   include_context("setup_git_committer_config")
 
-  let(:argv) { %w[delivery_project] }
+  let(:argv) { %w{delivery_project} }
 
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
 
   let(:expected_cookbook_file_relpaths) do
-    %w[
+    %w{
       .kitchen.yml
       data_bags
       data_bags/keys
@@ -62,7 +62,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
       recipes/unit.rb
       secrets
       secrets/fakey-mcfakerton
-    ]
+    }
   end
 
   let(:expected_cookbook_files) do
@@ -85,7 +85,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
   it "configures the chef runner" do
     expect(cookbook_generator.chef_runner).to be_a(ChefDK::ChefRunner)
-    expect(cookbook_generator.chef_runner.cookbook_path).to eq(File.expand_path('lib/chef-dk/skeletons', project_root))
+    expect(cookbook_generator.chef_runner.cookbook_path).to eq(File.expand_path("lib/chef-dk/skeletons", project_root))
   end
 
   context "when given invalid/incomplete arguments" do
@@ -94,7 +94,6 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
       "Usage: chef generate build-cookbook NAME [options]\n"
     end
 
-
     def with_argv(argv)
       generator = described_class.new(argv)
       allow(generator).to receive(:stdout).and_return(stdout_io)
@@ -111,7 +110,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
   context "when given the name of the delivery project" do
 
-    let(:argv) { %w[delivery_project] }
+    let(:argv) { %w{delivery_project} }
 
     let(:project_dir) { File.join(tempdir, "delivery_project") }
 
@@ -199,6 +198,7 @@ maintainer 'The Authors'
 maintainer_email 'you@example.com'
 license 'all_rights'
 version '0.1.0'
+chef_version '>= 12.1' if respond_to?(:chef_version)
 
 depends 'delivery-truck'
 METADATA
@@ -216,7 +216,7 @@ METADATA
         end
 
         it "generates phase recipes which include the corresponding delivery truck recipe" do
-          %w[
+          %w{
             deploy.rb
             functional.rb
             lint.rb
@@ -227,10 +227,10 @@ METADATA
             smoke.rb
             syntax.rb
             unit.rb
-          ].each do |phase_recipe|
+          }.each do |phase_recipe|
             recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "recipes", phase_recipe)
             phase = File.basename(phase_recipe, ".rb")
-            expected_content = %Q[include_recipe 'delivery-truck::#{phase}']
+            expected_content = %Q{include_recipe 'delivery-truck::#{phase}'}
             expect(IO.read(recipe_file)).to include(expected_content)
           end
         end
@@ -273,7 +273,7 @@ METADATA
         end
 
         it "generates phase recipes that are empty" do
-          %w[
+          %w{
             deploy.rb
             functional.rb
             lint.rb
@@ -284,7 +284,7 @@ METADATA
             smoke.rb
             syntax.rb
             unit.rb
-          ].each do |phase_recipe|
+          }.each do |phase_recipe|
             recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "recipes", phase_recipe)
             expect(IO.read(recipe_file)).to_not include("include_recipe")
           end
@@ -323,6 +323,40 @@ METADATA
       end
 
     end
+
+    context "when the delivery project has already a config.json and project.toml" do
+
+      let(:dot_delivery) { File.join(project_dir, ".delivery") }
+      let(:config_json) { File.join(dot_delivery, "config.json") }
+      let(:project_toml) { File.join(dot_delivery, "project.toml") }
+
+      def git!(cmd)
+        Mixlib::ShellOut.new("git #{cmd}", cwd: project_dir).tap do |c|
+          c.run_command
+          c.error!
+        end
+      end
+
+      before do
+        FileUtils.mkdir_p(dot_delivery)
+        FileUtils.touch(config_json)
+        FileUtils.touch(project_toml)
+
+        git!("init .")
+        git!("add .")
+        git!("commit -m \"initial commit\"")
+
+        Dir.chdir(tempdir) do
+          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+          expect(cookbook_generator.run).to eq(0)
+        end
+      end
+
+      it "does not overwrite the delivery config" do
+        expect(git!("log").stdout).to_not include("Add generated delivery configuration")
+      end
+
+    end
   end
 
   context "when given a path including the .delivery directory" do

data/spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb

@@ -15,18 +15,18 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'stringio'
+require "spec_helper"
+require "stringio"
 
-require 'chef/run_context'
-require 'chef/cookbook/cookbook_collection'
-require 'chef/node'
-require 'chef/event_dispatch/dispatcher'
-require 'chef/formatters/base'
+require "chef/run_context"
+require "chef/cookbook/cookbook_collection"
+require "chef/node"
+require "chef/event_dispatch/dispatcher"
+require "chef/formatters/base"
 
-require 'ohai/system'
+require "ohai/system"
 
-require 'chef-dk/command/generator_commands/chef_exts/generator_desc_resource'
+require "chef-dk/command/generator_commands/chef_exts/generator_desc_resource"
 
 describe ChefDK::ChefResource::GeneratorDesc do
 

data/spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb

@@ -15,24 +15,24 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'stringio'
+require "spec_helper"
+require "stringio"
 
-require 'chef/config'
-require 'chef/recipe'
-require 'chef/run_context'
-require 'chef/event_dispatch/dispatcher'
-require 'chef/policy_builder'
-require 'chef/formatters/doc'
-require 'chef/cookbook/file_vendor'
-require 'chef/cookbook/file_system_file_vendor'
-require 'chef/cookbook/cookbook_collection'
-require 'chef/cookbook_loader'
+require "chef/config"
+require "chef/recipe"
+require "chef/run_context"
+require "chef/event_dispatch/dispatcher"
+require "chef/policy_builder"
+require "chef/formatters/doc"
+require "chef/cookbook/file_vendor"
+require "chef/cookbook/file_system_file_vendor"
+require "chef/cookbook/cookbook_collection"
+require "chef/cookbook_loader"
 
-require 'ohai/system'
+require "ohai/system"
 
-require 'chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext'
-require 'chef-dk/command/generator_commands/chef_exts/quieter_doc_formatter'
+require "chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext"
+require "chef-dk/command/generator_commands/chef_exts/quieter_doc_formatter"
 
 describe ChefDK::RecipeDSLExt do
 
@@ -56,7 +56,7 @@ describe ChefDK::RecipeDSLExt do
 
   let(:ohai) do
     Ohai::System.new.tap do |o|
-      o.all_plugins(["platform", "platform_version"])
+      o.all_plugins(%w{platform platform_version})
     end
   end