chef-config 13.12.14 → 14.0.190

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b4dc57a5386de49fc7397039fd81b3cdd654197de2b83c0019980027ce7075
-  data.tar.gz: 6ceeb2e2bd402085d24c0ec7d5a4c66fbd0d182fcf599c3a53b4a8acb3b02d9e
+  metadata.gz: 7191ffc57f1e2312b58ed62e80ba510d6bdceef757bab0f30b1f91eb01435e5c
+  data.tar.gz: f3ca9d4f2a034f1535009e7a6bfe5d4923f1738d9cc5037f98e7410ad24cc85f
 SHA512:
-  metadata.gz: bc3bc0136ede9a68fb0c995cb196e5c12d170c11a7dd586393266c753008a48251271812b58d572ebd6d272512f6d0bfd950152e2146f80da9b7bb0cf4be599c
-  data.tar.gz: ec5f913d15fcf2bdc6f2e0f08c8709e8142fc10219ca0f5632fc7c99c03f03728841aac77395814301948198e28133fdbeb32b36506afa2c849699f798d2950e
+  metadata.gz: db88da348340f6a1c278862e938259e9d68656de2f9ead722e629ba107698ba5a57276802693bf044f7a5ea2d65487c75b9fb6a6cadbdfde152a0854c1858c0a
+  data.tar.gz: 660d1b713084c5f75b5a15529389e343c5d7c05a3d6494e2ec7b46927ebcb2c97b3feb4b32e429a1e97da4044539831ba079ded8989431bf242116496830f458

data/Rakefile

@@ -1,6 +1,10 @@
-require "bundler/gem_tasks"
+require "chef-config/package_task"
 
-task default: :spec
+ChefConfig::PackageTask.new(File.expand_path("..", __FILE__), "ChefConfig", "chef-config") do |package|
+  package.module_path = "chef-config"
+end
+
+task :default => :spec
 
 begin
   require "rspec/core/rake_task"

data/chef-config.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mixlib-shellout", "~> 2.0"
-  spec.add_dependency "mixlib-config", ">= 2.2.12", "< 3.0"
+  spec.add_dependency "mixlib-config", "~> 2.0"
   spec.add_dependency "fuzzyurl"
   spec.add_dependency "addressable"
   spec.add_dependency "tomlrb", "~> 1.2"
 
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.0"
 
   %w{rspec-core rspec-expectations rspec-mocks}.each do |rspec|
     spec.add_development_dependency(rspec, "~> 3.2")

data/lib/chef-config/config.rb

@@ -4,7 +4,7 @@
 # Author:: AJ Christensen (<aj@chef.io>)
 # Author:: Mark Mzyk (<mmzyk@chef.io>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -354,6 +354,11 @@ module ChefConfig
 
     default :http_retry_count, 5
     default :http_retry_delay, 5
+    # Whether or not to send the Authorization header again on http redirects.
+    # As per the plan in https://github.com/chef/chef/pull/7006, this will be
+    # False in Chef 14, True in Chef 15, and will be removed entirely in Chef 16.
+    default :http_disable_auth_on_redirect, false
+
     default :interval, nil
     default :once, nil
     default :json_attribs, nil
@@ -440,7 +445,7 @@ module ChefConfig
     default :splay, nil
     default :why_run, false
     default :color, false
-    default :client_fork, true
+    default :client_fork, nil
     default :ez, false
     default :enable_reporting, true
     default :enable_reporting_url_fatals, false
@@ -712,6 +717,12 @@ module ChefConfig
     # The selected profile when using credentials.
     default :profile, nil
 
+    default :chef_guid_path do
+      PathHelper.join(config_dir, "chef_guid")
+    end
+
+    default :chef_guid, nil
+
     # knife configuration data
     config_context :knife do
       # XXX: none of these default values are applied to knife (and would create a backcompat
@@ -1054,9 +1065,9 @@ module ChefConfig
       end
     rescue
       if ChefConfig.windows?
-        ChefConfig.logger.debug "Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else."
+        ChefConfig.logger.trace "Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else."
       else
-        ChefConfig.logger.debug "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
+        ChefConfig.logger.trace "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
       end
       "en_US.UTF-8"
     end

data/lib/chef-config/logger.rb

@@ -27,6 +27,9 @@ module ChefConfig
     def add(_severity, _message = nil, _progname = nil)
     end
 
+    def trace(_progname = nil, &block)
+    end
+
     def debug(_progname = nil, &block)
     end
 

data/lib/chef-config/package_task.rb

@@ -0,0 +1,289 @@
+#
+# Author:: Kartik Null Cating-Subramanian (<ksubramanian@chef.io>)
+# Copyright:: Copyright 2015-2016, Chef, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "rake"
+require "rubygems"
+require "rubygems/package_task"
+
+module ChefConfig
+  class PackageTask < Rake::TaskLib
+
+    # Full path to root of top-level repository.  All other files (like VERSION or
+    # lib/<module_path>/version.rb are rooted at this path).
+    attr_accessor :root_path
+
+    # Name of the top-level module/library build built.  This is used to define
+    # the top level module which contains VERSION and MODULE_ROOT.
+    attr_accessor :module_name
+
+    # Name of the gem being built. This is used to find the lines to fix in
+    # Gemfile.lock.
+    attr_accessor :gem_name
+
+    # Should the generated version.rb be in a class or module?  Default is false (module).
+    attr_accessor :generate_version_class
+
+    # Paths to the roots of any components that also support ChefPackageTask.
+    # If relative paths are provided, they are rooted against root_path.
+    attr_accessor :component_paths
+
+    # This is the module name as it appears on the path "lib/module/".
+    # e.g. for module_name  "ChefDK", you'd want module_path to be "chef-dk".
+    # The default is module_name but lower-cased.
+    attr_writer :module_path
+
+    def module_path
+      @module_path || module_name.downcase
+    end
+
+    # Directory used to store package files and output that is generated.
+    # This has the same meaning (or lack thereof) as package_dir in
+    # rake/packagetask.
+    attr_accessor :package_dir
+
+    # Name of git remote used to push tags during a release.  Default is origin.
+    attr_accessor :git_remote
+
+    # True if should use Chef::VersionString.
+    attr_accessor :use_versionstring
+
+    def initialize(root_path = nil, module_name = nil, gem_name = nil)
+      init(root_path, module_name, gem_name)
+      yield self if block_given?
+      define unless root_path.nil? || module_name.nil?
+    end
+
+    def init(root_path, module_name, gem_name)
+      @root_path = root_path
+      @module_name = module_name
+      @gem_name = gem_name
+      @component_paths = []
+      @module_path = nil
+      @package_dir = "pkg"
+      @git_remote = "origin"
+      @generate_version_class = false
+    end
+
+    def component_full_paths
+      component_paths.map { |path| File.expand_path(path, root_path) }
+    end
+
+    def version_rb_path
+      File.expand_path("lib/#{module_path}/version.rb", root_path)
+    end
+
+    def chef_root_path
+      module_name == "Chef" ? root_path : File.dirname(root_path)
+    end
+
+    def version_file_path
+      File.join(chef_root_path, "VERSION")
+    end
+
+    def gemfile_lock_path
+      File.join(root_path, "Gemfile.lock")
+    end
+
+    def version
+      IO.read(version_file_path).strip
+    end
+
+    def full_package_dir
+      File.expand_path(package_dir, root_path)
+    end
+
+    def class_or_module
+      generate_version_class ? "class" : "module"
+    end
+
+    def with_clean_env(&block)
+      if defined?(Bundler)
+        Bundler.with_clean_env(&block)
+      else
+        yield
+      end
+    end
+
+    def define
+      raise "Need to provide package root and module name" if root_path.nil? || module_name.nil?
+
+      desc "Build Gems of component dependencies"
+      task :package_components do
+        component_full_paths.each do |component_path|
+          Dir.chdir(component_path) do
+            sh "rake package"
+          end
+        end
+      end
+
+      task :package => :package_components
+
+      desc "Build and install component dependencies"
+      task :install_components => :package_components do
+        component_full_paths.each do |component_path|
+          Dir.chdir(component_path) do
+            sh "rake install"
+          end
+        end
+      end
+
+      task :install => :install_components
+
+      desc "Clean up builds of component dependencies"
+      task :clobber_component_packages do
+        component_full_paths.each do |component_path|
+          Dir.chdir(component_path) do
+            sh "rake clobber_package"
+          end
+        end
+      end
+
+      task :clobber_package => :clobber_component_packages
+
+      desc "Update the version number for component dependencies"
+      task :update_components_versions do
+        component_full_paths.each do |component_path|
+          Dir.chdir(component_path) do
+            sh "rake version"
+          end
+        end
+      end
+
+      namespace :version do
+        desc "Regenerate lib/#{module_path}/version.rb from VERSION file"
+        task :update => :update_components_versions do
+          update_version_rb
+          update_gemfile_lock
+        end
+
+        task :bump => %w{version:bump_patch version:update}
+
+        task :show do
+          puts version
+        end
+
+        # Add 1 to the current patch version in the VERSION file, and write it back out.
+        task :bump_patch do
+          current_version = version
+          new_version = current_version.sub(/^(\d+\.\d+\.)(\d+)/) { "#{$1}#{$2.to_i + 1}" }
+          puts "Updating version in #{version_rb_path} from #{current_version.chomp} to #{new_version.chomp}"
+          IO.write(version_file_path, new_version)
+        end
+
+        task :bump_minor do
+          current_version = version
+          new_version = current_version.sub(/^(\d+)\.(\d+)\.(\d+)/) { "#{$1}.#{$2.to_i + 1}.0" }
+          puts "Updating version in #{version_rb_path} from #{current_version.chomp} to #{new_version.chomp}"
+          IO.write(version_file_path, new_version)
+        end
+
+        task :bump_major do
+          current_version = version
+          new_version = current_version.sub(/^(\d+)\.(\d+\.\d+)/) { "#{$1.to_i + 1}.0.0" }
+          puts "Updating version in #{version_rb_path} from #{current_version.chomp} to #{new_version.chomp}"
+          IO.write(version_file_path, new_version)
+        end
+
+        def update_version_rb # rubocop:disable Lint/NestedMethodDefinition
+          puts "Updating #{version_rb_path} to include version #{version} ..."
+          contents = <<-VERSION_RB
+# Copyright:: Copyright 2010-2016, Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# NOTE: This file is generated by running `rake version` in the top level of
+# this repo. Do not edit this manually. Edit the VERSION file and run the rake
+# task instead.
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#{"\nrequire \"chef/version_string\"\n" if use_versionstring}
+#{class_or_module} #{module_name}
+  #{module_name.upcase}_ROOT = File.expand_path("../..", __FILE__)
+  VERSION = #{use_versionstring ? "Chef::VersionString.new(\"#{version}\")" : "\"#{version}\""}
+end
+
+#
+# NOTE: the Chef::Version class is defined in version_class.rb
+#
+# NOTE: DO NOT Use the Chef::Version class on #{module_name}::VERSIONs.  The
+#       Chef::Version class is for _cookbooks_ only, and cannot handle
+#       pre-release versions like "10.14.0.rc.2".  Please use Rubygem's
+#       Gem::Version class instead.
+#
+          VERSION_RB
+          IO.write(version_rb_path, contents)
+        end
+
+        def update_gemfile_lock # rubocop:disable Lint/NestedMethodDefinition
+          if File.exist?(gemfile_lock_path)
+            puts "Updating #{gemfile_lock_path} to include version #{version} ..."
+            contents = IO.read(gemfile_lock_path)
+            contents.gsub!(/^\s*(chef|chef-config)\s*\((= )?\S+\)\s*$/) do |line|
+              line.gsub(/\((= )?\d+(\.\d+)+/) { "(#{$1}#{version}" }
+            end
+            IO.write(gemfile_lock_path, contents)
+          end
+        end
+      end
+
+      task :version => "version:update"
+
+      gemspec_platform_to_install = ""
+      Dir[File.expand_path("*.gemspec", root_path)].reverse_each do |gemspec_path|
+        gemspec = eval(IO.read(gemspec_path))
+        Gem::PackageTask.new(gemspec) do |task|
+          task.package_dir = full_package_dir
+        end
+        gemspec_platform_to_install = "-#{gemspec.platform}" if gemspec.platform != Gem::Platform::RUBY && Gem::Platform.match(gemspec.platform)
+      end
+
+      desc "Build and install a #{module_path} gem"
+      task :install => [:package] do
+        with_clean_env do
+          full_module_path = File.join(full_package_dir, module_path)
+          sh %{gem install #{full_module_path}-#{version}#{gemspec_platform_to_install}.gem --no-rdoc --no-ri}
+        end
+      end
+
+      task :uninstall do
+        sh %{gem uninstall #{module_path} -x -v #{version} }
+      end
+
+      desc "Build it, tag it and ship it"
+      task :ship => [:clobber_package, :gem] do
+        sh("git tag #{version}")
+        sh("git push #{git_remote} --tags")
+        Dir[File.expand_path("*.gem", full_package_dir)].reverse_each do |built_gem|
+          sh("gem push #{built_gem}")
+        end
+      end
+    end
+  end
+
+end

data/lib/chef-config/path_helper.rb

@@ -79,7 +79,7 @@ module ChefConfig
         end
 
         if windows_max_length_exceeded?(path)
-          ChefConfig.logger.debug("Path '#{path}' is longer than #{WIN_MAX_PATH}, prefixing with'\\\\?\\'")
+          ChefConfig.logger.trace("Path '#{path}' is longer than #{WIN_MAX_PATH}, prefixing with'\\\\?\\'")
           path.insert(0, "\\\\?\\")
         end
       end
@@ -251,7 +251,7 @@ module ChefConfig
     # Determine if the given path is protected by OS X System Integrity Protection.
     def self.is_sip_path?(path, node)
       if node["platform"] == "mac_os_x" && Gem::Version.new(node["platform_version"]) >= Gem::Version.new("10.11")
-          # @todo: parse rootless.conf for this?
+          # todo: parse rootless.conf for this?
         sip_paths = [
           "/System", "/bin", "/sbin", "/usr"
         ]

data/lib/chef-config/version.rb

@@ -21,7 +21,7 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "13.12.14"
+  VERSION = "14.0.190"
 end
 
 #

data/spec/unit/config_spec.rb

@@ -767,8 +767,8 @@ RSpec.describe ChefConfig::Config do
         shared_examples_for "a suitable locale" do
           it "returns an English UTF-8 locale" do
             expect(ChefConfig.logger).to_not receive(:warn).with(/Please install an English UTF-8 locale for Chef to use/)
-            expect(ChefConfig.logger).to_not receive(:debug).with(/Defaulting to locale en_US.UTF-8 on Windows/)
-            expect(ChefConfig.logger).to_not receive(:debug).with(/No usable locale -a command found/)
+            expect(ChefConfig.logger).to_not receive(:trace).with(/Defaulting to locale en_US.UTF-8 on Windows/)
+            expect(ChefConfig.logger).to_not receive(:trace).with(/No usable locale -a command found/)
             expect(ChefConfig::Config.guess_internal_locale).to eq expected_locale
           end
         end
@@ -837,9 +837,9 @@ RSpec.describe ChefConfig::Config do
 
           it "should default to 'en_US.UTF-8'" do
             if is_windows
-              expect(ChefConfig.logger).to receive(:debug).with("Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else.")
+              expect(ChefConfig.logger).to receive(:trace).with("Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else.")
             else
-              expect(ChefConfig.logger).to receive(:debug).with("No usable locale -a command found, assuming you have en_US.UTF-8 installed.")
+              expect(ChefConfig.logger).to receive(:trace).with("No usable locale -a command found, assuming you have en_US.UTF-8 installed.")
             end
             expect(ChefConfig::Config.guess_internal_locale).to eq "en_US.UTF-8"
           end
@@ -852,9 +852,13 @@ RSpec.describe ChefConfig::Config do
     before(:all) do
       @original_env = ENV.to_hash
       ENV["http_proxy"] = nil
+      ENV["HTTP_PROXY"] = nil
       ENV["https_proxy"] = nil
+      ENV["HTTPS_PROXY"] = nil
       ENV["ftp_proxy"] = nil
+      ENV["FTP_PROXY"] = nil
       ENV["no_proxy"] = nil
+      ENV["NO_PROXY"] = nil
     end
 
     after(:all) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 13.12.14
+  version: 14.0.190
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -28,22 +28,16 @@ dependencies:
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.12
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.12
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fuzzyurl
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +84,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +154,7 @@ files:
 - lib/chef-config/mixin/credentials.rb
 - lib/chef-config/mixin/dot_d.rb
 - lib/chef-config/mixin/fuzzy_hostname_matcher.rb
+- lib/chef-config/package_task.rb
 - lib/chef-config/path_helper.rb
 - lib/chef-config/version.rb
 - lib/chef-config/windows.rb
@@ -189,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Chef's default configuration and config loading