chef-dk 3.3.23 → 3.4.38

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

@@ -27,21 +27,21 @@ module ChefDK
 
       include Configurable
 
-      banner(<<-E)
-Usage: chef install [ POLICY_FILE ] [options]
+      banner(<<~E)
+        Usage: chef install [ POLICY_FILE ] [options]
 
-`chef 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 Server and apply that exact set of
-cookbooks to nodes in your infrastructure.
+        `chef 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 Server and apply that exact set of
+        cookbooks to nodes in your infrastructure.
 
-See our detailed README for more information:
+        See our detailed README for more information:
 
-https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile.html
 
-Options:
+        Options:
 
 E
 

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

@@ -71,19 +71,19 @@ module ChefDK
       end
 
       def chef_config
-        config = <<-CONFIG
-# SSL Settings:
-ssl_verify_mode #{Chef::Config.ssl_verify_mode.inspect}
+        config = <<~CONFIG
+          # SSL Settings:
+          ssl_verify_mode #{Chef::Config.ssl_verify_mode.inspect}
 
 CONFIG
         if enable_policyfile
-          policyfile_config = <<-CONFIG
-# Policyfile Settings:
-use_policyfile true
-policy_document_native_api true
+          policyfile_config = <<~CONFIG
+            # Policyfile Settings:
+            use_policyfile true
+            policy_document_native_api true
 
-policy_group "#{policy_group}"
-policy_name "#{policy_name}"
+            policy_group "#{policy_group}"
+            policy_name "#{policy_name}"
 
 CONFIG
           config << policyfile_config
@@ -100,39 +100,39 @@ CONFIG
 
     class Provision < Base
 
-      banner(<<-E)
-Usage: chef provision POLICY_GROUP --policy-name POLICY_NAME [options]
-       chef provision POLICY_GROUP --sync [POLICYFILE_PATH] [options]
-       chef provision --no-policy [options]
+      banner(<<~E)
+        Usage: chef provision POLICY_GROUP --policy-name POLICY_NAME [options]
+               chef provision POLICY_GROUP --sync [POLICYFILE_PATH] [options]
+               chef provision --no-policy [options]
 
-`chef provision` invokes an embedded chef-client run to provision machines
-using Chef Provisioning. If not otherwise specified, `chef provision` will
-expect to find a cookbook named 'provision' in the current working directory.
-It runs a recipe in this cookbook which should use Chef Provisioning to create
-one or more machines (or other infrastructure).
+        `chef provision` invokes an embedded chef-client run to provision machines
+        using Chef Provisioning. If not otherwise specified, `chef provision` will
+        expect to find a cookbook named 'provision' in the current working directory.
+        It runs a recipe in this cookbook which should use Chef Provisioning to create
+        one or more machines (or other infrastructure).
 
-`chef provision` provides three forms of operation:
+        `chef provision` provides three forms of operation:
 
-### chef provision POLICY_GROUP --policy-name POLICY_NAME
+        ### chef provision POLICY_GROUP --policy-name POLICY_NAME
 
-In the first form of the command, `chef provision` creates machines that will
-operate in policyfile mode. The chef configuration passed to the cookbook will
-set the policy group and policy name as given.
+        In the first form of the command, `chef provision` creates machines that will
+        operate in policyfile mode. The chef configuration passed to the cookbook will
+        set the policy group and policy name as given.
 
-### chef provision POLICY_GROUP --sync [POLICYFILE_PATH] [options]
+        ### chef provision POLICY_GROUP --sync [POLICYFILE_PATH] [options]
 
-In the second form of the command, `chef provision` create machines that will
-operate in policyfile mode and syncronizes a local policyfile to the server
-before converging the machine(s) defined in the provision cookbook.
+        In the second form of the command, `chef provision` create machines that will
+        operate in policyfile mode and syncronizes a local policyfile to the server
+        before converging the machine(s) defined in the provision cookbook.
 
-### chef provision --no-policy [options]
+        ### chef provision --no-policy [options]
 
-In the third form of the command, `chef provision` expects to create machines
-that will not operate in policyfile mode.
+        In the third form of the command, `chef provision` expects to create machines
+        that will not operate in policyfile mode.
 
-Chef Provisioning is documented at https://docs.chef.io/provisioning.html
+        Chef Provisioning is documented at https://docs.chef.io/provisioning.html
 
-Options:
+        Options:
 
 E
       include Configurable

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

@@ -27,19 +27,19 @@ module ChefDK
 
       include Configurable
 
-      banner(<<-E)
-Usage: chef push POLICY_GROUP [ POLICY_FILE ] [options]
+      banner(<<~E)
+        Usage: chef push POLICY_GROUP [ POLICY_FILE ] [options]
 
-`chef push` Uploads an existing Policyfile.lock.json to a Chef Server, 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.
+        `chef push` Uploads an existing Policyfile.lock.json to a Chef Server, 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.
 
-See our detailed README for more information:
+        See our detailed README for more information:
 
-https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile.html
 
-Options:
+        Options:
 
 E
 

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

@@ -27,19 +27,19 @@ module ChefDK
 
       include Configurable
 
-      banner(<<-E)
-Usage: chef push-archive POLICY_GROUP ARCHIVE_FILE [options]
+      banner(<<~E)
+        Usage: chef push-archive POLICY_GROUP ARCHIVE_FILE [options]
 
-`chef push-archive` publishes a policy archive to a Chef Server. 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.
+        `chef push-archive` publishes a policy archive to a Chef Server. 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.
 
-For more information about Policyfiles, see our detailed README:
+        For more information about Policyfiles, see our detailed README:
 
-https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile.html
 
-Options:
+        Options:
 E
 
       option :config_file,

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

@@ -43,37 +43,37 @@ module ChefDK
 
       SUPPORTED_SHELLS = %w{ bash fish zsh sh powershell posh}.map(&:freeze).freeze
 
-      banner(<<-HELP)
-Usage: chef shell-init
+      banner(<<~HELP)
+        Usage: chef shell-init
 
-`chef shell-init` modifies your shell environment to make ChefDK your default
-ruby.
+        `chef shell-init` modifies your shell environment to make ChefDK your default
+        ruby.
 
-  To enable for just the current shell session:
+          To enable for just the current shell session:
 
-    In sh, bash, and zsh:
-      eval "$(chef shell-init SHELL_NAME)"
-    In fish:
-      eval (chef shell-init fish)
-    In Powershell:
-      chef shell-init powershell | Invoke-Expression
+            In sh, bash, and zsh:
+              eval "$(chef shell-init SHELL_NAME)"
+            In fish:
+              eval (chef shell-init fish)
+            In Powershell:
+              chef shell-init powershell | Invoke-Expression
 
-  To permanently enable:
+          To permanently enable:
 
-    In sh, bash, and zsh:
-      echo 'eval "$(chef shell-init SHELL_NAME)"' >> ~/.YOUR_SHELL_RC_FILE
-    In fish:
-      echo 'eval (chef shell-init SHELL_NAME)' >> ~/.config/fish/config.fish
-    In Powershell
-      "chef shell-init powershell | Invoke-Expression" >> $PROFILE
+            In sh, bash, and zsh:
+              echo 'eval "$(chef shell-init SHELL_NAME)"' >> ~/.YOUR_SHELL_RC_FILE
+            In fish:
+              echo 'eval (chef shell-init SHELL_NAME)' >> ~/.config/fish/config.fish
+            In Powershell
+              "chef shell-init powershell | Invoke-Expression" >> $PROFILE
 
-OPTIONS:
+        OPTIONS:
 
 HELP
 
       option :omnibus_dir,
-        :long         => "--omnibus-dir OMNIBUS_DIR",
-        :description  => "Alternate path to omnibus install (used for testing)"
+        long: "--omnibus-dir OMNIBUS_DIR",
+        description: "Alternate path to omnibus install (used for testing)"
 
       def initialize
         super

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

@@ -26,22 +26,22 @@ module ChefDK
 
     class ShowPolicy < Base
 
-      banner(<<-BANNER)
-Usage: chef show-policy [POLICY_NAME [POLICY_GROUP]] [options]
+      banner(<<~BANNER)
+        Usage: chef show-policy [POLICY_NAME [POLICY_GROUP]] [options]
 
-`chef 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.
+        `chef 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.
 
-When both POLICY_NAME and POLICY_GROUP are given, the command shows the content
-of a the active policyfile lock for the given POLICY_GROUP. See also the `diff`
-command.
+        When both POLICY_NAME and POLICY_GROUP are given, the command shows the content
+        of a the active policyfile lock for the given POLICY_GROUP. See also the `diff`
+        command.
 
-See our detailed README for more information:
+        See our detailed README for more information:
 
-https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile.html
 
-Options:
+        Options:
 
 BANNER
 

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

@@ -25,30 +25,30 @@ module ChefDK
 
     class Undelete < Base
 
-      banner(<<-BANNER)
-Usage: chef undelete [--list | --id ID] [options]
+      banner(<<~BANNER)
+        Usage: chef undelete [--list | --id ID] [options]
 
-`chef 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`.
+        `chef 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,
-running `chef undelete` will overwrite it.
+        CAVEATS:
+        `chef 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
-policies. If you have cleaned the policy cookbooks after the delete operation
-you want to reverse, `chef undelete` may not be able to fully restore the
-previous state.
+        Undo information does not include cookbooks that might be referenced by
+        policies. If you have cleaned the policy cookbooks after the delete operation
+        you want to reverse, `chef undelete` may not be able to fully restore the
+        previous state.
 
-The delete commands also do not store access control data, so you may have to
-manually reapply any ACL customizations you have made.
+        The delete commands also do not store access control data, so you may have to
+        manually reapply any ACL customizations you have made.
 
-See our detailed README for more information:
+        See our detailed README for more information:
 
-https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile.html
 
-Options:
+        Options:
 
 BANNER
 

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

@@ -28,23 +28,23 @@ module ChefDK
 
       include Configurable
 
-      banner(<<-BANNER)
-Usage: chef update [ POLICY_FILE ] [options] [cookbook_1] [...]
+      banner(<<~BANNER)
+        Usage: chef update [ POLICY_FILE ] [options] [cookbook_1] [...]
 
-`chef 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`.
+        `chef 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`.
 
-Individual dependent cookbooks (and their dependencies) may be updated by
-passing their names after the POLICY_FILE. The POLICY_FILE parameter is
-mandatory if you want to update individual cookbooks.
+        Individual dependent cookbooks (and their dependencies) may be updated by
+        passing their names after the POLICY_FILE. The POLICY_FILE parameter is
+        mandatory if you want to update individual cookbooks.
 
-See our detailed README for more information:
+        See our detailed README for more information:
 
-https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile.html
 
-Options:
+        Options:
 
 BANNER
 

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

@@ -28,25 +28,25 @@ module ChefDK
       banner "Usage: chef verify [component, ...] [options]"
 
       option :omnibus_dir,
-        :long         => "--omnibus-dir OMNIBUS_DIR",
-        :description  => "Alternate path to omnibus install (used for testing)"
+        long: "--omnibus-dir OMNIBUS_DIR",
+        description: "Alternate path to omnibus install (used for testing)"
 
       option :unit,
-        :long         => "--unit",
-        :description  => "Run bundled app unit tests (only smoke tests run by default)"
+        long: "--unit",
+        description: "Run bundled app unit tests (only smoke tests run by default)"
 
       option :integration,
-        :long         => "--integration",
-        :description  => "Run integration tests. Possibly dangerous, for development systems only"
+        long: "--integration",
+        description: "Run integration tests. Possibly dangerous, for development systems only"
 
       option :verbose,
-        :long         => "--verbose",
-        :description  => "Display all test output, not just failing tests"
+        long: "--verbose",
+        description: "Display all test output, not just failing tests"
 
       class << self
         def add_component(name, _delete_me = nil)
           component = ComponentTest.new(name)
-          yield component if block_given? #delete this conditional
+          yield component if block_given? # delete this conditional
           component_map[name] = component
         end
 
@@ -124,25 +124,25 @@ module ChefDK
         c.smoke_test do
           tmpdir do |cwd|
             File.open(File.join(cwd, ".kitchen.yml"), "w+") do |f|
-              f.print(<<-KITCHEN_YML)
----
-driver:
-  name: dummy
-  network:
-    - ["forwarded_port", {guest: 80, host: 8080}]
-
-provisioner:
-  name: policyfile_zero
-  require_chef_omnibus: 12.3.0
-
-platforms:
-  - name: ubuntu-14.04
-
-suites:
-  - name: default
-    run_list:
-      - recipe[aar::default]
-    attributes:
+              f.print(<<~KITCHEN_YML)
+                ---
+                driver:
+                  name: dummy
+                  network:
+                    - ["forwarded_port", {guest: 80, host: 8080}]
+
+                provisioner:
+                  name: policyfile_zero
+                  require_chef_omnibus: 12.3.0
+
+                platforms:
+                  - name: ubuntu-14.04
+
+                suites:
+                  - name: default
+                    run_list:
+                      - recipe[aar::default]
+                    attributes:
 
 KITCHEN_YML
             end
@@ -186,10 +186,10 @@ KITCHEN_YML
 
       add_component "chef-apply" do |c|
         c.gem_base_dir = "chef-apply"
-        c.unit_test do
-          bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
-          sh("#{embedded_bin("bundle")} exec rspec")
-        end
+      #   c.unit_test do
+      #     bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
+      #     sh("#{embedded_bin("bundle")} exec rspec")
+      #   end
         c.smoke_test { sh("#{bin("chef-run")} -v") }
       end
 
@@ -206,13 +206,13 @@ KITCHEN_YML
 
           # construct a hash of { driver_name => [version1, version2, ...]}
           driver_versions = {}
-          Gem::Specification.all.map { |gs| [gs.name, gs.version] }.
-                                  select { |n| n[0] =~ /^chef-provisioning-/ }.
-                                  each { |gem, version| (driver_versions[gem] ||= []) << version }
+          Gem::Specification.all.map { |gs| [gs.name, gs.version] }
+                                  .select { |n| n[0] =~ /^chef-provisioning-/ }
+                                  .each { |gem, version| (driver_versions[gem] ||= []) << version }
 
-          drivers = Gem::Specification.all.map { |gs| gs.name }.
-                                           select { |n| n =~ /^chef-provisioning-/ }.
-                                           uniq
+          drivers = Gem::Specification.all.map { |gs| gs.name }
+                                           .select { |n| n =~ /^chef-provisioning-/ }
+                                           .uniq
 
           versions = Gem::Specification.find_all_by_name("chef-provisioning").map { |s| s.version }
           $VERBOSE = verbose
@@ -222,9 +222,9 @@ KITCHEN_YML
           # ------------
           # fail the verify if we have more than one version of chef-provisioning or any of its drivers.
           def format_gem_failure(name, versions)
-            <<-EOS
-#{name} has multiple versions installed:
-#{versions.sort.map { |gv| "    #{gv}" }.join("\n")}
+            <<~EOS
+              #{name} has multiple versions installed:
+              #{versions.sort.map { |gv| "    #{gv}" }.join("\n")}
             EOS
           end
 
@@ -236,10 +236,10 @@ KITCHEN_YML
           end
 
           if failures.size > 0
-            failures << <<-EOS
+            failures << <<~EOS
 
-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.
+              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
           end
 
@@ -300,20 +300,20 @@ EOS
           tmpdir do |cwd|
             FileUtils.mkdir(File.join(cwd, "spec"))
             with_file(File.join(cwd, "spec", "spec_helper.rb")) do |f|
-              f.write <<-EOF
-require 'chefspec'
-require 'chefspec/berkshelf'
-require 'chefspec/cacher'
+              f.write <<~EOF
+                require 'chefspec'
+                require 'chefspec/berkshelf'
+                require 'chefspec/cacher'
 
-RSpec.configure do |config|
-    config.expect_with(:rspec) { |c| c.syntax = :expect }
-end
+                RSpec.configure do |config|
+                    config.expect_with(:rspec) { |c| c.syntax = :expect }
+                end
               EOF
             end
             FileUtils.touch(File.join(cwd, "Berksfile"))
             with_file(File.join(cwd, "spec", "foo_spec.rb")) do |f|
-              f.write <<-EOF
-require 'spec_helper'
+              f.write <<~EOF
+                require 'spec_helper'
               EOF
             end
             sh(embedded_bin("rspec"), cwd: cwd)
@@ -418,9 +418,9 @@ require 'spec_helper'
 
         # Commenting out the unit and integration tests for now until we figure
         # out the bundler error
-        #c.unit_test { sh("#{embedded_bin("bundle")} exec rake test:isolated") }
+        # c.unit_test { sh("#{embedded_bin("bundle")} exec rake test:isolated") }
         # This runs Test Kitchen (using kitchen-inspec) with some inspec tests
-        #c.integration_test { sh("#{embedded_bin("bundle")} exec rake test:vm") }
+        # c.integration_test { sh("#{embedded_bin("bundle")} exec rake test:vm") }
 
         # It would be nice to use a chef generator to create these specs, but
         # we dont have that yet.  So we do it manually.
@@ -513,11 +513,11 @@ require 'spec_helper'
         c.smoke_test do
           tmpdir do |cwd|
             with_file(File.join(cwd, "foo.rb")) do |f|
-              f.write <<-EOF
-require 'chef/sugar'
-log 'something' do
-  not_if  { _64_bit? }
-end
+              f.write <<~EOF
+                require 'chef/sugar'
+                log 'something' do
+                  not_if  { _64_bit? }
+                end
               EOF
             end
             sh("chef-apply foo.rb", cwd: cwd)
@@ -594,9 +594,9 @@ end
             end
 
             {
-              :component => component,
-              :results => results,
-              :component_status => component_status,
+              component: component,
+              results: results,
+              component_status: component_status,
             }
           end