knife 18.8.68 → 19.0.102

data/lib/chef/knife/core/windows_bootstrap_context.rb

@@ -169,14 +169,65 @@ class Chef
         end
 
         def start_chef
-          c_opscode_dir = ChefConfig::PathHelper.cleanpath(ChefConfig::Config.c_opscode_dir, windows: true)
+          path_command = build_path_command
+          chef_executable = build_chef_executable
+          license_argument = build_license_argument
+
           client_rb = clean_etc_chef_file("client.rb")
           first_boot = clean_etc_chef_file("first-boot.json")
+          bootstrap_environment_option = build_environment_option
 
-          bootstrap_environment_option = bootstrap_environment.nil? ? "" : " -E #{bootstrap_environment}"
+          "#{path_command}#{chef_executable} -c #{client_rb} -j #{first_boot}#{bootstrap_environment_option}#{license_argument}\n"
+        end
 
-          start_chef = "SET \"PATH=%SYSTEM32%;%SystemRoot%;%SYSTEM32%\\Wbem;%SYSTEM32%\\WindowsPowerShell\\v1.0\\;C:\\ruby\\bin;#{c_opscode_dir}\\bin;#{c_opscode_dir}\\embedded\\bin\;%PATH%\"\n"
-          start_chef << "#{ChefUtils::Dist::Infra::CLIENT} -c #{client_rb} -j #{first_boot}#{bootstrap_environment_option}\n"
+        def build_path_command
+          base_path = "SET \"PATH=%SYSTEM32%;%SystemRoot%;%SYSTEM32%\\Wbem;%SYSTEM32%\\WindowsPowerShell\\v1.0\\;"
+
+          # For --bootstrap-url, use conditional logic based on chef_ice? since we don't know what the script installs
+          if config[:bootstrap_url] && !config[:bootstrap_url].empty?
+            additional_paths = if chef_ice?
+                                 "C:\\hab\\bin"
+                               else
+                                 c_opscode_dir = ChefConfig::PathHelper.cleanpath(ChefConfig::Config.c_opscode_dir, windows: true)
+                                 "C:\\ruby\\bin;#{c_opscode_dir}\\bin;#{c_opscode_dir}\\embedded\\bin"
+                               end
+          else
+            # For default/msi flows, use standard paths
+            c_opscode_dir = ChefConfig::PathHelper.cleanpath(ChefConfig::Config.c_opscode_dir, windows: true)
+            additional_paths = "C:\\ruby\\bin;#{c_opscode_dir}\\bin;#{c_opscode_dir}\\embedded\\bin;C:\\hab\\bin"
+          end
+
+          "#{base_path}#{additional_paths};%PATH%\"\n"
+        end
+
+        def build_chef_executable
+          # For --bootstrap-url, use conditional logic based on chef_ice? since we don't know what the script installs
+          if config[:bootstrap_url] && !config[:bootstrap_url].empty?
+            if chef_ice?
+              # Set HAB_LICENSE to auto-accept Habitat license for non-interactive bootstrap
+              "SET \"HAB_LICENSE=accept-no-persist\"\nhab pkg exec chef/chef-infra-client #{ChefUtils::Dist::Infra::CLIENT}"
+            else
+              ChefUtils::Dist::Infra::CLIENT
+            end
+          else
+            # For default/msi flows, use standard chef-client
+            ChefUtils::Dist::Infra::CLIENT
+          end
+        end
+
+        def build_license_argument
+          return "" if config[:disable_license_activation]
+          return "" unless chef_ice? && config[:license_id]
+
+          # Skip license flag when using custom MSI or bootstrap URLs
+          return "" if config[:msi_url] && !config[:msi_url].empty?
+          return "" if config[:bootstrap_url] && !config[:bootstrap_url].empty?
+
+          " --chef-license-key #{config[:license_id]}"
+        end
+
+        def build_environment_option
+          bootstrap_environment.nil? ? "" : " -E #{bootstrap_environment}"
         end
 
         def win_wget
@@ -187,7 +238,7 @@ class Chef
             path = WScript.Arguments.Named("path")
             proxy = null
             '* Vaguely attempt to handle file:// scheme urls by url unescaping and switching all
-            '* / into \.  Also assume that file:/// is a local absolute path and that file://<foo>
+            '* / into . Also assume that file:/// is a local absolute path and that file://<foo>
             '* is possibly a network file path.
             If InStr(url, "file://") = 1 Then
             url = Unescape(url)
@@ -305,10 +356,8 @@ class Chef
           escape_and_echo(win_wget_ps)
         end
 
-        def install_chef
-          # The normal install command uses regular double quotes in
-          # the install command, so request such a string from install_command
-          install_command('"') + "\n" + fallback_install_task_command
+        def first_boot
+          escape_and_echo(super.to_json)
         end
 
         def clean_etc_chef_file(path)
@@ -323,31 +372,17 @@ class Chef
           ChefConfig::Config.etc_chef_dir(windows: true)
         end
 
-        def local_download_path
-          "%TEMP%\\#{ChefUtils::Dist::Infra::CLIENT}-latest.msi"
-        end
-
-        # Build a URL that will redirect to the correct Chef Infra msi download.
-        def msi_url(machine_os = nil, machine_arch = nil, download_context = nil)
-          if config[:msi_url].nil? || config[:msi_url].empty?
-            url = if config[:license_id] && !config[:omnitruck_url].empty?
-                    format(config[:omnitruck_url], config[:channel] + "/chef/download") + "&p=windows"
-                  else
-                    "https://omnitruck.chef.io/chef/download?p=windows&channel=#{config[:channel]}"
-                  end
-            url += "&pv=#{machine_os}" unless machine_os.nil?
-            url += "&m=#{machine_arch}" unless machine_arch.nil?
-            url += "&DownloadContext=#{download_context}" unless download_context.nil?
-            url += "&v=#{version_to_install}"
-          else
-            config[:msi_url]
+        # Build a URL for the PowerShell install script (install.ps1)
+        def install_ps1_url
+          if config[:bootstrap_url]
+            # Use custom bootstrap URL if provided
+            config[:bootstrap_url]
+          elsif config[:license_url]
+            # Use license-aware install script URL
+            config[:license_url].gsub("install.sh", "install.ps1")
           end
         end
 
-        def first_boot
-          escape_and_echo(super.to_json)
-        end
-
         # escape WIN BATCH special chars
         # and prefixes each line with an
         # echo
@@ -355,12 +390,15 @@ class Chef
           file_contents.gsub(/^(.*)$/, 'echo.\1').gsub(/([(<|>)^])/, '^\1')
         end
 
-        private
-
-        def install_command(executor_quote)
-          "msiexec /qn /log #{executor_quote}%CHEF_CLIENT_MSI_LOG_PATH%#{executor_quote} /i #{executor_quote}%LOCAL_DESTINATION_MSI_PATH%#{executor_quote}"
+        # Returns the MSI URL for downloading Chef Infra Client
+        # Supports both chef and chef-ice products, and custom URLs
+        def msi_url
+          # If a custom MSI URL is provided, use it directly
+          config[:msi_url] if config[:msi_url] && !config[:msi_url].empty?
         end
 
+        private
+
         # Returns a string for copying the trusted certificates on the workstation to the system being bootstrapped
         # This string should contain both the commands necessary to both create the files, as well as their content
         def trusted_certs_content
@@ -394,12 +432,39 @@ class Chef
           content
         end
 
+        def install_chef
+          # The normal install command uses regular double quotes in
+          # the install command, so request such a string from msi_install_command
+          msi_install_command('"') + "\n" + fallback_install_task_command
+        end
+
+        def msi_install_command(executor_quote)
+          "msiexec /qn /log #{executor_quote}%CHEF_CLIENT_MSI_LOG_PATH%#{executor_quote} /i #{executor_quote}%LOCAL_DESTINATION_MSI_PATH%#{executor_quote}"
+        end
+
+        def install_command(executor_quote)
+          commands = []
+
+          # Add license environment variable if applicable
+          license_key = @config[:license_key] || @config[:license_id]
+
+          # Only add license environment variable for Chef Infra 19+
+          if license_key && chef_ice?
+            commands << "set CHEF_LICENSE_KEY=#{license_key}"
+          end
+
+          # Add the msiexec installation command
+          commands << msi_install_command(executor_quote)
+
+          commands.join("\n")
+        end
+
         def fallback_install_task_command
           # This command will be executed by schtasks.exe in the batch
           # code below. To handle tasks that contain arguments that
           # need to be double quoted, schtasks allows the use of single
           # quotes that will later be converted to double quotes
-          command = install_command("'")
+          command = msi_install_command("'")
           <<~EOH
             @set MSIERRORCODE=!ERRORLEVEL!
             @if ERRORLEVEL 1 (
@@ -409,7 +474,7 @@ class Chef
                 @move "%CHEF_CLIENT_MSI_LOG_PATH%" "!OLDLOGLOCATION!" > NUL
                 @echo WARNING: Saving installation log of failure at !OLDLOGLOCATION!
                 @echo WARNING: Retrying installation with local context...
-                @schtasks /create /f  /sc once /st 00:00:00 /tn chefclientbootstraptask /ru SYSTEM /rl HIGHEST /tr \"cmd /c #{command} & sleep 2 & waitfor /s %computername% /si chefclientinstalldone\"
+                @schtasks /create /f  /sc once /st 00:00:00 /tn chefclientbootstraptask /ru SYSTEM /rl HIGHEST /tr "cmd /c #{command} & sleep 2 & waitfor /s %computername% /si chefclientinstalldone"
 
                 @if ERRORLEVEL 1 (
                     @echo ERROR: Failed to create #{ChefUtils::Dist::Infra::PRODUCT} installation scheduled task with status code !ERRORLEVEL! > "&2"
@@ -435,6 +500,7 @@ class Chef
             )
           EOH
         end
+
       end
     end
   end

data/lib/chef/knife/data_bag_secret_options.rb

@@ -66,7 +66,7 @@ class Chef
           config[:cl_secret]
         elsif config[:cl_secret_file]
           Chef::EncryptedDataBagItem.load_secret(config[:cl_secret_file])
-        elsif secret = config[:secret]
+        elsif (secret = config[:secret])
           secret
         else
           secret_file = config[:secret_file]

data/lib/chef/knife/download.rb

@@ -71,7 +71,7 @@ class Chef
 
         error = false
         pattern_args.each do |pattern|
-          fs_error, result = Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+          fs_error, _result = Chef::ChefFS::FileSystem.copy_to(pattern, chef_fs, local_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
           if fs_error
             error = true
           end

data/lib/chef/knife/environment_compare.rb

@@ -105,9 +105,8 @@ class Chef
         columns = environments.count + 1
         environments.each { |env| rows << ui.color(env, :bold) }
         cookbooks.each_key do |c|
-          total = []
-          environments.each { |n| total << constraints[n][c] }
-          if total.uniq.count == 1
+          total = environments.map { |n| constraints[n][c] }
+          if total.uniq.one?
             next if config[:mismatch]
 
             color = :white

data/lib/chef/knife/key_create.rb

@@ -89,11 +89,7 @@ class Chef
           key.name(@config[:key_name])
         end
 
-        if @config[:expiration_date]
-          key.expiration_date(@config[:expiration_date])
-        else
-          key.expiration_date("infinity")
-        end
+        key.expiration_date(@config[:expiration_date] || "infinity")
 
         output = edit_hash(key)
         key = create_key_from_hash(output)

data/lib/chef/knife/key_edit.rb

@@ -89,11 +89,7 @@ class Chef
           key.public_key(File.read(File.expand_path(@config[:public_key])))
         end
 
-        if @config[:key_name]
-          key.name(@config[:key_name])
-        else
-          key.name(@original_name)
-        end
+        key.name(@config[:key_name] || @original_name)
 
         if @config[:expiration_date]
           key.expiration_date(@config[:expiration_date])

data/lib/chef/knife/license.rb

@@ -42,8 +42,12 @@ class Chef
         when "add"
           ChefLicensing.add_license
         else
-          ChefLicensing.fetch_and_persist.each do |key|
-            ui.msg("License_key: #{key}")
+          # The license command needs to run with require_license, otherwise
+          # license activation will be skipped
+          ChefLicensing::Config.require_license_for do
+            ChefLicensing.fetch_and_persist.each do |key|
+              ui.msg("License_key: #{key}")
+            end
           end
         end
       end

data/lib/chef/knife/list.rb

@@ -115,7 +115,7 @@ class Chef
             printed_something = true
           end
           output "#{format_path(result)}:"
-          print_results(children.map { |result| maybe_add_slash(result.display_name, result.dir?) }.sort, "")
+          print_results(children.map { |child| maybe_add_slash(child.display_name, child.dir?) }.sort, "")
         end
 
         exit exit_code if exit_code

data/lib/chef/knife/node_edit.rb

@@ -45,7 +45,7 @@ class Chef
         end
 
         updated_node = node_editor.edit_node
-        if updated_values = node_editor.updated?
+        if (updated_values = node_editor.updated?)
           ui.info "Saving updated #{updated_values.join(", ")} on node #{node.name}"
           updated_node.save
         else

data/lib/chef/knife/raw.rb

@@ -83,7 +83,6 @@ class Chef
           exit(1)
         end
 
-        path = name_args[0]
         data = false
         if config[:input]
           data = File.read(config[:input])
@@ -108,7 +107,7 @@ class Chef
             result = chef_rest.request(method, name_args[0], headers, data)
           end
           output result
-        rescue Timeout::Error => e
+        rescue Timeout::Error
           ui.error "Server timeout"
           exit 1
         rescue Net::HTTPClientException => e

data/lib/chef/knife/recipe_list.rb

@@ -23,7 +23,7 @@ class Chef::Knife::RecipeList < Chef::Knife
 
   def run
     recipes = rest.get("cookbooks/_recipes")
-    if pattern = @name_args.first
+    if (pattern = @name_args.first)
       recipes = recipes.grep(Regexp.new(pattern))
     end
     output(recipes)

data/lib/chef/knife/search.rb

@@ -42,14 +42,14 @@ class Chef
         long: "--start ROW",
         description: "The row to start returning results at.",
         default: 0,
-        proc: lambda { |i| i.to_i }
+        proc: lambda(&:to_i)
 
       option :rows,
         short: "-R INT",
         long: "--rows INT",
         description: "The number of rows to return.",
         default: nil,
-        proc: lambda { |i| i.to_i }
+        proc: lambda(&:to_i)
 
       option :run_list,
         short: "-r",

data/lib/chef/knife/ssh.rb

@@ -43,7 +43,7 @@ class Chef
         long: "--concurrency NUM",
         description: "The number of concurrent connections.",
         default: nil,
-        proc: lambda { |o| o.to_i }
+        proc: lambda(&:to_i)
 
       option :ssh_attribute,
         short: "-a ATTR",
@@ -79,7 +79,7 @@ class Chef
         short: "-p PORT",
         long: "--ssh-port PORT",
         description: "The ssh port.",
-        proc: Proc.new { |key| key.strip }
+        proc: Proc.new(&:strip)
 
       option :ssh_timeout,
         short: "-t SECONDS",
@@ -92,7 +92,7 @@ class Chef
         short: "-G GATEWAY",
         long: "--ssh-gateway GATEWAY",
         description: "The ssh gateway.",
-        proc: Proc.new { |key| key.strip }
+        proc: Proc.new(&:strip)
 
       option :ssh_gateway_identity,
         long: "--ssh-gateway-identity SSH_GATEWAY_IDENTITY",
@@ -344,11 +344,11 @@ class Chef
 
       def print_data(host, data)
         @buffers ||= {}
-        if leftover = @buffers[host]
+        if (leftover = @buffers[host])
           @buffers[host] = nil
           print_data(host, leftover + data)
         else
-          if newline_index = data.index("\n")
+          if (newline_index = data.index("\n"))
             line = data.slice!(0...newline_index)
             data.slice!(0)
             print_line(host, line)

data/lib/chef/knife/ssl_fetch.rb

@@ -90,7 +90,7 @@ class Chef
 
       def cn_of(certificate)
         subject = certificate.subject
-        if cn_field_tuple = subject.to_a.find { |field| field[0] == "CN" }
+        if (cn_field_tuple = subject.to_a.find { |field| field[0] == "CN" })
           cn_field_tuple[1]
         else
           nil

data/lib/chef/knife/supermarket_share.rb

@@ -95,11 +95,12 @@ class Chef
             do_upload("#{tmp_cookbook_dir}/#{cookbook_name}.tgz", category, Chef::Config[:node_name], Chef::Config[:client_key])
             ui.info("Upload complete")
             Chef::Log.trace("Removing local staging directory at #{tmp_cookbook_dir}")
-            FileUtils.rm_rf tmp_cookbook_dir
           rescue => e
             ui.error("Error uploading cookbook #{cookbook_name} to Supermarket: #{e.message}. Increase log verbosity (-VV) for more information.")
             Chef::Log.trace("\n#{e.backtrace.join("\n")}")
             exit(1)
+          ensure
+            FileUtils.rm_rf tmp_cookbook_dir
           end
 
         else
@@ -132,7 +133,7 @@ class Chef
         res = Chef::JSONCompat.from_json(http_resp.body)
         if http_resp.code.to_i != 201
           if res["error_messages"]
-            if /Version already exists/.match?(res["error_messages"][0])
+            if res["error_messages"][0].match?(/Version (already exists|has already been taken)/)
               ui.error "The same version of this cookbook already exists on Supermarket."
               exit(1)
             else

data/lib/chef/knife/upload.rb

@@ -73,7 +73,7 @@ class Chef
 
         error = false
         pattern_args.each do |pattern|
-          fs_error, result = Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
+          fs_error, _result = Chef::ChefFS::FileSystem.copy_to(pattern, local_fs, chef_fs, config[:recurse] ? nil : 1, config, ui, proc { |entry| format_path(entry) })
           if fs_error
             error = true
           end

data/lib/chef/knife/user_create.rb

@@ -120,27 +120,17 @@ class Chef
           user.public_key File.read(File.expand_path(config[:user_key]))
         end
 
-        if @name_args.size > 1
-          user_hash = {
-            username: user.username,
-            first_name: user.first_name,
-            last_name: user.last_name,
-            display_name: "#{user.first_name} #{user.last_name}",
-            email: user.email,
-            password: password,
-            create_key: user.create_key,
-          }
-        else
-          user_hash = {
-            username: user.username,
-            first_name: user.first_name,
-            last_name: user.last_name,
-            display_name: user.display_name,
-            email: user.email,
-            password: password,
-            create_key: user.create_key,
-          }
-        end
+        user_hash = {
+          username: user.username,
+          first_name: user.first_name,
+          last_name: user.last_name,
+          display_name: @name_args.size > 1 ? "#{user.first_name} #{user.last_name}" : user.display_name,
+          email: user.email,
+          password: password,
+        }
+
+        user_hash[:create_key] = user.create_key if user.create_key
+        user_hash[:public_key] = user.public_key if user.public_key
 
         # Check the file before creating the user so the api is more transactional.
         if config[:file]

data/lib/chef/knife/user_list.rb

@@ -35,9 +35,9 @@ class Chef
         description: "Show corresponding URIs."
 
       option :all_users,
-             short: "-a",
-             long: "--all-users",
-             description: "Show all user details."
+        short: "-a",
+        long: "--all-users",
+        description: "Show all user details."
       def run
         users = Chef::UserV1.list(config[:all_users])
         if config[:all_users]

data/lib/chef/knife/version.rb

@@ -17,8 +17,6 @@
 class Chef
   class Knife
     KNIFE_ROOT = File.expand_path("../..", __dir__)
-    VERSION = "18.8.68".freeze
+    VERSION = "19.0.102".freeze
   end
 end
-
-

data/lib/chef/knife/xargs.rb

@@ -131,7 +131,6 @@ class Chef
                 begin
                   error = true if xargs_files(command, tempfiles)
                   files = []
-                  ran = true
                 ensure
                   destroy_tempfiles(tempfiles)
                 end

data/lib/chef/knife.rb

@@ -32,6 +32,7 @@ require "chef/server_api" unless defined?(Chef::ServerAPI)
 require "http/authenticator" unless defined?(Chef::HTTP::Authenticator)
 require "http/http_request" unless defined?(Chef::HTTP::HTTPRequest)
 require "http" unless defined?(Chef::HTTP)
+# require "chef/utils/licensing_handler"
 # End
 
 require "pp" unless defined?(PP)
@@ -215,6 +216,8 @@ class Chef
     #   subcommands know about global knife CLI options
     #
     def self.run(args, options = {})
+      # Check software entitlement
+      # Chef::Utils::LicensingHandler.check_software_entitlement!(ui)
       # Fallback debug logging. Normally the logger isn't configured until we
       # read the config, but this means any logging that happens before the
       # config file is read may be lost. If the KNIFE_DEBUG variable is set, we
@@ -283,7 +286,7 @@ class Chef
 
         if CHEF_ORGANIZATION_MANAGEMENT.include?(args[0])
           list_commands("CHEF ORGANIZATION MANAGEMENT")
-        elsif category_commands = guess_category(args)
+        elsif (category_commands = guess_category(args))
           list_commands(category_commands)
         elsif OFFICIAL_PLUGINS.include?(args[0]) # command was an uninstalled official chef knife plugin
           ui.info("Use `#{ChefUtils::Dist::Infra::EXEC} gem install knife-#{args[0]}` to install the plugin into Chef Workstation")

data/lib/chef/utils/licensing_config.rb

@@ -6,4 +6,3 @@ ChefLicensing.configure do |config|
   config.chef_executable_name = "knife"
   config.license_server_url   = "https://services.chef.io/licensing"
 end
-

data/lib/chef/utils/licensing_handler.rb

@@ -1,31 +1,13 @@
-#
-# Copyright:: Copyright (c) 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_relative "licensing_config"
 
 class Chef
   class Utils
     class LicensingHandler
-      LEGACY_OMNITRUCK_URL = "https://omnitruck.chef.io".freeze
-
-      OMNITRUCK_URLS = {
-        "free"       => "https://chefdownload-trial.chef.io",
-        "trial"      => "https://chefdownload-trial.chef.io",
-        "commercial" => "https://chefdownload-commerical.chef.io",
+      # Omnitruck URLs are no longer used. Updated to new download URLs.
+      DOWNLOAD_URLS = {
+        "free" => "https://chefdownload-trial.chef.io",
+        "trial" => "https://chefdownload-trial.chef.io",
+        "commercial" => "https://chefdownload-commercial.chef.io",
       }.freeze
 
       attr_reader :license_key, :license_type
@@ -36,11 +18,9 @@ class Chef
       end
 
       def omnitruck_url
-        url = OMNITRUCK_URLS[license_type]
-        is_legacy = url.nil?
-        url ||= LEGACY_OMNITRUCK_URL
+        url = DOWNLOAD_URLS[license_type]
 
-        "#{url}/%s#{is_legacy ? "" : "?license_id=#{license_key}"}"
+        "#{url}/%s?license_id=#{license_key}"
       end
 
       def install_sh_url
@@ -50,7 +30,7 @@ class Chef
       class << self
         def validate!
           license_keys = begin
-                           ChefLicensing::LicenseKeyFetcher.fetch
+                           ChefLicensing.fetch_and_persist
                          # If the env is airgapped or the local licensing service is unreachable,
                          # the licensing gem will raise ChefLicensing::RestfulClientConnectionError.
                          # In such cases, we are assuming the license is not available.
@@ -66,6 +46,16 @@ class Chef
 
           new(licenses_metadata.last.id, licenses_metadata.last.license_type)
         end
+
+        def check_software_entitlement!(ui)
+          ChefLicensing.check_software_entitlement!
+        rescue ChefLicensing::SoftwareNotEntitled
+          ui.error "License is not entitled to use Workstation."
+          exit 1
+        rescue ChefLicensing::Error => e
+          ui.error e.message
+          exit 1
+        end
       end
     end
   end

data/spec/data/cookbooks/openldap/templates/default/all_windows_line_endings.erb

@@ -1,4 +1,4 @@
-Template rendering libraries
-should support
-different line endings
-
+Template rendering libraries
+should support
+different line endings
+

data/spec/data/cookbooks/openldap/templates/default/some_windows_line_endings.erb

@@ -1,4 +1,4 @@
 Template rendering libraries
-should support
+should support
 different line endings
-
+