chef-dk 3.6.57 → 3.7.23

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

@@ -67,7 +67,7 @@ module ChefDK
           `staging` Policy Group.
 
         Options:
-BANNER
+      BANNER
 
       option :git,
         short:       "-g GIT_REF",

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

@@ -44,7 +44,7 @@ module ChefDK
 
         Options:
 
-E
+      E
 
       option :archive,
         short:       "-a",

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

@@ -65,7 +65,7 @@ module ChefDK
           Usage: chef generate GENERATOR [options]
 
           Available generators:
-E
+        E
       end
 
       def self.generator_list

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

@@ -112,7 +112,7 @@ module ChefDK
             long_description 'Custom code generator cookbook for use with ChefDK'
             version          '0.1.0'
 
-METADATA
+          METADATA
         end
 
         def custom_cookbook_name?

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

@@ -43,7 +43,7 @@ module ChefDK
 
         Options:
 
-E
+      E
 
       option :config_file,
         short:       "-c CONFIG_FILE",

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

@@ -75,7 +75,7 @@ module ChefDK
           # SSL Settings:
           ssl_verify_mode #{Chef::Config.ssl_verify_mode.inspect}
 
-CONFIG
+        CONFIG
         if enable_policyfile
           policyfile_config = <<~CONFIG
             # Policyfile Settings:
@@ -85,7 +85,7 @@ CONFIG
             policy_group "#{policy_group}"
             policy_name "#{policy_name}"
 
-CONFIG
+          CONFIG
           config << policyfile_config
         end
 
@@ -101,6 +101,8 @@ CONFIG
     class Provision < Base
 
       banner(<<~E)
+        DEPRECATED: This command is deprecated and will be removed in ChefDK 4.
+
         Usage: chef provision POLICY_GROUP --policy-name POLICY_NAME [options]
                chef provision POLICY_GROUP --sync [POLICYFILE_PATH] [options]
                chef provision --no-policy [options]
@@ -134,7 +136,7 @@ CONFIG
 
         Options:
 
-E
+      E
       include Configurable
 
       option :config_file,
@@ -226,6 +228,7 @@ E
       end
 
       def run(params = [])
+        ui.msg("DEPRECATED: This command is deprecated and will be removed in ChefDK 4.")
         return 1 unless apply_params!(params)
         chef_config # force chef config to load
         return 1 unless check_cookbook_and_recipe_path

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

@@ -41,7 +41,7 @@ module ChefDK
 
         Options:
 
-E
+      E
 
       option :config_file,
         short:       "-c CONFIG_FILE",

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

@@ -40,7 +40,7 @@ module ChefDK
         https://docs.chef.io/policyfile.html
 
         Options:
-E
+      E
 
       option :config_file,
         short:       "-c CONFIG_FILE",

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

@@ -69,7 +69,7 @@ module ChefDK
 
         OPTIONS:
 
-HELP
+      HELP
 
       option :omnibus_dir,
         long: "--omnibus-dir OMNIBUS_DIR",

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

@@ -43,7 +43,7 @@ module ChefDK
 
         Options:
 
-BANNER
+      BANNER
 
       option :show_orphans,
         short:        "-o",

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

@@ -50,7 +50,7 @@ module ChefDK
 
         Options:
 
-BANNER
+      BANNER
 
       option :undo_last,
         short:        "-l",

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

@@ -46,7 +46,7 @@ module ChefDK
 
         Options:
 
-BANNER
+      BANNER
 
       option :config_file,
         short:       "-c CONFIG_FILE",

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

@@ -144,7 +144,7 @@ module ChefDK
                       - recipe[aar::default]
                     attributes:
 
-KITCHEN_YML
+              KITCHEN_YML
             end
 
             sh("kitchen list", cwd: cwd)
@@ -240,7 +240,7 @@ KITCHEN_YML
 
               Some applications may need or prefer different versions of the chef-provisioning gem or its drivers, so
               this multiple-version check can fail if a user has installed new versions of those libraries.
-EOS
+            EOS
           end
 
           # ------------

data/lib/chef-dk/generator.rb

@@ -89,7 +89,7 @@ module ChefDK
             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.
-EOH
+          EOH
         when "mit"
           result = <<~EOH
             The MIT License (MIT)
@@ -113,7 +113,7 @@ EOH
             LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
             OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
             THE SOFTWARE.
-EOH
+          EOH
         when "gplv2"
           result = <<~EOH
             Copyright:: #{year},  #{copyright_holder}
@@ -131,7 +131,7 @@ EOH
             You should have received a copy of the GNU General Public License along
             with this program; if not, write to the Free Software Foundation, Inc.,
             51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-EOH
+          EOH
         when "gplv3"
           result = <<~EOH
             Copyright:: #{year},  #{copyright_holder}
@@ -148,7 +148,7 @@ EOH
 
             You should have received a copy of the GNU General Public License
             along with this program.  If not, see <http://www.gnu.org/licenses/>.
-EOH
+          EOH
         else
           raise ArgumentError, "Invalid generator.license setting: #{license}.  See available licenses at https://docs.chef.io/ctl_chef.html#chef-generate-cookbook"
         end

data/lib/chef-dk/policyfile/git_lock_fetcher.rb

@@ -84,7 +84,7 @@ module ChefDK
       # @return [Hash] The source_options that describe how to fetch this exact lock again
       def source_options_for_lock
         source_options.merge({
-                               revision:  revision,
+                               revision: revision,
                              })
       end
 

data/lib/chef-dk/policyfile/uploader.rb

@@ -57,7 +57,7 @@ module ChefDK
             WARN: Uploading policy to policy group #{policy_group} in compatibility mode.
             Cookbooks will be uploaded with very large version numbers, which may be picked
             up by existing nodes.
-DRAGONS
+          DRAGONS
         end
 
         upload_cookbooks

data/lib/chef-dk/policyfile_services/export_repo.rb

@@ -255,7 +255,7 @@ module ChefDK
               exit!(1)
             end
 
-CONFIG
+          CONFIG
         end
       end
 
@@ -298,7 +298,7 @@ CONFIG
             policy. However, exported policies contain only a single policy revision, so
             this policy group name is hardcoded to "local" and should not be changed.
 
-README
+          README
         end
       end
 

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

@@ -92,7 +92,7 @@ module ChefDK
             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.
-MESSAGE
+          MESSAGE
         end
 
         unless File.exist?(policyfile_lock_path)

data/lib/chef-dk/service_exception_inspectors/http.rb

@@ -44,7 +44,7 @@ module ChefDK
 
           #{response_body}
 
-END
+        END
       end
 
       def response

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "3.6.57".freeze
+  VERSION = "3.7.23".freeze
 end

data/spec/unit/cli_spec.rb

@@ -51,7 +51,7 @@ describe ChefDK::CLI do
           verify   Test the embedded ChefDK applications
           gem      Runs the `gem` command in context of the embedded ruby
           example  Example subcommand for testing
-E
+    E
   end
 
   let(:version_message) { "Chef Development Kit Version: #{ChefDK::VERSION}\n" }

data/spec/unit/command/base_spec.rb

@@ -109,7 +109,7 @@ describe ChefDK::Command::Base do
             -u, --user                       If the user exists
             -v, --version                    Show chef version
 
-E
+      E
       expect(stdout).to eq(expected)
     end
 
@@ -129,7 +129,7 @@ E
             -u, --user                       If the user exists
             -v, --version                    Show chef version
 
-E
+      E
       expect(stdout).to eq(expected)
 
     end
@@ -149,7 +149,7 @@ E
          50: chefdk.foo "bar"
          51:
 
-MESSAGE
+      MESSAGE
     end
 
     let(:exception) { Chef::Exceptions::ConfigurationError.new(exception_message) }

data/spec/unit/command/clean_policy_cookbooks_spec.rb

@@ -138,7 +138,7 @@ describe ChefDK::Command::CleanPolicyCookbooks do
           Error: Failed to delete some policy revisions.
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         expect(ui.output).to eq(expected_output)
       end
@@ -154,7 +154,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
           expected_output << backtrace.join("\n") << "\n"
 
           expect(ui.output).to eq(expected_output)

data/spec/unit/command/clean_policy_revisions_spec.rb

@@ -138,7 +138,7 @@ describe ChefDK::Command::CleanPolicyRevisions do
           Error: Failed to delete some policy revisions.
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         expect(ui.output).to eq(expected_output)
       end
@@ -154,7 +154,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
           expected_output << backtrace.join("\n") << "\n"
 
           expect(ui.output).to eq(expected_output)

data/spec/unit/command/delete_policy_group_spec.rb

@@ -165,7 +165,7 @@ describe ChefDK::Command::DeletePolicyGroup do
           Error: Failed to delete policy group
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         expect(ui.output).to eq(expected_output)
       end
@@ -180,7 +180,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
           expected_output << backtrace.join("\n") << "\n"
 
           expect(ui.output).to eq(expected_output)

data/spec/unit/command/delete_policy_spec.rb

@@ -165,7 +165,7 @@ describe ChefDK::Command::DeletePolicy do
           Error: Failed to delete policy.
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         expect(ui.output).to eq(expected_output)
       end
@@ -180,7 +180,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
           expected_output << backtrace.join("\n") << "\n"
 
           expect(ui.output).to eq(expected_output)

data/spec/unit/command/export_spec.rb

@@ -136,7 +136,7 @@ describe ChefDK::Command::Export do
           To converge this system with the exported policy, run:
             cd /path/to/export
             chef-client -z
-MESSAGE
+        MESSAGE
         expect(ui.output).to include(expected_message)
       end
     end
@@ -168,7 +168,7 @@ MESSAGE
           Error: export failed
           Reason: (StandardError) some operation failed
 
-E
+        E
 
         command.run(params)
         expect(ui.output).to eq(expected_error_text)
@@ -184,7 +184,7 @@ E
             Reason: (StandardError) some operation failed
 
 
-E
+          E
 
           expected_error_text << backtrace.join("\n") << "\n"
 

data/spec/unit/command/generate_spec.rb

@@ -79,7 +79,7 @@ describe ChefDK::Command::Generate do
 
         Available generators:
           example  this is a test
-E
+      E
     end
 
     before do

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

@@ -201,7 +201,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
               chef_version '>= 13.0'
 
               depends 'delivery-truck'
-METADATA
+            METADATA
           end
         end
       end
@@ -258,7 +258,7 @@ METADATA
               maintainer_email 'you@example.com'
               license 'all_rights'
               version '0.1.0'
-METADATA
+            METADATA
           end
         end
       end

data/spec/unit/command/generator_commands/cookbook_spec.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");
@@ -72,7 +72,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       If you'd prefer to dive right in, the default recipe can be found at:
 
       recipes/default.rb
-EOF
+    EOF
   end
 
   subject(:cookbook_generator) do
@@ -216,7 +216,7 @@ EOF
             # of the `delivery local` command across many different projects.
             #
             # remote_file = "https://url/project.toml"
-PROJECT_DOT_TOML
+          PROJECT_DOT_TOML
         end
 
         it "exists with default config for Cookbook Workflow" do
@@ -248,7 +248,7 @@ PROJECT_DOT_TOML
               },
               "dependencies": []
             }
-  CONFIG_DOT_JSON
+          CONFIG_DOT_JSON
         end
 
         it "configures delivery to use a local build cookbook" do
@@ -269,9 +269,9 @@ PROJECT_DOT_TOML
             # Cookbook:: build_cookbook
             # Recipe:: publish
             #
-            # Copyright:: 2018, The Authors, All Rights Reserved.
+            # Copyright:: 2019, The Authors, All Rights Reserved.
             include_recipe 'delivery-truck::publish'
-  CONFIG_DOT_JSON
+          CONFIG_DOT_JSON
         end
 
         it "delegates functionality to delivery-truck" do
@@ -295,7 +295,7 @@ PROJECT_DOT_TOML
             group :delivery do
               cookbook 'test', path: './test/fixtures/cookbooks/test'
             end
-  CONFIG_DOT_JSON
+          CONFIG_DOT_JSON
         end
 
         it "sets the sources for delivery library cookbooks to github" do
@@ -369,7 +369,7 @@ PROJECT_DOT_TOML
           - Merging delivery content feature branch to master
 
           #{non_delivery_breadcrumb}
-OUTPUT
+        OUTPUT
 
         actual = stdout_io.string
 
@@ -421,7 +421,7 @@ OUTPUT
           - Merging delivery content feature branch to master
 
           Your cookbook is ready. To setup the pipeline, type `cd new_cookbook`, then run `delivery init`
-OUTPUT
+        OUTPUT
 
         actual = stdout_io.string
 
@@ -542,7 +542,7 @@ OUTPUT
 
             # Specify a custom source for a single cookbook:
             cookbook 'new_cookbook', path: '.'
-POLICYFILE_RB
+          POLICYFILE_RB
         end
 
         before do
@@ -595,7 +595,7 @@ POLICYFILE_RB
                   inspec_tests:
                     - test/integration/default
                 attributes:
-KITCHEN_YML
+          KITCHEN_YML
         end
 
       end
@@ -607,7 +607,7 @@ KITCHEN_YML
             # frozen_string_literal: true
             require 'chefspec'
             require 'chefspec/policyfile'
-SPEC_HELPER
+          SPEC_HELPER
         end
 
       end
@@ -628,7 +628,7 @@ SPEC_HELPER
             source 'https://supermarket.chef.io'
 
             metadata
-POLICYFILE_RB
+          POLICYFILE_RB
         end
 
         before do
@@ -674,7 +674,7 @@ POLICYFILE_RB
                   inspec_tests:
                     - test/integration/default
                 attributes:
-KITCHEN_YML
+          KITCHEN_YML
         end
 
       end
@@ -686,7 +686,7 @@ KITCHEN_YML
             # frozen_string_literal: true
             require 'chefspec'
             require 'chefspec/berkshelf'
-SPEC_HELPER
+          SPEC_HELPER
         end
 
       end