chef-dk 1.2.22 → 1.3.40

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'addressable/uri'
-require 'chef-dk/exceptions'
+require "addressable/uri"
+require "chef-dk/exceptions"
 
 module ChefDK
   module Policyfile

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'chef-dk/cookbook_omnifetch'
-require 'chef-dk/exceptions'
+require "chef-dk/cookbook_omnifetch"
+require "chef-dk/exceptions"
 
 module ChefDK
   module Policyfile
@@ -45,14 +45,14 @@ module ChefDK
           raise InvalidPolicyfileFilename, "Policyfile filenames must end with `.rb' extension (you gave: `#{policyfile_filename}')"
         end
         @policyfile_filename = policyfile_filename
-        @policyfile_lock_filename = policyfile_filename.sub(/\.rb\Z/, '.lock.json')
+        @policyfile_lock_filename = policyfile_filename.sub(/\.rb\Z/, ".lock.json")
         @relative_paths_root = File.dirname(policyfile_filename)
         self
       end
 
       def use_policyfile_lock(policyfile_lock_filename)
         @policyfile_lock_filename = policyfile_lock_filename
-        @policyfile_filename = policyfile_lock_filename.sub(/\.lock\.json\Z/, '.rb')
+        @policyfile_filename = policyfile_lock_filename.sub(/\.lock\.json\Z/, ".rb")
         @relative_paths_root = File.dirname(policyfile_lock_filename)
         self
       end
@@ -100,4 +100,3 @@ module ChefDK
 
   end
 end
-

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/exceptions'
+require "chef-dk/exceptions"
 
 module ChefDK
   module Policyfile
@@ -35,7 +35,7 @@ module ChefDK
           {
             "policy_name" => policy_name,
             "policy_group" => policy_group,
-            "data" => data
+            "data" => data,
           }
         end
 
@@ -71,7 +71,7 @@ module ChefDK
         unless data.kind_of?(Hash)
           raise InvalidUndoRecord, "Undo data is incorrectly formatted. Must be a Hash, got '#{data}'."
         end
-        missing_fields = %w[ format_version description backup_data ].select { |key| !data.key?(key) }
+        missing_fields = %w{ format_version description backup_data }.select { |key| !data.key?(key) }
         unless missing_fields.empty?
           raise InvalidUndoRecord, "Undo data is missing mandatory field(s) #{missing_fields.join(', ')}. Undo data: '#{data}'"
         end
@@ -82,7 +82,7 @@ module ChefDK
         unless policy_data.kind_of?(Hash)
           raise InvalidUndoRecord, "'backup_data' in the undo record is incorrectly formatted. Must be a Hash, got '#{policy_data}'"
         end
-        missing_policy_data_fields = %w[ policy_groups policy_revisions ].select { |key| !policy_data.key?(key) }
+        missing_policy_data_fields = %w{ policy_groups policy_revisions }.select { |key| !policy_data.key?(key) }
         unless missing_policy_data_fields.empty?
           raise InvalidUndoRecord,
             "'backup_data' in the undo record is missing mandatory field(s) #{missing_policy_data_fields.join(', ')}. Backup data: #{policy_data}"
@@ -121,8 +121,8 @@ module ChefDK
           "description" => description,
           "backup_data" => {
             "policy_groups" => policy_groups,
-            "policy_revisions" => policy_revisions.map(&:for_serialization)
-          }
+            "policy_revisions" => policy_revisions.map(&:for_serialization),
+          },
         }
       end
 
@@ -137,6 +137,3 @@ module ChefDK
     end
   end
 end
-
-
-

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

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require 'fileutils'
+require "fileutils"
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
-require 'chef-dk/helpers'
-require 'chef-dk/policyfile/undo_record'
+require "chef-dk/helpers"
+require "chef-dk/policyfile/undo_record"
 
 module ChefDK
   module Policyfile
@@ -114,17 +114,15 @@ module ChefDK
       end
 
       def undo_record_files
-        Dir[File.join(undo_dir, '*')].sort
+        Dir[File.join(undo_dir, "*")].sort
       end
 
       def ensure_undo_dir_exists
         return false if File.directory?(undo_dir)
 
-
         FileUtils.mkdir_p(undo_dir)
       end
     end
 
   end
 end
-

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'chef/cookbook_uploader'
-require 'chef-dk/policyfile/read_cookbook_for_compat_mode_upload'
+require "chef/cookbook_uploader"
+require "chef-dk/policyfile/read_cookbook_for_compat_mode_upload"
 
-require 'chef-dk/ui'
-require 'chef-dk/policyfile/reports/upload'
+require "chef-dk/ui"
+require "chef-dk/policyfile/reports/upload"
 
 module ChefDK
   module Policyfile
@@ -77,7 +77,7 @@ DRAGONS
       end
 
       def data_bag_create
-        http_client.post("data", {"name" => COMPAT_MODE_DATA_BAG_NAME})
+        http_client.post("data", { "name" => COMPAT_MODE_DATA_BAG_NAME })
       rescue Net::HTTPServerException => e
         raise e unless e.response.code == "409"
       end
@@ -95,7 +95,7 @@ DRAGONS
           "raw_data" => lock_data,
           # we'd prefer to leave this out, but the "compatibility mode"
           # implementation in chef-client relies on magical class inflation
-          "json_class" => "Chef::DataBagItem"
+          "json_class" => "Chef::DataBagItem",
         }
 
         upload_lockfile_as_data_bag_item(policy_id, data_item)
@@ -182,9 +182,9 @@ DRAGONS
 
       def list_cookbooks_url
         if using_policy_document_native_api?
-          'cookbook_artifacts?num_versions=all'
+          "cookbook_artifacts?num_versions=all"
         else
-          'cookbooks?num_versions=all'
+          "cookbooks?num_versions=all"
         end
       end
 

data/lib/chef-dk/policyfile_compiler.rb

@@ -15,17 +15,17 @@
 # limitations under the License.
 #
 
-require 'set'
-require 'forwardable'
+require "set"
+require "forwardable"
 
-require 'solve'
-require 'chef/run_list'
+require "solve"
+require "chef/run_list"
 
-require 'chef-dk/policyfile/dsl'
-require 'chef-dk/policyfile_lock'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile/reports/install'
-require 'chef-dk/exceptions'
+require "chef-dk/policyfile/dsl"
+require "chef-dk/policyfile_lock"
+require "chef-dk/ui"
+require "chef-dk/policyfile/reports/install"
+require "chef-dk/exceptions"
 
 module ChefDK
 
@@ -33,7 +33,7 @@ module ChefDK
 
     extend Forwardable
 
-    DEFAULT_DEMAND_CONSTRAINT = '>= 0.0.0'.freeze
+    DEFAULT_DEMAND_CONSTRAINT = ">= 0.0.0".freeze
 
     # Cookbooks from these sources lock that cookbook to exactly one version
     SOURCE_TYPES_WITH_FIXED_VERSIONS = [:git, :path].freeze
@@ -95,7 +95,7 @@ module ChefDK
     end
 
     def normalized_named_run_lists
-      expanded_named_run_lists.inject({}) do |normalized,(name, run_list)|
+      expanded_named_run_lists.inject({}) do |normalized, (name, run_list)|
         normalized[name] = run_list.map { |i| normalize_recipe(i) }
         normalized
       end
@@ -126,14 +126,14 @@ module ChefDK
 
       graph_solution.each do |cookbook_name, version|
         spec = cookbook_location_spec_for(cookbook_name)
-        if spec.nil? or !spec.version_fixed?
+        if spec.nil? || !spec.version_fixed?
           spec = create_spec_for_cookbook(cookbook_name, version)
           install_report.installing_cookbook(spec)
           spec.ensure_cached
         end
 
         required_recipes = cookbook_and_recipe_list.select { |cb_name, _recipe| cb_name == spec.name }
-        missing_recipes = required_recipes.select {|_cb_name, recipe| !spec.cookbook_has_recipe?(recipe) }
+        missing_recipes = required_recipes.select { |_cb_name, recipe| !spec.cookbook_has_recipe?(recipe) }
 
         unless missing_recipes.empty?
           missing_recipes_by_cb_spec[spec] = missing_recipes
@@ -143,7 +143,7 @@ module ChefDK
       unless missing_recipes_by_cb_spec.empty?
         message = "The installed cookbooks do not contain all the recipes required by your run list(s):\n"
         missing_recipes_by_cb_spec.each do |spec, missing_items|
-          message << "#{spec.to_s}\nis missing the following required recipes:\n"
+          message << "#{spec}\nis missing the following required recipes:\n"
           missing_items.each { |_cb, recipe| message << "* #{recipe}\n" }
         end
 
@@ -152,8 +152,6 @@ module ChefDK
 
         raise CookbookDoesNotContainRequiredRecipe, message
       end
-
-
     end
 
     def create_spec_for_cookbook(cookbook_name, version)
@@ -265,7 +263,7 @@ module ChefDK
     end
 
     def version_constraint_for(cookbook_name)
-      if (cookbook_location_spec = cookbook_location_spec_for(cookbook_name)) and cookbook_location_spec.version_fixed?
+      if (cookbook_location_spec = cookbook_location_spec_for(cookbook_name)) && cookbook_location_spec.version_fixed?
         version = cookbook_location_spec.version
         "= #{version}"
       else
@@ -282,7 +280,7 @@ module ChefDK
     end
 
     def cookbooks_in_run_list
-      recipes = combined_run_lists.map {|recipe| recipe.name }
+      recipes = combined_run_lists.map { |recipe| recipe.name }
       recipes.map { |r| r[/^([^:]+)/, 1] }
     end
 
@@ -298,7 +296,6 @@ module ChefDK
       end
     end
 
-
     def build
       yield @dsl
       self
@@ -358,7 +355,6 @@ module ChefDK
       end
     end
 
-
     def preferred_source_for_cookbook(conflicting_cb_name)
       default_source.find { |s| s.preferred_source_for?(conflicting_cb_name) }
     end

data/lib/chef-dk/policyfile_lock.rb

@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-require 'digest/sha2'
+require "digest/sha2"
 
-require 'chef-dk/policyfile/storage_config'
-require 'chef-dk/policyfile/cookbook_locks'
-require 'chef-dk/policyfile/solution_dependencies'
-require 'chef-dk/ui'
+require "chef-dk/policyfile/storage_config"
+require "chef-dk/policyfile/cookbook_locks"
+require "chef-dk/policyfile/solution_dependencies"
+require "chef-dk/ui"
 
 module ChefDK
 
@@ -65,7 +65,7 @@ module ChefDK
       end
     end
 
-    RUN_LIST_ITEM_FORMAT = /\Arecipe\[[^\s]+::[^\s]+\]\Z/.freeze
+    RUN_LIST_ITEM_FORMAT = /\Arecipe\[[^\s]+::[^\s]+\]\Z/
 
     def self.build(storage_config)
       lock = new(storage_config)
@@ -319,7 +319,7 @@ module ChefDK
         # keys to UTF-8 first so that the sort order uses the UTF-8 strings.
         item_with_normalized_keys = item.inject({}) do |normalized_item, (key, value)|
           validate_attr_key(key)
-          normalized_item[key.encode('utf-8')] = value
+          normalized_item[key.encode("utf-8")] = value
           normalized_item
         end
         elements = item_with_normalized_keys.keys.sort.map do |key|
@@ -327,12 +327,12 @@ module ChefDK
           v = canonicalize_elements(item_with_normalized_keys[key])
           k << v
         end
-        "{" << elements.join(',') << "}"
+        "{" << elements.join(",") << "}"
       when String
-        '"' << item.encode('utf-8') << '"'
+        '"' << item.encode("utf-8") << '"'
       when Array
         elements = item.map { |i| canonicalize_elements(i) }
-        '[' << elements.join(',') << ']'
+        "[" << elements.join(",") << "]"
       when Integer
         item.to_s
       when Float
@@ -396,7 +396,6 @@ module ChefDK
       end
 
       @name = name_attribute
-
     end
 
     def set_run_list_from_lock_data(lock_data)

data/lib/chef-dk/policyfile_services/clean_policies.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'chef-dk/exceptions'
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile/lister'
+require "chef-dk/exceptions"
+require "chef-dk/service_exceptions"
+require "chef-dk/policyfile/lister"
 
 module ChefDK
   module PolicyfileServices

data/lib/chef-dk/policyfile_services/clean_policy_cookbooks.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 PolicyfileServices
@@ -59,7 +59,6 @@ module ChefDK
         end
       end
 
-
       def all_cookbooks
         cookbook_list = http_client.get("/cookbook_artifacts")
         cookbook_list.inject({}) do |cb_map, (name, cb_info)|
@@ -122,4 +121,3 @@ module ChefDK
     end
   end
 end
-

data/lib/chef-dk/policyfile_services/export_repo.rb

@@ -15,18 +15,18 @@
 # limitations under the License.
 #
 
-require 'pathname'
-require 'fileutils'
-require 'tmpdir'
-require 'zlib'
+require "pathname"
+require "fileutils"
+require "tmpdir"
+require "zlib"
 
-require 'archive/tar/minitar'
+require "archive/tar/minitar"
 
-require 'chef/cookbook/chefignore'
+require "chef/cookbook/chefignore"
 
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile_lock'
-require 'chef-dk/policyfile/storage_config'
+require "chef-dk/service_exceptions"
+require "chef-dk/policyfile_lock"
+require "chef-dk/policyfile/storage_config"
 
 module ChefDK
   module PolicyfileServices
@@ -37,7 +37,7 @@ module ChefDK
       # have multiple active iterations of a policy at once, but we don't need
       # this when serving a single exported policy via Chef Zero, so hardcode
       # it to a "well known" value:
-      POLICY_GROUP = 'local'.freeze
+      POLICY_GROUP = "local".freeze
 
       include Policyfile::StorageConfigDelegation
 
@@ -211,9 +211,9 @@ module ChefDK
         data = {
           "policies" => {
             policyfile_lock.name => {
-              "revision_id" => policyfile_lock.revision_id
-            }
-          }
+              "revision_id" => policyfile_lock.revision_id,
+            },
+          },
         }
 
         File.open(policy_group_repo_item_path, "wb+") do |f|
@@ -418,4 +418,3 @@ README
 
   end
 end
-

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

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
-require 'chef-dk/helpers'
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile_compiler'
-require 'chef-dk/policyfile/storage_config'
-require 'chef-dk/policyfile_lock'
+require "chef-dk/helpers"
+require "chef-dk/service_exceptions"
+require "chef-dk/policyfile_compiler"
+require "chef-dk/policyfile/storage_config"
+require "chef-dk/policyfile_lock"
 
 module ChefDK
   module PolicyfileServices