diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-08-09 21:52:49 +0100 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-08-09 13:58:20 -0700 |
| commit | 746a374f6ffe9be0628d720b0e4759bde7caf8db (patch) | |
| tree | d848d7233aee548cc9313a3de5e07bc00e585e12 | |
| parent | 310bd552e320a0fd0561b3d1619820428a07a01d (diff) | |
| download | puppet-746a374f6ffe9be0628d720b0e4759bde7caf8db.tar.gz puppet-746a374f6ffe9be0628d720b0e4759bde7caf8db.tar.xz puppet-746a374f6ffe9be0628d720b0e4759bde7caf8db.zip | |
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 <nick@puppetlabs.com>
| -rw-r--r-- | lib/puppet/application.rb | 2 | ||||
| -rwxr-xr-x | 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 |