chef-config 14.9.13 → 14.10.9

data/lib/chef-config/exceptions.rb

@@ -1,27 +1,27 @@
-#
-# Copyright:: Copyright 2015-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.
-#
-
-require "chef-config/windows"
-require "chef-config/logger"
-
-module ChefConfig
-
-  class ConfigurationError < ArgumentError; end
-  class InvalidPath < StandardError; end
-  class UnparsableConfigOption < StandardError; end
-
-end
+#
+# Copyright:: Copyright 2015-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.
+#
+
+require "chef-config/windows"
+require "chef-config/logger"
+
+module ChefConfig
+
+  class ConfigurationError < ArgumentError; end
+  class InvalidPath < StandardError; end
+  class UnparsableConfigOption < StandardError; end
+
+end

data/lib/chef-config/fips.rb

@@ -1,51 +1,51 @@
-#
-# Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 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.
-#
-
-module ChefConfig
-
-  def self.fips?
-    if ChefConfig.windows?
-      begin
-        require "win32/registry"
-      rescue LoadError
-        return false
-      end
-
-      # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
-      reg_type =
-        case ::RbConfig::CONFIG["target_cpu"]
-        when "i386"
-          Win32::Registry::KEY_READ | 0x100
-        when "x86_64"
-          Win32::Registry::KEY_READ | 0x200
-        else
-          Win32::Registry::KEY_READ
-        end
-      begin
-        Win32::Registry::HKEY_LOCAL_MACHINE.open('System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy', reg_type) do |policy|
-          policy["Enabled"] != 0
-        end
-      rescue Win32::Registry::Error
-        false
-      end
-    else
-      fips_path = "/proc/sys/crypto/fips_enabled"
-      File.exist?(fips_path) && File.read(fips_path).chomp != "0"
-    end
-  end
-end
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 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.
+#
+
+module ChefConfig
+
+  def self.fips?
+    if ChefConfig.windows?
+      begin
+        require "win32/registry"
+      rescue LoadError
+        return false
+      end
+
+      # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
+      reg_type =
+        case ::RbConfig::CONFIG["target_cpu"]
+        when "i386"
+          Win32::Registry::KEY_READ | 0x100
+        when "x86_64"
+          Win32::Registry::KEY_READ | 0x200
+        else
+          Win32::Registry::KEY_READ
+        end
+      begin
+        Win32::Registry::HKEY_LOCAL_MACHINE.open('System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy', reg_type) do |policy|
+          policy["Enabled"] != 0
+        end
+      rescue Win32::Registry::Error
+        false
+      end
+    else
+      fips_path = "/proc/sys/crypto/fips_enabled"
+      File.exist?(fips_path) && File.read(fips_path).chomp != "0"
+    end
+  end
+end

data/lib/chef-config/logger.rb

@@ -1,62 +1,62 @@
-#
-# Copyright:: Copyright 2015-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.
-#
-
-module ChefConfig
-
-  # Implements enough of Logger's API that we can use it in place of a real
-  # logger for `ChefConfig.logger`
-  class NullLogger
-
-    def <<(_msg)
-    end
-
-    def add(_severity, _message = nil, _progname = nil)
-    end
-
-    def trace(_progname = nil, &block)
-    end
-
-    def debug(_progname = nil, &block)
-    end
-
-    def info(_progname = nil, &block)
-    end
-
-    def warn(_progname = nil, &block)
-    end
-
-    def deprecation(_progname = nil, &block)
-    end
-
-    def error(_progname = nil, &block)
-    end
-
-    def fatal(_progname = nil, &block)
-    end
-
-  end
-
-  @logger = NullLogger.new
-
-  def self.logger=(new_logger)
-    @logger = new_logger
-  end
-
-  def self.logger
-    @logger
-  end
-end
+#
+# Copyright:: Copyright 2015-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.
+#
+
+module ChefConfig
+
+  # Implements enough of Logger's API that we can use it in place of a real
+  # logger for `ChefConfig.logger`
+  class NullLogger
+
+    def <<(_msg)
+    end
+
+    def add(_severity, _message = nil, _progname = nil)
+    end
+
+    def trace(_progname = nil, &block)
+    end
+
+    def debug(_progname = nil, &block)
+    end
+
+    def info(_progname = nil, &block)
+    end
+
+    def warn(_progname = nil, &block)
+    end
+
+    def deprecation(_progname = nil, &block)
+    end
+
+    def error(_progname = nil, &block)
+    end
+
+    def fatal(_progname = nil, &block)
+    end
+
+  end
+
+  @logger = NullLogger.new
+
+  def self.logger=(new_logger)
+    @logger = new_logger
+  end
+
+  def self.logger
+    @logger
+  end
+end

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

@@ -1,98 +1,98 @@
-#
-# Copyright:: Copyright 2017, 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.
-#
-
-require "tomlrb"
-require "chef-config/path_helper"
-
-module ChefConfig
-  module Mixin
-    # Helper methods for working with credentials files.
-    #
-    # @since 13.7
-    # @api internal
-    module Credentials
-      # 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
-
-      # Compute the path to the credentials file.
-      #
-      # @since 14.4
-      # @return [String]
-      def credentials_file_path
-        PathHelper.home(".chef", "credentials").freeze
-      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
-
-      # 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)
-      end
-    end
-  end
-end
+#
+# Copyright:: Copyright 2017, 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.
+#
+
+require "tomlrb"
+require "chef-config/path_helper"
+
+module ChefConfig
+  module Mixin
+    # Helper methods for working with credentials files.
+    #
+    # @since 13.7
+    # @api internal
+    module Credentials
+      # 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
+
+      # Compute the path to the credentials file.
+      #
+      # @since 14.4
+      # @return [String]
+      def credentials_file_path
+        PathHelper.home(".chef", "credentials").freeze
+      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
+
+      # 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)
+      end
+    end
+  end
+end