chef-dk 0.15.9 → 0.15.15

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

@@ -1,169 +1,169 @@
-#
-# 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/custom_generator_cookbook'
-require 'chef-dk/command/generator_commands/app'
-
-describe ChefDK::Command::GeneratorCommands::App do
-
-  let(:argv) { %w[new_app] }
-
-  let(:stdout_io) { StringIO.new }
-  let(:stderr_io) { StringIO.new }
-
-  let(:expected_cookbook_file_relpaths) do
-    %w[
-      .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
-      README.md
-      cookbooks/new_app/Berksfile
-      cookbooks/new_app/chefignore
-      cookbooks/new_app/metadata.rb
-      cookbooks/new_app/recipes
-      cookbooks/new_app/recipes/default.rb
-      cookbooks/new_app/spec
-      cookbooks/new_app/spec/spec_helper.rb
-      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
-    expected_cookbook_file_relpaths.map do |relpath|
-      File.join(tempdir, "new_app", relpath)
-    end
-  end
-
-  subject(:cookbook_generator) { described_class.new(argv) }
-
-  def generator_context
-    ChefDK::Generator.context
-  end
-
-  before do
-    ChefDK::Generator.reset
-  end
-
-  include_examples "custom generator cookbook" do
-
-    let(:generator_arg) { "new_app" }
-
-    let(:generator_name) { "app" }
-
-  end
-
-  context "when given the name of the cookbook to generate" do
-
-    before do
-      reset_tempdir
-    end
-
-    it "configures the generator context" do
-      cookbook_generator.read_and_validate_params
-      cookbook_generator.setup_context
-      expect(generator_context.app_root).to eq(Dir.pwd)
-      expect(generator_context.app_name).to eq("new_app")
-      expect(generator_context.cookbook_root).to eq(File.join(Dir.pwd, "new_app", "cookbooks"))
-      expect(generator_context.cookbook_name).to eq("new_app")
-      expect(generator_context.recipe_name).to eq("default")
-    end
-
-    describe "generated files" do
-      it "creates a new cookbook" do
-        Dir.chdir(tempdir) do
-          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          cookbook_generator.run
-        end
-        generated_files = Dir.glob(File.join(tempdir, "new_app", "**", "*"), File::FNM_DOTMATCH)
-        expected_cookbook_files.each do |expected_file|
-          expect(generated_files).to include(expected_file)
-        end
-      end
-
-      shared_examples_for "a generated file" do |context_var|
-        before do
-          Dir.chdir(tempdir) do
-            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
-          end
-        end
-
-        it "should contain #{context_var} from the generator context" do
-          expect(File.read(file)).to match line
-        end
-      end
-
-      describe "README.md" do
-        let(:file) { File.join(tempdir, "new_app", "README.md") }
-
-        include_examples "a generated file", :cookbook_name do
-          let(:line) { "# new_app" }
-        end
-      end
-
-      describe ".kitchen.yml" do
-        let(:file) { File.join(tempdir, "new_app", ".kitchen.yml") }
-
-        include_examples "a generated file", :cookbook_name do
-          let(:line) { /\s*- recipe\[new_app::default\]/ }
-        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") }
-
-        include_examples "a generated file", :cookbook_name do
-          let(:line) { "describe 'new_app::default' do" }
-        end
-      end
-
-      describe "cookbooks/new_app/metadata.rb" do
-        let(:file) { File.join(tempdir, "new_app", "cookbooks", "new_app", "metadata.rb") }
-
-        include_examples "a generated file", :cookbook_name do
-          let(:line) { /name\s+'new_app'/ }
-        end
-      end
-
-      describe "cookbooks/new_app/recipes/default.rb" do
-        let(:file) { File.join(tempdir, "new_app", "cookbooks", "new_app", "recipes", "default.rb") }
-
-        include_examples "a generated file", :cookbook_name do
-          let(:line) { "# Cookbook Name:: new_app" }
-        end
-      end
-
-      describe "cookbooks/new_app/spec/unit/recipes/default_spec.rb" do
-        let(:file) { File.join(tempdir, "new_app", "cookbooks", "new_app", "spec", "unit", "recipes", "default_spec.rb") }
-
-        include_examples "a generated file", :cookbook_name do
-          let(:line) { "describe \'new_app::default\' do" }
-        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 '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(:stdout_io) { StringIO.new }
+  let(:stderr_io) { StringIO.new }
+
+  let(:expected_cookbook_file_relpaths) do
+    %w[
+      .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
+      README.md
+      cookbooks/new_app/Berksfile
+      cookbooks/new_app/chefignore
+      cookbooks/new_app/metadata.rb
+      cookbooks/new_app/recipes
+      cookbooks/new_app/recipes/default.rb
+      cookbooks/new_app/spec
+      cookbooks/new_app/spec/spec_helper.rb
+      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
+    expected_cookbook_file_relpaths.map do |relpath|
+      File.join(tempdir, "new_app", relpath)
+    end
+  end
+
+  subject(:cookbook_generator) { described_class.new(argv) }
+
+  def generator_context
+    ChefDK::Generator.context
+  end
+
+  before do
+    ChefDK::Generator.reset
+  end
+
+  include_examples "custom generator cookbook" do
+
+    let(:generator_arg) { "new_app" }
+
+    let(:generator_name) { "app" }
+
+  end
+
+  context "when given the name of the cookbook to generate" do
+
+    before do
+      reset_tempdir
+    end
+
+    it "configures the generator context" do
+      cookbook_generator.read_and_validate_params
+      cookbook_generator.setup_context
+      expect(generator_context.app_root).to eq(Dir.pwd)
+      expect(generator_context.app_name).to eq("new_app")
+      expect(generator_context.cookbook_root).to eq(File.join(Dir.pwd, "new_app", "cookbooks"))
+      expect(generator_context.cookbook_name).to eq("new_app")
+      expect(generator_context.recipe_name).to eq("default")
+    end
+
+    describe "generated files" do
+      it "creates a new cookbook" do
+        Dir.chdir(tempdir) do
+          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+          cookbook_generator.run
+        end
+        generated_files = Dir.glob(File.join(tempdir, "new_app", "**", "*"), File::FNM_DOTMATCH)
+        expected_cookbook_files.each do |expected_file|
+          expect(generated_files).to include(expected_file)
+        end
+      end
+
+      shared_examples_for "a generated file" do |context_var|
+        before do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            cookbook_generator.run
+          end
+        end
+
+        it "should contain #{context_var} from the generator context" do
+          expect(File.read(file)).to match line
+        end
+      end
+
+      describe "README.md" do
+        let(:file) { File.join(tempdir, "new_app", "README.md") }
+
+        include_examples "a generated file", :cookbook_name do
+          let(:line) { "# new_app" }
+        end
+      end
+
+      describe ".kitchen.yml" do
+        let(:file) { File.join(tempdir, "new_app", ".kitchen.yml") }
+
+        include_examples "a generated file", :cookbook_name do
+          let(:line) { /\s*- recipe\[new_app::default\]/ }
+        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") }
+
+        include_examples "a generated file", :cookbook_name do
+          let(:line) { "describe 'new_app::default' do" }
+        end
+      end
+
+      describe "cookbooks/new_app/metadata.rb" do
+        let(:file) { File.join(tempdir, "new_app", "cookbooks", "new_app", "metadata.rb") }
+
+        include_examples "a generated file", :cookbook_name do
+          let(:line) { /name\s+'new_app'/ }
+        end
+      end
+
+      describe "cookbooks/new_app/recipes/default.rb" do
+        let(:file) { File.join(tempdir, "new_app", "cookbooks", "new_app", "recipes", "default.rb") }
+
+        include_examples "a generated file", :cookbook_name do
+          let(:line) { "# Cookbook Name:: new_app" }
+        end
+      end
+
+      describe "cookbooks/new_app/spec/unit/recipes/default_spec.rb" do
+        let(:file) { File.join(tempdir, "new_app", "cookbooks", "new_app", "spec", "unit", "recipes", "default_spec.rb") }
+
+        include_examples "a generated file", :cookbook_name do
+          let(:line) { "describe \'new_app::default\' do" }
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -17,10 +17,14 @@
 
 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(:stdout_io) { StringIO.new }
@@ -125,7 +129,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
     it "creates a build cookbook" do
       Dir.chdir(tempdir) do
         allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-        cookbook_generator.run
+        expect(cookbook_generator.run).to eq(0)
       end
       generated_files = Dir.glob("#{tempdir}/delivery_project/**/*", File::FNM_DOTMATCH)
       expected_cookbook_files.each do |expected_file|
@@ -137,7 +141,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
       before do
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          cookbook_generator.run
+          expect(cookbook_generator.run).to eq(0)
         end
       end
 
@@ -155,7 +159,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
         before do
           Dir.chdir(tempdir) do
             allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
+            expect(cookbook_generator.run).to eq(0)
           end
         end
 
@@ -207,7 +211,7 @@ METADATA
         before do
           Dir.chdir(tempdir) do
             allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
+            expect(cookbook_generator.run).to eq(0)
           end
         end
 
@@ -264,7 +268,7 @@ METADATA
         before do
           Dir.chdir(tempdir) do
             allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
+            expect(cookbook_generator.run).to eq(0)
           end
         end
 
@@ -289,6 +293,36 @@ METADATA
       end
 
     end
+
+    context "when the delivery project is a git repo" do
+
+      let(:readme) { File.join(project_dir, "README.md") }
+
+      def git!(cmd)
+        Mixlib::ShellOut.new("git #{cmd}", cwd: project_dir).tap do |c|
+          c.run_command
+          c.error!
+        end
+      end
+
+      before do
+        FileUtils.touch(readme)
+
+        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 "creates delivery config in a feature branch and merges it" do
+        expect(git!("log").stdout).to include("Merge branch 'add-delivery-configuration'")
+      end
+
+    end
   end
 
   context "when given a path including the .delivery directory" do

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

@@ -17,10 +17,13 @@
 
 require 'spec_helper'
 require 'shared/custom_generator_cookbook'
+require 'shared/setup_git_committer_config'
 require 'chef-dk/command/generator_commands/cookbook'
 
 describe ChefDK::Command::GeneratorCommands::Cookbook do
 
+  include_context("setup_git_committer_config")
+
   let(:argv) { %w[new_cookbook] }
 
   let(:stdout_io) { StringIO.new }
@@ -59,6 +62,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
   subject(:cookbook_generator) do
     g = described_class.new(argv)
     allow(g).to receive(:cookbook_path_in_git_repo?).and_return(false)
+    allow(g).to receive(:stdout).and_return(stdout_io)
     g
   end
 
@@ -129,7 +133,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
     it "creates a new cookbook" do
       Dir.chdir(tempdir) do
         allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-        cookbook_generator.run
+        expect(cookbook_generator.run).to eq(0)
       end
       generated_files = Dir.glob("#{tempdir}/new_cookbook/**/*", File::FNM_DOTMATCH)
       expected_cookbook_files.each do |expected_file|
@@ -141,7 +145,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       before do
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          cookbook_generator.run
+          expect(cookbook_generator.run).to eq(0)
         end
       end
 
@@ -164,17 +168,21 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
 
       describe "Generating Test Kitchen and integration testing files" do
 
-        before do
-          Dir.chdir(tempdir) do
-            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
+        describe "generating kitchen config" do
+
+          before do
+            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
-        end
 
-        let(:file) { File.join(tempdir, "new_cookbook", ".kitchen.yml") }
+          let(:file) { File.join(tempdir, "new_cookbook", ".kitchen.yml") }
+
+          it "creates a .kitchen.yml with the expected content" do
+            expect(IO.read(file)).to eq(expected_kitchen_yml_content)
+          end
 
-        it "creates a .kitchen.yml with the expected content" do
-          expect(IO.read(file)).to eq(expected_kitchen_yml_content)
         end
 
         describe "test/integration/default/serverspec/default_spec.rb" do
@@ -196,7 +204,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
         before do
           Dir.chdir(tempdir) do
             allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
+            expect(cookbook_generator.run).to eq(0)
           end
         end
 
@@ -242,7 +250,7 @@ POLICYFILE_RB
         before do
           Dir.chdir(tempdir) do
             allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
+            expect(cookbook_generator.run).to eq(0)
           end
         end
 
@@ -326,7 +334,7 @@ POLICYFILE_RB
         before do
           Dir.chdir(tempdir) do
             allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            cookbook_generator.run
+            expect(cookbook_generator.run).to eq(0)
           end
         end
 
@@ -389,7 +397,7 @@ SPEC_HELPER
       before do
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          cookbook_generator.run
+          expect(cookbook_generator.run).to eq(0)
         end
       end