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

chef-dk 4.0.60 → 4.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (369) hide show

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

File without changes

data/lib/chef-dk/completions/bash.sh.erb CHANGED

File without changes

data/lib/chef-dk/completions/chef.fish.erb CHANGED

File without changes

data/lib/chef-dk/completions/zsh.zsh.erb CHANGED

File without changes

data/lib/chef-dk/component_test.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,8 +15,8 @@
 # limitations under the License.
 #
-require "chef-dk/exceptions"
-require "chef-dk/helpers"
+require_relative "exceptions"
+require_relative "helpers"
 # https://github.com/bundler/bundler/issues/4368
 # As of rubygems 2.6.2, Rubygems will call Bundler::SpecSet#size, which does
@@ -144,9 +144,7 @@ module ChefDK
     end
     def nix_platform_native_bin_dir
-      if /sunos|solaris/ =~ RUBY_PLATFORM
-        "/opt/local/bin"
-      elsif /darwin/ =~ RUBY_PLATFORM
+      if /darwin/ =~ RUBY_PLATFORM
         "/usr/local/bin"
       else
         "/usr/bin"

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

@@ -18,8 +18,8 @@
 require "chef/config"
 require "chef/workstation_config_loader"
-require "chef-dk/cookbook_omnifetch"
-require "chef-dk/chef_server_api_multi"
+require_relative "cookbook_omnifetch"
+require_relative "chef_server_api_multi"
 # Define a config context for ChefDK
 class Chef::Config

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

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

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

@@ -16,9 +16,9 @@
 #
 require "cookbook-omnifetch"
-require "chef-dk/shell_out"
-require "chef-dk/cookbook_metadata"
-require "chef-dk/helpers"
+require_relative "shell_out"
+require_relative "cookbook_metadata"
+require_relative "helpers"
 require "chef/http/simple"

data/lib/chef-dk/cookbook_profiler/git.rb CHANGED

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

data/lib/chef-dk/cookbook_profiler/identifiers.rb CHANGED

@@ -16,13 +16,13 @@
 #
 # TODO: Chef should require its dependency correctly.
-require "singleton"
+require "singleton" unless defined?(Singleton)
 require "chef/cookbook/cookbook_version_loader"
 require "digest/sha1"
 require "chef/digester"
-require "chef-dk/exceptions"
+require_relative "../exceptions"
 module ChefDK
   module CookbookProfiler

data/lib/chef-dk/cookbook_profiler/null_scm.rb CHANGED

File without changes

data/lib/chef-dk/dist.rb ADDED

@@ -0,0 +1,27 @@
+module ChefDK
+  class Dist
+    # This class is not fully implemented, depending on it is not recommended!
+    # The full marketing name of the product
+    PRODUCT = "ChefDK".freeze
+    # The chef executable, as in `chef gem install` or `chef generate cookbook`
+    EXEC = "chef".freeze
+    # the name of the overall infra product
+    INFRA_PRODUCT = "Chef Infra".freeze
+    INFRA_CLIENT_PRODUCT = "Chef Infra Client".freeze
+    INFRA_CLIENT_CLI = "chef-client".freeze
+    SERVER_PRODUCT = "Chef Infra Server".freeze
+    INSPEC_PRODUCT = "Chef InSpec".freeze
+    INSPEC_CLI = "inspec".freeze
+    WORKFLOW = "Chef Workflow (Delivery)".freeze
+    # Chef-Zero's product name
+    ZERO_PRODUCT = "Chef Infra Zero".freeze
+  end
+end

data/lib/chef-dk/exceptions.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");
@@ -51,8 +51,10 @@ module ChefDK
   end
   class OmnibusInstallNotFound < RuntimeError
+    require_relative "dist"
     def initialize
-      super("Can not find omnibus installation directory for Chef.")
+      super("Can not find omnibus installation directory for #{ChefDK::Dist::PRODUCT}.")
     end
   end
@@ -66,7 +68,7 @@ module ChefDK
     def initialize(url, reason = nil)
       @url    = url
       @reason = reason
-      msg     = "'#{@url}' is not a valid Policy File Source URI"
+      msg     = "'#{@url}' is not a valid Policyfile Source URI"
       msg << " #{@reason}." unless @reason.nil?
       super(msg)
     end

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

File without changes

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
-require "mixlib/shellout"
-require "chef-dk/exceptions"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require_relative "exceptions"
 module ChefDK
   module Helpers

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

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

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

@@ -16,9 +16,9 @@
 #
 require "json"
-require "chef-dk/cookbook_omnifetch"
-require "chef-dk/policyfile/source_uri"
-require "chef-dk/exceptions"
+require_relative "../cookbook_omnifetch"
+require_relative "source_uri"
+require_relative "../exceptions"
 require "chef/http/simple"
 module ChefDK

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

File without changes

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
-require "chef-dk/exceptions"
+require_relative "../exceptions"
 require "chef/cookbook_loader"
 require "chef/cookbook/file_system_file_vendor"
-require "chef-dk/ui"
+require_relative "../ui"
 module ChefDK
   module Policyfile

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

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
-require "ffi_yajl"
-require "chef-dk/exceptions"
-require "chef-dk/policyfile/source_uri"
-require "chef-dk/chef_server_api_multi"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require_relative "../exceptions"
+require_relative "source_uri"
+require_relative "../chef_server_api_multi"
 module ChefDK
   module Policyfile

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

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile_lock"
-require "chef-dk/exceptions"
+require_relative "../policyfile_lock"
+require_relative "../exceptions"
 module ChefDK
   module Policyfile
@@ -128,8 +128,8 @@ module ChefDK
         end
       rescue Net::ProtocolError => e
         if e.respond_to?(:response) && e.response.code.to_s == "404"
-          raise ChefDK::PolicyfileLockDownloadError.new("No policyfile lock named '#{policy_name}' found with revision '#{revision}' at #{http_client.url}") if revision
-          raise ChefDK::PolicyfileLockDownloadError.new("No policyfile lock named '#{policy_name}' found with policy group '#{policy_group}' at #{http_client.url}") if policy_group
+          raise ChefDK::PolicyfileLockDownloadError.new("No Policyfile lock named '#{policy_name}' found with revision '#{revision}' at #{http_client.url}") if revision
+          raise ChefDK::PolicyfileLockDownloadError.new("No Policyfile lock named '#{policy_name}' found with policy group '#{policy_group}' at #{http_client.url}") if policy_group
         else
           raise ChefDK::PolicyfileLockDownloadError.new("HTTP error attempting to fetch policyfile lock from #{http_client.url}")
         end

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

@@ -16,8 +16,8 @@
 #
 require "json"
-require "chef-dk/cookbook_omnifetch"
-require "chef-dk/exceptions"
+require_relative "../cookbook_omnifetch"
+require_relative "../exceptions"
 require "chef/http/simple"
 module ChefDK

data/lib/chef-dk/policyfile/comparison_base.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");
@@ -15,9 +15,9 @@
 # limitations under the License.
 #
-require "ffi_yajl"
-require "mixlib/shellout"
-require "chef-dk/service_exceptions"
+require "ffi_yajl" unless defined?(FFI_Yajl)
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require_relative "../service_exceptions"
 module ChefDK
   module Policyfile
@@ -108,12 +108,12 @@ module ChefDK
           http_client.get("policy_groups/#{group}/policies/#{policy_name}")
         rescue Net::ProtocolError => e
           if e.respond_to?(:response) && e.response.code.to_s == "404"
-            raise PolicyfileDownloadError.new("No policyfile lock named '#{policy_name}' found in policy_group '#{group}' at #{http_client.url}", e)
+            raise PolicyfileDownloadError.new("No Policyfile lock named '#{policy_name}' found in policy_group '#{group}' at #{http_client.url}", e)
           else
-            raise PolicyfileDownloadError.new("HTTP error attempting to fetch policyfile lock from #{http_client.url}", e)
+            raise PolicyfileDownloadError.new("HTTP error attempting to fetch Policyfile lock from #{http_client.url}", e)
           end
         rescue => e
-          raise PolicyfileDownloadError.new("Failed to fetch policyfile lock from #{http_client.url}", e)
+          raise PolicyfileDownloadError.new("Failed to fetch Policyfile lock from #{http_client.url}", e)
         end
       end

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

@@ -16,8 +16,8 @@
 #
 require "semverse"
-require "chef-dk/cookbook_omnifetch"
-require "chef-dk/policyfile/storage_config"
+require_relative "../cookbook_omnifetch"
+require_relative "storage_config"
 module ChefDK
   module Policyfile

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

@@ -15,17 +15,17 @@
 # limitations under the License.
 #
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
-require "chef-dk/exceptions"
+require_relative "../exceptions"
-require "chef-dk/cookbook_profiler/null_scm"
-require "chef-dk/cookbook_profiler/git"
+require_relative "../cookbook_profiler/null_scm"
+require_relative "../cookbook_profiler/git"
-require "chef-dk/cookbook_profiler/identifiers"
-require "chef-dk/policyfile/storage_config"
+require_relative "../cookbook_profiler/identifiers"
+require_relative "storage_config"
-require "chef-dk/policyfile/cookbook_location_specification"
+require_relative "cookbook_location_specification"
 module ChefDK

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

@@ -15,9 +15,9 @@
 # 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/artifactory_cookbook_source"
+require_relative "null_cookbook_source"
+require_relative "community_cookbook_source"
+require_relative "chef_server_cookbook_source"
+require_relative "chef_repo_cookbook_source"
+require_relative "delivery_supermarket_source"
+require_relative "artifactory_cookbook_source"

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
 require "semverse"
-require "chef-dk/policyfile/community_cookbook_source"
+require_relative "community_cookbook_source"
 module ChefDK
   module Policyfile

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

@@ -18,7 +18,7 @@
 require "diff/lcs"
 require "diff/lcs/hunk"
 require "paint"
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 module ChefDK
   module Policyfile

data/lib/chef-dk/policyfile/dsl.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,10 +15,10 @@
 # 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/policyfile_location_specification"
+require_relative "cookbook_sources"
+require_relative "cookbook_location_specification"
+require_relative "storage_config"
+require_relative "policyfile_location_specification"
 require "chef/node/attribute"
 require "chef/run_list/run_list_item"
@@ -151,7 +151,7 @@ module ChefDK
         validate!
         self
       rescue SyntaxError => e
-        @errors << "Invalid ruby syntax in policyfile '#{policyfile_filename}':\n\n#{e.message}"
+        @errors << "Invalid Ruby syntax in Policyfile '#{policyfile_filename}':\n\n#{e.message}"
       rescue SignalException, SystemExit
         # allow signal from kill, ctrl-C, etc. to bubble up:
         raise

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
-require "chef-dk/policyfile_lock"
-require "chef-dk/exceptions"
-require "chef-dk/helpers"
-require "mixlib/shellout"
-require "tmpdir"
+require_relative "../policyfile_lock"
+require_relative "../exceptions"
+require_relative "../helpers"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "tmpdir" unless defined?(Dir.mktmpdir)
 module ChefDK
   module Policyfile

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

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

data/lib/chef-dk/policyfile/lister.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 Policyfile