chef-config 14.3.37 → 14.4.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8143b86ea4c5fd0ec8d4b8623aee402b2c0ade39738133a99c14f7338ff3327d
-  data.tar.gz: 607162e7ef57736d7ecd7154a27c4ee132bd8c61452c758084b4dcb16768ce26
+  metadata.gz: 4df16d2c91bd0790bf8341d5f98ebc5ebee39c83091da38c5973822b971c1f0c
+  data.tar.gz: 0f2d9279a1a8358bbf4455d5c92c46b7ebd457143c8f4c4efcef5f39a223dd67
 SHA512:
-  metadata.gz: 81d3a5a11e0281b00c0ae18da2298e3c0227df063597734431423febe7728c0f805a815e4f6d2fd74f465724ee2a1da45bb3fbbc5022a29758e322810e1d26c1
-  data.tar.gz: b88d7a8a2d4fa5d5abf31839763cee4437e51bff8369ac17061f695f55b9fd3145399f98027801c9e8f0a2752e546184d764581c662f3146bdbb65caf8459624
+  metadata.gz: eefc7a831fb6ba7f2adfc4af8bd84f5dbfeaaefb2c407bda3806736774f3e9bb5d098182d23a8ebbe11b120d7f27013c2167ce883fa6b2c2fecf3dbfbbb7bd8a
+  data.tar.gz: d54a0eded2c548970fcd7f22a73df3e0d02b9bd4fc95cdb7eff6da3e2b6fe87a95f1b00cbf69f31726a5c724728aca9d5f78411582c9fa029fe081bd0838c7ec

data/Rakefile

@@ -1,8 +1,4 @@
-require "chef-config/package_task"
-
-ChefConfig::PackageTask.new(File.expand_path("..", __FILE__), "ChefConfig", "chef-config") do |package|
-  package.module_path = "chef-config"
-end
+require "bundler/gem_tasks"
 
 task default: :spec
 

data/chef-config.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "tomlrb", "~> 1.2"
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
 
   %w{rspec-core rspec-expectations rspec-mocks}.each do |rspec|
     spec.add_development_dependency(rspec, "~> 3.2")

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

@@ -20,37 +20,78 @@ require "chef-config/path_helper"
 
 module ChefConfig
   module Mixin
+    # Helper methods for working with credentials files.
+    #
+    # @since 13.7
+    # @api internal
     module Credentials
-
-      def load_credentials(profile = nil)
-        credentials_file = PathHelper.home(".chef", "credentials").freeze
+      # Compute the active credentials profile name.
+      #
+      # The lookup order is argument (from --profile), environment variable
+      # ($CHEF_PROFILE), context file (~/.chef/context), and then "default" as
+      # a fallback.
+      #
+      # @since 14.4
+      # @param profile [String, nil] Optional override for the active profile,
+      #   normally set via a command-line option.
+      # @return [String]
+      def credentials_profile(profile = nil)
         context_file = PathHelper.home(".chef", "context").freeze
+        if !profile.nil?
+          profile
+        elsif ENV.include?("CHEF_PROFILE")
+          ENV["CHEF_PROFILE"]
+        elsif File.file?(context_file)
+          File.read(context_file).strip
+        else
+          "default"
+        end
+      end
 
-        return unless File.file?(credentials_file)
-
-        context = File.read(context_file).strip if File.file?(context_file)
-
-        environment = ENV.fetch("CHEF_PROFILE", nil)
+      # Compute the path to the credentials file.
+      #
+      # @since 14.4
+      # @return [String]
+      def credentials_file_path
+        PathHelper.home(".chef", "credentials").freeze
+      end
 
-        profile = if !profile.nil?
-                    profile
-                  elsif !environment.nil?
-                    environment
-                  elsif !context.nil?
-                    context
-                  else
-                    "default"
-                  end
+      # Load and parse the credentials file.
+      #
+      # Returns `nil` if the credentials file is unavailable.
+      #
+      # @since 14.4
+      # @return [String, nil]
+      def parse_credentials_file
+        credentials_file = credentials_file_path
+        return nil unless File.file?(credentials_file)
+        begin
+          Tomlrb.load_file(credentials_file)
+        rescue => e
+          # TOML's error messages are mostly rubbish, so we'll just give a generic one
+          message = "Unable to parse Credentials file: #{credentials_file}\n"
+          message << e.message
+          raise ChefConfig::ConfigurationError, message
+        end
+      end
 
-        config = Tomlrb.load_file(credentials_file)
+      # Load and process the active credentials.
+      #
+      # @see WorkstationConfigLoader#apply_credentials
+      # @param profile [String, nil] Optional override for the active profile,
+      #   normally set via a command-line option.
+      # @return [void]
+      def load_credentials(profile = nil)
+        profile = credentials_profile(profile)
+        config = parse_credentials_file
+        return if config.nil? # No credentials, nothing to do here.
+        if config[profile].nil?
+          # Unknown profile name. For "default" just silently ignore, otherwise
+          # raise an error.
+          return if profile == "default"
+          raise ChefConfig::ConfigurationError, "Profile #{profile} doesn't exist. Please add it to #{credentials_file}."
+        end
         apply_credentials(config[profile], profile)
-      rescue ChefConfig::ConfigurationError
-        raise
-      rescue => e
-        # TOML's error messages are mostly rubbish, so we'll just give a generic one
-        message = "Unable to parse Credentials file: #{credentials_file}\n"
-        message << e.message
-        raise ChefConfig::ConfigurationError, message
       end
     end
   end

data/lib/chef-config/path_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -152,7 +152,7 @@ module ChefConfig
       canonical_path(path1) == canonical_path(path2)
     end
 
-    # Note: this method is deprecated. Please use escape_glob_dirs
+    # @deprecated this method is deprecated. Please use escape_glob_dirs
     # Paths which may contain glob-reserved characters need
     # to be escaped before globbing can be done.
     # http://stackoverflow.com/questions/14127343
@@ -295,5 +295,28 @@ module ChefConfig
       ChefConfig.logger.error("Cannot write to a SIP Path on OS X 10.11+")
       false
     end
+
+    # Splits a string into an array of tokens as commands and arguments
+    #
+    # str = 'command with "some arguments"'
+    # split_args(str) => ["command", "with", "\"some arguments\""]
+    #
+    def self.split_args(line)
+      cmd_args = []
+      field = ""
+      line.scan(/\s*(?>([^\s\\"]+|"([^"]*)"|'([^']*)')|(\S))(\s|\z)?/m) do |word, within_dq, within_sq, esc, sep|
+
+        # Append the string with Word & Escape Character
+        field << (word || esc.gsub(/\\(.)/, '\\1'))
+
+        # Re-build the field when any whitespace character or
+        # End of string is encountered
+        if sep
+          cmd_args << field
+          field = ""
+        end
+      end
+      cmd_args
+    end
   end
 end

data/lib/chef-config/version.rb

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

data/lib/chef-config/workstation_config_loader.rb

@@ -225,12 +225,14 @@ module ChefConfig
       Config[:node_name] ||= Etc.getlogin
       # If we don't have a key (path or inline) check user.pem and $node_name.pem.
       unless Config.key?(:client_key) || Config.key?(:client_key_contents)
-        Config[:client_key] = find_default_key(["#{Config[:node_name]}.pem", "user.pem"])
+        key_path = find_default_key(["#{Config[:node_name]}.pem", "user.pem"])
+        Config[:client_key] = key_path if key_path
       end
       # Similarly look for a validation key file, though this should be less
       # common these days.
       unless Config.key?(:validation_key) || Config.key?(:validation_key_contents)
-        Config[:validation_key] = find_default_key(["#{Config[:validation_client_name]}.pem", "validator.pem", "validation.pem"])
+        key_path = find_default_key(["#{Config[:validation_client_name]}.pem", "validator.pem", "validation.pem"])
+        Config[:validation_key] = key_path if key_path
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 14.3.37
+  version: 14.4.56
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -90,16 +90,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,6 @@ 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

data/lib/chef-config/package_task.rb

@@ -1,289 +0,0 @@
-#
-# 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