vendor/TextMate/Zena.tmbundle/Support/RubyMate/catch_exception.rb
vendor/TextMate/Zena.tmbundle/Support/RubyMate/stdin_dialog.rb
@@ -24,7 +24,7 @@ export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}"
<key>input</key>
<string>document</string>
<key>keyEquivalent</key>
- <string>@r</string>
+ <string>~r</string>
<key>name</key>
<string>Run all yaml tests</string>
<key>output</key>
vendor/TextMate/Zena.tmbundle/Commands/Run all yaml tests.tmCommand
@@ -7,8 +7,7 @@
<key>command</key>
<string># Assumes the current file is a yaml test file
# Runs with the currently-focused method as the test name
-
-args=$(${TM_RUBY:=ruby} <<"EOF"
+args=$(${TM_RUBY:=ruby} <<"EOF"
n = ENV['TM_LINE_NUMBER'].to_i
@@ -36,7 +35,7 @@ exit_show_tool_tip
fi
export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}"
-"${TM_RUBY:-ruby}" -- "$TM_BUNDLE_SUPPORT/RubyMate/run_script.rb" $args</string>
+"${TM_RUBY:-ruby}" -- "$TM_BUNDLE_SUPPORT/RubyMate/run_script.rb" $args </string>
<key>input</key>
<string>document</string>
<key>keyEquivalent</key>
vendor/TextMate/Zena.tmbundle/Commands/Run focused yaml test.tmCommand
@@ -1,74 +1,118 @@
-require "#{ENV["TM_SUPPORT_PATH"]}/lib/scriptmate"
-require "cgi"
+require "#{ENV['TM_SUPPORT_PATH']}/lib/scriptmate"
+require 'cgi'
-$SCRIPTMATE_VERSION = "$Revision: 8136 $"
+$SCRIPTMATE_VERSION = "$Revision: 6354 $"
-class TrivialScript < UserCommand
- attr_reader :lang
- def initialize(*args)
- super
- @cmd = "ruby #{ARGV.join(' ')}"
- @display_name = ARGV.last
- @lang = "Ruby"
- end
+class RubyScript < UserScript
+ attr_reader :test_name, :base_path, :path, :content
+ def lang; 'Ruby' end
+ def executable; @hashbang || ENV['TM_RUBY'] || 'ruby' end
+ def args; ['-rcatch_exception', '-rstdin_dialog'] end
def version_string
- ruby_path = %x{ ruby -e 'require "rbconfig"; print Config::CONFIG["bindir"] + "/" + Config::CONFIG["ruby_install_name"]'}
- res = "Ruby r" + %x{ ruby -e 'print RUBY_VERSION' }
+ ruby_path = %x{ #{executable} -e 'require "rbconfig"; print Config::CONFIG["bindir"] + "/" + Config::CONFIG["ruby_install_name"]'}
+ res = "Ruby r" + %x{ #{executable} -e 'print RUBY_VERSION' }
res + " (#{ruby_path})"
end
- def args; ['-rcatch_exception', '-rstdin_dialog'] end
- def run
- stdin, stdout, stderr, pid = my_popen3(@cmd)
- return stdout, stderr, nil, pid
+ def test_script?
+ @path =~ /(?:\b|_)(?:tc|ts|test)(?:\b|_)/ or
+ @content =~ /\brequire\b.+(?:test\/unit|test_helper)/
+ end
+ def filter_cmd(cmd)
+ cmd -= [ENV['TM_FILEPATH']]
+ if test_script?
+ path_ary = @path.split('/')
+ if index = path_ary.rindex('test')
+ test_path = File.join(*path_ary[0..index])
+ lib_path = File.join( *( path_ary[0..-2] +
+ ['..'] * (path_ary.length - index - 1) ) +
+ ['lib'] )
+ if File.exist? lib_path
+ cmd.insert(1, "-I#{e_sh lib_path}:#{e_sh test_path}")
+ end
+ end
+ end
+ if index = cmd.rindex('--name')
+ @test_name = cmd[index+1]
+ @base_path = cmd[index-1].gsub(/\_test.rb$/,'')
+ else
+ @base_path = cmd.last.gsub(/\_test.rb$/,'')
+ end
+ @cmd = cmd
end
end
class RubyMate < ScriptMate
+ def base_path
+ @base_path ||= begin
+ path_ary = @command.path.split('/')
+ if index = path_ary.rindex('test')
+ File.join(*path_ary[0..(index -1)])
+ else
+ @command.path
+ end
+ end
+ end
+
+ def run
+ super
+ rescue => err
+ File.open('/Users/gaspard/yaml.log', 'ab') do |f|
+ f.puts err.message
+ f.puts err.backtrace.join("\n")
+ end
+ raise err
+ end
+
+ def absolute_path(path)
+ if path =~ %r{\A/}
+ path
+ else
+ "#{base_path}/#{path}"
+ end
+ end
+
+ def full_method_name(file, method)
+ if absolute_path(file) == @command.path
+ method
+ else
+ "#{File.basename(file)} #{method}"
+ end
+ end
+
def filter_stdout(str)
- if str =~ /\A[.EF]+\Z/
- return htmlize(str).gsub(/[EF]+/, "<span style=\"color: red\">\\&</span>") +
- "<br style=\"display: none\"/>"
+ if @command.test_script? and str =~ /\A[.EF]+\Z/
+ # ...F....E....
+ htmlize(str).gsub(/[EF]+/, "<span style=\"color: red\">\\&</span>") + "<br style=\"display: none\"/>"
else
- str.map do |line|
- if line =~ /^(\s+)(\S.*?):(\d+)(?::in\s*`(.*?)')?/
- indent, file, line, method = $1, $2, $3, $4
- url, display_name = '', 'untitled document';
- unless file == "-"
- indent += " " if file.sub!(/^\[/, "")
- url = '&url=file://' + e_url(file)
- display_name = File.basename(file)
- end
- if method =~ /^test_([a-zA-Z]+)_(.*)/
- line = 0
- yaml_file, test_name = $1, $2
- file_path = File.join(File.dirname(ENV['TM_FILEPATH']), "#{yaml_file}.yml")
- $file_contents[file_path] ||= File.read(file_path)
- $file_contents[file_path].split("\n").each do |l|
- line += 1
- break if l =~ /^#{test_name}:/
+ if @command.test_script?
+ str.map do |line|
+ if line =~ %r{\(eval\).*in `(test_(\w+?)_(.*))'}
+ test_name = $1
+ group, method = $2, $3
+ begin
+ file = File.join(@command.base_path, "#{group}.yml")
+ lines = File.read(file).split("\n")
+ position = lines.rindex { |l| l =~ %r{^#{method}:} } + 1
+ "<span><a class='near' href=\"txmt://open?url=file://#{e_url(file)}&line=#{position}\">#{test_name}</a></span>:#{position}<br/>"
+ rescue => err
+ line
end
- line = line.to_s
- url = '&url=file://' + e_url(file_path)
+ elsif line =~ /^\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors/
+ "<span style=\"color: #{$1 + $2 == "00" ? "green" : "red"}\">#{$&}</span><br/>"
+ elsif line =~ /Loaded suite/ && @command.test_name
+ htmlize(line.chomp + " --name #{@command.test_name}\n")
+ elsif line =~ /`yt_|\(eval\)/
+ nil
+ else
+ htmlize(line)
end
- "#{indent}<a class='near' href='txmt://open?line=#{line + url}'>" +
- (method ? "method #{CGI::escapeHTML method}" : '<em>at top level</em>') +
- "</a> in <strong>#{CGI::escapeHTML display_name}</strong> at line #{line}<br/>"
- elsif line =~ /(\[[^\]]+\]\([^)]+\))\s+\[([\w\_\/\.]+)\:(\d+)\]/
- spec, file, line = $1, $2, $3, $4
- "<span><a style=\"color: blue;\" href=\"txmt://open?url=file://#{e_url(file)}&line=#{line}\">#{spec}</span>:#{line}<br/>"
- elsif line =~ /([\w\_]+).*\[([\w\_\/\.]+)\:(\d+)\]/
- method, file, line = $1, $2, $3
- "<span><a style=\"color: blue;\" href=\"txmt://open?url=file://#{e_url(file)}&line=#{line}\">#{method}</span>:#{line}<br/>"
- elsif line =~ /^\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors\b.*/
- "<span style=\"color: #{$1 + $2 == "00" ? "green" : "red"}\">#{$&}</span><br/>"
- else
- htmlize(line)
- end
- end.join
+ end.compact.join
+ else
+ htmlize(str)
+ end
end
end
end
-$file_contents = {}
-$file_contents[ENV['TM_FILEPATH']] = STDIN.read
-script = TrivialScript.new($file_content)
-RubyMate.new(script).emit_html
\ No newline at end of file
+
+script = RubyScript.new(STDIN.read)
+RubyMate.new(script).emit_html
vendor/TextMate/Zena.tmbundle/Support/RubyMate/run_script.rb
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>deleted</key>
+ <array/>
<key>name</key>
<string>Zena</string>
<key>ordering</key>
vendor/TextMate/Zena.tmbundle/info.plist
8b5ab6263a59beadf96092e06823c1e37e64f82b
Gaspard Bucher
gaspard@teti.ch
http://github.com/zena/zena/commit/2c5354237f33d6948ec2c326145c55a79d1c9172
2c5354237f33d6948ec2c326145c55a79d1c9172
2009-11-10T01:12:18-08:00
2009-11-10T01:12:18-08:00
Added 'run focused yaml test' to Zena bundle for TextMate.
b171c0c9f92e8648a959c3fab8f82c1b217f1d8b
Gaspard Bucher
gaspard@teti.ch