utils 0.0.54 → 0.0.55

data/VERSION

@@ -1 +1 @@
-0.0.54
+0.0.55

data/bin/discover

@@ -30,6 +30,7 @@ Options are
   -a CSET     use only character set CSET from PATTERN
   -I SUFFIX   only include files with suffix SUFFIX during finding
   -b          match also binary files
+  -v          be verbose
   -h          display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -37,7 +38,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:a:rdDciebh'
+args = go 'I:a:rdDciebvh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
@@ -45,7 +46,7 @@ roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
 Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args['c']
 STDOUT.sync = true
 config = Utils::Config::ConfigFile.new
-config.parse_config_file File.expand_path('~/.utilsrc')
+config.configure_from_paths
 args['b'] ||= config.discover.binary
 finder = Finder.new(
   :pattern => pattern,

data/bin/probe

@@ -28,7 +28,7 @@ def cmd(*args)
 end
 
 $config = Utils::Config::ConfigFile.new
-$config.parse_config_file File.expand_path('~/.utilsrc')
+$config.configure_from_paths
 testrunner_args = []
 if i = ARGV.index('--')
   testrunner_args.concat ARGV[(i + 1)..-1]

data/bin/search

@@ -49,6 +49,7 @@ Options are
   -I SUFFIX   only include files with suffix SUFFIX in search
   -e          open the matching files with edit command
   -a CSET     use only character set CSET from PATTERN
+  -v          be verbose
   -h          display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -56,7 +57,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:A:B:C:s:S:n:N:a:RciflLeh'
+args = go 'I:A:B:C:s:S:n:N:a:RciflLevh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
@@ -64,7 +65,7 @@ roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
 Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args['c']
 STDOUT.sync = true
 config = Utils::Config::ConfigFile.new
-config.parse_config_file File.expand_path('~/.utilsrc')
+config.configure_from_paths
 grepper = Grepper.new(
   :pattern => pattern,
   :args    => args,

data/bin/strip_spaces

@@ -38,7 +38,7 @@ paths = paths.map { |p| File.expand_path(p) }
 suffix = args['I'].ask_and_send(:split, /[\s,]+/).to_a
 
 config = Utils::Config::ConfigFile.new
-config.parse_config_file File.expand_path('~/.utilsrc')
+config.configure_from_paths
 
 find(*(paths + [ { :suffix => suffix} ])) do |filename|
   bn, s = File.basename(filename), File.stat(filename)

data/lib/utils/config/config_file.rb

@@ -2,6 +2,15 @@ require 'dslkit/polite'
 require 'tins/xt/string'
 
 class Utils::Config::ConfigFile
+  class << self
+    attr_accessor :config_file_paths
+  end
+  self.config_file_paths = [
+    '/etc/utilsrc',
+    '~/.utilsrc',
+    './.utilsrc',
+  ]
+
   include DSLKit::Interpreter
 
   class ConfigFileError < StandardError; end
@@ -9,14 +18,21 @@ class Utils::Config::ConfigFile
   def initialize
   end
 
-  def parse_config_file(config_file_name)
-    File.open(config_file_name) do |cf|
+  def configure_from_paths(paths = self.class.config_file_paths)
+    for config_file_path in paths
+      parse_config_file config_file_path
+    end
+  end
+
+  def parse_config_file(config_file_path)
+    config_file_path = File.expand_path(config_file_path)
+    File.open(config_file_path) do |cf|
       parse cf.read
     end
     self
   rescue SystemCallError => e
     $DEBUG and warn "Couldn't read config file "\
-      "#{config_file_name.inspect}: #{e.class} #{e}"
+      "#{config_file_path.inspect}: #{e.class} #{e}"
     return nil
   end
 
@@ -48,7 +64,7 @@ class Utils::Config::ConfigFile
 
     def to_ruby
       result = ''
-      result << "#{self.class.name[/::([^:]+)\Z/, 1].underscore} do\n"
+      result << "#{self.class.name[/::([^:]+)\z/, 1].underscore} do\n"
       for da in self.class.dsl_attributes
         result << "  #{da} #{Array(__send__(da)).map(&:inspect) * ', '}\n"
       end
@@ -92,9 +108,9 @@ class Utils::Config::ConfigFile
   end
 
   class Search < FileFinder
-    config :prune_dirs, /\A(\.svn|\.git|CVS|tmp)\Z/
+    config :prune_dirs, /\A(\.svn|\.git|CVS|tmp)\z/
 
-    config :skip_files, /(\A\.|\.sw[pon]\Z|\.log\Z|~\Z)/
+    config :skip_files, /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
   end
 
   def search(&block)
@@ -105,9 +121,9 @@ class Utils::Config::ConfigFile
   end
 
   class Discover < FileFinder
-    config :prune_dirs, /\A(\.svn|\.git|CVS|tmp)\Z/
+    config :prune_dirs, /\A(\.svn|\.git|CVS|tmp)\z/
 
-    config :skip_files, /(\A\.|\.sw[pon]\Z|\.log\Z|~\Z)/
+    config :skip_files, /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
 
     config :binary, false
   end
@@ -120,9 +136,9 @@ class Utils::Config::ConfigFile
   end
 
   class StripSpaces < FileFinder
-    config :prune_dirs, /\A(\..*|CVS)\Z/
+    config :prune_dirs, /\A(\..*|CVS)\z/
 
-    config :skip_files, /(\A\.|\.sw[pon]\Z|\.log\Z|~\Z)/
+    config :skip_files, /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
   end
 
   def strip_spaces(&block)

data/lib/utils/finder.rb

@@ -57,11 +57,11 @@ class Utils::Finder
       begin
         bn, s = filename.pathname.basename, filename.stat
         if !s || s.directory? && @config.discover.prune?(bn)
-          $DEBUG and warn "Pruning #{filename.inspect}."
+          @args['v'] and warn "Pruning #{filename.inspect}."
           prune
         end
         if s.file? && @config.discover.skip?(bn)
-          $DEBUG and warn "Skipping #{filename.inspect}."
+          @args['v'] and warn "Skipping #{filename.inspect}."
           next
         end
         paths << filename
@@ -70,7 +70,7 @@ class Utils::Finder
     paths.uniq!
     paths.map! { |p| a = File.split(p) ; a.unshift(p) ; a }
     paths = paths.map! do |path, dir, file|
-      if do_match = attempt_match?(path) and $DEBUG
+      if do_match = attempt_match?(path) and @args['v']
         warn "Attempt match of #{path.inspect}"
       end
       if do_match and match = @pattern.match(file)

data/lib/utils/grepper.rb

@@ -71,7 +71,7 @@ class Utils::Grepper
     @output = []
     bn, s = File.basename(filename), File.stat(filename)
     if !s || s.directory? && @config.search.prune?(bn)
-      $DEBUG and warn "Pruning #{filename.inspect}."
+      @args['v'] and warn "Pruning #{filename.inspect}."
       prune
     end
     if s.file? && !@config.search.skip?(bn) &&
@@ -79,18 +79,18 @@ class Utils::Grepper
     then
       File.open(filename, 'rb') do |file|
         if file.binary? != true
-          $DEBUG and warn "Matching #{filename.inspect}."
+          @args['v'] and warn "Matching #{filename.inspect}."
           if @args['f']
             @output << filename
           else
             match_lines file
           end
         else
-          $DEBUG and warn "Skipping binary file #{filename.inspect}."
+          @args['v'] and warn "Skipping binary file #{filename.inspect}."
         end
       end
     else
-      $DEBUG and warn "Skipping #{filename.inspect}."
+      @args['v'] and warn "Skipping #{filename.inspect}."
     end
     unless @output.empty?
       case

data/lib/utils/irb.rb

@@ -112,7 +112,7 @@ module Utils
 
         attr_reader :description
 
-        alias to_str name
+        alias to_str description
 
         alias inspect description
 
@@ -136,15 +136,27 @@ module Utils
       class MethodWrapper < WrapperBase
         def initialize(obj, name, modul)
           super(name)
-          if modul
-            @arity = obj.instance_method(name).arity
-          else
-            @arity = obj.method(name).arity
-          end
-          @description = "#@name(#@arity)"
+          @method = modul ? obj.instance_method(name) : obj.method(name)
+          @description = "#{owner}##@name(#{arity})"
+        end
+
+        attr_reader :method
+
+        def owner
+          method.respond_to?(:owner) ? method.owner : nil
         end
 
-        attr_reader :arity
+        def arity
+          method.arity
+        end
+
+        def source_location
+          method.source_location
+        end
+
+        def <=>(other)
+          @description <=> other.description
+        end
       end
 
       class ConstantWrapper < WrapperBase

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.54'
+  VERSION         = '0.0.55'
   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.54"
+  s.version = "0.0.55"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-09-05"
+  s.date = "2012-09-25"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
   s.executables = ["chroot-exec", "chroot-libs", "classify", "create_tags", "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.54
+  version: 0.0.55
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -256,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2048215407046048042
+      hash: 147024533922954409
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: