chef-dk 0.15.9 → 0.15.15

data/lib/chef-dk/command/generator_commands/build_cookbook.rb

@@ -56,6 +56,7 @@ module ChefDK
           super
           Generator.add_attr_to_context(:delivery_project_dir, delivery_project_dir)
 
+          Generator.add_attr_to_context(:delivery_project_git_initialized, delivery_project_git_initialized?)
           Generator.add_attr_to_context(:build_cookbook_parent_is_cookbook, build_cookbook_parent_is_cookbook?)
         end
 
@@ -91,6 +92,10 @@ module ChefDK
           project_dir
         end
 
+        def delivery_project_git_initialized?
+          File.exist?(File.join(delivery_project_dir, ".git"))
+        end
+
         def read_and_validate_params
           arguments = parse_options(params)
           @cookbook_name_or_path = arguments[0]

data/lib/chef-dk/command/generator_commands/cookbook.rb

@@ -72,6 +72,8 @@ module ChefDK
           if params_valid?
             setup_context
             chef_runner.converge
+            msg("")
+            msg("Your cookbook is ready. Type `cd #{cookbook_name_or_path}` to start working.")
             0
           else
             err(opt_parser)
@@ -96,6 +98,7 @@ module ChefDK
           Generator.add_attr_to_context(:enable_delivery, enable_delivery?)
           Generator.add_attr_to_context(:delivery_project_dir, cookbook_full_path)
           Generator.add_attr_to_context(:build_cookbook_parent_is_cookbook, true)
+          Generator.add_attr_to_context(:delivery_project_git_initialized, have_git? && !cookbook_path_in_git_repo?)
 
           Generator.add_attr_to_context(:use_berkshelf, berks_mode?)
         end

data/lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb

@@ -1,8 +1,8 @@
-require 'serverspec'
-
-if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM).nil?
-  set :backend, :exec
-else
-  set :backend, :cmd
-  set :os, family: 'windows'
-end
+require 'serverspec'
+
+if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM).nil?
+  set :backend, :exec
+else
+  set :backend, :cmd
+  set :os, family: 'windows'
+end

data/lib/chef-dk/skeletons/code_generator/recipes/app.rb

@@ -1,97 +1,97 @@
-
-
-context = ChefDK::Generator.context
-app_dir = File.join(context.app_root, context.app_name)
-cookbooks_dir = context.cookbook_root
-cookbook_dir = File.join(cookbooks_dir, context.cookbook_name)
-
-# app root dir
-directory app_dir
-
-# Top level files
-
-# TK
-template "#{app_dir}/.kitchen.yml" do
-  source 'kitchen.yml.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-directory "#{app_dir}/test/integration/default/serverspec" do
-  recursive true
-end
-
-directory "#{app_dir}/test/integration/helpers/serverspec" do
-  recursive true
-end
-
-cookbook_file "#{app_dir}/test/integration/helpers/serverspec/spec_helper.rb" do
-  source 'serverspec_spec_helper.rb'
-  action :create_if_missing
-end
-
-template "#{app_dir}/test/integration/default/serverspec/default_spec.rb" do
-  source 'serverspec_default_spec.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# README
-template "#{app_dir}/README.md" do
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# Generated Cookbook:
-
-# cookbook collection dir
-directory cookbooks_dir
-
-# cookbook collection dir
-directory cookbook_dir
-
-# metadata.rb
-template "#{cookbook_dir}/metadata.rb" do
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# chefignore
-cookbook_file "#{cookbook_dir}/chefignore"
-
-# Berks
-cookbook_file "#{cookbook_dir}/Berksfile"
-
-# Recipes
-
-directory "#{cookbook_dir}/recipes"
-
-template "#{cookbook_dir}/recipes/default.rb" do
-  source "recipe.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# Chefspec
-directory "#{cookbook_dir}/spec/unit/recipes" do
-  recursive true
-end
-
-cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
-  action :create_if_missing
-end
-
-template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
-  source "recipe_spec.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# git
-if context.have_git
-  if !context.skip_git_init
-    execute("initialize-git") do
-      command("git init .")
-      cwd app_dir
-    end
-  end
-  cookbook_file "#{app_dir}/.gitignore" do
-    source "gitignore"
-  end
-end
+
+
+context = ChefDK::Generator.context
+app_dir = File.join(context.app_root, context.app_name)
+cookbooks_dir = context.cookbook_root
+cookbook_dir = File.join(cookbooks_dir, context.cookbook_name)
+
+# app root dir
+directory app_dir
+
+# Top level files
+
+# TK
+template "#{app_dir}/.kitchen.yml" do
+  source 'kitchen.yml.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+directory "#{app_dir}/test/integration/default/serverspec" do
+  recursive true
+end
+
+directory "#{app_dir}/test/integration/helpers/serverspec" do
+  recursive true
+end
+
+cookbook_file "#{app_dir}/test/integration/helpers/serverspec/spec_helper.rb" do
+  source 'serverspec_spec_helper.rb'
+  action :create_if_missing
+end
+
+template "#{app_dir}/test/integration/default/serverspec/default_spec.rb" do
+  source 'serverspec_default_spec.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# README
+template "#{app_dir}/README.md" do
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# Generated Cookbook:
+
+# cookbook collection dir
+directory cookbooks_dir
+
+# cookbook collection dir
+directory cookbook_dir
+
+# metadata.rb
+template "#{cookbook_dir}/metadata.rb" do
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# chefignore
+cookbook_file "#{cookbook_dir}/chefignore"
+
+# Berks
+cookbook_file "#{cookbook_dir}/Berksfile"
+
+# Recipes
+
+directory "#{cookbook_dir}/recipes"
+
+template "#{cookbook_dir}/recipes/default.rb" do
+  source "recipe.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+# Chefspec
+directory "#{cookbook_dir}/spec/unit/recipes" do
+  recursive true
+end
+
+cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
+  action :create_if_missing
+end
+
+template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
+  source "recipe_spec.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# git
+if context.have_git
+  if !context.skip_git_init
+    execute("initialize-git") do
+      command("git init .")
+      cwd app_dir
+    end
+  end
+  cookbook_file "#{app_dir}/.gitignore" do
+    source "gitignore"
+  end
+end

data/lib/chef-dk/skeletons/code_generator/recipes/build_cookbook.rb

@@ -86,3 +86,67 @@ cookbook_file "#{build_cookbook_dir}/test/fixtures/cookbooks/test/recipes/defaul
   source "build-cookbook/test-fixture-recipe.rb"
 end
 
+# Construct git history as if we did all the work in a feature branch which we
+# merged into master at the end, which looks like this:
+#
+# ```
+# git log --graph --oneline
+# *   5fec5bd Merge branch 'add-delivery-configuration'
+# |\
+# | * 967bb9f Add generated delivery build cookbook
+# | * 1558e0a Add generated delivery configuration
+# |/
+# * db22790 Add generated cookbook content
+# ```
+#
+if context.have_git && context.delivery_project_git_initialized && !context.skip_git_init
+
+  execute("git-create-feature-branch") do
+    command("git checkout -t -b add-delivery-configuration")
+    cwd delivery_project_dir
+  end
+
+  execute("git-add-delivery-config-json") do
+    command("git add .delivery/config.json")
+    cwd delivery_project_dir
+
+    only_if "git status --porcelain |grep \".\""
+  end
+
+  execute("git-commit-delivery-config") do
+    command("git commit -m \"Add generated delivery configuration\"")
+    cwd delivery_project_dir
+
+    only_if "git status --porcelain |grep \".\""
+  end
+
+
+  execute("git-add-delivery-build-cookbook-files") do
+    command("git add .delivery")
+    cwd delivery_project_dir
+
+    only_if "git status --porcelain |grep \".\""
+  end
+
+  execute("git-commit-delivery-build-cookbook") do
+    command("git commit -m \"Add generated delivery build cookbook\"")
+    cwd delivery_project_dir
+
+    only_if "git status --porcelain |grep \".\""
+  end
+
+  execute("git-return-to-master-branch") do
+    command("git checkout master")
+    cwd delivery_project_dir
+  end
+
+  execute("git-merge-delivery-config-branch") do
+    command("git merge --no-ff add-delivery-configuration")
+    cwd delivery_project_dir
+  end
+
+  execute("git-remove-delivery-config-branch") do
+    command("git branch -d add-delivery-configuration")
+    cwd delivery_project_dir
+  end
+end

data/lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb

@@ -103,17 +103,31 @@ end
 
 # git
 if context.have_git
-  if !context.skip_git_init
+  unless context.skip_git_init
 
     execute("initialize-git") do
       command("git init .")
       cwd cookbook_dir
     end
+
   end
 
   cookbook_file "#{cookbook_dir}/.gitignore" do
     source "gitignore"
   end
+
+  unless context.skip_git_init
+
+    execute("git-add-new-files") do
+      command("git add .")
+      cwd cookbook_dir
+    end
+
+    execute("git-commit-new-files") do
+      command("git commit -m \"Add generated cookbook content\"")
+      cwd cookbook_dir
+    end
+  end
 end
 
 if context.enable_delivery

data/lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb

@@ -1,9 +1,9 @@
-require 'spec_helper'
-
-describe '<%= cookbook_name %>::default' do
-  # Serverspec examples can be found at
-  # http://serverspec.org/resource_types.html
-  it 'does something' do
-    skip 'Replace this with meaningful tests'
-  end
-end
+require 'spec_helper'
+
+describe '<%= cookbook_name %>::default' do
+  # Serverspec examples can be found at
+  # http://serverspec.org/resource_types.html
+  it 'does something' do
+    skip 'Replace this with meaningful tests'
+  end
+end

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "0.15.9"
+  VERSION = "0.15.15"
 end

data/omnibus_overrides.rb

@@ -17,4 +17,4 @@ override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.8"
 override "libzmq", version: "4.0.5"
-override "delivery-cli", version: "0.0.21"
+override "delivery-cli", version: "0.0.23"

data/spec/shared/custom_generator_cookbook.rb

@@ -16,7 +16,13 @@ shared_examples_for "custom generator cookbook" do
 
     let(:argv) { [generator_arg, "--generator-cookbook", generator_cookbook_path] }
 
-    subject(:code_generator) { described_class.new(argv) }
+    let(:stdout_io) { StringIO.new }
+
+    subject(:code_generator) do
+      described_class.new(argv).tap do |gen|
+        allow(gen).to receive(:stdout).and_return(stdout_io)
+      end
+    end
 
     before do
       reset_tempdir

data/spec/shared/setup_git_committer_config.rb

@@ -0,0 +1,54 @@
+#
+# 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 "mixlib/shellout"
+
+RSpec.shared_context("setup_git_committer_config") do
+
+  def _have_git_config_key?(key)
+    cmd = Mixlib::ShellOut.new("git config --global #{key}", returns: [0,1])
+    cmd.run_command
+    cmd.error!
+    cmd.status.success?
+  end
+
+  def _git_config(subcommand_args)
+    cmd = Mixlib::ShellOut.new("git config --global #{subcommand_args}")
+    cmd.run_command
+    cmd.error!
+    cmd
+  end
+
+  before(:all) do
+    unless _have_git_config_key?("user.name")
+      _git_config("user.name \"chefdk_rspec_user\"")
+    end
+    unless _have_git_config_key?("user.email")
+      _git_config("user.email \"chefdk_rspec_user@example.com\"")
+    end
+  end
+
+  after(:all) do
+    if _git_config("user.name").stdout.include?("chefdk_rspec_user")
+      _git_config("--unset user.name")
+    end
+    if _git_config("user.email").stdout.include?("chefdk_rspec_user")
+      _git_config("--unset user.email")
+    end
+  end
+
+end