chef-dk 1.2.22 → 1.3.40

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/cookbook_code_file'
+require "chef-dk/command/generator_commands/cookbook_code_file"
 
 module ChefDK
   module Command
@@ -28,10 +28,9 @@ module ChefDK
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe
-          'attribute'
+          "attribute"
         end
       end
     end
   end
 end
-

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'chef-dk/configurable'
-require 'chef-dk/command/generator_commands'
+require "chef-dk/configurable"
+require "chef-dk/command/generator_commands"
 
-require 'chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext'
-require 'chef-dk/command/generator_commands/chef_exts/generator_desc_resource'
+require "chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext"
+require "chef-dk/command/generator_commands/chef_exts/generator_desc_resource"
 
 module ChefDK
   module Command
@@ -71,11 +71,11 @@ module ChefDK
           apply_generator_values_from_config
           Generator.add_attr_to_context(:have_git, have_git?)
           Generator.add_attr_to_context(:skip_git_init, false)
-          config.each do |k,v|
+          config.each do |k, v|
             Generator.add_attr_to_context(k, v)
           end
           # inject the arbitrary args supplied on cmdline, default = []
-          config[:generator_arg].each do |k,v|
+          config[:generator_arg].each do |k, v|
             Generator.add_attr_to_context(k, v)
           end
         end
@@ -85,7 +85,7 @@ module ChefDK
         def have_git?
           path = ENV["PATH"] || ""
           paths = path.split(File::PATH_SEPARATOR)
-          exts = [RbConfig::CONFIG['EXEEXT']]
+          exts = [RbConfig::CONFIG["EXEEXT"]]
           exts.concat(ENV["PATHEXT"].split(";")) unless ENV["PATHEXT"].nil?
           paths.any? do |bin_path|
             exts.any? do |ext|
@@ -136,20 +136,20 @@ module ChefDK
 
         def coerce_generator_copyright_holder
           generator_config.copyright_holder ||
-          knife_config.cookbook_copyright ||
-          "The Authors"
+            knife_config.cookbook_copyright ||
+            "The Authors"
         end
 
         def coerce_generator_email
           generator_config.email ||
-          knife_config.cookbook_email ||
-          "you@example.com"
+            knife_config.cookbook_email ||
+            "you@example.com"
         end
 
         def coerce_generator_license
           generator_config.license ||
-          knife_config.cookbook_license ||
-          "all_rights"
+            knife_config.cookbook_license ||
+            "all_rights"
         end
       end
     end

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/base'
+require "chef-dk/command/generator_commands/base"
 
 module ChefDK
   module Command
@@ -30,7 +30,7 @@ module ChefDK
         attr_reader :cookbook_name_or_path
 
         option :pipeline,
-          :long  => "--pipeline PIPELINE",
+          :long => "--pipeline PIPELINE",
           :description => "Use PIPELINE to set target branch to something other than master for the build_cookbook",
           :default => "master"
 

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'chef/resource'
-require 'chef/provider'
+require "chef/resource"
+require "chef/provider"
 
 module ChefDK
   module ChefResource

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef/formatters/doc'
+require "chef/formatters/doc"
 
 module ChefDK
 
@@ -36,4 +36,3 @@ module ChefDK
     end
   end
 end
-

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef/dsl/recipe'
+require "chef/dsl/recipe"
 
 module ChefDK
 
@@ -37,4 +37,3 @@ module ChefDK
 end
 
 Chef::DSL::Recipe.send(:include, ChefDK::RecipeDSLExt)
-

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/base'
+require "chef-dk/command/generator_commands/base"
 
 module ChefDK
   module Command
@@ -64,7 +64,7 @@ module ChefDK
           default:      false
 
         option :pipeline,
-          :long  => "--pipeline PIPELINE",
+          :long => "--pipeline PIPELINE",
           :description => "Use PIPELINE to set target branch to something other than master for the build_cookbook",
           :default => "master"
 

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/base'
+require "chef-dk/command/generator_commands/base"
 
 module ChefDK
   module Command
@@ -46,7 +46,7 @@ module ChefDK
             setup_context
             chef_runner.converge
           else
-            errors.each {|error| err("Error: #{error}") }
+            errors.each { |error| err("Error: #{error}") }
             parse_options(params)
             msg(opt_parser)
             1
@@ -85,7 +85,7 @@ module ChefDK
         end
 
         def validate_cookbook_path
-          unless File.directory?(File.join(cookbook_path, "recipes"))
+          unless File.file?(File.join(cookbook_path, "metadata.rb"))
             @errors << "Directory #{cookbook_path} is not a cookbook"
             @params_valid = false
           end

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/cookbook_code_file'
+require "chef-dk/command/generator_commands/cookbook_code_file"
 
 module ChefDK
   module Command
@@ -32,7 +32,7 @@ module ChefDK
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe
-          'cookbook_file'
+          "cookbook_file"
         end
 
         def setup_context

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'fileutils'
+require "fileutils"
 
-require 'chef-dk/configurable'
-require 'chef-dk/ui'
-require 'chef-dk/command/generator_commands/base'
+require "chef-dk/configurable"
+require "chef-dk/ui"
+require "chef-dk/command/generator_commands/base"
 
 module ChefDK
   module Command
@@ -115,7 +115,6 @@ version          '0.1.0'
 METADATA
         end
 
-
         def custom_cookbook_name?
           @custom_cookbook_name
         end
@@ -170,8 +169,6 @@ METADATA
 
       end
 
-
     end
   end
 end
-

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/cookbook_code_file'
+require "chef-dk/command/generator_commands/cookbook_code_file"
 
 module ChefDK
   module Command
@@ -28,7 +28,7 @@ module ChefDK
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe
-          'lwrp'
+          "lwrp"
         end
       end
     end

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/base'
+require "chef-dk/command/generator_commands/base"
 
 module ChefDK
   module Command
@@ -42,7 +42,7 @@ module ChefDK
         end
 
         def recipe
-          'policyfile'
+          "policyfile"
         end
 
         def setup_context
@@ -88,7 +88,6 @@ module ChefDK
             err("ERROR: too many arguments")
             return false
           end
-
         end
 
         private

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/cookbook_code_file'
+require "chef-dk/command/generator_commands/cookbook_code_file"
 
 module ChefDK
   module Command
@@ -28,7 +28,7 @@ module ChefDK
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe
-          'recipe'
+          "recipe"
         end
       end
     end

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/base'
+require "chef-dk/command/generator_commands/base"
 
 module ChefDK
   module Command
@@ -121,5 +121,3 @@ module ChefDK
     end
   end
 end
-
-

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/cookbook_code_file'
+require "chef-dk/command/generator_commands/cookbook_code_file"
 
 module ChefDK
   module Command
@@ -33,7 +33,7 @@ module ChefDK
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe
-          'template'
+          "template"
         end
 
         def setup_context

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/install'
-require 'chef-dk/configurable'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/policyfile_services/install"
+require "chef-dk/configurable"
 
 module ChefDK
   module Command
@@ -118,4 +118,3 @@ E
     end
   end
 end
-

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

@@ -15,14 +15,14 @@
 # limitations under the License.
 #
 
-require 'ostruct'
+require "ostruct"
 
-require 'chef-dk/command/base'
-require 'chef-dk/configurable'
-require 'chef-dk/chef_runner'
-require 'chef-dk/policyfile_services/push'
+require "chef-dk/command/base"
+require "chef-dk/configurable"
+require "chef-dk/chef_runner"
+require "chef-dk/policyfile_services/push"
 
-require 'chef/provisioning'
+require "chef/provisioning"
 
 module ChefDK
 
@@ -66,18 +66,18 @@ module ChefDK
       def convergence_options
         {
           chef_server: Chef::Config.chef_server_url,
-          chef_config: chef_config
+          chef_config: chef_config,
         }
       end
 
       def chef_config
-        config=<<-CONFIG
+        config = <<-CONFIG
 # SSL Settings:
 ssl_verify_mode #{Chef::Config.ssl_verify_mode.inspect}
 
 CONFIG
         if enable_policyfile
-          policyfile_config=<<-CONFIG
+          policyfile_config = <<-CONFIG
 # Policyfile Settings:
 use_policyfile true
 policy_document_native_api true
@@ -185,14 +185,14 @@ E
         long:         "--target REMOTE_HOST",
         description:  "Set hostname or IP of the host to converge (may be overriden by provisioning cookbook)"
 
-      OPT_SEPARATOR = /[=\s]+/.freeze
+      OPT_SEPARATOR = /[=\s]+/
 
       def self.split_opt(key_value)
         key, _separator, value = key_value.partition(OPT_SEPARATOR)
         [key, value]
       end
 
-      opts={}
+      opts = {}
 
       option :opts,
         short:        "-o OPT=VALUE",
@@ -207,7 +207,6 @@ E
         description: "Enable stacktraces and other debug output",
         default:     false
 
-
       attr_reader :params
       attr_reader :policyfile_relative_path
       attr_reader :policy_group
@@ -371,7 +370,7 @@ E
       end
 
       def provisioning_recipe_path
-        File.join(cookbook_expanded_path, 'recipes', "#{recipe}.rb")
+        File.join(cookbook_expanded_path, "recipes", "#{recipe}.rb")
       end
 
       def cookbook_expanded_path
@@ -435,4 +434,3 @@ E
     end
   end
 end
-

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/push'
-require 'chef-dk/configurable'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/policyfile_services/push"
+require "chef-dk/configurable"
 
 module ChefDK
   module Command
@@ -102,7 +102,7 @@ E
 
       def apply_params!(params)
         remaining_args = parse_options(params)
-        if remaining_args.size < 1 or remaining_args.size > 2
+        if remaining_args.size < 1 || remaining_args.size > 2
           ui.err(opt_parser)
           return false
         else
@@ -115,4 +115,3 @@ E
     end
   end
 end
-