utils 0.0.22 → 0.0.23

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/bin/probe

@@ -13,8 +13,9 @@ Usage: #{File.basename($0)} [OPTS] FILENAME[:LINENO]
 
 Options are
 
-  -n TESTNAME run the test TESTNAME in file FILENAME
-  -h          display this help
+  -n TESTNAME   run the test TESTNAME in file FILENAME
+  -t FRAMEWORK  use test framework FRAMEWORK (rspec or test-unit)
+  -h            display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
   EOT
@@ -26,22 +27,38 @@ def cmd(*args)
   exec *args
 end
 
+$config = Utils::Config::ConfigFile.new
+$config.parse_config_file File.expand_path('~/.utilsrc')
+$opt = go 't:n:h'
 filename = ARGV.shift or fail "require filename or filename:line_number as first argument"
-$opt = go 'n:h'
 $opt['h'] and usage
-if testname = $opt['n']
-  cmd "testrb", '-I', 'lib:test:ext', '-n', testname , filename
-elsif filename =~ /^\s*([^:]+):(\d+)/
-  filename, line_number = $1, $2
-  lf = Tins::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
+case ($opt['t'] || $config.probe.test_framework).to_sym
+when :rspec
+  if line_number = $opt['n']
+    cmd "rspec", '-I', $config.probe.include_dirs_argument, '-l', line_number , filename
+  elsif filename =~ /^\s*([^:]+):(\d+)/
+    filename, line_number = $1, $2
+    puts "Running test at #{filename}:#{line_number}"
+    cmd "rspec", '-I', $config.probe.include_dirs_argument, '-l', line_number , filename
   else
-    warn "no test found before line #{line_number}"
-    exit 1
+    puts "Running ALL tests in #{filename}"
+    cmd "rspec", '-I', $config.probe.include_dirs_argument, filename
+  end
+when :'test-unit'
+  if testname = $opt['n']
+    cmd "testrb", '-I', $config.probe.include_dirs_argument, '-n', testname , filename
+  elsif filename =~ /^\s*([^:]+):(\d+)/
+    filename, line_number = $1, $2
+    lf = Tins::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', $config.probe.include_dirs_argument, '-n', testname , filename
+    else
+      warn "no test found before line #{line_number}"
+      exit 1
+    end
+  else
+    puts "Running ALL tests in #{filename}"
+    cmd "testrb", '-I', $config.probe.include_dirs_argument, filename
   end
-else
-  puts "Running ALL tests in #{filename}"
-  cmd "testrb", '-Ilib:test:ext', filename
 end

data/lib/utils/config/config_file.rb

@@ -4,6 +4,8 @@ require 'tins/xt/string'
 class Utils::Config::ConfigFile
   include DSLKit::Interpreter
 
+  class ConfigFileError < StandardError; end
+
   def initialize
   end
 
@@ -53,6 +55,30 @@ class Utils::Config::ConfigFile
     end
   end
 
+  class Probe < BlockConfig
+    config :test_framework, :'test-unit'
+
+    config :include_dirs, %w[lib test tests ext spec]
+
+    def include_dirs_argument
+      Array(include_dirs) * ':'
+    end
+
+    def initialize(&block)
+      super
+      test_frameworks_allowed = [ :'test-unit', :rspec ]
+      test_frameworks_allowed.include?(test_framework) or raise ConfigFileError,
+        "test_framework has to be in #{test_frameworks_allowed.inspect}"
+    end
+  end
+
+  def probe(&block)
+    if block
+      @probe = Probe.new(&block)
+    end
+    @probe ||= Probe.new
+  end
+
   class FileFinder < BlockConfig
     def prune?(basename)
       Array(prune_dirs).any? { |pd| pd.match(basename) }
@@ -104,7 +130,7 @@ class Utils::Config::ConfigFile
 
   def to_ruby
     result = "# vim: set ft=ruby:\n"
-    for bc in %w[search discover]
+    for bc in %w[search discover strip_spaces probe]
       result << "\n" << __send__(bc).to_ruby
     end
     result

data/lib/utils/config/irbrc

@@ -450,17 +450,16 @@ def ls(*args)
   puts `ls #{args.map { |x| "'#{x}'" } * ' '}`
 end
 
-if defined?(ActiveRecord::Base)
-  $logger = Logger.new(STDERR)
+if RUBY_VERSION < '1.9' && defined?(ActiveRecord::Base)
+  require 'logger'
+  $real_logger = Logger.new(STDERR)
+  $logger = Tins::NULL
   def irb_toggle_logging
-    require 'logger'
-    if ActiveRecord::Base.logger != $logger
-      $old_logger = ActiveRecord::Base.logger
-      ActiveRecord::Base.logger = $logger
-      true
-    else
-      ActiveRecord::Base.logger = $old_logger
-      false
+    case $logger
+    when Tins::NULL
+      $logger = $real_logger
+    when Logger
+      $logger = Tins::NULL
     end
   end
 end

data/lib/utils/config/vimrc

@@ -221,10 +221,10 @@ noremap <PageDown> <Nop>
 cnoremap <C-0> <Home>
 cnoremap <C-^> <Home>
 cnoremap <C-$> <End>
-cnoremap <C-H> <Left>
-cnoremap <C-L> <Right>
-cnoremap <C-K> <Up>
-cnoremap <C-J> <Down>
+cnoremap <C-h> <Left>
+cnoremap <C-l> <Right>
+cnoremap <C-k> <Up>
+cnoremap <C-j> <Down>
 vnoremap < <gv
 vnoremap > >gv
 " Marks

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.22'
+  VERSION         = '0.0.23'
   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.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-09-25"
+  s.date = "2011-10-08"
   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", "unquarantine_apps", "vacuum_firefox_sqlite", "sedit"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000Z
+date: 2011-10-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2156179340 !ruby/object:Gem::Requirement
+  requirement: &2156440800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *2156179340
+  version_requirements: *2156440800
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &2156178520 !ruby/object:Gem::Requirement
+  requirement: &2156440360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2156178520
+  version_requirements: *2156440360
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2156177520 !ruby/object:Gem::Requirement
+  requirement: &2156439940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156177520
+  version_requirements: *2156439940
 - !ruby/object:Gem::Dependency
   name: dslkit
-  requirement: &2156176500 !ruby/object:Gem::Requirement
+  requirement: &2156439500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2156176500
+  version_requirements: *2156439500
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables: