+ Removed Gem::FileOperations since it is a dummy class

rubygems · Apr 12, 2011 · 048ed59 · 048ed59
1 parent 6bab483
commit 048ed59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 32 deletions.
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
@@ -6,32 +6,6 @@
 
 require 'rubygems/specification'
 
-##
-# Wrapper for FileUtils meant to provide logging and additional operations if
-# needed.
-
-class Gem::FileOperations
-
-  def initialize(logger = nil)
-    require 'fileutils'
-    @logger = logger
-  end
-
-  def method_missing(meth, *args, &block)
-    case
-    when FileUtils.respond_to?(meth)
-      @logger.log "#{meth}: #{args}" if @logger
-      FileUtils.send meth, *args, &block
-    when Gem::FileOperations.respond_to?(meth)
-      @logger.log "#{meth}: #{args}" if @logger
-      Gem::FileOperations.send meth, *args, &block
-    else
-      super
-    end
-  end
-
-end
-
 module Gem::Package
 
   class Error < StandardError; end

diff --git a/lib/rubygems/package/tar_input.rb b/lib/rubygems/package/tar_input.rb
@@ -110,7 +110,6 @@ def initialize(io, security_policy = nil)
     end
 
     @tarreader.rewind
-    @fileops = Gem::FileOperations.new
 
     unless has_meta then
       path = io.path if io.respond_to? :path
@@ -146,9 +145,9 @@ def extract_entry(destdir, entry, expected_md5sum = nil)
       dest = File.join destdir, entry.full_name
 
       if File.directory? dest then
-        @fileops.chmod entry.header.mode, dest, :verbose => false
+        FileUtils.chmod entry.header.mode, dest, :verbose => false
       else
-        @fileops.mkdir_p dest, :mode => entry.header.mode, :verbose => false
+        FileUtils.mkdir_p dest, :mode => entry.header.mode, :verbose => false
       end
 
       fsync_dir dest
@@ -160,9 +159,9 @@ def extract_entry(destdir, entry, expected_md5sum = nil)
     # it's a file
     md5 = Digest::MD5.new if expected_md5sum
     destdir = File.join destdir, File.dirname(entry.full_name)
-    @fileops.mkdir_p destdir, :mode => 0755, :verbose => false
+    FileUtils.mkdir_p destdir, :mode => 0755, :verbose => false
     destfile = File.join destdir, File.basename(entry.full_name)
-    @fileops.chmod 0600, destfile, :verbose => false rescue nil # Errno::ENOENT
+    FileUtils.chmod 0600, destfile, :verbose => false rescue nil # Errno::ENOENT
 
     open destfile, "wb", entry.header.mode do |os|
       loop do
@@ -176,7 +175,7 @@ def extract_entry(destdir, entry, expected_md5sum = nil)
       os.fsync
     end
 
-    @fileops.chmod entry.header.mode, destfile, :verbose => false
+    FileUtils.chmod entry.header.mode, destfile, :verbose => false
     fsync_dir File.dirname(destfile)
     fsync_dir File.join(File.dirname(destfile), "..")