chef-dk 3.13.1 → 4.0.60

data/spec/unit/policyfile_services/export_repo_spec.rb

@@ -269,7 +269,7 @@ describe ChefDK::PolicyfileServices::ExportRepo do
 
           it "creates a working local mode configuration file" do
             expected_config_text = <<~CONFIG
-              ### Chef Client Configuration ###
+              ### Chef Infra Client Configuration ###
               # The settings in this file will configure chef to apply the exported policy in
               # this directory. To use it, run:
               #
@@ -358,21 +358,21 @@ describe ChefDK::PolicyfileServices::ExportRepo do
 
         context "When the export dir has conflicting content" do
 
-          let(:non_conflicting_file_in_export_dir) { File.join(Dir["#{export_dir}"], "some_random_cruft") }
+          let(:non_conflicting_file_in_export_dir) { File.join(export_dir, "some_random_cruft") }
 
-          let(:cookbook_artifacts_dir) { File.join(Dir["#{export_dir}"], "cookbook_artifacts") }
+          let(:cookbook_artifacts_dir) { File.join(export_dir, "cookbook_artifacts") }
 
           let(:file_in_cookbook_artifacts_dir) { File.join(cookbook_artifacts_dir, "some_random_cruft") }
 
-          let(:policies_dir) { File.join(Dir["#{export_dir}"], "policies") }
+          let(:policies_dir) { File.join(export_dir, "policies") }
 
-          let(:policy_groups_dir) { File.join(Dir["#{export_dir}"], "policy_groups") }
+          let(:policy_groups_dir) { File.join(export_dir, "policy_groups") }
 
           let(:extra_policy_item) { File.join(policies_dir, "leftover-policy.json") }
 
           let(:extra_policy_group_item) { File.join(policy_groups_dir, "leftover-policy-group.json") }
 
-          let(:conflicting_policyfile_lock) { File.join(Dir["#{export_dir}"], "Policyfile.lock.json") }
+          let(:conflicting_policyfile_lock) { File.join(export_dir, "Policyfile.lock.json") }
 
           before do
             FileUtils.mkdir_p(export_dir)

data/spec/unit/policyfile_services/push_archive_spec.rb

@@ -287,8 +287,8 @@ describe ChefDK::PolicyfileServices::PushArchive do
               This archive is in an unsupported format.
 
               This archive was created with an older version of ChefDK. This version of
-              ChefDK does not support archives in the older format. Re-create the archive
-              with a newer version of ChefDK or downgrade ChefDK.
+              ChefDK does not support archives in the older format. Please Re-create the
+              archive with a newer version of ChefDK or Workstation.
             MESSAGE
             expect(exception_cause.message).to eq(msg)
           end

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -93,7 +93,7 @@ describe ChefDK::ServiceExceptionInspectors::HTTP do
 
   end
 
-  context "with a JSON response body in the standard Chef Server format" do
+  context "with a JSON response body in the standard Chef Infra Server format" do
 
     let(:response_body) { %q[{"error":["Field 'name' invalid"]}] }
 

data/warning.txt

@@ -1,8 +1,9 @@
-Thanks for installing chef-dk! Unfortunately, since ChefDK is
+Thanks for installing chef-dk! Unfortunately, since Chef Development Kit is
 supposed to be installed as the omnibus binaries in order to support various
 platforms, this is not the official way to install chef-dk.
 
 Please download the latest version for your operating system from the URL below,
 and make sure you have uninstalled your chef-dk gem to avoid conflicts:
 
-https://downloads.chef.io/chefdk
+https://downloads.chef.io/chef-dk/
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 4.0.60
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -183,19 +183,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: chef-provisioning
+  name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +279,6 @@ files:
 - lib/chef-dk/command/gem.rb
 - lib/chef-dk/command/generate.rb
 - lib/chef-dk/command/generator_commands.rb
-- lib/chef-dk/command/generator_commands/app.rb
 - lib/chef-dk/command/generator_commands/attribute.rb
 - lib/chef-dk/command/generator_commands/base.rb
 - lib/chef-dk/command/generator_commands/build_cookbook.rb
@@ -390,7 +395,6 @@ files:
 - lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb
 - lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb
 - lib/chef-dk/skeletons/code_generator/metadata.rb
-- lib/chef-dk/skeletons/code_generator/recipes/app.rb
 - lib/chef-dk/skeletons/code_generator/recipes/attribute.rb
 - lib/chef-dk/skeletons/code_generator/recipes/build_cookbook.rb
 - lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb
@@ -450,7 +454,6 @@ files:
 - spec/unit/command/exec_spec.rb
 - spec/unit/command/export_spec.rb
 - spec/unit/command/generate_spec.rb
-- spec/unit/command/generator_commands/app_spec.rb
 - spec/unit/command/generator_commands/attribute_spec.rb
 - spec/unit/command/generator_commands/base_spec.rb
 - spec/unit/command/generator_commands/build_cookbook_spec.rb
@@ -466,7 +469,6 @@ files:
 - spec/unit/command/generator_commands/resource_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
 - spec/unit/command/install_spec.rb
-- spec/unit/command/provision_spec.rb
 - spec/unit/command/push_archive_spec.rb
 - spec/unit/command/push_spec.rb
 - spec/unit/command/shell_init_spec.rb
@@ -498,10 +500,10 @@ files:
 - spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/chefignore
 - spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/metadata.rb
 - spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/recipes/default.rb
-- spec/unit/fixtures/cookbook_cache/foo-1.0.0/.kitchen.yml
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/Berksfile
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/README.md
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/chefignore
+- spec/unit/fixtures/cookbook_cache/foo-1.0.0/kitchen.yml
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/metadata.rb
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/recipes/default.rb
 - spec/unit/fixtures/cookbooks_api/chef_server_universe.json
@@ -627,15 +629,16 @@ homepage: https://www.chef.io/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: |
-  Thanks for installing chef-dk! Unfortunately, since ChefDK is
+post_install_message: |+
+  Thanks for installing chef-dk! Unfortunately, since Chef Development Kit is
   supposed to be installed as the omnibus binaries in order to support various
   platforms, this is not the official way to install chef-dk.
 
   Please download the latest version for your operating system from the URL below,
   and make sure you have uninstalled your chef-dk gem to avoid conflicts:
 
-  https://downloads.chef.io/chefdk
+  https://downloads.chef.io/chef-dk/
+
 rdoc_options: []
 require_paths:
 - lib
@@ -643,7 +646,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -677,7 +680,6 @@ test_files:
 - spec/unit/command/exec_spec.rb
 - spec/unit/command/export_spec.rb
 - spec/unit/command/generate_spec.rb
-- spec/unit/command/generator_commands/app_spec.rb
 - spec/unit/command/generator_commands/attribute_spec.rb
 - spec/unit/command/generator_commands/base_spec.rb
 - spec/unit/command/generator_commands/build_cookbook_spec.rb
@@ -693,7 +695,6 @@ test_files:
 - spec/unit/command/generator_commands/resource_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
 - spec/unit/command/install_spec.rb
-- spec/unit/command/provision_spec.rb
 - spec/unit/command/push_archive_spec.rb
 - spec/unit/command/push_spec.rb
 - spec/unit/command/shell_init_spec.rb
@@ -725,10 +726,10 @@ test_files:
 - spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/chefignore
 - spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/metadata.rb
 - spec/unit/fixtures/cookbook_cache/dep_of_bar-1.2.3/recipes/default.rb
-- spec/unit/fixtures/cookbook_cache/foo-1.0.0/.kitchen.yml
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/Berksfile
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/README.md
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/chefignore
+- spec/unit/fixtures/cookbook_cache/foo-1.0.0/kitchen.yml
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/metadata.rb
 - spec/unit/fixtures/cookbook_cache/foo-1.0.0/recipes/default.rb
 - spec/unit/fixtures/cookbooks_api/chef_server_universe.json

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

@@ -1,106 +0,0 @@
-#
-# Copyright:: Copyright (c) 2014-2018 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 "chef-dk/command/generator_commands/base"
-
-module ChefDK
-  module Command
-    module GeneratorCommands
-
-      # ## App
-      # chef generate app path/to/basename --generator-cookbook=path/to/generator
-      #
-      # Generates a full "application" directory structure.
-      class App < Base
-
-        banner "Usage: chef generate app NAME [options]"
-
-        attr_reader :errors
-        attr_reader :app_name_or_path
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @app_name = nil
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-          else
-            err(opt_parser)
-            1
-          end
-        rescue ChefDK::ChefRunnerError => e
-          err("ERROR: #{e}")
-          1
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:app_root, app_root)
-          Generator.add_attr_to_context(:app_name, app_name)
-          Generator.add_attr_to_context(:cookbook_root, cookbook_root)
-          Generator.add_attr_to_context(:cookbook_name, cookbook_name)
-          Generator.add_attr_to_context(:recipe_name, recipe_name)
-        end
-
-        def recipe
-          "app"
-        end
-
-        def recipe_name
-          "default"
-        end
-
-        def app_name
-          File.basename(app_full_path)
-        end
-
-        def app_root
-          File.dirname(app_full_path)
-        end
-
-        def cookbook_root
-          File.join(app_full_path, "cookbooks")
-        end
-
-        def cookbook_name
-          app_name
-        end
-
-        def app_full_path
-          File.expand_path(app_name_or_path, Dir.pwd)
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          @app_name_or_path = arguments[0]
-          @params_valid = false unless @app_name_or_path
-        end
-
-        def params_valid?
-          @params_valid
-        end
-      end
-    end
-  end
-end

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

@@ -1,87 +0,0 @@
-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
-
-# Test Kitchen
-template "#{app_dir}/kitchen.yml" do
-  source 'kitchen.yml.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-# Inspec
-directory "#{app_dir}/test/integration/default" do
-  recursive true
-end
-
-template "#{app_dir}/test/integration/default/default_test.rb" do
-  source 'inspec_default_test.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
-  unless 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