chef-dk 0.15.16 → 0.16.28

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

@@ -31,11 +31,8 @@ describe ChefDK::Command::GeneratorCommands::App do
       .gitignore
       .kitchen.yml
       test
-      test/integration
-      test/integration/default
-      test/integration/default/serverspec
-      test/integration/default/serverspec/default_spec.rb
-      test/integration/helpers/serverspec/spec_helper.rb
+      test/recipes
+      test/recipes/default_test.rb
       README.md
       cookbooks/new_app/Berksfile
       cookbooks/new_app/chefignore
@@ -131,11 +128,11 @@ describe ChefDK::Command::GeneratorCommands::App do
         end
       end
 
-      describe "test/integration/default/serverspec/default_spec.rb" do
-        let(:file) { File.join(tempdir, "new_app", "test", "integration", "default", "serverspec", "default_spec.rb") }
+      describe "test/recipes/default_test.rb" do
+        let(:file) { File.join(tempdir, "new_app", "test", "recipes", "default_test.rb") }
 
         include_examples "a generated file", :cookbook_name do
-          let(:line) { "describe 'new_app::default' do" }
+          let(:line) { "describe port" }
         end
       end
 

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

@@ -1,32 +1,32 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/attribute'
-
-describe ChefDK::Command::GeneratorCommands::Attribute do
-
-  include_examples "a file generator" do
-
-    let(:generator_name) { "attribute" }
-    let(:generated_files) { [ "attributes/new_attribute_file.rb" ] }
-    let(:new_file_name) { "new_attribute_file" }
-
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'shared/a_file_generator'
+require 'chef-dk/command/generator_commands/attribute'
+
+describe ChefDK::Command::GeneratorCommands::Attribute do
+
+  include_examples "a file generator" do
+
+    let(:generator_name) { "attribute" }
+    let(:generated_files) { [ "attributes/new_attribute_file.rb" ] }
+    let(:new_file_name) { "new_attribute_file" }
+
+  end
+end
+

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

@@ -1,136 +1,136 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'pry'
-require 'spec_helper'
-require 'chef-dk/command/generator_commands/base'
-
-describe ChefDK::Command::GeneratorCommands::Base do
-  describe 'parsing Chef configuration' do
-    let(:cli_args) do
-      [
-        "-C", "Business Man",
-        "-I", "Serious Business",
-        "-m", "business.man@corporation.com"
-      ]
-    end
-
-    before do
-      Chef::Config.reset
-    end
-
-    context 'when generator configuration is defined' do
-      before do
-        Chef::Config.reset
-        Chef::Config.chefdk.generator.copyright_holder = "This Guy"
-        Chef::Config.chefdk.generator.email = "this.guy@twothumbs.net"
-        Chef::Config.chefdk.generator.license = "Two Thumbs License"
-      end
-
-      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')
-      end
-
-      context 'when cli overrides are provided' do
-        before do
-          Chef::Config.reset
-          Chef::Config.chefdk.generator.copyright_holder = "This Guy"
-          Chef::Config.chefdk.generator.email = "this.guy@twothumbs.net"
-          Chef::Config.chefdk.generator.license = "Two Thumbs License"
-        end
-
-        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')
-        end
-      end
-
-      context 'when knife configuration is also defined' do
-
-        before do
-          Chef::Config.reset
-          Chef::Config.chefdk.generator.copyright_holder = "This Guy"
-          Chef::Config.chefdk.generator.email = "this.guy@twothumbs.net"
-          Chef::Config.chefdk.generator.license = "Two Thumbs License"
-          Chef::Config.knife.cookbook_copyright = "Knife User"
-          Chef::Config.knife.cookbook_email = "knife.user@example.com"
-          Chef::Config.knife.cookbook_license = "GPLv9000"
-        end
-
-        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')
-        end
-      end
-    end
-
-    context 'when knife configuration is defined' do
-      before do
-        Chef::Config.reset
-        Chef::Config.knife.cookbook_copyright = "Knife User"
-        Chef::Config.knife.cookbook_email = "knife.user@example.com"
-        Chef::Config.knife.cookbook_license = "GPLv9000"
-      end
-
-      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')
-      end
-
-      context 'when cli overrides are provided' do
-
-        before do
-          Chef::Config.reset
-          Chef::Config.knife.cookbook_copyright = "Knife User"
-          Chef::Config.knife.cookbook_email = "knife.user@example.com"
-          Chef::Config.knife.cookbook_license = "GPLv9000"
-        end
-
-        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')
-        end
-      end
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'pry'
+require 'spec_helper'
+require 'chef-dk/command/generator_commands/base'
+
+describe ChefDK::Command::GeneratorCommands::Base do
+  describe 'parsing Chef configuration' do
+    let(:cli_args) do
+      [
+        "-C", "Business Man",
+        "-I", "Serious Business",
+        "-m", "business.man@corporation.com"
+      ]
+    end
+
+    before do
+      Chef::Config.reset
+    end
+
+    context 'when generator configuration is defined' do
+      before do
+        Chef::Config.reset
+        Chef::Config.chefdk.generator.copyright_holder = "This Guy"
+        Chef::Config.chefdk.generator.email = "this.guy@twothumbs.net"
+        Chef::Config.chefdk.generator.license = "Two Thumbs License"
+      end
+
+      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')
+      end
+
+      context 'when cli overrides are provided' do
+        before do
+          Chef::Config.reset
+          Chef::Config.chefdk.generator.copyright_holder = "This Guy"
+          Chef::Config.chefdk.generator.email = "this.guy@twothumbs.net"
+          Chef::Config.chefdk.generator.license = "Two Thumbs License"
+        end
+
+        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')
+        end
+      end
+
+      context 'when knife configuration is also defined' do
+
+        before do
+          Chef::Config.reset
+          Chef::Config.chefdk.generator.copyright_holder = "This Guy"
+          Chef::Config.chefdk.generator.email = "this.guy@twothumbs.net"
+          Chef::Config.chefdk.generator.license = "Two Thumbs License"
+          Chef::Config.knife.cookbook_copyright = "Knife User"
+          Chef::Config.knife.cookbook_email = "knife.user@example.com"
+          Chef::Config.knife.cookbook_license = "GPLv9000"
+        end
+
+        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')
+        end
+      end
+    end
+
+    context 'when knife configuration is defined' do
+      before do
+        Chef::Config.reset
+        Chef::Config.knife.cookbook_copyright = "Knife User"
+        Chef::Config.knife.cookbook_email = "knife.user@example.com"
+        Chef::Config.knife.cookbook_license = "GPLv9000"
+      end
+
+      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')
+      end
+
+      context 'when cli overrides are provided' do
+
+        before do
+          Chef::Config.reset
+          Chef::Config.knife.cookbook_copyright = "Knife User"
+          Chef::Config.knife.cookbook_email = "knife.user@example.com"
+          Chef::Config.knife.cookbook_license = "GPLv9000"
+        end
+
+        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')
+        end
+      end
+    end
+  end
+end

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

@@ -67,7 +67,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
   let(:expected_cookbook_files) do
     expected_cookbook_file_relpaths.map do |relpath|
-      File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", relpath)
+      File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", relpath)
     end
   end
 
@@ -163,7 +163,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
           end
         end
 
-        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", ".kitchen.yml") }
+        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", ".kitchen.yml") }
 
         it "creates a .kitchen.yml with the expected content" do
           expect(IO.read(file)).to eq(expected_kitchen_yml_content)
@@ -189,12 +189,12 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
       end
 
       describe "metadata.rb" do
-        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "metadata.rb") }
+        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "metadata.rb") }
 
         include_examples "a generated file", :cookbook_name do
           let(:line) do
             <<-METADATA
-name 'build-cookbook'
+name 'build_cookbook'
 maintainer 'The Authors'
 maintainer_email 'you@example.com'
 license 'all_rights'
@@ -228,7 +228,7 @@ METADATA
             syntax.rb
             unit.rb
           ].each do |phase_recipe|
-            recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "recipes", 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}']
             expect(IO.read(recipe_file)).to include(expected_content)
@@ -248,12 +248,12 @@ METADATA
       end
 
       describe "metadata.rb" do
-        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "metadata.rb") }
+        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "metadata.rb") }
 
         include_examples "a generated file", :cookbook_name do
           let(:line) do
             <<-METADATA
-name 'build-cookbook'
+name 'build_cookbook'
 maintainer 'The Authors'
 maintainer_email 'you@example.com'
 license 'all_rights'
@@ -285,7 +285,7 @@ METADATA
             syntax.rb
             unit.rb
           ].each do |phase_recipe|
-            recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build-cookbook", "recipes", 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
         end
@@ -326,7 +326,7 @@ METADATA
   end
 
   context "when given a path including the .delivery directory" do
-    let(:argv) { [ File.join(tempdir, "delivery_project", ".delivery", "build-cookbook") ] }
+    let(:argv) { [ File.join(tempdir, "delivery_project", ".delivery", "build_cookbook") ] }
 
     before do
       reset_tempdir

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

@@ -0,0 +1,97 @@
+#
+# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+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 'ohai/system'
+
+require 'chef-dk/command/generator_commands/chef_exts/generator_desc_resource'
+
+describe ChefDK::ChefResource::GeneratorDesc do
+
+  let(:node) { Chef::Node.new }
+
+  let(:stdout) { StringIO.new }
+
+  let(:stderr) { StringIO.new }
+
+  let(:null_formatter) do
+    Chef::Formatters.new(:null, stdout, stderr)
+  end
+
+  let(:events) do
+    Chef::EventDispatch::Dispatcher.new.tap do |d|
+      d.register(null_formatter)
+    end
+  end
+
+  let(:cookbook_collection) { Chef::CookbookCollection.new }
+
+  let(:run_context) do
+    Chef::RunContext.new(node, cookbook_collection, events)
+  end
+
+  let(:message) { "this part of the cookbook does a thing" }
+
+  let(:resource) do
+    described_class.new(message, run_context)
+  end
+
+  describe "resource" do
+
+    it "has the message it was created with" do
+      expect(resource.message).to eq(message)
+    end
+
+    it "defaults to action :write" do
+      expect(resource.action).to eq( [ :write ] )
+    end
+
+    it "is identified by the message property" do
+      expect(resource.identity).to eq(message)
+    end
+
+  end
+
+  describe "provider" do
+
+    let(:provider) do
+      ChefDK::ChefProvider::GeneratorDesc.new(resource, run_context)
+    end
+
+    it "supports why run" do
+      expect(provider.whyrun_supported?).to be(true)
+    end
+
+    it "does nothing for load current resource" do
+      expect(provider.load_current_resource).to be(true)
+    end
+
+    it "writes the message to the formatter" do
+      provider.action_write
+      expect(stdout.string).to include(message)
+    end
+  end
+
+end