chef-cli 3.1.6 → 5.2.0

data/spec/unit/command/generator_commands/recipe_spec.rb

@@ -35,4 +35,38 @@ describe ChefCLI::Command::GeneratorCommands::Recipe do
 
   end
 
+  context "when YAML recipe flag is passed" do
+
+    let(:argv) { %w{some_recipe --yaml} }
+    let(:expected_cookbook_root) { tempdir }
+    let(:cookbook_name) { "example_cookbook" }
+    let(:cookbook_path) { File.join(tempdir, cookbook_name) }
+
+    let(:generator_name) { "recipe" }
+    let(:generated_files) do
+      [ "recipes/some_recipe.yml",
+                              "spec/spec_helper.rb",
+                              "spec/unit/recipes/some_recipe_spec.rb",
+                              "test/integration/default/some_recipe_test.rb",
+                            ]
+    end
+    let(:new_file_name) { "some_recipe" }
+
+    before do
+      FileUtils.cp_r(File.join(fixtures_path, "example_cookbook"), tempdir)
+    end
+
+    it "creates a new recipe" do
+      Dir.chdir(cookbook_path) do
+        allow(recipe_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+        recipe_generator.run
+      end
+
+      generated_files.each do |expected_file|
+        expect(File).to exist(File.join(cookbook_path, expected_file))
+      end
+    end
+
+  end
+
 end

data/spec/unit/helpers_spec.rb

@@ -0,0 +1,111 @@
+# 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 "spec_helper"
+require "chef-cli/helpers"
+
+describe ChefCLI::Helpers do
+  context "path_check!" do
+
+    before do
+      allow(Gem).to receive(:ruby).and_return(ruby_path)
+    end
+
+    context "when installed via omnibus" do
+      before do
+        allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return true
+      end
+
+      context "on unix" do
+
+        let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, "bin")) }
+        let(:omnibus_embedded_bin_dir) { "/opt/chef-workstation/embedded/bin" }
+        let(:omnibus_bin_dir) { "/opt/chef-workstation/bin" }
+        let(:expected_PATH) { [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ] }
+        let(:expected_GEM_ROOT) { Gem.default_dir }
+        let(:expected_GEM_HOME) { Gem.user_dir }
+        let(:expected_GEM_PATH) { Gem.path.join(File::PATH_SEPARATOR) }
+        let(:ruby_path) { "/opt/chef-workstation/embedded/bin/ruby" }
+
+        it "#omnibus_env path" do
+          allow(ChefCLI::Helpers).to receive(:omnibus_bin_dir).and_return("/opt/chef-workstation/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_embedded_bin_dir).and_return("/opt/chef-workstation/embedded/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_env).and_return(
+            "PATH" => expected_PATH.flatten.uniq.join(File::PATH_SEPARATOR),
+            "GEM_ROOT" => expected_GEM_ROOT,
+            "GEM_HOME" => expected_GEM_HOME,
+            "GEM_PATH" => expected_GEM_PATH
+          )
+        end
+      end
+
+      context "on windows" do
+        let(:ruby_path) { "c:/opscode/chef-workstation/embedded/bin/ruby.exe" }
+        let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, "bin")) }
+        let(:omnibus_embedded_bin_dir) { "c:/opscode/chef-workstation/embedded/bin" }
+        let(:omnibus_bin_dir) { "c:/opscode/chef-workstation/bin" }
+        let(:expected_GEM_ROOT) { Gem.default_dir }
+        let(:expected_GEM_HOME) { Gem.user_dir }
+        let(:expected_GEM_PATH) { Gem.path.join(File::PATH_SEPARATOR) }
+        let(:omnibus_root) { "c:/opscode/chef-workstation" }
+        let(:expected_PATH) { [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ] }
+
+        before do
+          allow(ChefCLI::Helpers).to receive(:expected_omnibus_root).and_return(ruby_path)
+          allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return(true)
+          allow(Chef::Platform).to receive(:windows?).and_return(true)
+        end
+
+        it "#omnibus_env path" do
+          allow(ChefCLI::Helpers).to receive(:omnibus_bin_dir).and_return("c:/opscode/chef-workstation/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_embedded_bin_dir).and_return("c:/opscode/chef-workstation/embedded/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_env).and_return(
+            "PATH" => expected_PATH.flatten.uniq.join(File::PATH_SEPARATOR),
+            "GEM_ROOT" => expected_GEM_ROOT,
+            "GEM_HOME" => expected_GEM_HOME,
+            "GEM_PATH" => expected_GEM_PATH
+          )
+        end
+      end
+    end
+
+    context "when not installed via omnibus" do
+
+      before do
+        allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return false
+      end
+      let(:ruby_path) { "/Users/bog/.lots_o_rubies/2.1.2/bin/ruby" }
+      let(:expected_root_path) { "/Users/bog/.lots_o_rubies" }
+
+      before do
+        allow(File).to receive(:exist?).with(expected_root_path).and_return(false)
+
+        %i{
+          omnibus_root
+          omnibus_bin_dir
+          omnibus_embedded_bin_dir
+        }.each do |method_name|
+          allow(ChefCLI::Helpers).to receive(method_name).and_raise(ChefCLI::OmnibusInstallNotFound.new)
+        end
+      end
+
+      it "skips the sanity check without error" do
+
+      end
+
+    end
+  end
+end

data/spec/unit/policyfile_services/export_repo_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,12 +42,15 @@ describe ChefCLI::PolicyfileServices::ExportRepo do
 
   let(:archive) { false }
 
+  let(:policy_group) { nil }
+
   subject(:export_service) do
     described_class.new(policyfile: policyfile_rb_explicit_name,
                         root_dir: working_dir,
                         export_dir: export_dir,
                         archive: archive,
-                        force: force_export)
+                        force: force_export,
+                        policy_group: policy_group)
   end
 
   it "uses Policyfile.rb as the default Policyfile name" do
@@ -306,6 +309,52 @@ describe ChefCLI::PolicyfileServices::ExportRepo do
             expect(File).to exist(readme_path)
           end
 
+          context "when the policy_group is changed" do
+            let(:policy_group) { "production" }
+            it "creates a policy_group file for a specified policy group with the revision id of the exported policy" do
+              exported_policy_group_path = File.join(export_dir, "policy_groups", "production.json")
+              exported_policy_group_data = FFI_Yajl::Parser.parse(IO.read(exported_policy_group_path))
+
+              expected_data = { "policies" => { "install-example" => { "revision_id" => revision_id } } }
+
+              expect(exported_policy_group_data).to eq(expected_data)
+            end
+
+            it "creates a working local mode configuration file with the changed policy_group" do
+              expected_config_text = <<~CONFIG
+              ### Chef Infra Client Configuration ###
+              # The settings in this file will configure chef to apply the exported policy in
+              # this directory. To use it, run:
+              #
+              # chef-client -z
+              #
+
+              policy_name 'install-example'
+              policy_group 'production'
+
+              use_policyfile true
+              policy_document_native_api true
+
+              # In order to use this repo, you need a version of Chef Infra Client and Chef Zero
+              # that supports policyfile "native mode" APIs:
+              current_version = Gem::Version.new(Chef::VERSION)
+              unless Gem::Requirement.new(">= 12.7").satisfied_by?(current_version)
+                puts("!" * 80)
+                puts(<<-MESSAGE)
+              This Chef Repo requires features introduced in Chef Infra Client 12.7, but you are using
+              Chef \#{Chef::VERSION}. Please upgrade to Chef Infra Client 12.7 or later.
+              MESSAGE
+                puts("!" * 80)
+                exit!(1)
+              end
+
+              CONFIG
+              config_path = File.join(export_dir, ".chef", "config.rb")
+              expect(File).to exist(config_path)
+              expect(IO.read(config_path)).to eq(expected_config_text)
+            end
+          end
+
         end
 
         context "when the export dir is empty" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 5.2.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -240,7 +240,6 @@ files:
 - lib/chef-cli/command/generator_commands.rb
 - lib/chef-cli/command/generator_commands/attribute.rb
 - lib/chef-cli/command/generator_commands/base.rb
-- lib/chef-cli/command/generator_commands/build_cookbook.rb
 - lib/chef-cli/command/generator_commands/chef_exts/generator_desc_resource.rb
 - lib/chef-cli/command/generator_commands/chef_exts/quieter_doc_formatter.rb
 - lib/chef-cli/command/generator_commands/chef_exts/recipe_dsl_ext.rb
@@ -328,13 +327,9 @@ files:
 - lib/chef-cli/service_exceptions.rb
 - lib/chef-cli/shell_out.rb
 - lib/chef-cli/skeletons/code_generator/files/default/Berksfile
-- lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/README.md
-- lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/kitchen.yml
-- lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/test-fixture-recipe.rb
 - lib/chef-cli/skeletons/code_generator/files/default/chefignore
 - lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md
 - lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md
-- lib/chef-cli/skeletons/code_generator/files/default/delivery-config.json
 - lib/chef-cli/skeletons/code_generator/files/default/delivery-project.toml
 - lib/chef-cli/skeletons/code_generator/files/default/gitignore
 - lib/chef-cli/skeletons/code_generator/files/default/repo/README.md
@@ -354,7 +349,6 @@ files:
 - lib/chef-cli/skeletons/code_generator/files/default/spec_helper_policyfile.rb
 - lib/chef-cli/skeletons/code_generator/metadata.rb
 - lib/chef-cli/skeletons/code_generator/recipes/attribute.rb
-- lib/chef-cli/skeletons/code_generator/recipes/build_cookbook.rb
 - lib/chef-cli/skeletons/code_generator/recipes/cookbook.rb
 - lib/chef-cli/skeletons/code_generator/recipes/cookbook_file.rb
 - lib/chef-cli/skeletons/code_generator/recipes/helpers.rb
@@ -372,10 +366,8 @@ files:
 - lib/chef-cli/skeletons/code_generator/templates/default/Policyfile.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/README.md.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/attribute.rb.erb
-- lib/chef-cli/skeletons/code_generator/templates/default/build_cookbook/Berksfile.erb
-- lib/chef-cli/skeletons/code_generator/templates/default/build_cookbook/metadata.rb.erb
-- lib/chef-cli/skeletons/code_generator/templates/default/build_cookbook/recipe.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/cookbook_file.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/delivery-project.toml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/helpers.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/inspec_default_test.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb
@@ -383,6 +375,7 @@ files:
 - lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/metadata.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/recipe.rb.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/recipe.yml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/recipe_spec.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/resource.rb.erb
@@ -415,7 +408,6 @@ files:
 - spec/unit/command/generate_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
 - spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb
 - spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
@@ -528,6 +520,7 @@ files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/helpers_spec.rb
 - spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb
@@ -594,7 +587,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -630,7 +623,6 @@ test_files:
 - spec/unit/command/generate_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
 - spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb
 - spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
@@ -743,6 +735,7 @@ test_files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/helpers_spec.rb
 - spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb

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

@@ -1,126 +0,0 @@
-#
-# Copyright:: Copyright (c) 2016-2019 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_relative "base"
-require_relative "../../dist"
-
-module ChefCLI
-  module Command
-    module GeneratorCommands
-
-      class BuildCookbook < Base
-
-        banner "Usage: #{ChefCLI::Dist::EXEC} generate build-cookbook NAME [options]"
-
-        attr_reader :errors
-
-        attr_reader :cookbook_name_or_path
-
-        option :pipeline,
-          long: "--pipeline PIPELINE",
-          description: "Use PIPELINE to set target branch to something other than master for the build_cookbook",
-          default: "master"
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          @params_valid = true
-          @cookbook_name = nil
-          super
-        end
-
-        def run
-          read_and_validate_params
-          if params_valid?
-            setup_context
-            chef_runner.converge
-            0
-          else
-            err(opt_parser)
-            1
-          end
-        rescue ChefCLI::ChefRunnerError => e
-          err("ERROR: #{e}")
-          1
-        end
-
-        def setup_context
-          super
-          Generator.add_attr_to_context(:workflow_project_dir, workflow_project_dir)
-
-          Generator.add_attr_to_context(:workflow_project_git_initialized, workflow_project_git_initialized?)
-          Generator.add_attr_to_context(:build_cookbook_parent_is_cookbook, build_cookbook_parent_is_cookbook?)
-
-          Generator.add_attr_to_context(:pipeline, pipeline)
-        end
-
-        def pipeline
-          config[:pipeline]
-        end
-
-        def recipe
-          "build_cookbook"
-        end
-
-        def build_cookbook_parent_is_cookbook?
-          metadata_json_path = File.join(workflow_project_dir, "metadata.json")
-          metadata_rb_path = File.join(workflow_project_dir, "metadata.rb")
-
-          File.exist?(metadata_json_path) || File.exist?(metadata_rb_path)
-        end
-
-        def workflow_project_dir
-          project_dir = File.expand_path(cookbook_name_or_path, Dir.pwd)
-          # Detect if we were invoked with arguments like
-          #
-          #     chef generate build-cookbook project/.delivery/build_cookbook
-          #
-          # If so, normalize paths so we don't make a directory structure like
-          # `.delivery/.delivery/build_cookbook`.
-          #
-          # Note that we don't check the name of the build cookbook the user
-          # asked for and we hard-code to naming it "build_cookbook". We also
-          # don't catch the case that the user requested something like
-          # `project/.delivery/build_cookbook/extra-thing-that-shouldn't-be-here`
-          Pathname.new(project_dir).ascend do |dir|
-            if File.basename(dir) == ".delivery"
-              project_dir = File.dirname(dir)
-            end
-          end
-          project_dir
-        end
-
-        def workflow_project_git_initialized?
-          File.exist?(File.join(workflow_project_dir, ".git"))
-        end
-
-        def read_and_validate_params
-          arguments = parse_options(params)
-          @cookbook_name_or_path = arguments[0]
-          unless @cookbook_name_or_path
-            @params_valid = false
-          end
-        end
-
-        def params_valid?
-          @params_valid
-        end
-
-      end
-    end
-  end
-end