RubyGems - chef-dk - Versions diffs - 4.0.60 → 4.1.7 - Mend

chef-dk 4.0.60 → 4.1.7

Files changed (369) hide show

data/lib/chef-dk/policyfile/local_lock_fetcher.rb CHANGED

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile_lock"
-require "chef-dk/policyfile/lock_fetcher_mixin"
-require "chef-dk/exceptions"
+require_relative "../policyfile_lock"
+require_relative "lock_fetcher_mixin"
+require_relative "../exceptions"
 module ChefDK
   module Policyfile

data/lib/chef-dk/policyfile/lock_applier.rb CHANGED

File without changes

data/lib/chef-dk/policyfile/lock_fetcher_mixin.rb CHANGED

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
-require "chef-dk/exceptions"
+require_relative "../exceptions"
 module ChefDK
   module Policyfile

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
-require "chef-dk/exceptions"
+require_relative "../exceptions"
 module ChefDK
   module Policyfile

data/lib/chef-dk/policyfile/policyfile_location_specification.rb CHANGED

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile_lock"
-require "chef-dk/policyfile/local_lock_fetcher"
-require "chef-dk/policyfile/remote_lock_fetcher"
-require "chef-dk/policyfile/chef_server_lock_fetcher"
-require "chef-dk/policyfile/git_lock_fetcher"
-require "chef-dk/exceptions"
+require_relative "../policyfile_lock"
+require_relative "local_lock_fetcher"
+require_relative "remote_lock_fetcher"
+require_relative "chef_server_lock_fetcher"
+require_relative "git_lock_fetcher"
+require_relative "../exceptions"
 module ChefDK
   module Policyfile

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

@@ -16,7 +16,7 @@
 #
 # This fixes a missing require in chef/digester:
-require "singleton"
+require "singleton" unless defined?(Singleton)
 require "chef/cookbook/cookbook_version_loader"
 require "chef/cookbook/chefignore"

data/lib/chef-dk/policyfile/remote_lock_fetcher.rb CHANGED

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile_lock"
-require "chef-dk/policyfile/lock_fetcher_mixin"
-require "chef-dk/exceptions"
+require_relative "../policyfile_lock"
+require_relative "lock_fetcher_mixin"
+require_relative "../exceptions"
 require "chef/http"
-require "tempfile"
+require "tempfile" unless defined?(Tempfile)
 module ChefDK
   module Policyfile

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile/reports/table_printer"
+require_relative "table_printer"
 module ChefDK
   module Policyfile

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

File without changes

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile/reports/table_printer"
+require_relative "table_printer"
 module ChefDK
   module Policyfile

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

@@ -16,8 +16,8 @@
 #
 require "semverse"
-require "set"
-require "chef-dk/exceptions"
+require "set" unless defined?(Set)
+require_relative "../exceptions"
 module ChefDK
   module Policyfile

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
-require "addressable/uri"
-require "chef-dk/exceptions"
+require "addressable/uri" unless defined?(Addressable::URI)
+require_relative "../exceptions"
 module ChefDK
   module Policyfile

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

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

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
-require "chef-dk/exceptions"
+require_relative "../exceptions"
 module ChefDK
   module Policyfile

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

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
-require "chef-dk/helpers"
-require "chef-dk/policyfile/undo_record"
+require_relative "../helpers"
+require_relative "undo_record"
 module ChefDK
   module Policyfile

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

@@ -16,10 +16,10 @@
 #
 require "chef/cookbook_uploader"
-require "chef-dk/policyfile/read_cookbook_for_compat_mode_upload"
+require_relative "read_cookbook_for_compat_mode_upload"
-require "chef-dk/ui"
-require "chef-dk/policyfile/reports/upload"
+require_relative "../ui"
+require_relative "reports/upload"
 module ChefDK
   module Policyfile

data/lib/chef-dk/policyfile_compiler.rb CHANGED

@@ -15,20 +15,20 @@
 # limitations under the License.
 #
-require "set"
-require "forwardable"
+require "set" unless defined?(Set)
+require "forwardable" unless defined?(Forwardable)
 require "solve"
 require "chef/run_list"
 require "chef/mixin/deep_merge"
-require "chef-dk/policyfile/dsl"
-require "chef-dk/policyfile/attribute_merge_checker"
-require "chef-dk/policyfile/included_policies_cookbook_source"
-require "chef-dk/policyfile_lock"
-require "chef-dk/ui"
-require "chef-dk/policyfile/reports/install"
-require "chef-dk/exceptions"
+require_relative "policyfile/dsl"
+require_relative "policyfile/attribute_merge_checker"
+require_relative "policyfile/included_policies_cookbook_source"
+require_relative "policyfile_lock"
+require_relative "ui"
+require_relative "policyfile/reports/install"
+require_relative "exceptions"
 module ChefDK

data/lib/chef-dk/policyfile_lock.rb CHANGED

@@ -16,12 +16,12 @@
 # limitations under the License.
 #
-require "digest/sha2"
+require "digest/sha2" unless defined?(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_relative "policyfile/storage_config"
+require_relative "policyfile/cookbook_locks"
+require_relative "policyfile/solution_dependencies"
+require_relative "ui"
 module ChefDK

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

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

data/lib/chef-dk/policyfile_services/clean_policy_cookbooks.rb CHANGED

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
-require "set"
+require "set" unless defined?(Set)
 require "chef/server_api"
-require "chef-dk/service_exceptions"
+require_relative "../service_exceptions"
 module ChefDK
   module PolicyfileServices

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,18 +15,18 @@
 # limitations under the License.
 #
-require "pathname"
-require "fileutils"
-require "tmpdir"
+require "pathname" unless defined?(Pathname)
+require "fileutils" unless defined?(FileUtils)
+require "tmpdir" unless defined?(Dir.mktmpdir)
 require "zlib"
 require "archive/tar/minitar"
 require "chef/cookbook/chefignore"
-require "chef-dk/service_exceptions"
-require "chef-dk/policyfile_lock"
-require "chef-dk/policyfile/storage_config"
+require_relative "../service_exceptions"
+require_relative "../policyfile_lock"
+require_relative "../policyfile/storage_config"
 module ChefDK
   module PolicyfileServices
@@ -242,14 +242,14 @@ module ChefDK
             use_policyfile true
             policy_document_native_api true
-            # In order to use this repo, you need a version of Chef Client and Chef Zero
+            # In order to use this repo, you need a version of Chef Infra Client and Chef Zero
             # that supports policyfile "native mode" APIs:
             current_version = Gem::Version.new(Chef::VERSION)
             unless Gem::Requirement.new(">= 12.7").satisfied_by?(current_version)
               puts("!" * 80)
               puts(<<-MESSAGE)
-            This Chef Repo requires features introduced in Chef 12.7, but you are using
-            Chef \#{Chef::VERSION}. Please upgrade to Chef 12.7 or later.
+            This Chef Repo requires features introduced in Chef Infra Client 12.7, but you are using
+            Chef \#{Chef::VERSION}. Please upgrade to Chef Infra Client 12.7 or later.
             MESSAGE
               puts("!" * 80)
               exit!(1)
@@ -262,7 +262,7 @@ module ChefDK
       def create_readme_md
         File.open(readme_staging_path, "wb+") do |f|
           f.print( <<~README )
-            # Exported Chef Repository for Policy '#{policy_name}'
+            # Exported Chef Infra Repository for Policy '#{policy_name}'
             Policy revision: #{policyfile_lock.revision_id}

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

@@ -15,14 +15,14 @@
 # limitations under the License.
 #
-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/policyfile/lock_applier"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../helpers"
+require_relative "../service_exceptions"
+require_relative "../policyfile_compiler"
+require_relative "../policyfile/storage_config"
+require_relative "../policyfile_lock"
+require_relative "../policyfile/lock_applier"
 module ChefDK
   module PolicyfileServices

data/lib/chef-dk/policyfile_services/push.rb CHANGED

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
-require "chef-dk/service_exceptions"
+require_relative "../service_exceptions"
 require "chef/server_api"
-require "chef-dk/policyfile_compiler"
-require "chef-dk/policyfile/uploader"
-require "chef-dk/policyfile/storage_config"
+require_relative "../policyfile_compiler"
+require_relative "../policyfile/uploader"
+require_relative "../policyfile/storage_config"
 module ChefDK
   module PolicyfileServices

data/lib/chef-dk/policyfile_services/push_archive.rb CHANGED

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software Inc.
+# Copyright:: Copyright (c) 2015-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,10 +18,11 @@
 require "zlib"
 require "archive/tar/minitar"
-require "chef-dk/service_exceptions"
-require "chef-dk/policyfile_lock"
+require_relative "../service_exceptions"
+require_relative "../policyfile_lock"
 require "chef/server_api"
-require "chef-dk/policyfile/uploader"
+require_relative "../policyfile/uploader"
+require_relative "../dist"
 module ChefDK
   module PolicyfileServices
@@ -89,9 +90,9 @@ module ChefDK
           raise InvalidPolicyArchive, <<~MESSAGE
             This archive is in an unsupported format.
-            This archive was created with an older version of ChefDK. This version of
-            ChefDK does not support archives in the older format. Please Re-create the
-            archive with a newer version of ChefDK or Workstation.
+            This archive was created with an older version of #{ChefDK::Dist::PRODUCT}. This version of
+            #{ChefDK::Dist::PRODUCT} does not support archives in the older format. Please Re-create the
+            archive with a newer version of #{ChefDK::Dist::PRODUCT}.
           MESSAGE
         end

data/lib/chef-dk/policyfile_services/rm_policy.rb CHANGED

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
-require "chef-dk/service_exceptions"
+require_relative "../service_exceptions"
 require "chef/server_api"
-require "chef-dk/policyfile/undo_stack"
-require "chef-dk/policyfile/undo_record"
+require_relative "../policyfile/undo_stack"
+require_relative "../policyfile/undo_record"
 module ChefDK
   module PolicyfileServices

data/lib/chef-dk/policyfile_services/rm_policy_group.rb CHANGED

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
-require "chef-dk/service_exceptions"
+require_relative "../service_exceptions"
 require "chef/server_api"
-require "chef-dk/policyfile/undo_stack"
-require "chef-dk/policyfile/undo_record"
+require_relative "../policyfile/undo_stack"
+require_relative "../policyfile/undo_record"
 module ChefDK
   module PolicyfileServices

data/lib/chef-dk/policyfile_services/show_policy.rb CHANGED

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile/comparison_base"
-require "chef-dk/policyfile/lister"
-require "chef-dk/pager"
+require_relative "../policyfile/comparison_base"
+require_relative "../policyfile/lister"
+require_relative "../pager"
 module ChefDK
   module PolicyfileServices

data/lib/chef-dk/policyfile_services/undelete.rb CHANGED

@@ -16,8 +16,8 @@
 #
 require "chef/server_api"
-require "chef-dk/service_exceptions"
-require "chef-dk/policyfile/undo_stack"
+require_relative "../service_exceptions"
+require_relative "../policyfile/undo_stack"
 module ChefDK
   module PolicyfileServices