utils 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/edit

@@ -1,36 +1,17 @@
 #!/usr/bin/env ruby
 
+require 'spruz/go'
+include Spruz::GO
+require 'utils/edit'
+include Utils::Edit
 require 'tempfile'
 
-def cmd(*parts)
-  command = parts.inject([]) do |a, p|
-    case
-    when p == nil, p == []
-      a
-    when p.respond_to?(:to_ary)
-      a.concat p.to_ary
-    else
-      a << p.to_s
-    end
-  end
-  $DEBUG and warn command * ' '
-  command
-end
+$opt = go 'w'
 
-case `uname -s`
-when /\Adarwin/i
-  vim = if File.directory?('/Applications/Installed')
-          '/Applications/Installed/MacVim.app/Contents/MacOS/Vim'
-        elsif File.directory?('/Applications')
-          '/Applications/MacVim.app/Contents/MacOS/Vim'
-        else
-          fail "cannot find MacVim.app"
-        end
-else
-  vim       = 'gvim'
-  geometry  = [ '-geometry', '80x59' ]
-end
+vim = locate_vim_binary
 servername  = [ '--servername', "G#{ENV['USER'].upcase}" ]
+serverlist = `#{vim} -g --serverlist`.split
+remote = $opt['w'] ? '--remote-wait' : '--remote'
 
 argv = ARGV.dup
 if argv.empty?
@@ -42,12 +23,12 @@ if argv.empty?
     end
     file.close
     argv << file.path
-  elsif `#{vim} -g --serverlist`.split.member?(servername)
-    system *cmd(vim, '-g', geometry, servername, '--remote', "stupid_trick#{rand}")
+  elsif serverlist.member?(servername)
+    system *cmd(vim, '-g', servername, remote, "stupid_trick#{rand}")
     sleep 1
-    exec *cmd(vim, '-g', geometry, servername, '--remote-send', '<ESC>:bw<CR>')
+    exec *cmd(vim, '-g', servername, '--remote-send', '<ESC>:bw<CR>')
   else
-    exec *cmd(vim, '-g', geometry, servername)
+    exec *cmd(vim, '-g', servername, remote)
   end
 end
 unless argv.empty?
@@ -55,11 +36,11 @@ unless argv.empty?
   if argv.first =~ lineno_re
     for a in argv
       if a =~ lineno_re
-        system *cmd(vim, '-g', geometry, servername, '--remote', $1)
+        system *cmd(vim, '-g', servername, remote, $1)
         sleep 1
-        system *cmd(vim, '-g', geometry, servername, '--remote-send', "<ESC>:#$2<CR>")
+        system *cmd(vim, '-g', servername, '--remote-send', "<ESC>:#$2<CR>")
       else
-        system *cmd(vim, '-g', geometry, servername, '--remote', a)
+        system *cmd(vim, '-g', servername, remote, a)
       end
       if a != argv.last
         STDOUT.print "Press enter to edit the next file."
@@ -68,7 +49,7 @@ unless argv.empty?
       end
     end
   else
-    exec *cmd(vim, '-g', geometry, servername, '--remote', *argv)
+    exec *cmd(vim, '-g', servername, remote, *argv)
   end
 end
 exit 0

data/bin/edit_wait

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+exec 'edit', '-w', *$*

data/bin/path

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'spruz/go'
+include Spruz::GO
+require 'spruz/xt/write'
+require 'tempfile'
+
+path_separator = RUBY_PLATFORM =~ /mswin32/ ? ';' : ':'
+path = (ENV['PATH'] || '').split(path_separator)
+path.map! { |part| File.expand_path(part) }
+
+$opt = go('e')
+
+case cmd = ARGV.shift
+when 'prefix', 'postfix'
+  part = ARGV.shift or fail 'need a path part to prefix'
+  part = File.expand_path(part)
+  path.delete part
+  if cmd == 'prefix'
+    path.unshift part
+  else
+    path.push part
+  end
+when 'edit'
+  if path = ARGV.first
+    path = path.split(path_separator)
+    path.map! { |part| File.expand_path(part) }
+  end
+  path_file = File.join(Dir.tmpdir, "path_temp.#$$")
+  File.write path_file, path * "\n"
+  system "edit -w #{path_file.inspect}"
+  path = File.read(path_file).split(/\n/)
+  path.map! { |part| File.expand_path(part) }
+end
+
+path.uniq!
+
+puts "#{'export ' if $opt['e']}PATH=#{path * path_separator}"

data/lib/utils/edit.rb

@@ -0,0 +1,33 @@
+module Utils
+  module Edit
+    module_function
+
+    def locate_vim_binary
+      case `uname -s`
+      when /\Adarwin/i
+        if File.directory?('/Applications')
+          '/Applications/MacVim.app/Contents/MacOS/Vim'
+        else
+          'gvim'
+        end
+      else
+        'gvim'
+      end
+    end
+
+    def cmd(*parts)
+      command = parts.inject([]) do |a, p|
+        case
+        when p == nil, p == []
+          a
+        when p.respond_to?(:to_ary)
+          a.concat p.to_ary
+        else
+          a << p.to_s
+        end
+      end
+      $DEBUG and warn command * ' '
+      command
+    end
+  end
+end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.3'
+  VERSION         = '0.0.4'
   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 = %q{utils}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Florian Frank}]
-  s.date = %q{2011-06-24}
+  s.date = %q{2011-06-27}
   s.description = %q{This ruby gem provides some useful command line utilities}
   s.email = %q{flori@ping.de}
-  s.executables = [%q{untest}, %q{chroot-libs}, %q{chroot-exec}, %q{number_files}, %q{search}, %q{edit}, %q{git-empty}, %q{classify}, %q{utils-install-config}, %q{xmp}, %q{discover}, %q{sshscreen}, %q{myex}, %q{errf}, %q{same_files}, %q{unquarantine_apps}, %q{vacuum_firefox_sqlite}, %q{sedit}]
-  s.files = [%q{utils.gemspec}, %q{Rakefile}, %q{lib}, %q{lib/utils}, %q{lib/utils/config}, %q{lib/utils/config/screenrc}, %q{lib/utils/config/irbrc}, %q{lib/utils/config/rdebugrc}, %q{lib/utils/config/gdb}, %q{lib/utils/config/gdb/asm}, %q{lib/utils/config/gdb/ruby}, %q{lib/utils/config/vimrc}, %q{lib/utils/config/gdbinit}, %q{lib/utils/config/vim}, %q{lib/utils/config/vim/compiler}, %q{lib/utils/config/vim/compiler/rubyunit.vim}, %q{lib/utils/config/vim/compiler/ruby.vim}, %q{lib/utils/config/vim/compiler/eruby.vim}, %q{lib/utils/config/vim/syntax}, %q{lib/utils/config/vim/syntax/Decho.vim}, %q{lib/utils/config/vim/syntax/ruby.vim}, %q{lib/utils/config/vim/syntax/ragel.vim}, %q{lib/utils/config/vim/syntax/javascript.vim}, %q{lib/utils/config/vim/syntax/eruby.vim}, %q{lib/utils/config/vim/ftdetect}, %q{lib/utils/config/vim/ftdetect/ruby.vim}, %q{lib/utils/config/vim/ftdetect/ragel.vim}, %q{lib/utils/config/vim/autoload}, %q{lib/utils/config/vim/autoload/AlignMaps.vim}, %q{lib/utils/config/vim/autoload/rubycomplete.vim}, %q{lib/utils/config/vim/autoload/sqlcomplete.vim}, %q{lib/utils/config/vim/autoload/vimball.vim}, %q{lib/utils/config/vim/autoload/Align.vim}, %q{lib/utils/config/vim/autoload/rails.vim}, %q{lib/utils/config/vim/indent}, %q{lib/utils/config/vim/indent/IndentAnything_html.vim}, %q{lib/utils/config/vim/indent/ruby.vim}, %q{lib/utils/config/vim/indent/javascript.vim}, %q{lib/utils/config/vim/indent/eruby.vim}, %q{lib/utils/config/vim/colors}, %q{lib/utils/config/vim/colors/flori.vim}, %q{lib/utils/config/vim/plugin}, %q{lib/utils/config/vim/plugin/bufexplorer.vim}, %q{lib/utils/config/vim/plugin/AlignMapsPlugin.vim}, %q{lib/utils/config/vim/plugin/AlignPlugin.vim}, %q{lib/utils/config/vim/plugin/cecutil.vim}, %q{lib/utils/config/vim/plugin/taglist.vim}, %q{lib/utils/config/vim/plugin/Decho.vim}, %q{lib/utils/config/vim/plugin/IndentAnything.vim}, %q{lib/utils/config/vim/plugin/fugitive.vim}, %q{lib/utils/config/vim/plugin/test}, %q{lib/utils/config/vim/plugin/test/IndentAnything}, %q{lib/utils/config/vim/plugin/test/IndentAnything/test.js}, %q{lib/utils/config/vim/plugin/surround.vim}, %q{lib/utils/config/vim/plugin/lusty-explorer.vim}, %q{lib/utils/config/vim/plugin/vimballPlugin.vim}, %q{lib/utils/config/vim/plugin/rubyextra.vim}, %q{lib/utils/config/vim/plugin/rails.vim}, %q{lib/utils/config/vim/ftplugin}, %q{lib/utils/config/vim/ftplugin/ruby.vim}, %q{lib/utils/config/vim/ftplugin/xml.vim}, %q{lib/utils/config/vim/ftplugin/eruby.vim}, %q{lib/utils/version.rb}, %q{lib/utils/find.rb}, %q{lib/utils/config.rb}, %q{lib/utils/file_xt.rb}, %q{lib/utils/md5.rb}, %q{lib/utils/patterns.rb}, %q{lib/utils.rb}, %q{bin}, %q{bin/untest}, %q{bin/chroot-libs}, %q{bin/chroot-exec}, %q{bin/number_files}, %q{bin/search}, %q{bin/edit}, %q{bin/git-empty}, %q{bin/classify}, %q{bin/utils-install-config}, %q{bin/xmp}, %q{bin/discover}, %q{bin/sshscreen}, %q{bin/myex}, %q{bin/errf}, %q{bin/same_files}, %q{bin/unquarantine_apps}, %q{bin/vacuum_firefox_sqlite}, %q{bin/sedit}, %q{VERSION}]
+  s.executables = [%q{untest}, %q{chroot-libs}, %q{edit_wait}, %q{chroot-exec}, %q{number_files}, %q{search}, %q{path}, %q{edit}, %q{git-empty}, %q{classify}, %q{utils-install-config}, %q{xmp}, %q{discover}, %q{sshscreen}, %q{myex}, %q{errf}, %q{same_files}, %q{unquarantine_apps}, %q{vacuum_firefox_sqlite}, %q{sedit}]
+  s.files = [%q{utils.gemspec}, %q{Rakefile}, %q{lib}, %q{lib/utils}, %q{lib/utils/config}, %q{lib/utils/config/screenrc}, %q{lib/utils/config/irbrc}, %q{lib/utils/config/rdebugrc}, %q{lib/utils/config/gdb}, %q{lib/utils/config/gdb/asm}, %q{lib/utils/config/gdb/ruby}, %q{lib/utils/config/vimrc}, %q{lib/utils/config/gdbinit}, %q{lib/utils/config/vim}, %q{lib/utils/config/vim/compiler}, %q{lib/utils/config/vim/compiler/rubyunit.vim}, %q{lib/utils/config/vim/compiler/ruby.vim}, %q{lib/utils/config/vim/compiler/eruby.vim}, %q{lib/utils/config/vim/syntax}, %q{lib/utils/config/vim/syntax/Decho.vim}, %q{lib/utils/config/vim/syntax/ruby.vim}, %q{lib/utils/config/vim/syntax/ragel.vim}, %q{lib/utils/config/vim/syntax/javascript.vim}, %q{lib/utils/config/vim/syntax/eruby.vim}, %q{lib/utils/config/vim/ftdetect}, %q{lib/utils/config/vim/ftdetect/ruby.vim}, %q{lib/utils/config/vim/ftdetect/ragel.vim}, %q{lib/utils/config/vim/autoload}, %q{lib/utils/config/vim/autoload/AlignMaps.vim}, %q{lib/utils/config/vim/autoload/rubycomplete.vim}, %q{lib/utils/config/vim/autoload/sqlcomplete.vim}, %q{lib/utils/config/vim/autoload/vimball.vim}, %q{lib/utils/config/vim/autoload/Align.vim}, %q{lib/utils/config/vim/autoload/rails.vim}, %q{lib/utils/config/vim/indent}, %q{lib/utils/config/vim/indent/IndentAnything_html.vim}, %q{lib/utils/config/vim/indent/ruby.vim}, %q{lib/utils/config/vim/indent/javascript.vim}, %q{lib/utils/config/vim/indent/eruby.vim}, %q{lib/utils/config/vim/colors}, %q{lib/utils/config/vim/colors/flori.vim}, %q{lib/utils/config/vim/plugin}, %q{lib/utils/config/vim/plugin/bufexplorer.vim}, %q{lib/utils/config/vim/plugin/AlignMapsPlugin.vim}, %q{lib/utils/config/vim/plugin/AlignPlugin.vim}, %q{lib/utils/config/vim/plugin/cecutil.vim}, %q{lib/utils/config/vim/plugin/taglist.vim}, %q{lib/utils/config/vim/plugin/Decho.vim}, %q{lib/utils/config/vim/plugin/IndentAnything.vim}, %q{lib/utils/config/vim/plugin/fugitive.vim}, %q{lib/utils/config/vim/plugin/test}, %q{lib/utils/config/vim/plugin/test/IndentAnything}, %q{lib/utils/config/vim/plugin/test/IndentAnything/test.js}, %q{lib/utils/config/vim/plugin/surround.vim}, %q{lib/utils/config/vim/plugin/lusty-explorer.vim}, %q{lib/utils/config/vim/plugin/vimballPlugin.vim}, %q{lib/utils/config/vim/plugin/rubyextra.vim}, %q{lib/utils/config/vim/plugin/rails.vim}, %q{lib/utils/config/vim/ftplugin}, %q{lib/utils/config/vim/ftplugin/ruby.vim}, %q{lib/utils/config/vim/ftplugin/xml.vim}, %q{lib/utils/config/vim/ftplugin/eruby.vim}, %q{lib/utils/version.rb}, %q{lib/utils/find.rb}, %q{lib/utils/config.rb}, %q{lib/utils/edit.rb}, %q{lib/utils/file_xt.rb}, %q{lib/utils/md5.rb}, %q{lib/utils/patterns.rb}, %q{lib/utils.rb}, %q{bin}, %q{bin/untest}, %q{bin/chroot-libs}, %q{bin/edit_wait}, %q{bin/chroot-exec}, %q{bin/number_files}, %q{bin/search}, %q{bin/path}, %q{bin/edit}, %q{bin/git-empty}, %q{bin/classify}, %q{bin/utils-install-config}, %q{bin/xmp}, %q{bin/discover}, %q{bin/sshscreen}, %q{bin/myex}, %q{bin/errf}, %q{bin/same_files}, %q{bin/unquarantine_apps}, %q{bin/vacuum_firefox_sqlite}, %q{bin/sedit}, %q{VERSION}]
   s.homepage = %q{http://flori.github.com/utils}
   s.require_paths = [%q{lib}]
   s.rubygems_version = %q{1.8.5}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utils
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Florian Frank
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spruz
@@ -50,9 +50,11 @@ email: flori@ping.de
 executables: 
 - untest
 - chroot-libs
+- edit_wait
 - chroot-exec
 - number_files
 - search
+- path
 - edit
 - git-empty
 - classify
@@ -121,15 +123,18 @@ files:
 - lib/utils/version.rb
 - lib/utils/find.rb
 - lib/utils/config.rb
+- lib/utils/edit.rb
 - lib/utils/file_xt.rb
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
 - lib/utils.rb
 - bin/untest
 - bin/chroot-libs
+- bin/edit_wait
 - bin/chroot-exec
 - bin/number_files
 - bin/search
+- bin/path
 - bin/edit
 - bin/git-empty
 - bin/classify