diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
| commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
| tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /lib/chef/monkey_patches/pathname.rb | |
| parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
| parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
| download | chef-merging-master.tar.gz | |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'lib/chef/monkey_patches/pathname.rb')
| -rw-r--r-- | lib/chef/monkey_patches/pathname.rb | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/lib/chef/monkey_patches/pathname.rb b/lib/chef/monkey_patches/pathname.rb deleted file mode 100644 index c0255ae7ea..0000000000 --- a/lib/chef/monkey_patches/pathname.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'pathname' - -if RUBY_VERSION.to_f < 1.9 - class Pathname - @@old_each_filename = instance_method(:each_filename) - - def each_filename(&block) - if block_given? - EachFilenameEnumerable.new(self).each(&block) - else - EachFilenameEnumerable.new(self) - end - end - - def old_each_filename(&block) - @@old_each_filename.bind(self).call(&block) - end - - class EachFilenameEnumerable - include Enumerable - attr_reader :pathname - - def initialize(pathname) - @pathname = pathname - end - - def each(&block) - @pathname.old_each_filename(&block) - end - end - end -end |