chef-dk 4.0.60 → 4.1.7

data/lib/chef-dk/command/env.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,17 +15,18 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/cookbook_omnifetch"
-require "chef-dk/ui"
-require "chef-dk/version"
-require "mixlib/shellout"
+require_relative "base"
+require_relative "../cookbook_omnifetch"
+require_relative "../ui"
+require_relative "../version"
+require_relative "../dist"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 require "yaml"
 
 module ChefDK
   module Command
     class Env < ChefDK::Command::Base
-      banner "Usage: chef env"
+      banner "Usage: #{ChefDK::Dist::EXEC} env"
 
       attr_accessor :ui
 
@@ -36,7 +37,7 @@ module ChefDK
 
       def run(params)
         info = {}
-        info["Chef Development Kit"] = Hash.new.tap do |chefdk_env|
+        info["#{ChefDK::Dist::PRODUCT}"] = Hash.new.tap do |chefdk_env|
           chefdk_env["ChefDK"] = chefdk_info
           chefdk_env["Ruby"] = ruby_info
           chefdk_env["Path"] = paths

data/lib/chef-dk/command/exec.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,13 +15,14 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "mixlib/shellout"
+require_relative "base"
+require_relative "../dist"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module ChefDK
   module Command
     class Exec < ChefDK::Command::Base
-      banner "Usage: chef exec SYSTEM_COMMAND"
+      banner "Usage: #{ChefDK::Dist::EXEC} exec SYSTEM_COMMAND"
 
       def run(params)
         # Set ENV directly on the "parent" process (us) before running #exec to

data/lib/chef-dk/command/export.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/export_repo"
-require "chef-dk/configurable"
+require_relative "base"
+require_relative "../ui"
+require_relative "../policyfile_services/export_repo"
+require_relative "../configurable"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -28,15 +29,15 @@ module ChefDK
       include Configurable
 
       banner(<<~E)
-        Usage: chef export [ POLICY_FILE ] DESTINATION_DIRECTORY [options]
+        Usage: #{ChefDK::Dist::EXEC} export [ POLICY_FILE ] DESTINATION_DIRECTORY [options]
 
-        `chef export` creates a Chef Zero compatible Chef repository containing the
-        cookbooks described in a Policyfile.lock.json. The exported repository also
-        contains a .chef/config.rb which configures chef to apply your policy. Once the
+        `#{ChefDK::Dist::EXEC} export` creates a #{ChefDK::Dist::ZERO_PRODUCT} compatible #{ChefDK::Dist::INFRA_PRODUCT} repository containing the
+        cookbooks described in a Policyfile.lock.json. The exported repository also contains
+        a .chef/config.rb which configures #{ChefDK::Dist::INFRA_CLIENT_PRODUCT} to apply your policy. Once the
         exported repo is copied to the target machine, you can apply the policy to the
         machine with:
 
-        `chef-client -z`.
+        `#{ChefDK::Dist::INFRA_CLIENT_CLI} -z`.
 
         See our detailed README for more information:
 
@@ -89,7 +90,7 @@ module ChefDK
           ui.msg("")
           ui.msg("To converge this system with the exported policy, run:")
           ui.msg("  cd #{export_dir}")
-          ui.msg("  chef-client -z")
+          ui.msg("  #{ChefDK::Dist::INFRA_CLIENT_CLI} -z")
         end
         0
       rescue ExportDirNotEmpty => e

data/lib/chef-dk/command/gem.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,18 +15,19 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "rubygems"
+require_relative "base"
+require_relative "../dist"
+require "rubygems" unless defined?(Gem)
 require "rubygems/gem_runner"
 require "rubygems/exceptions"
-require "pp"
+require "pp" unless defined?(PP)
 
 module ChefDK
   module Command
 
     # Forwards all commands to rubygems.
     class GemForwarder < ChefDK::Command::Base
-      banner "Usage: chef gem GEM_COMMANDS_AND_OPTIONS"
+      banner "Usage: #{ChefDK::Dist::EXEC} gem GEM_COMMANDS_AND_OPTIONS"
 
       def run(params)
         retval = Gem::GemRunner.new.run( params.clone )

data/lib/chef-dk/command/generate.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,21 +15,22 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/base"
-require "chef-dk/command/generator_commands"
-require "chef-dk/command/generator_commands/base"
-require "chef-dk/command/generator_commands/cookbook_code_file"
-require "chef-dk/command/generator_commands/cookbook"
-require "chef-dk/command/generator_commands/attribute"
-require "chef-dk/command/generator_commands/cookbook_file"
-require "chef-dk/command/generator_commands/helpers"
-require "chef-dk/command/generator_commands/resource"
-require "chef-dk/command/generator_commands/recipe"
-require "chef-dk/command/generator_commands/template"
-require "chef-dk/command/generator_commands/repo"
-require "chef-dk/command/generator_commands/policyfile"
-require "chef-dk/command/generator_commands/generator_generator"
-require "chef-dk/command/generator_commands/build_cookbook"
+require_relative "base"
+require_relative "generator_commands"
+require_relative "generator_commands/base"
+require_relative "generator_commands/cookbook_code_file"
+require_relative "generator_commands/cookbook"
+require_relative "generator_commands/attribute"
+require_relative "generator_commands/cookbook_file"
+require_relative "generator_commands/helpers"
+require_relative "generator_commands/resource"
+require_relative "generator_commands/recipe"
+require_relative "generator_commands/template"
+require_relative "generator_commands/repo"
+require_relative "generator_commands/policyfile"
+require_relative "generator_commands/generator_generator"
+require_relative "generator_commands/build_cookbook"
+require_relative "../dist"
 
 module ChefDK
   module Command
@@ -52,14 +53,14 @@ module ChefDK
       generator(:file, :CookbookFile, "Generate a cookbook file")
       generator(:helpers, :Helpers, "Generate a cookbook helper file in libraries")
       generator(:resource, :Resource, "Generate a custom resource")
-      generator(:repo, :Repo, "Generate a Chef code repository")
+      generator(:repo, :Repo, "Generate a #{ChefDK::Dist::INFRA_PRODUCT} code repository")
       generator(:policyfile, :Policyfile, "Generate a Policyfile for use with the install/push commands")
-      generator(:generator, :GeneratorGenerator, "Copy ChefDK's generator cookbook so you can customize it")
-      generator(:'build-cookbook', :BuildCookbook, "Generate a build cookbook for use with Chef Workflow (Delivery)")
+      generator(:generator, :GeneratorGenerator, "Copy #{ChefDK::Dist::PRODUCT}'s generator cookbook so you can customize it")
+      generator(:'build-cookbook', :BuildCookbook, "Generate a build cookbook for use with #{ChefDK::Dist::WORKFLOW}")
 
       def self.banner_headline
         <<~E
-          Usage: chef generate GENERATOR [options]
+          Usage: #{ChefDK::Dist::EXEC} generate GENERATOR [options]
 
           Available generators:
         E

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

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require "mixlib/cli"
+require "mixlib/cli" unless defined?(Mixlib::CLI)
 require "rbconfig"
-require "pathname"
-require "chef-dk/command/base"
-require "chef-dk/chef_runner"
-require "chef-dk/generator"
+require "pathname" unless defined?(Pathname)
+require_relative "base"
+require_relative "../chef_runner"
+require_relative "../generator"
 
 module ChefDK
   module Command

data/lib/chef-dk/command/generator_commands/attribute.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 attribute [path/to/cookbook_root] NAME
       class Attribute < CookbookCodeFile
 
-        banner "Usage: chef generate attribute [path/to/cookbook] NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate attribute [path/to/cookbook] NAME [options]"
 
         options.merge!(SharedGeneratorOptions.options)
 

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require "chef-dk/configurable"
-require "chef-dk/command/generator_commands"
+require_relative "../../configurable"
+require_relative "../generator_commands"
 
-require "chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext"
-require "chef-dk/command/generator_commands/chef_exts/generator_desc_resource"
+require_relative "chef_exts/recipe_dsl_ext"
+require_relative "chef_exts/generator_desc_resource"
 
 module ChefDK
   module Command

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2016-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 BuildCookbook < Base
 
-        banner "Usage: chef generate build-cookbook NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate build-cookbook NAME [options]"
 
         attr_reader :errors
 

data/lib/chef-dk/command/generator_commands/cookbook.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
@@ -29,7 +30,7 @@ module ChefDK
       # the relevant generators.
       class Cookbook < Base
 
-        banner "Usage: chef generate cookbook NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate cookbook NAME [options]"
 
         attr_reader :errors
 
@@ -57,7 +58,7 @@ module ChefDK
         option :workflow,
           short:        "-w",
           long:         "--workflow",
-          description:  "Generate a cookbook with a full Chef Workflow (Delivery) build cookbook.",
+          description:  "Generate a cookbook with a full #{ChefDK::Dist::WORKFLOW} build cookbook.",
           boolean:      true,
           default:      false
 
@@ -70,7 +71,7 @@ module ChefDK
 
         option :pipeline,
           long:         "--pipeline PIPELINE",
-          description:  "Use PIPELINE to set target branch to something other than master for the Workflow build_cookbook",
+          description:  "Use PIPELINE to set target branch to something other than master for the #{ChefDK::Dist::WORKFLOW} build_cookbook",
           default:      "master"
 
         options.merge!(SharedGeneratorOptions.options)

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef-dk/command/generator_commands/base"
+require_relative "base"
 
 module ChefDK
   module Command

data/lib/chef-dk/command/generator_commands/cookbook_file.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
@@ -27,7 +28,7 @@ module ChefDK
           long: "--source SOURCE_FILE",
           description: "Copy content from SOURCE_FILE"
 
-        banner "Usage: chef generate file [path/to/cookbook] NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate file [path/to/cookbook] NAME [options]"
 
         options.merge!(SharedGeneratorOptions.options)
 

data/lib/chef-dk/command/generator_commands/generator_generator.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 "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
-require "chef-dk/configurable"
-require "chef-dk/ui"
-require "chef-dk/command/generator_commands/base"
+require_relative "../../configurable"
+require_relative "../../ui"
+require_relative "base"
+require_relative "../../dist"
 
 module ChefDK
   module Command
@@ -32,7 +33,7 @@ module ChefDK
       # `GeneratorGenerator` to avoid causing a conflict.
       class GeneratorGenerator < Base
 
-        banner "Usage: chef generate generator [ PATH ] [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate generator [ PATH ] [options]"
 
         attr_reader :destination_dir
         attr_accessor :ui
@@ -108,8 +109,8 @@ module ChefDK
         def metadata_rb
           <<~METADATA
             name             '#{cookbook_name}'
-            description      'Custom code generator cookbook for use with ChefDK'
-            long_description 'Custom code generator cookbook for use with ChefDK'
+            description      'Custom code generator cookbook for use with #{ChefDK::Dist::PRODUCT}'
+            long_description 'Custom code generator cookbook for use with #{ChefDK::Dist::PRODUCT}'
             version          '0.1.0'
 
           METADATA

data/lib/chef-dk/command/generator_commands/helpers.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 helpers [path/to/cookbook_root] NAME
       class Helpers < CookbookCodeFile
 
-        banner "Usage: chef generate helpers [path/to/cookbook] NAME [options]"
+        banner "Usage: #{ChefDK::Dist::EXEC} generate helpers [path/to/cookbook] NAME [options]"
 
         options.merge!(SharedGeneratorOptions.options)