durb 0.2 → 0.3

data/bin/durb

@@ -41,7 +41,8 @@ opts = GetoptLong.new(
   ["--parsable", "--parseable", "-p", GetoptLong::REQUIRED_ARGUMENT],
   ["--help", "-h", GetoptLong::NO_ARGUMENT],
   ["--version", GetoptLong::NO_ARGUMENT],
-  ["--cross-filesystems", "-x", GetoptLong::NO_ARGUMENT])
+  ["--cross-filesystems", "-x", GetoptLong::NO_ARGUMENT],
+  ["--fatal-warnings", "-W", GetoptLong::NO_ARGUMENT])
 
 $options = {}
 opts.each do |opt, arg|
@@ -49,7 +50,7 @@ opts.each do |opt, arg|
 end
 if $options[:version]
   puts <<END_VERSION
-durb v0.2
+durb v0.3
 Copyright (c) 2009 Matteo Sasso
 
 END_VERSION
@@ -86,13 +87,16 @@ Options:
           By default durb only shows aggregate size for each directory shown.
           This option enables a more complex report of the disk space used.
 
+  -W, --fatal-warnings
+          This flag makes all warnings fatal.
+
 END_HELP
 end
 
 exit if $options[:version] or $options[:help]
 
 if $options[:parsable]
-  raise ArgumentError, "--parsable and --verbose make no sens toghether" if $options[:verbose]
+  raise ArgumentError, "--parsable and --verbose make no sense toghether" if $options[:verbose]
   $options[:output_fields] = $options[:parsable].split(',')
   $options[:output_fields].each do |f|
     raise ArgumentError, ("Unknown field: %s" % f) if not FIELD_NAMES.include?(f)
@@ -114,7 +118,10 @@ $paths = ["."] if $paths.empty?
 $paths = $paths.map{|p| File.expand_path(p)}
 
 $path = $paths.first
-$options[:threshold] ||= DEFAULT_THRESHOLD
+if not $options[:threshold]
+  $stderr.puts "INFO: using default threshold of %s" % DEFAULT_THRESHOLD
+  $options[:threshold] = DEFAULT_THRESHOLD
+end
 
 reduced_trees = []
 $paths.each do |p|

data/lib/directory_inspector.rb

@@ -27,9 +27,9 @@ class DirectoryInspector
 
 protected
   def make_node(path)
-    size, files, subdirectories = scan(path)
+    size, files, subdirectories, flags = scan(path)
 
-    dir = DirectoryNode.new(path, size, files)
+    dir = DirectoryNode.new(path, size, files, flags)
     subdirectories.map{|p| make_node(p)}.select{|n| not n.nil?}.each do |n|
       dir.add_subdirectory(n)
     end
@@ -45,7 +45,15 @@ protected
     begin
       dir = Dir.new(path_string)
     rescue Errno::EACCES
-      raise $!
+      $stderr.puts("%s: access denied to %s. %s" % [
+            $options[:fatal_warnings] ? "ERROR" : "WARNING",
+            path_string,
+            $options[:fatal_warnings] ? nil : "Skipped."])
+        if $options[:fatal_warnings]
+          exit
+        else
+          return 0, 0, [], [:imprecise]
+        end
     rescue Errno::ENOENT
       raise $!
     end
@@ -55,12 +63,20 @@ protected
       begin
         st = File.lstat(fname)
       rescue Errno::EACCES
-        raise $!
+        $stderr.puts("%s: access denied to %s/*. %s" % [
+            $options[:fatal_warnings] ? "ERROR" : "WARNING",
+            path_string,
+            $options[:fatal_warnings] ? nil : "Skipped."])
+        if $options[:fatal_warnings]
+          exit
+        else
+          return 0, 0, [], [:imprecise]
+        end
       rescue Errno::ENOENT, Errno::ELOOP
         next
       end
       if @filesystem and st.dev != @filesystem
-        $stderr.puts("SKIPPED: different filesystem for %s" % fname)
+        $stderr.puts("INFO: different filesystem for %s. Skipped." % fname)
         next
       end
       if st.file? or st.symlink?
@@ -73,6 +89,6 @@ protected
       end
     end
 
-    return size, files, subdirectories
+    return size, files, subdirectories, []
   end
 end

data/lib/directory_node.rb

@@ -20,8 +20,9 @@ class DirectoryNode
   attr_accessor :size, :files, :big, :show
   attr_accessor :s_subsize, :s_subfiles, :s_dirs
   attr_accessor :i_subsize, :i_subfiles, :i_dirs, :i_rec_dirs
+  attr_accessor :flags
 
-  def initialize(path, size, files)
+  def initialize(path, size, files, flags)
     @path = path
     @size = size
     @files = files
@@ -30,6 +31,11 @@ class DirectoryNode
     @big = true
     @show = false
     @subdirectories = []
+    @flags = flags
+  end
+
+  def precise?
+    @flags.include?(:imprecise) ? false : true
   end
 
   def add_subdirectory(d)
@@ -37,6 +43,7 @@ class DirectoryNode
     @s_subsize += d.s_subsize
     @s_subfiles += d.s_subfiles
     @s_dirs += d.s_dirs
+    @flags << :imprecise if not d.precise? and precise?
     if d.big
       @s_subsize += d.size + d.i_subsize
       @s_subfiles += d.files + d.i_subfiles

data/lib/durb.rb

@@ -1,3 +1,3 @@
 class Durb
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/lib/reducer.rb

@@ -17,7 +17,7 @@
 
 module Reducer
   def self.run(tree, threshold)
-    rtree = DirectoryNode.new(tree.path, tree.size, tree.files)
+    rtree = DirectoryNode.new(tree.path, tree.size, tree.files, tree.flags)
 
     tree.subdirectories.each{|n| rtree.add_subdirectory(run(n, threshold))}
     rtree.big = ((rtree.size + rtree.i_subsize) >= threshold)

data/lib/text_output.rb

@@ -20,7 +20,7 @@ class TextOutput
 
   def initialize(trees, output)
     trees_width = trees.map{|t| calc_width(t)}.max
-    @width = trees_width + ($options[:verbose] ? 47 : 9)
+    @width = trees_width + ($options[:verbose] ? 47 : 11)
     @output = output
     if output.tty?
       begin
@@ -81,7 +81,7 @@ class TextOutput
       if $options[:verbose]
         size_and_isize = (node.size > 0 and node.i_subsize > 0)
         tsize_and_ssize = (node.size + node.i_subsize > 0 and node.s_subsize > 0)
-        size_text = "%4s %1s %9s %1s %4s %1s %9s %1s %4s" % \
+        size_text = "%4s %1s %9s %1s %4s %1s %9s %1s %4s %1s" % \
               [
                 (node.size > 0) ? size_to_text(node.size) : nil,
                 size_and_isize ? "+" : nil,
@@ -94,11 +94,16 @@ class TextOutput
                       [size_to_text(node.s_subsize), size_to_text(node.s_dirs)] : nil,
                 tsize_and_ssize ? "=" : nil,
                 (node.size + node.i_subsize + node.s_subsize > 0) ?
-                size_to_text(node.size + node.i_subsize + node.s_subsize) : nil,
+                      size_to_text(node.size + node.i_subsize + node.s_subsize) : nil,
+                node.precise? ? nil : "*",
               ]
       else
         total_size = node.size + node.i_subsize
-        size_text = total_size < size ? nil : size_to_text(total_size)
+        size_text = "%4s %1s" % \
+              [
+                total_size < size ? nil : size_to_text(total_size),
+                node.precise? ? nil : "*",
+              ]
       end
       align((' ' * indentation) + (indentation == 0 ? node.path_string : node.name), size_text)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: durb
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Matteo Sasso
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-22 00:00:00 +01:00
+date: 2009-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency