chef-dk 4.0.60 → 4.1.7

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018, Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,8 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/generator_commands/base"
+require_relative "base"
+require_relative "../../dist"
 
 module ChefDK
   module Command
@@ -23,7 +24,7 @@ module ChefDK
 
       class Policyfile < Base
 
-        banner "Usage: chef generate policyfile [NAME] [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate policyfile [NAME] [options]"
 
         options.merge!(SharedGeneratorOptions.options)
 

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,8 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/generator_commands/cookbook_code_file"
+require_relative "cookbook_code_file"
+require_relative "../../dist"
 
 module ChefDK
   module Command
@@ -23,7 +24,7 @@ module ChefDK
       # chef generate recipe [path/to/cookbook/root] name
       class Recipe < CookbookCodeFile
 
-        banner "Usage: chef generate recipe [path/to/cookbook] NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate recipe [path/to/cookbook] NAME [options]"
 
         options.merge!(SharedGeneratorOptions.options)
 

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,8 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/generator_commands/base"
+require_relative "base"
+require_relative "../../dist"
 
 module ChefDK
   module Command
@@ -27,7 +28,7 @@ module ChefDK
       # Generates a full "chef-repo" directory structure.
       class Repo < Base
 
-        banner "Usage: chef generate repo NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate repo NAME [options]"
 
         attr_reader :errors
         attr_reader :repo_name_or_path

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,8 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/generator_commands/cookbook_code_file"
+require_relative "cookbook_code_file"
+require_relative "../../dist"
 
 module ChefDK
   module Command
@@ -23,7 +24,7 @@ module ChefDK
       # chef generate resource [path/to/cookbook_root] NAME
       class Resource < CookbookCodeFile
 
-        banner "Usage: chef generate resource [path/to/cookbook] NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate resource [path/to/cookbook] NAME [options]"
 
         options.merge!(SharedGeneratorOptions.options)
 

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,8 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/generator_commands/cookbook_code_file"
+require_relative "cookbook_code_file"
+require_relative "../../dist"
 
 module ChefDK
   module Command
@@ -28,7 +29,7 @@ module ChefDK
           long: "--source SOURCE_FILE",
           description: "Copy content from SOURCE_FILE"
 
-        banner "Usage: chef generate template [path/to/cookbook] NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate template [path/to/cookbook] NAME [options]"
 
         options.merge!(SharedGeneratorOptions.options)
 

data/lib/chef-dk/command/install.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,11 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/ui"
-require "chef-dk/policyfile_services/install"
-require "chef-dk/configurable"
+require_relative "base"
+require_relative "../ui"
+require_relative "../policyfile_services/install"
+require_relative "../configurable"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -28,13 +29,13 @@ module ChefDK
       include Configurable
 
       banner(<<~E)
-        Usage: chef install [ POLICY_FILE ] [options]
+        Usage: #{ChefDK::Dist::EXEC} install [ POLICY_FILE ] [options]
 
-        `chef install` evaluates a `Policyfile.rb` to find a compatible set of
+        `#{ChefDK::Dist::EXEC} install` evaluates a `Policyfile.rb` to find a compatible set of
         cookbooks for the policy's run_list and caches them locally. It emits a
         Policyfile.lock.json describing the locked cookbook set. You can use the
         lockfile to install the locked cookbooks on another machine. You can also push
-        the lockfile to a "policy group" on a Chef Infra Server and apply that exact set of
+        the lockfile to a "policy group" on a #{ChefDK::Dist::SERVER_PRODUCT} and apply that exact set of
         cookbooks to nodes in your infrastructure.
 
         See our detailed README for more information:

data/lib/chef-dk/command/provision.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,9 @@
 
 require "ostruct"
 
-require "chef-dk/command/base"
-require "chef-dk/chef_runner"
+require_relative "base"
+require_relative "../chef_runner"
+require_relative "../dist"
 
 module ChefDK
 
@@ -26,10 +27,10 @@ module ChefDK
 
     class Provision < Base
 
-      banner("DEPRECATED: Chef provisioning has been removed from ChefDK / Workstation. If you require Chef Provisioning you will need to install an earlier version of these products!")
+      banner("DEPRECATED: Chef provisioning has been removed from #{ChefDK::Dist::PRODUCT}. If you require Chef Provisioning you will need to install an earlier version of these products!")
 
       def run(params = [])
-        raise "Chef provisioning has been removed from ChefDK / Workstation. If you require Chef Provisioning you will need to install an earlier version of these products!"
+        raise "Chef provisioning has been removed from #{ChefDK::Dist::PRODUCT}. If you require Chef Provisioning you will need to install an earlier version of these products!"
       end
 
     end

data/lib/chef-dk/command/push.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,11 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/ui"
-require "chef-dk/policyfile_services/push"
-require "chef-dk/configurable"
+require_relative "base"
+require_relative "../ui"
+require_relative "../policyfile_services/push"
+require_relative "../configurable"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -28,9 +29,9 @@ module ChefDK
       include Configurable
 
       banner(<<~E)
-        Usage: chef push POLICY_GROUP [ POLICY_FILE ] [options]
+        Usage: #{ChefDK::Dist::EXEC} push POLICY_GROUP [ POLICY_FILE ] [options]
 
-        `chef push` Uploads an existing Policyfile.lock.json to a Chef Infra Server, along
+        `#{ChefDK::Dist::EXEC} push` Uploads an existing Policyfile.lock.json to a #{ChefDK::Dist::SERVER_PRODUCT}, along
         with all the cookbooks contained in the policy lock. The policy lock is applied
         to a specific POLICY_GROUP, which is a set of nodes that share the same
         run_list and cookbooks.

data/lib/chef-dk/command/push_archive.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software Inc.
+# Copyright:: Copyright (c) 2015-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,11 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/ui"
-require "chef-dk/policyfile_services/push_archive"
-require "chef-dk/configurable"
+require_relative "base"
+require_relative "../ui"
+require_relative "../policyfile_services/push_archive"
+require_relative "../configurable"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -28,9 +29,9 @@ module ChefDK
       include Configurable
 
       banner(<<~E)
-        Usage: chef push-archive POLICY_GROUP ARCHIVE_FILE [options]
+        Usage: #{ChefDK::Dist::EXEC} push-archive POLICY_GROUP ARCHIVE_FILE [options]
 
-        `chef push-archive` publishes a policy archive to a Chef Infra Server. Policy
+        `#{ChefDK::Dist::EXEC} push-archive` publishes a policy archive to a #{ChefDK::Dist::SERVER_PRODUCT}. Policy
         archives can be created with `chef export -a`. The policy will be applied to
         the given POLICY_GROUP, which is a set of nodes that share the same
         run_list and cookbooks.

data/lib/chef-dk/command/shell_init.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +17,11 @@
 
 require "erb"
 
-require "chef-dk/commands_map"
-require "chef-dk/builtin_commands"
-require "chef-dk/command/base"
-require "mixlib/shellout"
+require_relative "../commands_map"
+require_relative "../builtin_commands"
+require_relative "base"
+require_relative "../dist"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module ChefDK
 
@@ -44,28 +45,27 @@ module ChefDK
       SUPPORTED_SHELLS = %w{ bash fish zsh sh powershell posh}.map(&:freeze).freeze
 
       banner(<<~HELP)
-        Usage: chef shell-init
+        Usage: #{ChefDK::Dist::EXEC} shell-init
 
-        `chef shell-init` modifies your shell environment to make ChefDK or Workstation your
-        default Ruby.
+        `#{ChefDK::Dist::EXEC} shell-init` modifies your shell environment to make #{ChefDK::Dist::PRODUCT} your default Ruby.
 
           To enable for just the current shell session:
 
             In sh, bash, and zsh:
-              eval "$(chef shell-init SHELL_NAME)"
+              eval "$(#{ChefDK::Dist::EXEC} shell-init SHELL_NAME)"
             In fish:
-              eval (chef shell-init fish)
+              eval (#{ChefDK::Dist::EXEC} shell-init fish)
             In Powershell:
-              chef shell-init powershell | Invoke-Expression
+              #{ChefDK::Dist::EXEC} shell-init powershell | Invoke-Expression
 
           To permanently enable:
 
             In sh, bash, and zsh:
-              echo 'eval "$(chef shell-init SHELL_NAME)"' >> ~/.YOUR_SHELL_RC_FILE
+              echo 'eval "$(#{ChefDK::Dist::EXEC} shell-init SHELL_NAME)"' >> ~/.YOUR_SHELL_RC_FILE
             In fish:
-              echo 'eval (chef shell-init SHELL_NAME)' >> ~/.config/fish/config.fish
+              echo 'eval (#{ChefDK::Dist::EXEC} shell-init SHELL_NAME)' >> ~/.config/fish/config.fish
             In Powershell
-              "chef shell-init powershell | Invoke-Expression" >> $PROFILE
+              "#{ChefDK::Dist::EXEC} shell-init powershell | Invoke-Expression" >> $PROFILE
 
         OPTIONS:
 

data/lib/chef-dk/command/show_policy.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software Inc.
+# Copyright:: Copyright (c) 2015-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +15,12 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/ui"
-require "chef-dk/configurable"
-require "chef-dk/policyfile/lister"
-require "chef-dk/policyfile_services/show_policy"
+require_relative "base"
+require_relative "../ui"
+require_relative "../configurable"
+require_relative "../policyfile/lister"
+require_relative "../policyfile_services/show_policy"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -27,9 +28,9 @@ module ChefDK
     class ShowPolicy < Base
 
       banner(<<~BANNER)
-        Usage: chef show-policy [POLICY_NAME [POLICY_GROUP]] [options]
+        Usage: #{ChefDK::Dist::EXEC} show-policy [POLICY_NAME [POLICY_GROUP]] [options]
 
-        `chef show-policy` Displays the revisions of policyfiles on the server. By
+        `#{ChefDK::Dist::EXEC} show-policy` Displays the revisions of policyfiles on the server. By
         default, only active policy revisions are shown. Use the `--orphans` options to
         show policy revisions that are not assigned to any policy group.
 

data/lib/chef-dk/command/undelete.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software Inc.
+# Copyright:: Copyright (c) 2015-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +15,11 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/ui"
-require "chef-dk/configurable"
-require "chef-dk/policyfile_services/undelete"
+require_relative "base"
+require_relative "../ui"
+require_relative "../configurable"
+require_relative "../policyfile_services/undelete"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -26,14 +27,14 @@ module ChefDK
     class Undelete < Base
 
       banner(<<~BANNER)
-        Usage: chef undelete [--list | --id ID] [options]
+        Usage: #{ChefDK::Dist::EXEC} undelete [--list | --id ID] [options]
 
-        `chef undelete` helps you recover quickly if you've deleted a policy or policy
+        `#{ChefDK::Dist::EXEC} undelete` helps you recover quickly if you've deleted a policy or policy
         group in error. When run with no arguements, it lists the available undo
         operations. To undo the last delete operation, use `chef undelete --last`.
 
         CAVEATS:
-        `chef undelete` doesn't detect conflicts. If a deleted item has been recreated,
+        `#{ChefDK::Dist::EXEC} undelete` doesn't detect conflicts. If a deleted item has been recreated,
         running `chef undelete` will overwrite it.
 
         Undo information does not include cookbooks that might be referenced by

data/lib/chef-dk/command/update.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +15,12 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/ui"
-require "chef-dk/policyfile_services/install"
-require "chef-dk/policyfile_services/update_attributes"
-require "chef-dk/configurable"
+require_relative "base"
+require_relative "../ui"
+require_relative "../policyfile_services/install"
+require_relative "../policyfile_services/update_attributes"
+require_relative "../configurable"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -29,9 +30,9 @@ module ChefDK
       include Configurable
 
       banner(<<~BANNER)
-        Usage: chef update [ POLICY_FILE ] [options] [cookbook_1] [...]
+        Usage: #{ChefDK::Dist::EXEC} update [ POLICY_FILE ] [options] [cookbook_1] [...]
 
-        `chef update` reads your `Policyfile.rb`, applies any changes, re-solves the
+        `#{ChefDK::Dist::EXEC} update` reads your `Policyfile.rb`, applies any changes, re-solves the
         dependencies and emits an updated `Policyfile.lock.json`. The new locked policy
         will reflect any changes to the `run_list` and pull in any cookbook updates
         that are compatible with the version constraints stated in your `Policyfile.rb`.

data/lib/chef-dk/command/verify.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/exceptions"
-require "chef-dk/component_test"
+require_relative "base"
+require_relative "../exceptions"
+require_relative "../component_test"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -25,7 +26,7 @@ module ChefDK
 
       include ChefDK::Helpers
 
-      banner "Usage: chef verify [component, ...] [options]"
+      banner "Usage: #{ChefDK::Dist::EXEC} verify [component, ...] [options]"
 
       option :omnibus_dir,
         long: "--omnibus-dir OMNIBUS_DIR",
@@ -193,6 +194,11 @@ module ChefDK
         c.smoke_test { sh("#{bin("chef-run")} -v") }
       end
 
+      add_component "foodcritic" do |c|
+        c.gem_base_dir = "foodcritic"
+        c.smoke_test { sh("#{embedded_bin("foodcritic --list")}") } # foodcritic -v exits with 2 so use --list which exits 0
+      end
+
       add_component "chefspec" do |c|
         c.gem_base_dir = "chefspec"
         c.unit_test do
@@ -224,21 +230,26 @@ module ChefDK
         end
       end
 
-      add_component "generated-cookbooks-pass-chefspec" do |c|
-
+      add_component "generated-cookbooks-pass-chefspec-and-foodcritic" do |c|
         c.gem_base_dir = "chef-dk"
         c.smoke_test do
           tmpdir do |cwd|
             sh("#{bin("chef")} generate cookbook example", cwd: cwd)
             cb_cwd = File.join(cwd, "example")
             sh(embedded_bin("rspec"), cwd: cb_cwd)
+            sh(embedded_bin("foodcritic --tags ~supermarket ."), cwd: cb_cwd)
           end
         end
       end
 
+      add_component "chef-vault" do |c|
+        c.gem_base_dir = "chef-vault"
+        c.smoke_test { sh("#{embedded_bin("chef-vault -h")}") }
+      end
+
       add_component "fauxhai" do |c|
         c.gem_base_dir = "fauxhai"
-        c.smoke_test { sh("#{embedded_bin("gem")} list fauxhai") }
+        c.smoke_test { sh(embedded_bin("fauxhai")) }
       end
 
       add_component "knife-spork" do |c|
@@ -246,12 +257,6 @@ module ChefDK
         c.smoke_test { sh("#{bin("knife")} spork info") }
       end
 
-      add_component "kitchen-vagrant" do |c|
-        c.gem_base_dir = "kitchen-vagrant"
-        # The build is not passing in travis, so no tests
-        c.smoke_test { sh("#{embedded_bin("gem")} list kitchen-vagrant") }
-      end
-
       add_component "package installation" do |c|
 
         c.gem_base_dir = "chef-dk"
@@ -283,6 +288,7 @@ module ChefDK
             sh!("#{usr_bin_path("ohai")} -v")
             sh!("#{usr_bin_path("foodcritic")} -V")
             sh!("#{usr_bin_path("inspec")} version")
+            sh!("#{usr_bin_path("dco")} -h")
           end
 
           # Test blocks are expected to return a Mixlib::ShellOut compatible
@@ -296,7 +302,7 @@ module ChefDK
         c.gem_base_dir = "chef"
 
         test = <<-EOF.gsub(/^\s+/, "")
-        require "net/http"
+        require "net/http" unless defined?(Net::HTTP)
 
         uris = %w{https://www.google.com https://chef.io/ https://ec2.amazonaws.com}
         uris.each do |uri|