chef-dk 1.2.22 → 1.3.40

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'mixlib/cli'
-require 'chef-dk/helpers'
-require 'chef-dk/version'
-require 'chef/exceptions'
+require "mixlib/cli"
+require "chef-dk/helpers"
+require "chef-dk/version"
+require "chef/exceptions"
 
 module ChefDK
   module Command

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

@@ -15,15 +15,14 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/configurable'
-require 'chef-dk/policyfile_services/clean_policy_cookbooks'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/configurable"
+require "chef-dk/policyfile_services/clean_policy_cookbooks"
 
 module ChefDK
   module Command
 
-
     class CleanPolicyCookbooks < Base
 
       banner(<<-BANNER)

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

@@ -15,15 +15,14 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/configurable'
-require 'chef-dk/policyfile_services/clean_policies'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/configurable"
+require "chef-dk/policyfile_services/clean_policies"
 
 module ChefDK
   module Command
 
-
     class CleanPolicyRevisions < Base
 
       banner(<<-BANNER)
@@ -110,4 +109,3 @@ BANNER
     end
   end
 end
-

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

@@ -15,15 +15,14 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/configurable'
-require 'chef-dk/policyfile_services/rm_policy'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/configurable"
+require "chef-dk/policyfile_services/rm_policy"
 
 module ChefDK
   module Command
 
-
     class DeletePolicy < Base
 
       banner(<<-BANNER)
@@ -119,4 +118,3 @@ BANNER
     end
   end
 end
-

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

@@ -15,15 +15,14 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/configurable'
-require 'chef-dk/policyfile_services/rm_policy_group'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/configurable"
+require "chef-dk/policyfile_services/rm_policy_group"
 
 module ChefDK
   module Command
 
-
     class DeletePolicyGroup < Base
 
       banner(<<-BANNER)
@@ -79,8 +78,8 @@ BANNER
       def rm_policy_group_service
         @rm_policy_group_service ||=
           PolicyfileServices::RmPolicyGroup.new(config: chef_config,
-                                             ui: ui,
-                                             policy_group: policy_group)
+                                                ui: ui,
+                                                policy_group: policy_group)
       end
 
       def debug?
@@ -119,4 +118,3 @@ BANNER
     end
   end
 end
-

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

@@ -15,14 +15,14 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/pager'
-require 'chef-dk/policyfile/differ'
-require 'chef-dk/policyfile/comparison_base'
-require 'chef-dk/policyfile/storage_config'
-require 'chef-dk/configurable'
-require 'chef-dk/authenticated_http'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/pager"
+require "chef-dk/policyfile/differ"
+require "chef-dk/policyfile/comparison_base"
+require "chef-dk/policyfile/storage_config"
+require "chef-dk/configurable"
+require "chef-dk/authenticated_http"
 
 module ChefDK
   module Command
@@ -152,7 +152,7 @@ BANNER
         end
       end
 
-      def differ(ui = ui())
+      def differ(ui = self.ui())
         Policyfile::Differ.new(old_name: old_base.name,
                                old_lock: old_lock,
                                new_name: new_base.name,
@@ -313,4 +313,3 @@ BANNER
 
   end
 end
-

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

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/cookbook_omnifetch'
-require 'chef-dk/ui'
-require 'chef-dk/version'
-require 'mixlib/shellout'
-require 'yaml'
+require "chef-dk/command/base"
+require "chef-dk/cookbook_omnifetch"
+require "chef-dk/ui"
+require "chef-dk/version"
+require "mixlib/shellout"
+require "yaml"
 
 module ChefDK
   module Command
@@ -36,55 +36,54 @@ module ChefDK
 
       def run(params)
         info = {}
-        info['Chef Development Kit'] = Hash.new.tap do |chefdk_env|
-          chefdk_env['ChefDK'] = chefdk_info
-          chefdk_env['Ruby'] = ruby_info
-          chefdk_env['Path'] = paths
+        info["Chef Development Kit"] = Hash.new.tap do |chefdk_env|
+          chefdk_env["ChefDK"] = chefdk_info
+          chefdk_env["Ruby"] = ruby_info
+          chefdk_env["Path"] = paths
         end
         ui.msg info.to_yaml
       end
 
       def chefdk_info
         Hash.new.tap do |chefdk|
-          chefdk['ChefDK Version'] = ChefDK::VERSION
-          chefdk['ChefDK Home'] = chefdk_home
-          chefdk['ChefDK Install Directory'] = omnibus_root
-          chefdk['Policyfile Config'] = policyfile_config
+          chefdk["ChefDK Version"] = ChefDK::VERSION
+          chefdk["ChefDK Home"] = chefdk_home
+          chefdk["ChefDK Install Directory"] = omnibus_root
+          chefdk["Policyfile Config"] = policyfile_config
         end
       end
 
       def ruby_info
         Hash.new.tap do |ruby|
-          ruby['Ruby Executable'] = Gem.ruby
-          ruby['Ruby Version'] = RUBY_VERSION
-          ruby['RubyGems'] = Hash.new.tap do |rubygems|
-            rubygems['RubyGems Version'] = Gem::VERSION
-            rubygems['RubyGems Platforms'] = Gem.platforms.map(&:to_s)
-            rubygems['Gem Environment'] = gem_environment
+          ruby["Ruby Executable"] = Gem.ruby
+          ruby["Ruby Version"] = RUBY_VERSION
+          ruby["RubyGems"] = Hash.new.tap do |rubygems|
+            rubygems["RubyGems Version"] = Gem::VERSION
+            rubygems["RubyGems Platforms"] = Gem.platforms.map(&:to_s)
+            rubygems["Gem Environment"] = gem_environment
           end
         end
       end
 
       def gem_environment
         Hash.new.tap do |h|
-          h['GEM ROOT'] = omnibus_env['GEM_ROOT']
-          h['GEM HOME'] = omnibus_env['GEM_HOME']
-          h['GEM PATHS'] = omnibus_env['GEM_PATH'].split(File::PATH_SEPARATOR)
+          h["GEM ROOT"] = omnibus_env["GEM_ROOT"]
+          h["GEM HOME"] = omnibus_env["GEM_HOME"]
+          h["GEM PATHS"] = omnibus_env["GEM_PATH"].split(File::PATH_SEPARATOR)
         end
       end
 
       def paths
-        omnibus_env['PATH'].split(File::PATH_SEPARATOR)
+        omnibus_env["PATH"].split(File::PATH_SEPARATOR)
       end
 
       def policyfile_config
         Hash.new.tap do |h|
-          h['Cache Path'] = CookbookOmnifetch.cache_path
-          h['Storage Path'] = CookbookOmnifetch.storage_path.to_s
+          h["Cache Path"] = CookbookOmnifetch.cache_path
+          h["Storage Path"] = CookbookOmnifetch.storage_path.to_s
         end
       end
 
     end
   end
 end
-

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'mixlib/shellout'
+require "chef-dk/command/base"
+require "mixlib/shellout"
 
 module ChefDK
   module Command
@@ -26,9 +26,9 @@ module ChefDK
       def run(params)
         # Set ENV directly on the "parent" process (us) before running #exec to
         # ensure the custom PATH is honored when finding the command to exec
-        omnibus_env.each {|var, value| ENV[var] = value }
+        omnibus_env.each { |var, value| ENV[var] = value }
         exec(*params)
-        raise "Exec failed without an exception, your ruby is buggy"  # should never get here
+        raise "Exec failed without an exception, your ruby is buggy" # should never get here
       end
 
       def needs_version?(params)
@@ -37,9 +37,8 @@ module ChefDK
       end
 
       def needs_help?(params)
-        ['-h', '--help'].include? params[0]
+        ["-h", "--help"].include? params[0]
       end
     end
   end
 end
-

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/export_repo'
-require 'chef-dk/configurable'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/policyfile_services/export_repo"
+require "chef-dk/configurable"
 
 module ChefDK
   module Command
@@ -119,10 +119,10 @@ E
 
       def export_service
         @export_service ||= PolicyfileServices::ExportRepo.new(policyfile: policyfile_relative_path,
-                                                       export_dir: export_dir,
-                                                       root_dir: Dir.pwd,
-                                                       archive: archive?,
-                                                       force: config[:force])
+                                                               export_dir: export_dir,
+                                                               root_dir: Dir.pwd,
+                                                               archive: archive?,
+                                                               force: config[:force])
       end
 
       def handle_error(error)
@@ -153,5 +153,3 @@ E
     end
   end
 end
-
-

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-require 'pp'
+require "chef-dk/command/base"
+require "rubygems"
+require "rubygems/gem_runner"
+require "rubygems/exceptions"
+require "pp"
 
 module ChefDK
   module Command

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

@@ -15,21 +15,21 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/command/generator_commands'
-require 'chef-dk/command/generator_commands/base'
-require 'chef-dk/command/generator_commands/cookbook_code_file'
-require 'chef-dk/command/generator_commands/cookbook'
-require 'chef-dk/command/generator_commands/app'
-require 'chef-dk/command/generator_commands/attribute'
-require 'chef-dk/command/generator_commands/cookbook_file'
-require 'chef-dk/command/generator_commands/lwrp'
-require 'chef-dk/command/generator_commands/recipe'
-require 'chef-dk/command/generator_commands/template'
-require 'chef-dk/command/generator_commands/repo'
-require 'chef-dk/command/generator_commands/policyfile'
-require 'chef-dk/command/generator_commands/generator_generator'
-require 'chef-dk/command/generator_commands/build_cookbook'
+require "chef-dk/command/base"
+require "chef-dk/command/generator_commands"
+require "chef-dk/command/generator_commands/base"
+require "chef-dk/command/generator_commands/cookbook_code_file"
+require "chef-dk/command/generator_commands/cookbook"
+require "chef-dk/command/generator_commands/app"
+require "chef-dk/command/generator_commands/attribute"
+require "chef-dk/command/generator_commands/cookbook_file"
+require "chef-dk/command/generator_commands/lwrp"
+require "chef-dk/command/generator_commands/recipe"
+require "chef-dk/command/generator_commands/template"
+require "chef-dk/command/generator_commands/repo"
+require "chef-dk/command/generator_commands/policyfile"
+require "chef-dk/command/generator_commands/generator_generator"
+require "chef-dk/command/generator_commands/build_cookbook"
 
 module ChefDK
   module Command
@@ -66,8 +66,8 @@ E
       end
 
       def self.generator_list
-        justify_size = generators.map {|g| g.name.size }.max + 2
-        generators.map {|g| "  #{g.name.to_s.ljust(justify_size)}#{g.description}"}.join("\n")
+        justify_size = generators.map { |g| g.name.size }.max + 2
+        generators.map { |g| "  #{g.name.to_s.ljust(justify_size)}#{g.description}" }.join("\n")
       end
 
       def self.banner
@@ -101,7 +101,7 @@ E
       end
 
       def generator_for(arg)
-        self.class.generators.find {|g| g.name.to_s == arg}
+        self.class.generators.find { |g| g.name.to_s == arg }
       end
 
       # In the Base class, this is defined to be true if any args match "-h" or
@@ -114,7 +114,7 @@ E
       end
 
       def have_generator?(name)
-        self.class.generators.map {|g| g.name.to_s}.include?(name)
+        self.class.generators.map { |g| g.name.to_s }.include?(name)
       end
 
     end

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

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require 'mixlib/cli'
-require 'rbconfig'
-require 'pathname'
-require 'chef-dk/command/base'
-require 'chef-dk/chef_runner'
-require 'chef-dk/generator'
+require "mixlib/cli"
+require "rbconfig"
+require "pathname"
+require "chef-dk/command/base"
+require "chef-dk/chef_runner"
+require "chef-dk/generator"
 
 module ChefDK
   module Command
@@ -38,7 +38,7 @@ module ChefDK
         :long => "--license LICENSE",
         :description => "all_rights, apachev2, mit, gplv2, gplv3 - defaults to all_rights",
         :proc => Proc.new { |l|
-          l.match(/apache2/) ? 'apachev2' : l
+          l =~ /apache2/ ? "apachev2" : l
         },
         :default => nil
 
@@ -68,7 +68,7 @@ module ChefDK
         :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) }
+        :proc => Proc.new { |s| generator_args << s.split("=").map(&:strip) }
     end
 
     # ## GeneratorCommands

data/lib/chef-dk/command/generator_commands/app.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
@@ -80,7 +80,7 @@ module ChefDK
         end
 
         def cookbook_root
-          File.join(app_full_path, 'cookbooks')
+          File.join(app_full_path, "cookbooks")
         end
 
         def cookbook_name
@@ -104,4 +104,3 @@ module ChefDK
     end
   end
 end
-