chef-config 12.13.37 → 12.14.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 057458f594114dbb5d76620dbd646a96d0450ffa
-  data.tar.gz: 11b7cd5be4c1c0742fe5072b522aeddfc111dfc0
+  metadata.gz: 8f0310c0333002b81e02894cb156d76fb4766eed
+  data.tar.gz: 9c85269868058c8fe69057ab222cff8fffbf89c2
 SHA512:
-  metadata.gz: f5eaccdce2bceb76926b7b6a96a623ce8b390f645d42172eafaf92c2b5cdccbf3f97a6044c2a71b097714a69ae6a9c1d994dace24de3ccf5f8df4b9c75256449
-  data.tar.gz: 5249082a43abb467535d65f225c20b0a31f0091fa1ea0fdde8816417360d9eda38832d52e1306b83a314647a914a08335263c8193e8e21d97a89b643eff8c682
+  metadata.gz: 2d1a5082efadbced1482919dc1e1b456e17a94f56b62d9d78f680c2d1b1fff431654c861aeb4739066d2441f73cbb838a436bf84139f2944ed879d2c38feeefd
+  data.tar.gz: 4f78359931c5ad8510ee9f42fc09f82c1be3d700b39f6e752ed63db88252d3909fc160fbdc8201c47f5cf4b244cf82f06f635886fa35e44858481545730c179b

data/chef-config.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mixlib-shellout", "~> 2.0"
   spec.add_dependency "mixlib-config", "~> 2.0"
   spec.add_dependency "fuzzyurl"
+  spec.add_dependency "addressable"
 
   spec.add_development_dependency "rake", "~> 10.0"
 

data/lib/chef-config/config.rb

@@ -30,6 +30,7 @@ require "chef-config/mixin/fuzzy_hostname_matcher"
 
 require "mixlib/shellout"
 require "uri"
+require "addressable/uri"
 require "openssl"
 
 module ChefConfig
@@ -660,6 +661,20 @@ module ChefConfig
 
     # knife configuration data
     config_context :knife do
+      # XXX: none of these default values are applied to knife (and would create a backcompat
+      # break in knife if this bug was fixed since many of the defaults below are wrong).  this appears
+      # to be the start of an attempt to be able to use config_strict_mode true?  if so, this approach
+      # is fraught with peril because this namespace is used by every knife plugin in the wild and
+      # we would need to validate every cli option in every knife attribute out there and list them all here.
+      #
+      # based on the way that people may define `knife[:foobar] = "something"` for the knife-foobar
+      # gem plugin i'm pretty certain we can never turn on anything like config_string_mode since
+      # any config value may be a typo or it may be in some gem in some knife plugin we don't know about.
+      #
+      # we do still need to maintain at least one of these so that the knife config hash gets
+      # created.
+      #
+      # this whole situation is deeply unsatisfying.
       default :ssh_port, nil
       default :ssh_user, nil
       default :ssh_attribute, nil
@@ -791,6 +806,11 @@ module ChefConfig
     default :normal_attribute_whitelist, nil
     default :override_attribute_whitelist, nil
 
+    # Pull down all the rubygems versions from rubygems and cache them the first time we do a gem_package or
+    # chef_gem install.  This is memory-expensive and will grow without bounds, but will reduce network
+    # round trips.
+    default :rubygems_cache_enabled, false
+
     config_context :windows_service do
       # Set `watchdog_timeout` to the number of seconds to wait for a chef-client run
       # to finish
@@ -865,6 +885,13 @@ module ChefConfig
       export_no_proxy(no_proxy) if no_proxy
     end
 
+    # Character classes for Addressable
+    # See https://www.ietf.org/rfc/rfc3986.txt 3.2.1
+    # The user part may not have a : in it
+    USER = Addressable::URI::CharacterClasses::UNRESERVED + Addressable::URI::CharacterClasses::SUB_DELIMS
+    # The password part may have any valid USERINFO characters
+    PASSWORD = USER + "\\:"
+
     # Builds a proxy uri and exports it to the appropriate environment variables. Examples:
     #   http://username:password@hostname:port
     #   https://username@hostname:port
@@ -879,19 +906,17 @@ module ChefConfig
       path = "#{scheme}://#{path}" unless path.include?("://")
       # URI.split returns the following parts:
       # [scheme, userinfo, host, port, registry, path, opaque, query, fragment]
-      parts = URI.split(URI.encode(path))
-      # URI::Generic.build requires an integer for the port, but URI::split gives
-      # returns a string for the port.
-      parts[3] = parts[3].to_i if parts[3]
+      uri = Addressable::URI.encode(path, Addressable::URI)
+
       if user && !user.empty?
-        userinfo = URI.encode(URI.encode(user), "@:")
+        userinfo = Addressable::URI.encode_component(user, USER)
         if pass
-          userinfo << ":#{URI.encode(URI.encode(pass), '@:')}"
+          userinfo << ":#{Addressable::URI.encode_component(pass, PASSWORD)}"
         end
-        parts[1] = userinfo
+        uri.userinfo = userinfo
       end
 
-      path = URI::Generic.build(parts).to_s
+      path = uri.to_s
       ENV["#{scheme}_proxy".downcase] = path unless ENV["#{scheme}_proxy".downcase]
       ENV["#{scheme}_proxy".upcase] = path unless ENV["#{scheme}_proxy".upcase]
     end

data/lib/chef-config/mixin/fuzzy_hostname_matcher.rb

@@ -21,9 +21,9 @@ module ChefConfig
     module FuzzyHostnameMatcher
 
       def fuzzy_hostname_match_any?(hostname, matches)
-        return matches.to_s.split(/\s*,\s*/).compact.any? {
-          |m| fuzzy_hostname_match?(hostname, m)
-        } if (hostname != nil) && (matches != nil)
+        return matches.to_s.split(/\s*,\s*/).compact.any? do |m|
+          fuzzy_hostname_match?(hostname, m)
+        end if (hostname != nil) && (matches != nil)
 
         false
       end

data/lib/chef-config/package_task.rb

@@ -182,7 +182,7 @@ module ChefConfig
           IO.write(version_file_path, new_version)
         end
 
-        def update_version_rb
+        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.
@@ -223,7 +223,7 @@ end
           IO.write(version_rb_path, contents)
         end
 
-        def update_gemfile_lock
+        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)

data/lib/chef-config/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 12.13.37
+  version: 12.14.60
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement