[DO NOT MERGE] Updating the chef references to chef-cli

lib/chef-cli/dist.rb

@@ -36,7 +36,7 @@ class Dist
     WORKFLOW = "Chef Workflow (Delivery)".freeze
 
     # The chef executable, as in `chef gem install` or `chef generate cookbook`
-    EXEC = "chef".freeze
+    EXEC = "chef-cli".freeze
 
     # Chef-Zero's product name
     ZERO_PRODUCT = "Chef Infra Zero".freeze

spec/shared/a_file_generator.rb

@@ -40,7 +40,7 @@ def generator_context
     let(:argv) { [] }
 
     it "emits an error message and exits" do
-      expected_stdout = "Usage: chef generate #{generator_name} [path/to/cookbook] NAME [options]"
+      expected_stdout = "Usage: chef-cli generate #{generator_name} [path/to/cookbook] NAME [options]"
 
       expect(recipe_generator.run).to eq(1)
       expect(stdout).to include(expected_stdout)
@@ -85,7 +85,7 @@ def generator_context
       let(:argv) { [ new_file_name ] }
 
       it "emits an error message and exits" do
-        expected_stdout = "Usage: chef generate #{generator_name} [path/to/cookbook] NAME [options]"
+        expected_stdout = "Usage: chef-cli generate #{generator_name} [path/to/cookbook] NAME [options]"
         expected_stderr = "Error: Directory #{Dir.pwd} is not a cookbook\n"
 
         expect(recipe_generator.run).to eq(1)

spec/unit/cli_spec.rb

@@ -46,9 +46,9 @@ def stderr
       Patents: #{ChefCLI::Dist::PATENTS}
 
       Usage:
-          chef -h/--help
-          chef -v/--version
-          chef command [arguments...] [options...]
+          chef-cli -h/--help
+          chef-cli -v/--version
+          chef-cli command [arguments...] [options...]
 
       Available Commands:
           gem      Runs the `gem` command in context of the embedded ruby
@@ -290,7 +290,7 @@ def test_result
           run_cli_with_sanity_check(0)
           expect(stdout).to eq(base_help_message)
           expect(stderr).to include("please reverse that order")
-          expect(stderr).to include("chef shell-init")
+          expect(stderr).to include("chef-cli shell-init")
         end
 
         it "complains if only embedded is present" do
@@ -300,7 +300,7 @@ def test_result
           run_cli_with_sanity_check(0)
           expect(stdout).to eq(base_help_message)
           expect(stderr).to include("you must add")
-          expect(stderr).to include("chef shell-init")
+          expect(stderr).to include("chef-cli shell-init")
         end
 
         it "passes when both are present in the correct order" do
@@ -349,7 +349,7 @@ def test_result
           run_cli_with_sanity_check(0)
           expect(stdout).to eq(base_help_message)
           expect(stderr).to include("please reverse that order")
-          expect(stderr).to include("chef shell-init")
+          expect(stderr).to include("chef-cli shell-init")
         end
 
         it "complains if only embedded is present" do
@@ -359,7 +359,7 @@ def test_result
           run_cli_with_sanity_check(0)
           expect(stdout).to eq(base_help_message)
           expect(stderr).to include("you must add")
-          expect(stderr).to include("chef shell-init")
+          expect(stderr).to include("chef-cli shell-init")
         end
 
         it "passes when both are present in the correct order" do

spec/unit/command/env_spec.rb

@@ -29,7 +29,7 @@
   let(:omnibus_bin_dir) { "/foo/bin" }
 
   it "has a usage banner" do
-    expect(command_instance.banner).to eq("Usage: chef env")
+    expect(command_instance.banner).to eq("Usage: chef-cli env")
   end
 
   describe "when running from within an omnibus install" do

spec/unit/command/exec_spec.rb

@@ -28,7 +28,7 @@ def run_command
   end
 
   it "has a usage banner" do
-    expect(command_instance.banner).to eq("Usage: chef exec SYSTEM_COMMAND")
+    expect(command_instance.banner).to eq("Usage: chef-cli exec SYSTEM_COMMAND")
   end
 
   describe "when locating omnibus directory" do

spec/unit/command/generate_spec.rb

@@ -75,7 +75,7 @@ def stderr
   context "with a generator defined" do
     let(:expected_help_message) do
       <<~E
-        Usage: chef generate GENERATOR [options]
+        Usage: chef-cli generate GENERATOR [options]
 
         Available generators:
           example  this is a test

spec/unit/command/generator_commands/cookbook_spec.rb

@@ -131,7 +131,7 @@ def generator_context
   context "when given invalid/incomplete arguments" do
 
     let(:expected_help_message) do
-      "Usage: chef generate cookbook NAME [options]\n"
+      "Usage: chef-cli generate cookbook NAME [options]\n"
     end
 
     def with_argv(argv)

spec/unit/command/generator_commands/policyfile_spec.rb

@@ -212,7 +212,7 @@ def generator_context
     let(:argv) { %w{ foo bar baz } }
 
     it "shows usage and exits" do
-      expected_stdout = "Usage: chef generate policyfile [NAME] [options]"
+      expected_stdout = "Usage: chef-cli generate policyfile [NAME] [options]"
 
       expect(generator.run).to eq(1)
       expect(stderr).to include(expected_stdout)