utils 0.0.24 → 0.0.25

data/.gitignore

@@ -1,3 +1,4 @@
 .*.sw[pon]
+.rvmrc
 Gemfile.lock
 pkg

data/Rakefile

@@ -12,7 +12,7 @@ GemHadar do
   bindir      'bin'
   executables Dir['bin/*'].map(&File.method(:basename))
   test_dir    'tests'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc'
   readme      'README.rdoc'
 
   dependency  'tins',           '~>0.3'

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.25

data/bin/discover

@@ -29,6 +29,7 @@ Options are
   -e          open the matching files with edit command
   -a CSET     use only character set CSET from PATTERN
   -I SUFFIX   only include files with suffix SUFFIX during finding
+  -b          match also binary files
   -h          display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -36,7 +37,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:a:rdDcieh'
+args = go 'I:a:rdDciebh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
@@ -45,6 +46,7 @@ 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')
+args['b'] ||= config.discover.binary
 finder = Finder.new(
   :pattern => pattern,
   :args    => args,

data/bin/utils-utilsrc

@@ -24,6 +24,8 @@ when 'show'
   else
     puts $config.to_ruby
   end
+when 'default'
+  puts $config.to_ruby
 when 'diff'
   create_default_utilsrc do |default_utilsrc, utilsrc|
     system "diff -u #{default_utilsrc.inspect} #{utilsrc.inspect} | cdiff"

data/lib/utils/config/config_file.rb

@@ -106,6 +106,8 @@ class Utils::Config::ConfigFile
     config :prune_dirs, /\A(\.svn|\.git|CVS|tmp)\Z/
 
     config :skip_files, /(\A\.|\.sw[pon]\Z|\.log\Z|~\Z)/
+
+    config :binary, false
   end
 
   def discover(&block)

data/lib/utils/finder.rb

@@ -18,6 +18,7 @@ class Utils::Finder
       :cset  => @args['a'],
       :icase => @args['i'],
     }
+    @binary = @args['b']
     @pattern = @args['r'] ?
       RegexpPattern.new(pattern_opts) :
       FuzzyPattern.new(pattern_opts)
@@ -30,15 +31,19 @@ class Utils::Finder
 
   attr_reader :output
 
+  def ascii_file?(stat, path)
+    stat.file? && (@binary || stat.size == 0 || File.ascii?(path))
+  end
+
   def attempt_match?(path)
     stat = File.stat(path)
     stat.symlink? and stat = File.lstat(path)
     if @only_directory
       stat.directory?
     elsif @directory
-      stat.directory? || stat.file? && (stat.size == 0 || File.ascii?(path))
+      stat.directory? || ascii_file?(stat, path)
     else
-      stat.file? && (stat.size == 0 || File.ascii?(path))
+      ascii_file?(stat, path)
     end
   rescue SystemCallError => e
     warn "Caught #{e.class}: #{e}"

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.24'
+  VERSION         = '0.0.25'
   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,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-10-27"
+  s.date = "2011-11-07"
   s.description = "This ruby gem provides some useful command line utilities"
   s.email = "flori@ping.de"
-  s.executables = ["untest", "chroot-libs", "edit_wait", "chroot-exec", "number_files", "search", "strip_spaces", "path", "enum", "edit", "git-empty", "classify", "utils-install-config", "xmp", "discover", "sshscreen", "myex", "probe", "errf", "same_files", "utils-utilsrc", "unquarantine_apps", "vacuum_firefox_sqlite", "sedit"]
-  s.extra_rdoc_files = ["README.rdoc", "lib/utils/config/config_file.rb", "lib/utils/finder.rb", "lib/utils/version.rb", "lib/utils/find.rb", "lib/utils/config.rb", "lib/utils/editor.rb", "lib/utils/grepper.rb", "lib/utils/file_xt.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils.rb"]
-  s.files = [".gitignore", ".rvmrc", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "VERSION", "bin/chroot-exec", "bin/chroot-libs", "bin/classify", "bin/discover", "bin/edit", "bin/edit_wait", "bin/enum", "bin/errf", "bin/git-empty", "bin/myex", "bin/number_files", "bin/path", "bin/probe", "bin/same_files", "bin/search", "bin/sedit", "bin/sshscreen", "bin/strip_spaces", "bin/unquarantine_apps", "bin/untest", "bin/utils-install-config", "bin/utils-utilsrc", "bin/vacuum_firefox_sqlite", "bin/xmp", "lib/utils.rb", "lib/utils/config.rb", "lib/utils/config/config_file.rb", "lib/utils/config/gdb/asm", "lib/utils/config/gdb/ruby", "lib/utils/config/gdbinit", "lib/utils/config/irbrc", "lib/utils/config/rdebugrc", "lib/utils/config/screenrc", "lib/utils/config/utilsrc", "lib/utils/config/vim/autoload/Align.vim", "lib/utils/config/vim/autoload/AlignMaps.vim", "lib/utils/config/vim/autoload/rails.vim", "lib/utils/config/vim/autoload/rubycomplete.vim", "lib/utils/config/vim/autoload/sqlcomplete.vim", "lib/utils/config/vim/autoload/vimball.vim", "lib/utils/config/vim/colors/flori.vim", "lib/utils/config/vim/compiler/eruby.vim", "lib/utils/config/vim/compiler/ruby.vim", "lib/utils/config/vim/compiler/rubyunit.vim", "lib/utils/config/vim/ftdetect/ragel.vim", "lib/utils/config/vim/ftdetect/ruby.vim", "lib/utils/config/vim/ftplugin/eruby.vim", "lib/utils/config/vim/ftplugin/ruby.vim", "lib/utils/config/vim/ftplugin/xml.vim", "lib/utils/config/vim/indent/IndentAnything_html.vim", "lib/utils/config/vim/indent/eruby.vim", "lib/utils/config/vim/indent/javascript.vim", "lib/utils/config/vim/indent/ruby.vim", "lib/utils/config/vim/plugin/AlignMapsPlugin.vim", "lib/utils/config/vim/plugin/AlignPlugin.vim", "lib/utils/config/vim/plugin/Decho.vim", "lib/utils/config/vim/plugin/IndentAnything.vim", "lib/utils/config/vim/plugin/bufexplorer.vim", "lib/utils/config/vim/plugin/cecutil.vim", "lib/utils/config/vim/plugin/fugitive.vim", "lib/utils/config/vim/plugin/lusty-explorer.vim", "lib/utils/config/vim/plugin/rails.vim", "lib/utils/config/vim/plugin/rubyextra.vim", "lib/utils/config/vim/plugin/surround.vim", "lib/utils/config/vim/plugin/taglist.vim", "lib/utils/config/vim/plugin/test/IndentAnything/test.js", "lib/utils/config/vim/plugin/vimballPlugin.vim", "lib/utils/config/vim/syntax/Decho.vim", "lib/utils/config/vim/syntax/eruby.vim", "lib/utils/config/vim/syntax/javascript.vim", "lib/utils/config/vim/syntax/ragel.vim", "lib/utils/config/vim/syntax/ruby.vim", "lib/utils/config/vimrc", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/find.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/version.rb", "utils.gemspec"]
+  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"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/utils/config/config_file.rb", "lib/utils/config.rb", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/find.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/version.rb", "lib/utils.rb"]
+  s.files = [".gitignore", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "VERSION", "bin/chroot-exec", "bin/chroot-libs", "bin/classify", "bin/discover", "bin/edit", "bin/edit_wait", "bin/enum", "bin/errf", "bin/git-empty", "bin/myex", "bin/number_files", "bin/path", "bin/probe", "bin/same_files", "bin/search", "bin/sedit", "bin/sshscreen", "bin/strip_spaces", "bin/unquarantine_apps", "bin/untest", "bin/utils-install-config", "bin/utils-utilsrc", "bin/vacuum_firefox_sqlite", "bin/xmp", "lib/utils.rb", "lib/utils/config.rb", "lib/utils/config/config_file.rb", "lib/utils/config/gdb/asm", "lib/utils/config/gdb/ruby", "lib/utils/config/gdbinit", "lib/utils/config/irbrc", "lib/utils/config/rdebugrc", "lib/utils/config/screenrc", "lib/utils/config/utilsrc", "lib/utils/config/vim/autoload/Align.vim", "lib/utils/config/vim/autoload/AlignMaps.vim", "lib/utils/config/vim/autoload/rails.vim", "lib/utils/config/vim/autoload/rubycomplete.vim", "lib/utils/config/vim/autoload/sqlcomplete.vim", "lib/utils/config/vim/autoload/vimball.vim", "lib/utils/config/vim/colors/flori.vim", "lib/utils/config/vim/compiler/eruby.vim", "lib/utils/config/vim/compiler/ruby.vim", "lib/utils/config/vim/compiler/rubyunit.vim", "lib/utils/config/vim/ftdetect/ragel.vim", "lib/utils/config/vim/ftdetect/ruby.vim", "lib/utils/config/vim/ftplugin/eruby.vim", "lib/utils/config/vim/ftplugin/ruby.vim", "lib/utils/config/vim/ftplugin/xml.vim", "lib/utils/config/vim/indent/IndentAnything_html.vim", "lib/utils/config/vim/indent/eruby.vim", "lib/utils/config/vim/indent/javascript.vim", "lib/utils/config/vim/indent/ruby.vim", "lib/utils/config/vim/plugin/AlignMapsPlugin.vim", "lib/utils/config/vim/plugin/AlignPlugin.vim", "lib/utils/config/vim/plugin/Decho.vim", "lib/utils/config/vim/plugin/IndentAnything.vim", "lib/utils/config/vim/plugin/bufexplorer.vim", "lib/utils/config/vim/plugin/cecutil.vim", "lib/utils/config/vim/plugin/fugitive.vim", "lib/utils/config/vim/plugin/lusty-explorer.vim", "lib/utils/config/vim/plugin/rails.vim", "lib/utils/config/vim/plugin/rubyextra.vim", "lib/utils/config/vim/plugin/surround.vim", "lib/utils/config/vim/plugin/taglist.vim", "lib/utils/config/vim/plugin/test/IndentAnything/test.js", "lib/utils/config/vim/plugin/vimballPlugin.vim", "lib/utils/config/vim/syntax/Decho.vim", "lib/utils/config/vim/syntax/eruby.vim", "lib/utils/config/vim/syntax/javascript.vim", "lib/utils/config/vim/syntax/ragel.vim", "lib/utils/config/vim/syntax/ruby.vim", "lib/utils/config/vimrc", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/find.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/version.rb", "utils.gemspec"]
   s.homepage = "http://github.com/flori/utils"
   s.rdoc_options = ["--title", "Utils - Some useful command line utilities", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -22,18 +22,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.1"])
       s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_runtime_dependency(%q<dslkit>, ["~> 0.2"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
       s.add_dependency(%q<tins>, ["~> 0.3"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_dependency(%q<dslkit>, ["~> 0.2"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
     s.add_dependency(%q<tins>, ["~> 0.3"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
     s.add_dependency(%q<dslkit>, ["~> 0.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2152566620 !ruby/object:Gem::Requirement
+  requirement: &2158031260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2152566620
+  version_requirements: *2158031260
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &2152566160 !ruby/object:Gem::Requirement
+  requirement: &2158030820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152566160
+  version_requirements: *2158030820
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152565740 !ruby/object:Gem::Requirement
+  requirement: &2158030400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152565740
+  version_requirements: *2158030400
 - !ruby/object:Gem::Dependency
   name: dslkit
-  requirement: &2152565320 !ruby/object:Gem::Requirement
+  requirement: &2158029980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,51 +54,50 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2152565320
+  version_requirements: *2158029980
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
-- untest
+- chroot-exec
 - chroot-libs
+- classify
+- discover
+- edit
 - edit_wait
-- chroot-exec
-- number_files
-- search
-- strip_spaces
-- path
 - enum
-- edit
+- errf
 - git-empty
-- classify
-- utils-install-config
-- xmp
-- discover
-- sshscreen
 - myex
+- number_files
+- path
 - probe
-- errf
 - same_files
-- utils-utilsrc
+- search
+- sedit
+- sshscreen
+- strip_spaces
 - unquarantine_apps
+- untest
+- utils-install-config
+- utils-utilsrc
 - vacuum_firefox_sqlite
-- sedit
+- xmp
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 - lib/utils/config/config_file.rb
-- lib/utils/finder.rb
-- lib/utils/version.rb
-- lib/utils/find.rb
 - lib/utils/config.rb
 - lib/utils/editor.rb
-- lib/utils/grepper.rb
 - lib/utils/file_xt.rb
+- lib/utils/find.rb
+- lib/utils/finder.rb
+- lib/utils/grepper.rb
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
+- lib/utils/version.rb
 - lib/utils.rb
 files:
 - .gitignore
-- .rvmrc
 - COPYING
 - Gemfile
 - README.rdoc

data/.rvmrc

@@ -1,3 +0,0 @@
-rvm use ruby-1.9.2-p290
-rvm gemset create utils
-rvm gemset use utils