diff options
| author | Jon Morrow <jmorrow@opscode.com> | 2013-05-21 14:54:07 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2013-06-17 14:14:55 -0700 |
| commit | 001ed1e0570e58e6007e083cada1af5c63a5df1c (patch) | |
| tree | 458eed012f124af8f0d392e306096eb65225815f | |
| parent | 6f0296cb2ff48210222d25468bf854f91f9fd124 (diff) | |
| download | chef-001ed1e0570e58e6007e083cada1af5c63a5df1c.tar.gz | |
Removing Dir monkey patch.
| -rw-r--r-- | lib/chef.rb | 1 | ||||
| -rw-r--r-- | lib/chef/monkey_patches/dir.rb | 36 |
2 files changed, 0 insertions, 37 deletions
diff --git a/lib/chef.rb b/lib/chef.rb index ef173c4212..68e70749e7 100644 --- a/lib/chef.rb +++ b/lib/chef.rb @@ -33,7 +33,6 @@ require 'chef/handler' require 'chef/handler/json_file' require 'chef/monkey_patches/tempfile' -require 'chef/monkey_patches/dir' require 'chef/monkey_patches/string' require 'chef/monkey_patches/numeric' require 'chef/monkey_patches/object' diff --git a/lib/chef/monkey_patches/dir.rb b/lib/chef/monkey_patches/dir.rb deleted file mode 100644 index c86edcf013..0000000000 --- a/lib/chef/monkey_patches/dir.rb +++ /dev/null @@ -1,36 +0,0 @@ -# -# Author:: Adam Jacob (<adam@opscode.com>) -# Copyright:: Copyright (c) 2008 Opscode, 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. -# - -if RUBY_VERSION < "1.8.6" || RUBY_PLATFORM =~ /mswin|mingw32|windows/ - class Dir - class << self - alias_method :glob_, :glob - # Adds a Dir.glob to Ruby 1.8.5, for compat - def glob(pattern, flags=0) - raise ArgumentError unless ( - !pattern.nil? and ( - pattern.is_a? Array and !pattern.empty? - ) or pattern.is_a? String - ) - pattern.gsub!(/\\/, "/") if RUBY_PLATFORM =~ /mswin|mingw32|windows/ - [pattern].flatten.inject([]) { |r, p| r + glob_(p, flags) } - end - alias_method :[], :glob - end - end -end |