utils 0.0.16 → 0.0.17

data/Rakefile

@@ -15,7 +15,7 @@ GemHadar do
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
   readme      'README.rdoc'
 
-  dependency  'spruz', '~>0.2.12'
+  dependency  'spruz', '~>0.2.13'
   dependency  'term-ansicolor', '~>1.0'
 
   install_library do

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/bin/path

@@ -2,7 +2,7 @@
 
 require 'spruz/go'
 include Spruz::GO
-require 'spruz/xt/write'
+require 'spruz/xt/secure_write'
 require 'tempfile'
 
 path_separator = RUBY_PLATFORM =~ /mswin32/ ? ';' : ':'
@@ -27,7 +27,7 @@ when 'edit'
     path.map! { |part| File.expand_path(part) }
   end
   path_file = File.join(Dir.tmpdir, "path_temp.#$$")
-  File.write path_file, path * "\n"
+  File.secure_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) }

data/bin/probe

@@ -2,29 +2,31 @@
 # encoding: UTF-8
 
 require 'spruz/xt'
-require 'spruz/go'
+require 'spruz/lines_file'
 include Spruz::GO
 require 'utils'
 include Utils
 
 def cmd(*args)
   puts args * ' '
-  system *args
+  exec *args
 end
 
-filename = ARGV.shift or fail "require filename or filename:linenumber as first argument"
+filename = ARGV.shift or fail "require filename or filename:line_number as first argument"
 $opt = go 'n:'
 if testname = $opt['n']
   cmd "testrb", '-I', 'lib:test:ext', '-n', testname , filename
 elsif filename =~ /^\s*([^:]+):(\d+)/
-  filename, linenumber = $1, $2
-  lf = LinesFile.for_filename filename, linenumber
+  filename, line_number = $1, $2
+  lf = Spruz::LinesFile.for_filename filename, line_number.to_i
   if testname = lf.match_backward(/def\s+(\S+?)(?:\(|\s*$)/).full?(:first)
+    puts "Running test #{testname.inspect} at #{filename}:#{lf.line_number}"
     cmd "testrb", '-I', 'lib:test:ext', '-n', testname , filename
   else
-    warn "no test found before line #{linenumber}"
+    warn "no test found before line #{line_number}"
     exit 1
   end
 else
+  puts "Running ALL tests in #{filename}"
   cmd "testrb", '-Ilib:test:ext', filename
 end

data/bin/untest

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 
-require 'spruz/xt/write'
+require 'spruz/xt/secure_write'
 
 for filename in ARGV
   File.open(filename) do |input|
-    write(filename) do |output|
+    File.secure_write(filename) do |output|
       until input.eof?
         line = input.readline
         line.sub!(/^(\s*)test "(.+)" do\s*$/) do
           "#$1def test_" << $2.downcase.gsub(/\A[^a-z]/, '').gsub(/[ -]/, '_').delete('^0-9a-z_')
         end
-        output.puts line
+        output.write line
       end
     end
   end

data/lib/utils.rb

@@ -8,5 +8,4 @@ module Utils
   require 'utils/editor'
   require 'utils/finder'
   require 'utils/grepper'
-  require 'utils/lines_file'
 end

data/lib/utils/editor.rb

@@ -40,7 +40,7 @@ module Utils
         end
       end
       $DEBUG and warn command * ' '
-      system *command
+      system(*command)
     end
 
     def fullscreen=(enabled)

data/lib/utils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2153046640 !ruby/object:Gem::Requirement
+  requirement: &2152966880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.0.11
   type: :development
   prerelease: false
-  version_requirements: *2153046640
+  version_requirements: *2152966880
 - !ruby/object:Gem::Dependency
   name: spruz
-  requirement: &2153046080 !ruby/object:Gem::Requirement
+  requirement: &2152966340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *2153046080
+  version_requirements: *2152966340
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2153045540 !ruby/object:Gem::Requirement
+  requirement: &2152965800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,45 +43,44 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153045540
+  version_requirements: *2152965800
 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
-- errf
-- git-empty
-- myex
+- chroot-exec
 - number_files
+- search
+- strip_spaces
 - path
+- edit
+- git-empty
+- classify
+- utils-install-config
+- xmp
+- discover
+- sshscreen
+- myex
 - probe
+- errf
 - same_files
-- search
-- sedit
-- sshscreen
-- strip_spaces
 - unquarantine_apps
-- untest
-- utils-install-config
 - vacuum_firefox_sqlite
-- xmp
+- sedit
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- 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/lines_file.rb
+- lib/utils/file_xt.rb
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
-- lib/utils/version.rb
 - lib/utils.rb
 files:
 - .gitignore
@@ -165,7 +164,6 @@ files:
 - lib/utils/find.rb
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
-- lib/utils/lines_file.rb
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
 - lib/utils/version.rb
@@ -194,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Some useful command line utilities

data/lib/utils/lines_file.rb

@@ -1,122 +0,0 @@
-class Utils::LinesFile
-  module LineExtension
-    attr_reader :line_number
-
-    def filename
-      lines_file.filename.dup
-    end
-  end
-
-  include Enumerable
-
-  def self.for_filename(filename, line_number = nil)
-    obj = new(File.readlines(filename), line_number)
-    obj.filename = filename
-    obj
-  end
-
-  def self.for_file(file, line_number)
-    obj = new(file.readlines, line_number)
-    obj.filename = filename
-    obj
-  end
-
-  def self.for_lines(lines, line_number = nil)
-    new(lines, line_number)
-  end
-
-  def initialize(lines, line_number = nil)
-    @lines = lines
-    @lines.each_with_index do |line, i|
-      line.extend LineExtension
-      line.instance_variable_set :@line_number, i + 1
-      line.instance_variable_set :@lines_file, self
-    end
-    self.line_number = line_number || (@lines.empty? ? 0 : 1)
-  end
-
-  attr_accessor :filename
-
-  attr_reader :line_number
-
-  def rewind
-    self.line_number = 1
-    self
-  end
-
-  def next!
-    self.line_number += 1
-    self
-  end
-
-  def previous!
-    self.line_number -= 1
-    self
-  end
-
-  def line_number=(number)
-    number = number.to_i
-    if number > 0 && number <= last_line_number
-      @line_number = number
-    end
-  end
-
-  def last_line_number
-    @lines.size
-  end
-
-  def empty?
-    @lines.empty?
-  end
-
-  def each(&block)
-    @lines.empty? and return
-    old_line_number = line_number
-    1.upto(last_line_number) do |number|
-      self.line_number = number
-      block.call(line)
-    end
-    self
-  ensure
-    self.line_number = old_line_number
-  end
-
-  def line
-    index = line_number - 1
-    @lines[index] if index >= 0
-  end
-
-  def file_linenumber
-    "#{filename}:#{line_number}"
-  end
-
-  def match_backward(regexp, previous_after_match = false)
-    empty? and return
-    while line_number >= 1
-      if line =~ regexp
-        previous_after_match and previous!
-        return $~.captures
-      end
-      previous!
-    end
-  end
-
-  def match_forward(regexp, next_after_match = false)
-    empty? and return
-    begin
-      if line =~ regexp
-        next_after_match and next!
-        return $~.captures
-      end
-      next!
-    end while line_number < last_line_number
-  end
-
-  def to_s
-    "#{line_number} #{line.chomp}"
-  end
-
-  def inspect
-    "#<#{self.class}: #{to_s.inspect}>"
-  end
-end