utils 0.0.38 → 0.0.39

data/TODO

@@ -1,6 +1,7 @@
-- A default for searched/discovered files should be configurable, and be
-  modifiable via command line options.
-- Mark trailing spaces in vim
+- option for search to display all files that would be searched
+- make -I option take a list (comma <- or spaces seperated?)
+
+CHECK
 - When finding many places in the same file only jump to the first occurence if
   a cli option is given.
 - Make it configurable to find the same file many times via different symlinks

data/VERSION

@@ -1 +1 @@
-0.0.38
+0.0.39

data/bin/search

@@ -6,11 +6,18 @@ include Utils
 require 'tins/go'
 include Tins::GO
 
+def convert_ruby_to_vim_regexp(pattern)
+  regexp = pattern.source.dup
+  regexp.gsub!(/([^\\])\?/, '\1\\?')
+  pattern.casefold? and regexp << '\c'
+  regexp
+end
+
 def edit_files(pattern, pathes)
   editor = Utils::Editor.new do |config|
     config.wait = true
   end
-  editor.edit_remote_send("<ESC>/#{pattern.source}<CR>")
+  editor.edit_remote_send("<ESC>/#{convert_ruby_to_vim_regexp(pattern)}<CR>")
   for path in pathes
     STDERR.puts "Edit #{path}"
     editor.edit(path)
@@ -33,6 +40,7 @@ Options are
   -A NUMBER   displays NUMBER lines of context after the match
   -B NUMBER   displays NUMBER lines of context before the match
   -C NUMBER   displays NUMBER lines of context around the match
+  -f          just list the pathes of the files that would be searched
   -l          just list the pathes of the files with matches
   -L          list only the path:linenumber of the files with matches
   -R          interpret PATTERN argument as fuzzy not regex
@@ -48,7 +56,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:A:B:C:s:S:n:N:a:RcilLeh'
+args = go 'I:A:B:C:s:S:n:N:a:RciflLeh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }

data/lib/utils/config/vim/colors/flori.vim

@@ -111,3 +111,6 @@ hi DiffAdd guibg=green guifg=white ctermbg=green ctermfg=white
 hi DiffChange guibg=blue guifg=white ctermbg=blue ctermfg=white
 hi DiffText guifg=yellow ctermbg=yellow ctermfg=white
 hi DiffDelete guibg=red guifg=white ctermbg=red ctermfg=white
+
+hi ExtraWhitespace ctermbg=red guibg=#663333
+match ExtraWhitespace /\s\+$/

data/lib/utils/config/vimrc

@@ -74,6 +74,7 @@ filetype on
 filetype indent on
 filetype plugin on
 source $VIMRUNTIME/macros/matchit.vim
+set t_Co=256
 colorscheme flori
 
 " Configure GUIs
@@ -514,5 +515,8 @@ iabbrev I_MFG Mit freundlichen Grüssen,<CR><CR>Florian Frank
 iabbrev I_DATE <ESC>:call Itime("%F")<CR>
 iabbrev I_DATETIME <ESC>:call Itime("%F %T")<CR>
 iabbrev I_TIME <ESC>:call Itime("%T")<CR>
+iabbrev I_CLASS <ESC>:call Iexec("classify -b " . expand('%'))<CR>
 iabbrev I_KLASS <ESC>:call Iexec("classify -b " . expand('%'))<CR>
+iabbrev I_MODULE <ESC>:call Iexec("classify -b " . expand('%'))<CR>
 iabbrev I_PATH_KLASS <ESC>:call Iexec("classify " . expand('%'))<CR>
+iabbrev I_ENCODE # encoding: utf-8

data/lib/utils/finder.rb

@@ -70,9 +70,11 @@ class Utils::Finder
     end
     pathes.uniq!
     pathes.map! { |p| a = File.split(p) ; a.unshift(p) ; a }
-    @suffix = @args['I']
+    @suffixes = @args['I'].ask_and_send(:split, /[\s,]+/).to_a
     pathes = pathes.map! do |path, dir, file|
-      @suffix && @suffix != File.extname(file)[1..-1] and next
+      if @suffixes.full?
+        @suffixes.include?(File.extname(file)[1..-1]) or next
+      end
       if do_match = attempt_match?(path) and $DEBUG
         warn "Attempt match of #{path.inspect}"
       end

data/lib/utils/grepper.rb

@@ -77,7 +77,11 @@ class Utils::Grepper
       File.open(filename, 'rb') do |file|
         if file.binary? != true
           $DEBUG and warn "Matching #{filename.inspect}."
-          match_lines file
+          if @args['f']
+            @output << filename
+          else
+            match_lines file
+          end
         else
           $DEBUG and warn "Skipping binary file #{filename.inspect}."
         end
@@ -141,10 +145,10 @@ class Utils::Grepper
   end
 
   def search
-    @suffix = @args['I']
+    @suffixes = @args['I'].ask_and_send(:split, /[\s,]+/).to_a
     for dir in @roots
       Utils::Find.find(dir) do |filename|
-        if !@suffix || @suffix == File.extname(filename)[1..-1]
+        if @suffixes.empty? || @suffixes.include?(File.extname(filename)[1..-1])
           match(filename)
         end
       end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.38'
+  VERSION         = '0.0.39'
   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.38"
+  s.version = "0.0.39"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-03-01"
+  s.date = "2012-03-16"
   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"]
@@ -22,20 +22,20 @@ 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.4"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.7"])
       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"])
       s.add_runtime_dependency(%q<pry-editline>, [">= 0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.7"])
       s.add_dependency(%q<tins>, ["~> 0.3"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_dependency(%q<dslkit>, ["~> 0.2"])
       s.add_dependency(%q<pry-editline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.7"])
     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.38
+  version: 0.0.39
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2153080320 !ruby/object:Gem::Requirement
+  requirement: &2153332960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.7
   type: :development
   prerelease: false
-  version_requirements: *2153080320
+  version_requirements: *2153332960
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &2153079600 !ruby/object:Gem::Requirement
+  requirement: &2153332460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153079600
+  version_requirements: *2153332460
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2153078600 !ruby/object:Gem::Requirement
+  requirement: &2153331900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153078600
+  version_requirements: *2153331900
 - !ruby/object:Gem::Dependency
   name: dslkit
-  requirement: &2153077740 !ruby/object:Gem::Requirement
+  requirement: &2153331340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153077740
+  version_requirements: *2153331340
 - !ruby/object:Gem::Dependency
   name: pry-editline
-  requirement: &2153037600 !ruby/object:Gem::Requirement
+  requirement: &2153330840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153037600
+  version_requirements: *2153330840
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
@@ -225,9 +225,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2842823016203684465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: