utils 0.0.46 → 0.0.47

data/VERSION

@@ -1 +1 @@
-0.0.46
+0.0.47

data/lib/utils/find.rb

@@ -7,21 +7,8 @@ module Utils
         attr_writer :finder
 
         def file
-          tried = false
           begin
-            file = @finder.get_file(self)
-            if file
-              file.closed? and file.reopen(file.path, 'rb')
-            else
-              file = File.new(self, 'rb')
-              @finder.add_file self, file
-            end
-            return file
-          rescue Errno::EMFILE
-            tried and raise
-            @finder.close_files
-            tried = true
-            retry
+            @finder.open_file(self)
           rescue Errno::ENOENT, Errno::EACCES
             return
           end
@@ -70,8 +57,22 @@ module Utils
         path
       end
 
-      def get_file(path)
-        @files[path]
+      def open_file(path, opts = {})
+        retried = false
+        mode = opts.fetch(:mode, 'rb')
+        if file = @files[path]
+          if file.closed?
+            file.reopen(file.path, mode)
+          end
+        else
+          file = File.new(path, mode)
+          add_file path, file
+        end
+        file
+      rescue Errno::EMFILE
+        close_files
+        retried = true
+        retry
       end
 
       def add_file(path, file)
@@ -79,6 +80,10 @@ module Utils
         self
       end
 
+      def current_open_files
+        @files.inject(0) { |c, f| c + f.closed? ? 0 : 1 }
+      end
+
       def close_files
         @files.each_value do |f|
           f.closed? or f.close
@@ -109,13 +114,7 @@ module Utils
             end
             if s.directory? then
               begin
-                tried = false
                 fs = Dir.entries(file)
-              rescue Errno::EMFILE
-                tried and raise
-                close_files
-                tried = true
-                retry
               rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
                 next
               end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.46'
+  VERSION         = '0.0.47'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.46"
+  s.version = "0.0.47"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-06-05"
+  s.date = "2012-07-05"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
   s.executables = ["chroot-exec", "chroot-libs", "classify", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "myex", "number_files", "path", "probe", "same_files", "search", "sedit", "sshscreen", "strip_spaces", "unquarantine_apps", "untest", "utils-install-config", "utils-utilsrc", "vacuum_firefox_sqlite", "xmp"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -243,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3272327584408506437
+      hash: 1507338635745314567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: