chef-dk 3.3.23 → 3.4.38

data/lib/chef-dk/cli.rb

@@ -31,24 +31,24 @@ module ChefDK
     include ChefDK::Helpers
     include Chef::Mixin::ShellOut
 
-    banner(<<-BANNER)
-Usage:
-    chef -h/--help
-    chef -v/--version
-    chef command [arguments...] [options...]
+    banner(<<~BANNER)
+      Usage:
+          chef -h/--help
+          chef -v/--version
+          chef command [arguments...] [options...]
 BANNER
 
     option :version,
-      :short        => "-v",
-      :long         => "--version",
-      :description  => "Show chef version",
-      :boolean      => true
+      short: "-v",
+      long: "--version",
+      description: "Show chef version",
+      boolean: true
 
     option :help,
-      :short        => "-h",
-      :long         => "--help",
-      :description  => "Show this message",
-      :boolean      => true
+      short: "-h",
+      long: "--help",
+      description: "Show this message",
+      boolean: true
 
     attr_reader :argv
 

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

@@ -27,16 +27,16 @@ module ChefDK
       include ChefDK::Helpers
 
       option :help,
-        :short        => "-h",
-        :long         => "--help",
-        :description  => "Show this message",
-        :boolean      => true
+        short: "-h",
+        long: "--help",
+        description: "Show this message",
+        boolean: true
 
       option :version,
-        :short        => "-v",
-        :long         => "--version",
-        :description  => "Show chef version",
-        :boolean      => true
+        short: "-v",
+        long: "--version",
+        description: "Show chef version",
+        boolean: true
 
       def initialize
         super

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

@@ -25,20 +25,20 @@ module ChefDK
 
     class CleanPolicyCookbooks < Base
 
-      banner(<<-BANNER)
-Usage: chef clean-policy-cookbooks [options]
+      banner(<<~BANNER)
+        Usage: chef clean-policy-cookbooks [options]
 
-`chef clean-policy-cookbooks` deletes unused policyfile cookbooks. Cookbooks
-are considered unused when they are not referenced by any policyfile revision
-on the server. Note that cookbooks which are referenced by "orphaned" policy
-revisions are not removed, so you may wish to run `chef clean-policy-revisions`
-to remove orphaned policies before running this command.
+        `chef clean-policy-cookbooks` deletes unused policyfile cookbooks. Cookbooks
+        are considered unused when they are not referenced by any policyfile revision
+        on the server. Note that cookbooks which are referenced by "orphaned" policy
+        revisions are not removed, so you may wish to run `chef clean-policy-revisions`
+        to remove orphaned policies before running this 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/clean_policy_revisions.rb

@@ -25,19 +25,19 @@ module ChefDK
 
     class CleanPolicyRevisions < Base
 
-      banner(<<-BANNER)
-Usage: chef clean-policy-revisions [options]
+      banner(<<~BANNER)
+        Usage: chef clean-policy-revisions [options]
 
-`chef clean-policy-revisions` deletes orphaned policyfile revisions from the Chef
-Server. Orphaned policyfile revisions are not associated to any group, and
-therefore not in active use by any nodes. To list orphaned policyfile revisions
-before deleting them, use `chef show-policy --orphans`.
+        `chef clean-policy-revisions` deletes orphaned policyfile revisions from the Chef
+        Server. Orphaned policyfile revisions are not associated to any group, and
+        therefore not in active use by any nodes. To list orphaned policyfile revisions
+        before deleting them, use `chef show-policy --orphans`.
 
-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/delete_policy.rb

@@ -25,19 +25,19 @@ module ChefDK
 
     class DeletePolicy < Base
 
-      banner(<<-BANNER)
-Usage: chef delete-policy POLICY_NAME [options]
+      banner(<<~BANNER)
+        Usage: chef delete-policy POLICY_NAME [options]
 
-`chef delete-policy POLICY_NAME` deletes all revisions of the policy
-`POLICY_NAME` on the configured Chef Server. All policy revisions will be
-backed up locally, allowing you to undo this operation via the `chef undelete`
-command.
+        `chef delete-policy POLICY_NAME` deletes all revisions of the policy
+        `POLICY_NAME` on the configured Chef Server. All policy revisions will be
+        backed up locally, allowing you to undo this operation via the `chef undelete`
+        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/delete_policy_group.rb

@@ -25,19 +25,19 @@ module ChefDK
 
     class DeletePolicyGroup < Base
 
-      banner(<<-BANNER)
-Usage: chef delete-policy-group POLICY_GROUP [options]
+      banner(<<~BANNER)
+        Usage: chef delete-policy-group POLICY_GROUP [options]
 
-`chef delete-policy-group POLICY_GROUP` deletes the policy group POLICY_GROUP on
-the configured Chef Server. Policy Revisions associated to the policy group are
-not deleted. The state of the policy group will be backed up locally, allowing
-you to undo this operation via the `chef undelete` command.
+        `chef delete-policy-group POLICY_GROUP` deletes the policy group POLICY_GROUP on
+        the configured Chef Server. Policy Revisions associated to the policy group are
+        not deleted. The state of the policy group will be backed up locally, allowing
+        you to undo this operation via the `chef undelete` 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/diff.rb

@@ -32,41 +32,41 @@ module ChefDK
       include Configurable
       include Policyfile::StorageConfigDelegation
 
-      banner(<<-BANNER)
-Usage: chef diff [POLICYFILE] [--head | --git GIT_REF | POLICY_GROUP | POLICY_GROUP...POLICY_GROUP ]
-
-`chef diff` displays an itemized diff comparing two revisions of a
-Policyfile lock.
-
-When the `--git` option is given, `chef diff` either compares a given
-git reference against the current lockfile revision on disk or compares
-between two git references. Examples:
-
-* `chef diff --git HEAD`: compares the current lock with the latest
-  commit on the current branch.
-* `chef diff --git master` compares the current lock with the latest
-  commit to master.
-* `chef diff --git v1.0.0`: compares the current lock with the revision
-  as of the `v1.0.0` tag.
-* `chef diff --git master...dev-branch` compares the Policyfile lock on
-  master with the revision on the `dev-branch` branch.
-* `chef diff --git v1.0.0...master` compares the Policyfile lock at the
-  `v1.0.0` tag with the lastest revision on the master branch.
-
-`chef diff --head` is a shortcut for `chef diff --git HEAD`.
-
-When no git-specific flag is given, `chef diff` either compares the
-current lockfile revision on disk to one on the server or compares two
-lockfiles on the server. Lockfiles on the Chef Server are specified by
-Policy Group. Examples:
-
-* `chef diff staging`: compares the current lock with the one currently
-  assigned to the `staging` Policy Group.
-* `chef diff production...staging` compares the lock currently assigned
-  to the `production` Policy Group to the lock currently assigned to the
-  `staging` Policy Group.
-
-Options:
+      banner(<<~BANNER)
+        Usage: chef diff [POLICYFILE] [--head | --git GIT_REF | POLICY_GROUP | POLICY_GROUP...POLICY_GROUP ]
+
+        `chef diff` displays an itemized diff comparing two revisions of a
+        Policyfile lock.
+
+        When the `--git` option is given, `chef diff` either compares a given
+        git reference against the current lockfile revision on disk or compares
+        between two git references. Examples:
+
+        * `chef diff --git HEAD`: compares the current lock with the latest
+          commit on the current branch.
+        * `chef diff --git master` compares the current lock with the latest
+          commit to master.
+        * `chef diff --git v1.0.0`: compares the current lock with the revision
+          as of the `v1.0.0` tag.
+        * `chef diff --git master...dev-branch` compares the Policyfile lock on
+          master with the revision on the `dev-branch` branch.
+        * `chef diff --git v1.0.0...master` compares the Policyfile lock at the
+          `v1.0.0` tag with the lastest revision on the master branch.
+
+        `chef diff --head` is a shortcut for `chef diff --git HEAD`.
+
+        When no git-specific flag is given, `chef diff` either compares the
+        current lockfile revision on disk to one on the server or compares two
+        lockfiles on the server. Lockfiles on the Chef Server are specified by
+        Policy Group. Examples:
+
+        * `chef diff staging`: compares the current lock with the one currently
+          assigned to the `staging` Policy Group.
+        * `chef diff production...staging` compares the lock currently assigned
+          to the `production` Policy Group to the lock currently assigned to the
+          `staging` Policy Group.
+
+        Options:
 BANNER
 
       option :git,

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

@@ -27,22 +27,22 @@ module ChefDK
 
       include Configurable
 
-      banner(<<-E)
-Usage: chef export [ POLICY_FILE ] DESTINATION_DIRECTORY [options]
+      banner(<<~E)
+        Usage: chef 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
-exported repo is copied to the target machine, you can apply the policy to the
-machine with:
+        `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
+        exported repo is copied to the target machine, you can apply the policy to the
+        machine with:
 
-`chef-client -z`.
+        `chef-client -z`.
 
-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/generate.rb

@@ -61,10 +61,10 @@ module ChefDK
       generator(:'build-cookbook', :BuildCookbook, "Generate a build cookbook for use with Delivery")
 
       def self.banner_headline
-        <<-E
-Usage: chef generate GENERATOR [options]
+        <<~E
+          Usage: chef generate GENERATOR [options]
 
-Available generators:
+          Available generators:
 E
       end
 

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

@@ -34,41 +34,41 @@ module ChefDK
       # You really want these to have default values, as
       # they will likely be used all over the place.
       option :license,
-        :short => "-I LICENSE",
-        :long => "--license LICENSE",
-        :description => "all_rights, apachev2, mit, gplv2, gplv3 - defaults to all_rights",
-        :proc => Proc.new { |l|
+        short: "-I LICENSE",
+        long: "--license LICENSE",
+        description: "all_rights, apachev2, mit, gplv2, gplv3 - defaults to all_rights",
+        proc: Proc.new { |l|
           l =~ /apache2/ ? "apachev2" : l
         },
-        :default => nil
+        default: nil
 
       option :copyright_holder,
-        :short => "-C COPYRIGHT",
-        :long => "--copyright COPYRIGHT",
-        :description => "Name of the copyright holder - defaults to 'The Authors'",
-        :default => nil
+        short: "-C COPYRIGHT",
+        long: "--copyright COPYRIGHT",
+        description: "Name of the copyright holder - defaults to 'The Authors'",
+        default: nil
 
       option :email,
-        :short => "-m EMAIL",
-        :long => "--email EMAIL",
-        :description => "Email address of the author - defaults to 'you@example.com'",
-        :default => nil
+        short: "-m EMAIL",
+        long: "--email EMAIL",
+        description: "Email address of the author - defaults to 'you@example.com'",
+        default: nil
 
       option :generator_cookbook,
-        :short => "-g GENERATOR_COOKBOOK_PATH",
-        :long  => "--generator-cookbook GENERATOR_COOKBOOK_PATH",
-        :description => "Use GENERATOR_COOKBOOK_PATH for the code_generator cookbook",
-        :default => nil,
-        :proc => Proc.new { |s| File.expand_path(s) },
-        :on => :tail
+        short: "-g GENERATOR_COOKBOOK_PATH",
+        long: "--generator-cookbook GENERATOR_COOKBOOK_PATH",
+        description: "Use GENERATOR_COOKBOOK_PATH for the code_generator cookbook",
+        default: nil,
+        proc: Proc.new { |s| File.expand_path(s) },
+        on: :tail
 
       generator_args = [] # accumulator variable
       option :generator_arg,
-        :short => "-a KEY=VALUE",
-        :long  => "--generator-arg KEY=VALUE",
-        :description => "Use to set arbitrary attribute KEY to VALUE in the code_generator cookbook",
-        :default => [],
-        :proc => Proc.new { |s| generator_args << s.split("=").map(&:strip) }
+        short: "-a KEY=VALUE",
+        long: "--generator-arg KEY=VALUE",
+        description: "Use to set arbitrary attribute KEY to VALUE in the code_generator cookbook",
+        default: [],
+        proc: Proc.new { |s| generator_args << s.split("=").map(&:strip) }
     end
 
     # ## GeneratorCommands

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

@@ -30,9 +30,9 @@ module ChefDK
         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"
+          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)
 

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

@@ -44,7 +44,7 @@ module ChefDK
         set_or_return(
           :message,
           arg,
-          :kind_of => String
+          kind_of: String
         )
       end
 

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

@@ -64,9 +64,9 @@ module ChefDK
           default:      false
 
         option :pipeline,
-          :long => "--pipeline PIPELINE",
-          :description => "Use PIPELINE to set target branch to something other than master for the build_cookbook",
-          :default => "master"
+          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)
 

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

@@ -23,9 +23,9 @@ module ChefDK
       # chef generate file [path/to/cookbook_root] name --source=source_file
       class CookbookFile < CookbookCodeFile
         option :source,
-          :short => "-s SOURCE_FILE",
-          :long  => "--source SOURCE_FILE",
-          :description => "Copy content from SOURCE_FILE"
+          short: "-s SOURCE_FILE",
+          long: "--source SOURCE_FILE",
+          description: "Copy content from SOURCE_FILE"
 
         banner "Usage: chef generate file [path/to/cookbook] NAME [options]"
 

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

@@ -106,11 +106,11 @@ module ChefDK
 
         # @api private
         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'
-version          '0.1.0'
+          <<~METADATA
+            name             '#{cookbook_name}'
+            description      'Custom code generator cookbook for use with ChefDK'
+            long_description 'Custom code generator cookbook for use with ChefDK'
+            version          '0.1.0'
 
 METADATA
         end

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

@@ -24,9 +24,9 @@ module ChefDK
       class Template < CookbookCodeFile
 
         option :source,
-          :short => "-s SOURCE_FILE",
-          :long  => "--source SOURCE_FILE",
-          :description => "Copy content from SOURCE_FILE"
+          short: "-s SOURCE_FILE",
+          long: "--source SOURCE_FILE",
+          description: "Copy content from SOURCE_FILE"
 
         banner "Usage: chef generate template [path/to/cookbook] NAME [options]"