chef-dk 1.2.22 → 1.3.40

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'chef-dk/policyfile/null_cookbook_source'
-require 'chef-dk/policyfile/community_cookbook_source'
-require 'chef-dk/policyfile/chef_server_cookbook_source'
-require 'chef-dk/policyfile/chef_repo_cookbook_source'
-require 'chef-dk/policyfile/delivery_supermarket_source'
+require "chef-dk/policyfile/null_cookbook_source"
+require "chef-dk/policyfile/community_cookbook_source"
+require "chef-dk/policyfile/chef_server_cookbook_source"
+require "chef-dk/policyfile/chef_repo_cookbook_source"
+require "chef-dk/policyfile/delivery_supermarket_source"

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'forwardable'
+require "forwardable"
 
-require 'semverse'
+require "semverse"
 
-require 'chef-dk/policyfile/community_cookbook_source'
+require "chef-dk/policyfile/community_cookbook_source"
 
 module ChefDK
   module Policyfile
@@ -71,11 +71,11 @@ module ChefDK
         @universe_graph ||= begin
           @community_source.universe_graph.inject({}) do |truncated, (cookbook_name, version_and_deps_list)|
             sorted_versions = version_and_deps_list.keys.sort_by do |version_string|
-            Semverse::Version.new(version_string)
-          end
-          greatest_version = sorted_versions.last
-          truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
-          truncated
+              Semverse::Version.new(version_string)
+            end
+            greatest_version = sorted_versions.last
+            truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
+            truncated
           end
         end
       end
@@ -87,4 +87,3 @@ module ChefDK
     end
   end
 end
-

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'diff/lcs'
-require 'diff/lcs/hunk'
-require 'paint'
-require 'ffi_yajl'
+require "diff/lcs"
+require "diff/lcs/hunk"
+require "paint"
+require "ffi_yajl"
 
 module ChefDK
   module Policyfile
@@ -29,7 +29,6 @@ module ChefDK
       INITIAL_FILE_LENGTH_DIFFERENCE = 0
       FORMAT = :unified
 
-
       attr_reader :old_lock
       attr_reader :old_name
       attr_reader :new_lock
@@ -88,7 +87,7 @@ module ChefDK
       end
 
       def report_rev_id_changes
-        h1('REVISION ID CHANGED')
+        h1("REVISION ID CHANGED")
         old_rev = old_lock["revision_id"]
         new_rev = new_lock["revision_id"]
         diff_lines([ old_rev ], [ new_rev ])
@@ -179,12 +178,12 @@ module ChefDK
 
       def h1(str)
         ui.msg(str)
-        ui.msg('=' * str.size)
+        ui.msg("=" * str.size)
       end
 
       def h2(str)
         ui.msg(str)
-        ui.msg('-' * str.size)
+        ui.msg("-" * str.size)
       end
 
       def diff_lines(old_lines, new_lines)
@@ -259,8 +258,6 @@ module ChefDK
         end
       end
 
-
     end
   end
 end
-

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

@@ -15,18 +15,18 @@
 # limitations under the License.
 #
 
-require 'chef-dk/policyfile/cookbook_sources'
-require 'chef-dk/policyfile/cookbook_location_specification'
-require 'chef-dk/policyfile/storage_config'
+require "chef-dk/policyfile/cookbook_sources"
+require "chef-dk/policyfile/cookbook_location_specification"
+require "chef-dk/policyfile/storage_config"
 
-require 'chef/node/attribute'
-require 'chef/run_list/run_list_item'
+require "chef/node/attribute"
+require "chef/run_list/run_list_item"
 
 module ChefDK
   module Policyfile
     class DSL
 
-      RUN_LIST_ITEM_COMPONENT = %r/^[.[:alnum:]_-]+$/.freeze
+      RUN_LIST_ITEM_COMPONENT = %r{^[.[:alnum:]_-]+$}
 
       include StorageConfigDelegation
 
@@ -108,7 +108,6 @@ module ChefDK
         constraint = version_and_source_opts.first || ">= 0.0.0"
         spec = CookbookLocationSpecification.new(name, constraint, source_options, storage_config)
 
-
         if existing_source = @cookbook_location_specs[name]
           err = "Cookbook '#{name}' assigned to conflicting sources\n\n"
           err << "Previous source: #{existing_source.source_options.inspect}\n"
@@ -140,7 +139,7 @@ module ChefDK
         raise
       rescue Exception => e
         error_message = "Evaluation of policyfile '#{policyfile_filename}' raised an exception\n"
-        error_message << "  Exception: #{e.class.name} \"#{e.to_s}\"\n\n"
+        error_message << "  Exception: #{e.class.name} \"#{e}\"\n\n"
         trace = filtered_bt(policyfile_filename, e)
         error_message << "  Relevant Code:\n"
         error_message << "    #{error_context(policyfile_string, policyfile_filename, e)}\n\n"
@@ -201,7 +200,7 @@ module ChefDK
           run_list_desc = run_list_name.nil? ? "Run List Item '#{item}'" : "Named Run List '#{run_list_name}' Item '#{item}'"
 
           item_name = Chef::RunList::RunListItem.new(item).name
-          cookbook, separator, recipe = item_name.partition('::')
+          cookbook, separator, recipe = item_name.partition("::")
 
           if RUN_LIST_ITEM_COMPONENT.match(cookbook).nil?
             message = "#{run_list_desc} has invalid cookbook name '#{cookbook}'.\nCookbook names can only contain alphanumerics, hyphens, and underscores."
@@ -247,7 +246,7 @@ module ChefDK
 
       def culprit_line_number(policyfile_filename, exception)
         if most_proximate_backtrace_line = filtered_bt(policyfile_filename, exception).first
-          most_proximate_backtrace_line[/^(?:.\:)?[^:]+:([\d]+)/,1].to_i
+          most_proximate_backtrace_line[/^(?:.\:)?[^:]+:([\d]+)/, 1].to_i
         else
           nil
         end
@@ -255,7 +254,7 @@ module ChefDK
 
       def filtered_bt(policyfile_filename, exception)
         policyfile_filename_matcher = /^#{Regexp.escape(policyfile_filename)}/
-        exception.backtrace.select {|line| line =~ policyfile_filename_matcher }
+        exception.backtrace.select { |line| line =~ policyfile_filename_matcher }
       end
 
     end

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'set'
+require "set"
 
-require 'chef-dk/authenticated_http'
-require 'chef-dk/service_exceptions'
+require "chef-dk/authenticated_http"
+require "chef-dk/service_exceptions"
 
 module ChefDK
   module Policyfile
@@ -33,7 +33,6 @@ module ChefDK
         @lock_info_by_rev_id = lock_info_by_rev_id
       end
 
-
       def cb_info_for(rev_id, cookbook_name)
         lock = lock_info_by_rev_id[rev_id]
         cookbook_lock = lock["cookbook_locks"][cookbook_name]
@@ -228,5 +227,3 @@ module ChefDK
     end
   end
 end
-
-

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

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'chef-dk/exceptions'
+require "chef-dk/exceptions"
 
 module ChefDK
   module Policyfile
     class NullCookbookSource
 
-      def initialize(_uri=nil)
+      def initialize(_uri = nil)
       end
 
       def universe_graph
@@ -29,7 +29,7 @@ module ChefDK
       end
 
       def source_options_for(cookbook_name, cookbook_version)
-        raise UnsupportedFeature, 'You must set a default_source in your Policyfile to download cookbooks without explicit sources'
+        raise UnsupportedFeature, "You must set a default_source in your Policyfile to download cookbooks without explicit sources"
       end
 
       def null?

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

@@ -16,9 +16,9 @@
 #
 
 # This fixes a missing require in chef/digester:
-require 'singleton'
-require 'chef/cookbook/cookbook_version_loader'
-require 'chef/cookbook/chefignore'
+require "singleton"
+require "chef/cookbook/cookbook_version_loader"
+require "chef/cookbook/chefignore"
 
 module ChefDK
   module Policyfile

data/lib/chef-dk/policyfile/reports/install.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/policyfile/reports/table_printer'
+require "chef-dk/policyfile/reports/table_printer"
 
 module ChefDK
   module Policyfile
@@ -48,7 +48,7 @@ module ChefDK
 
         def fixed_version_install_table
           @fixed_version_install_table ||= TablePrinter.new(ui) do |t|
-            t.column(["Using", "Installing"])
+            t.column(%w{Using Installing})
             t.column(policyfile_compiler.fixed_version_cookbooks_specs.keys)
             t.column
             t.column
@@ -57,7 +57,7 @@ module ChefDK
 
         def install_table
           @install_table ||= TablePrinter.new(ui) do |t|
-            t.column(["Using", "Installing"])
+            t.column(%w{Using Installing})
             t.column(policyfile_compiler.graph_solution.keys)
             t.column(policyfile_compiler.graph_solution.values)
           end
@@ -67,4 +67,3 @@ module ChefDK
     end
   end
 end
-

data/lib/chef-dk/policyfile/reports/table_printer.rb

@@ -55,4 +55,3 @@ module ChefDK
     end
   end
 end
-

data/lib/chef-dk/policyfile/reports/upload.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/policyfile/reports/table_printer'
+require "chef-dk/policyfile/reports/table_printer"
 
 module ChefDK
   module Policyfile
@@ -38,18 +38,18 @@ module ChefDK
         def show
           reused_cbs.each do |cb_with_lock|
             lock = cb_with_lock.lock
-            table.print_row("Using", lock.name, lock.version, "(#{lock.identifier[0,8]})")
+            table.print_row("Using", lock.name, lock.version, "(#{lock.identifier[0, 8]})")
           end
 
           uploaded_cbs.each do |cb_with_lock|
             lock = cb_with_lock.lock
-            table.print_row("Uploaded", lock.name, lock.version, "(#{lock.identifier[0,8]})")
+            table.print_row("Uploaded", lock.name, lock.version, "(#{lock.identifier[0, 8]})")
           end
         end
 
         def table
           @table ||= TablePrinter.new(ui) do |t|
-            t.column(%w[ Using Uploaded ])
+            t.column(%w{ Using Uploaded })
             t.column(cookbook_names)
             t.column(cookbook_version_numbers)
             t.column

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

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'semverse'
+require "semverse"
 
-require 'chef-dk/exceptions'
+require "chef-dk/exceptions"
 
 module ChefDK
   module Policyfile
@@ -35,7 +35,7 @@ module ChefDK
         end
 
         def self.parse(str)
-          name, version_w_parens = str.split(' ')
+          name, version_w_parens = str.split(" ")
           version = version_w_parens[/\(([^)]+)\)/, 1]
           new(name, version)
         end
@@ -45,8 +45,8 @@ module ChefDK
         end
 
         def eql?(other)
-          other.kind_of?(self.class) and
-            other.name == name and
+          other.kind_of?(self.class) &&
+            other.name == name &&
             other.version == version
         end
 
@@ -57,7 +57,7 @@ module ChefDK
       end
 
       def self.from_lock(lock_data)
-        new.tap {|e| e.consume_lock_data(lock_data) }
+        new.tap { |e| e.consume_lock_data(lock_data) }
       end
 
       attr_reader :policyfile_dependencies
@@ -84,7 +84,7 @@ module ChefDK
       end
 
       def consume_lock_data(lock_data)
-        unless lock_data.key?("Policyfile") and lock_data.key?("dependencies")
+        unless lock_data.key?("Policyfile") && lock_data.key?("dependencies")
           msg = %Q|lockfile solution_dependencies must be a Hash of the form `{"Policyfile": [], "dependencies": {} }' (got: #{lock_data.inspect})|
           raise InvalidLockfile, msg
         end
@@ -154,8 +154,8 @@ module ChefDK
         policyfile_conflicts = []
 
         @policyfile_dependencies.each do |dep_name, constraint|
-          if dep_name == cookbook_name and !constraint.satisfies?(version)
-            policyfile_conflicts << ['Policyfile', dep_name, constraint]
+          if dep_name == cookbook_name && !constraint.satisfies?(version)
+            policyfile_conflicts << ["Policyfile", dep_name, constraint]
           end
         end
 
@@ -167,7 +167,7 @@ module ChefDK
 
         @cookbook_dependencies.each do |top_level_dep_name, dependencies|
           dependencies.each do |dep_name, constraint|
-            if dep_name == cookbook_name and !constraint.satisfies?(version)
+            if dep_name == cookbook_name && !constraint.satisfies?(version)
               cookbook_conflicts << [top_level_dep_name, dep_name, constraint]
             end
           end
@@ -195,7 +195,7 @@ module ChefDK
       end
 
       def find_cookbook_dep_by_name(name)
-        @cookbook_dependencies.find { |k,v| k.name == name }
+        @cookbook_dependencies.find { |k, v| k.name == name }
       end
 
       def find_cookbook_dep_by_name_and_version(name, version)
@@ -216,19 +216,19 @@ module ChefDK
       end
 
       def add_policyfile_dep_from_lock_data(entry)
-        unless entry.kind_of?(Array) and entry.size == 2
-          msg = %Q(lockfile solution_dependencies Policyfile dependencies entry must be like [ "$COOKBOOK_NAME", "$CONSTRAINT" ] (got: #{entry.inspect}))
+        unless entry.kind_of?(Array) && entry.size == 2
+          msg = %Q{lockfile solution_dependencies Policyfile dependencies entry must be like [ "$COOKBOOK_NAME", "$CONSTRAINT" ] (got: #{entry.inspect})}
           raise InvalidLockfile, msg
         end
 
         cookbook_name, constraint = entry
 
-        unless cookbook_name.kind_of?(String) and !cookbook_name.empty?
+        unless cookbook_name.kind_of?(String) && !cookbook_name.empty?
           msg = "lockfile solution_dependencies Policyfile dependencies entry. Cookbook name portion must be a string (got: #{entry.inspect})"
           raise InvalidLockfile, msg
         end
 
-        unless constraint.kind_of?(String) and !constraint.empty?
+        unless constraint.kind_of?(String) && !constraint.empty?
           msg = "malformed lockfile solution_dependencies Policyfile dependencies entry. Version constraint portion must be a string (got: #{entry.inspect})"
           raise InvalidLockfile, msg
         end
@@ -254,35 +254,35 @@ module ChefDK
       def add_cookbook_dep_from_lock_data(name_and_version, deps_list)
         unless name_and_version.kind_of?(String)
           show = "#{name_and_version.inspect} => #{deps_list.inspect}"
-          msg = %Q(lockfile cookbook_dependencies entries must be of the form "$COOKBOOK_NAME ($VERSION)" => [ $dependency, ...] (got: #{show}) )
+          msg = %Q{lockfile cookbook_dependencies entries must be of the form "$COOKBOOK_NAME ($VERSION)" => [ $dependency, ...] (got: #{show}) }
           raise InvalidLockfile, msg
         end
 
         unless Cookbook.valid_str?(name_and_version)
-          msg = %Q(lockfile cookbook_dependencies entry keys must be of the form "$COOKBOOK_NAME ($VERSION)" (got: #{name_and_version.inspect}) )
+          msg = %Q{lockfile cookbook_dependencies entry keys must be of the form "$COOKBOOK_NAME ($VERSION)" (got: #{name_and_version.inspect}) }
           raise InvalidLockfile, msg
         end
 
         unless deps_list.kind_of?(Array)
-          msg = %Q(lockfile cookbook_dependencies entry values must be an Array like [ [ "$COOKBOOK_NAME", "$CONSTRAINT" ], ... ] (got: #{deps_list.inspect}) )
+          msg = %Q{lockfile cookbook_dependencies entry values must be an Array like [ [ "$COOKBOOK_NAME", "$CONSTRAINT" ], ... ] (got: #{deps_list.inspect}) }
           raise InvalidLockfile, msg
         end
 
         deps_list.each do |entry|
 
-          unless entry.kind_of?(Array) and entry.size == 2
-            msg = %Q(lockfile solution_dependencies dependencies entry must be like [ "$COOKBOOK_NAME", "$CONSTRAINT" ] (got: #{entry.inspect}))
+          unless entry.kind_of?(Array) && entry.size == 2
+            msg = %Q{lockfile solution_dependencies dependencies entry must be like [ "$COOKBOOK_NAME", "$CONSTRAINT" ] (got: #{entry.inspect})}
             raise InvalidLockfile, msg
           end
 
           dep_name, constraint = entry
 
-          unless dep_name.kind_of?(String) and !dep_name.empty?
+          unless dep_name.kind_of?(String) && !dep_name.empty?
             msg = "malformed lockfile solution_dependencies dependencies entry. Cookbook name portion must be a string (got: #{entry.inspect})"
             raise InvalidLockfile, msg
           end
 
-          unless constraint.kind_of?(String) and !constraint.empty?
+          unless constraint.kind_of?(String) && !constraint.empty?
             msg = "malformed lockfile solution_dependencies dependencies entry. Version constraint portion must be a string (got: #{entry.inspect})"
             raise InvalidLockfile, msg
           end