From 746a374f6ffe9be0628d720b0e4759bde7caf8db Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Tue, 9 Aug 2011 21:52:49 +0100 Subject: maint: Fix case sensitive require Mac's filesystems aren't case sensitive, so developing this change didn't catch the issue with requiring filenames that had been uppercased. Reviewed-by: Nick Lewis --- lib/puppet/application.rb | 2 +- spec/unit/application_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index 1e00bcce7..b7cb1169d 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -216,7 +216,7 @@ class Application klass = name.to_s.capitalize begin - require File.join('puppet', 'application', name.to_s) + require File.join('puppet', 'application', name.to_s.downcase) rescue LoadError => e puts "Unable to find application '#{name}'. #{e}" Kernel::exit(1) diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb index b56aa20b0..fd93ceb00 100755 --- a/spec/unit/application_spec.rb +++ b/spec/unit/application_spec.rb @@ -32,7 +32,7 @@ describe Puppet::Application do it "should exit if it can't find a class" do reg = "Unable to find application 'ThisShallNeverEverEverExist'. " - reg += "no such file to load -- puppet/application/ThisShallNeverEverEverExist" + reg += "no such file to load -- puppet/application/thisshallneverevereverexist" @klass.expects(:puts).with(reg) expect { @klass.find("ThisShallNeverEverEverExist") }.to exit_with 1 -- cgit