utils 0.0.33 → 0.0.34

data/VERSION

@@ -1 +1 @@
-0.0.33
+0.0.34

data/bin/strip_spaces

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'tins/go'
+include Tins::GO
 require 'tins/secure_write'
 include Tins::SecureWrite
 require 'utils'
@@ -9,6 +11,25 @@ class ::File
   include Utils::FileXt
 end
 
+def usage
+  puts <<-EOT
+Usage: #{File.basename($0)} [OPTS] [PATHES]
+
+PATHES are the directory and file pathes that are search for files to be
+stripped.
+
+Options are
+
+  -h          display this help
+
+Version is #{File.basename($0)} #{Utils::VERSION}.
+  EOT
+  exit 1
+end
+
+args = go 'h'
+args['h'] and usage
+
 pathes = ARGV.empty? ?  %w[.] : ARGV
 pathes = pathes.map { |p| File.expand_path(p) }
 

data/lib/utils/config/irbrc

@@ -6,7 +6,9 @@ require 'enumerator'
 require 'pp'
 require 'fileutils'
 require 'find'
-require 'pry-editline'
+if Readline.respond_to?(:point) && Readline.respond_to?(:line_buffer)
+  require 'pry-editline'
+end
 include FileUtils
 begin
   require 'ap'

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

@@ -4,9 +4,6 @@
 " :he group-name
 " :he highlight-groups
 
-if has("gui_running")
-  set background=dark
-endif
 if exists("syntax_on")
    syntax reset
 endif
@@ -21,74 +18,74 @@ endif
 let g:colors_name="flori"
 
 " general highlight groups
-hi Normal guifg=lightyellow guibg=grey20
-hi ColorColumn guibg=grey25
+hi Normal guifg=lightyellow guibg=grey20 ctermfg=lightgrey ctermbg=none
+hi ColorColumn guibg=grey25 ctermbg=darkgrey
+"hi CursorColumn guibg=grey30
+"hi CursorLine guibg=grey30
+hi Folded guibg=grey30 guifg=gold ctermbg=lightgrey ctermfg=black
+hi FoldColumn guibg=grey30 guifg=tan ctermbg=lightgrey ctermfg=black
+hi IncSearch guifg=slategrey guibg=khaki ctermbg=darkred ctermfg=lightred
+hi ModeMsg guifg=goldenrod ctermfg=green
+hi MoreMsg guifg=seagreen ctermfg=green
+hi NonText guifg=lightblue guibg=grey30 ctermfg=lightblue
+hi Question guifg=springgreen ctermfg=green
+hi Search guibg=peru guifg=white ctermbg=darkred ctermfg=lightred
+hi SpecialKey guifg=yellowgreen ctermfg=lightgreen
+hi VertSplit guibg=#c2bfa5 guifg=grey50 gui=none ctermbg=darkgrey ctermfg=lightgrey cterm=none
+hi StatusLine guibg=#c2bfa5 guifg=black gui=bold ctermbg=white ctermfg=lightblue
+hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none ctermbg=black ctermfg=grey
+hi Title guifg=indianred ctermfg=red
+hi WarningMsg guifg=salmon guibg=NONE ctermfg=red
+hi LineNr guifg=slategrey guibg=NONE ctermfg=darkgrey
+hi Pmenu guifg=grey40 guibg=#c2bfa5 gui=NONE ctermbg=darkgrey ctermfg=lightgrey
+hi PmenuSel guifg=white guibg=grey40 gui=NONE ctermbg=red ctermfg=lightred
+hi PmenuSbar guifg=black guibg=grey30 ctermfg=white ctermbg=blue
+hi PmenuThumb guifg=black guibg=white ctermfg=white ctermbg=black
 hi Cursor guibg=khaki guifg=slategrey
 hi CursorIM guibg=khaki guifg=slategrey
-hi CursorColumn guibg=grey25
-hi CursorLine guibg=grey25
-hi Folded guibg=grey30 guifg=gold
-hi FoldColumn guibg=grey30 guifg=tan
-hi IncSearch guifg=slategrey guibg=khaki
-hi ModeMsg guifg=goldenrod
-hi MoreMsg guifg=seagreen
-hi NonText guifg=lightblue guibg=grey30
-hi Question guifg=springgreen
-hi Search guibg=peru guifg=white
-hi SpecialKey guifg=yellowgreen
-hi VertSplit guibg=#c2bfa5 guifg=grey50 gui=none
-hi StatusLine guibg=#c2bfa5 guifg=black gui=none
-hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none
-hi Title guifg=indianred
 hi Visual guifg=NONE guibg=peru
 hi VisualNOS guifg=NONE guibg=grey25 gui=none
-hi WarningMsg guifg=salmon guibg=NONE
-hi LineNr guifg=slategrey guibg=NONE
-hi Pmenu guifg=grey40 guibg=#c2bfa5 gui=NONE
-hi PmenuSel guifg=white guibg=grey40 gui=NONE
-hi PmenuSbar guifg=black guibg=grey30
-hi PmenuThumb guifg=black guibg=white
 
 " syntax highlighting groups
-hi Comment guifg=slategrey guibg=NONE
+hi Comment guifg=slategrey guibg=NONE ctermfg=darkgrey
 "
-hi Constant guifg=lightgreen guibg=NONE
-hi String guifg=salmon guibg=NONE
-hi Character guifg=greenyellow guibg=NONE
-hi Number guifg=red guibg=NONE
-hi Boolean guifg=red guibg=NONE
+hi Constant guifg=lightgreen guibg=NONE ctermfg=lightgreen
+hi String guifg=salmon guibg=NONE ctermfg=red
+hi Character guifg=greenyellow guibg=NONE ctermfg=red
+hi Number guifg=red guibg=NONE ctermfg=darkred
+hi Boolean guifg=red guibg=NONE ctermfg=darkred
 hi link Float Number
-hi Regexp guifg=tomato guibg=NONE
+hi Regexp guifg=tomato guibg=NONE ctermfg=lightred
 "
-hi Identifier guifg=palegreen guibg=NONE
-hi Function guifg=limegreen guibg=NONE
+hi Identifier guifg=palegreen guibg=NONE ctermfg=lightgreen
+hi Function guifg=limegreen guibg=NONE ctermfg=darkgreen
 "
-hi Statement guifg=khaki guibg=NONE
-hi Keyword guifg=brown gui=bold guibg=NONE
-hi Operator guifg=orangered guibg=NONE
+hi Statement guifg=khaki guibg=NONE ctermfg=yellow
+hi Keyword guifg=brown gui=bold guibg=NONE ctermfg=brown cterm=bold
+hi Operator guifg=orangered guibg=NONE ctermfg=darkred
 "
-hi PreProc guifg=indianred guibg=NONE
+hi PreProc guifg=indianred guibg=NONE ctermfg=red
 "
-hi Type  guifg=darkkhaki guibg=NONE
+hi Type  guifg=darkkhaki guibg=NONE ctermfg=green
 "
-hi Special guifg=orange guibg=NONE
+hi Special guifg=orange guibg=NONE ctermfg=red
 "
-hi Underlined guifg=darkslateblue gui=underline guibg=NONE
+hi Underlined guifg=darkslateblue gui=underline guibg=NONE cterm=underline
 "
-hi Ignore guifg=grey40 guibg=NONE
+hi Ignore guifg=grey40 guibg=NONE ctermfg=darkgrey
 "
-hi Error guifg=yellow guibg=orangered
+hi Error guifg=yellow guibg=orangered ctermfg=white ctermbg=red
 "
-hi Todo guifg=orangered guibg=yellow
+hi Todo guifg=orangered guibg=yellow ctermfg=red ctermbg=yellow
 "
 
 hi rubyInterpolation guifg=moccasin guibg=NONE
-hi rubyInstanceVariable guifg=orangered guibg=NONE
-hi rubyClassVariable guifg=#dc1436 guibg=NONE
-hi rubyGlobalVariable guifg=deeppink guibg=NONE
-hi rubyEval guifg=red guibg=NONE
-hi rubyBlockParameter guifg=orchid guibg=NONE
-hi rubyBlockArgument guifg=orchid guibg=NONE
+hi rubyInstanceVariable guifg=orangered guibg=NONE ctermfg=red
+hi rubyClassVariable guifg=#dc1436 guibg=NONE ctermfg=red
+hi rubyGlobalVariable guifg=deeppink guibg=NONE ctermfg=magenta
+hi rubyEval guifg=red guibg=NONE ctermfg=darkred
+hi rubyBlockParameter guifg=orchid guibg=NONE ctermfg=lightmagenta
+hi rubyBlockArgument guifg=orchid guibg=NONE ctermfg=lightmagenta
 hi link rubyEscape              Character
 hi link rubySymbol              Function
 hi link rubyPseudoVariable      Special
@@ -108,7 +105,9 @@ hi link rubyRegexpDelimiter     rubyRegexp
 hi link javascriptRegexpString  Regexp
 hi link javascriptNumber        Number
 hi link javascriptNull          Constant
-hi DiffAdd guibg=green guifg=white
-hi DiffChange guibg=blue guifg=white
-hi DiffText guifg=yellow
-hi DiffDelete guibg=red guifg=white
+
+" diffing
+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

data/lib/utils/config/vimrc

@@ -72,11 +72,11 @@ filetype on
 filetype indent on
 filetype plugin on
 source $VIMRUNTIME/macros/matchit.vim
+colorscheme flori
 
 " Configure GUIs
 if has("gui_running")
   set guipty
-  colorscheme flori
   hi Pmenu ctermbg=Grey guibg=DarkGrey
 	set guioptions-=r
 	set guioptions-=R
@@ -123,8 +123,6 @@ if has("gui_running")
     end
   end
 else
-  set background=dark
-  colorscheme darkblue
   hi DiffAdd ctermbg=green
   hi DiffChange ctermbg=blue
   hi DiffText ctermbg=gray

data/lib/utils/editor.rb

@@ -1,5 +1,25 @@
 module Utils
   class Editor
+    FILE_LINENUMBER_REGEXP = /^\s*([^:]+):(\d+)/
+
+    module SourceLocationExtension
+      def source_location
+        if respond_to?(:to_str)
+          if (string = to_str) =~ FILE_LINENUMBER_REGEXP
+            [ $1, $2.to_i ]
+          else
+            [ string, 1 ]
+          end
+        else
+          [ to_s, 1 ]
+        end
+      end
+    end
+
+    class ::Object
+      include SourceLocationExtension
+    end
+
     def initialize
       self.wait           = false
       self.pause_duration = 1
@@ -41,7 +61,7 @@ module Utils
         end
       end
       $DEBUG and warn command * ' '
-      system(*command)
+      system(*command.map(&:to_s))
     end
 
     def fullscreen=(enabled)
@@ -56,22 +76,22 @@ module Utils
     end
 
     def file_linenumber?(filename)
-      filename.match(/^\s*([^:]+):(\d+)/)
+      filename.match(FILE_LINENUMBER_REGEXP)
+    end
+
+    def expand_globs(filenames)
+      filenames.map { |f| Dir[f] }.flatten.uniq.sort
     end
 
     def edit(*filenames)
-      filenames_with_colon, filenames_without_colon =
-        filenames.partition { |x| x =~ /:/ }
-      filenames_without_colon.map! { |f| Dir[f] }.flatten!
-      filenames = filenames_with_colon + filenames_without_colon
-      if filenames.size == 1
-        filename = filenames.first
-        if m = file_linenumber?(filename)
-          edit_file_linenumber(*m.captures)
-        else
-          edit_file(filename)
-        end
-      elsif !filenames.empty?
+      if filenames.size == 1 and
+        source_location = filenames.first.source_location
+      then
+        edit_source_location(source_location) ||
+          edit_file(expand_globs(source_location[0, 1]))
+      else
+        filenames =
+          expand_globs(filenames.map(&:source_location).map(&:first))
         edit_file(*filenames)
       end
     end
@@ -93,6 +113,14 @@ module Utils
       end
     end
 
+    def edit_source_location(source_location)
+      if File.exist?(source_location[0])
+        edit_file_linenumber(source_location[0], source_location[1])
+      else
+        false
+      end
+    end
+
     def ensure_running
       started? ? activate : start
       self

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.33'
+  VERSION         = '0.0.34'
   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,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.33"
+  s.version = "0.0.34"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-02-09"
+  s.date = "2012-02-11"
   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"]
-  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.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", "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/rvmrc", "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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2153736960 !ruby/object:Gem::Requirement
+  requirement: &70292458276420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *2153736960
+  version_requirements: *70292458276420
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &2153736520 !ruby/object:Gem::Requirement
+  requirement: &70292458290860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153736520
+  version_requirements: *70292458290860
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2153736100 !ruby/object:Gem::Requirement
+  requirement: &70292458289280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153736100
+  version_requirements: *70292458289280
 - !ruby/object:Gem::Dependency
   name: dslkit
-  requirement: &2153735680 !ruby/object:Gem::Requirement
+  requirement: &70292458288380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153735680
+  version_requirements: *70292458288380
 - !ruby/object:Gem::Dependency
   name: pry-editline
-  requirement: &2153735320 !ruby/object:Gem::Requirement
+  requirement: &70292458287140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,47 +65,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153735320
+  version_requirements: *70292458287140
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
-- chroot-exec
+- untest
 - chroot-libs
-- classify
-- discover
-- edit
 - edit_wait
+- chroot-exec
+- number_files
+- search
+- strip_spaces
+- path
 - enum
-- errf
+- edit
 - git-empty
+- classify
+- utils-install-config
+- xmp
+- discover
+- sshscreen
 - myex
-- number_files
-- path
 - probe
+- errf
 - same_files
-- search
-- sedit
-- sshscreen
-- strip_spaces
-- unquarantine_apps
-- untest
-- utils-install-config
 - utils-utilsrc
+- unquarantine_apps
 - vacuum_firefox_sqlite
-- xmp
+- sedit
 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/file_xt.rb
-- lib/utils/find.rb
-- lib/utils/finder.rb
 - lib/utils/grepper.rb
+- lib/utils/file_xt.rb
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
-- lib/utils/version.rb
 - lib/utils.rb
 files:
 - .gitignore
@@ -214,6 +214,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3400982928978965266
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: