ZenTest 3.6.1 → 3.7.0

data/lib/autotest/cctray.rb

@@ -0,0 +1,57 @@
+# -*- ruby -*-
+
+require 'fileutils'
+
+module Autotest::CCTray
+  MAX = 30
+  STATUS = {
+    :all_good => "Success",
+    :green    => "Success",
+    :red      => "Failure",
+  }
+  DIR = File.expand_path("~/Sites/dashboard")
+
+  def self.project_name= name
+    @@project_name = name
+  end
+
+  def self.update_status status
+    dir = File.join(DIR, @@project_name)
+    serial = Time.now.to_i
+    file = "status.#{serial}.xml"
+    FileUtils.mkdir_p dir
+    Dir.chdir dir do
+      File.open(file, 'w') do |f|
+        f.puts %(<Project name="#{@@project_name}" activity="Sleeping" lastBuildStatus="#{STATUS[status]}" lastBuildLabel="build.#{serial}" lastBuildTime="#{Time.now.xmlschema}" webUrl="http://localhost/~ryan/dashboard/#{@@project_name}/"/>)
+      end
+      files = Dir["*.xml"].sort_by { |f| File.mtime f }.reverse
+      (files - files.first(MAX)).each do |f|
+        File.unlink f
+      end
+    end
+
+    Dir.chdir DIR do
+      new_file = "cctray.xml.#{$$}"
+      old_file = "cctray.xml"
+      File.open(from_file, "w") do |out|
+        out.puts "<Projects>"
+        Dir["*"].each do |d|
+          next unless File.directory? d
+          Dir.chdir d do
+            latest = Dir["*.xml"].sort_by { |f| File.mtime f }.last
+            out.puts File.read(latest)
+          end
+        end
+        out.puts "</Projects>"
+      end
+      File.rename new_file, old_file
+    end
+  end
+
+  [:run, :red, :green, :all_good].each do |status|
+    Autotest.add_hook status do |at|
+      STATUS[Time.now] = at.files_to_test.size
+      update_status status
+    end
+  end
+end

data/lib/autotest/redgreen.rb

@@ -5,7 +5,7 @@ module Autotest::RedGreen
   BAR = "=" * 80
 
   Autotest.add_hook :ran_command do |at|
-    if at.results.last.match(/^.* (\d+) failures, (\d+) errors$/)
+    if at.results.last =~ /^.* (\d+) failures, (\d+) errors$/
       code = ($1 != "0" or $2 != "0") ? 31 : 32
       puts "\e[#{code}m#{BAR}\e[0m\n\n"
     end

data/lib/autotest/screen.rb

@@ -1,5 +1,5 @@
 ##
-# Autotest::Screen is test result notify GUN Screen's statusline.
+# Autotest::Screen is test result notify GNU Screen's statusline.
 #
 # === screenshots
 # * <img src="http://f.hatena.ne.jp/images/fotolife/s/secondlife/20061109/20061109015543.png" />

data/lib/test/rails.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rubygems'
 require 'rubygems/version'
 require 'test_help' # hopefully temporary, required for Test::Rails to work
                     # until we get rid of test_help so Test::Unit::TestCase

data/lib/test/rails/view_test_case.rb

@@ -7,7 +7,7 @@
 #
 # * Allows testing of individual AJAX templates.
 # * Allows testing of individual partials.
-# * Large library of helful assertions.
+# * Large library of helpful assertions.
 #
 # = Naming
 #

data/lib/test/zentest_assertions.rb

@@ -3,6 +3,18 @@
 
 module Test::Unit::Assertions
 
+  ##
+  # TODO: should this go in this file?
+  # Asserts that model indeed has a given callback
+  #
+  # assert_callback(Model, :before_save, :something)
+
+  def assert_callback(model_class, callback, method_name, message=nil)
+    vars = model_class.instance_variable_get(:@inheritable_attributes)
+    assert vars.has_key?(callback), message
+    assert_include vars[callback], method_name, message
+  end
+
   ##
   # Asserts that +obj+ responds to #empty? and #empty? returns true.
 

data/lib/unit_diff.rb

@@ -188,7 +188,7 @@ class UnitDiff
             if result.empty? then
               output.push "[no difference--suspect ==]"
             else
-              output.push result.map { |line| line.chomp }
+              output.push result.split("\n")
             end
 
             if $k then

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.6.1'
+  VERSION = '3.7.0'
 
   include ZenTestMapping
 
@@ -128,21 +128,24 @@ class ZenTest
     klass = self.get_class(klass) if klass.kind_of? String
 
     # WTF? public_instance_methods: default vs true vs false = 3 answers
+    # to_s on all results if ruby >= 1.9
     public_methods = klass.public_instance_methods(false)
-    klass_methods = klass.singleton_methods(full)
-    klass_methods -= Class.public_methods(true)
-    klass_methods -= %w(suite new)
-    klass_methods = klass_methods.map { |m| "self." + m }
-    public_methods += klass_methods
     public_methods -= Kernel.methods unless full
+    public_methods.map! { |m| m.to_s }
     public_methods -= %w(pretty_print pretty_print_cycle)
-    klassmethods = {}
-    public_methods.each do |meth|
+
+    klass_methods = klass.singleton_methods(full)
+    klass_methods -= Class.public_methods(true)
+    klass_methods = klass_methods.map { |m| "self.#{m}" }
+    klass_methods  -= %w(self.suite new)
+
+    result = {}
+    (public_methods + klass_methods).each do |meth|
       puts "# found method #{meth}" if $DEBUG
-      klassmethods[meth] = true
+      result[meth] = true
     end
 
-    return klassmethods
+    return result
   end
 
   # Return the methods for class klass, as a hash with the
@@ -165,7 +168,7 @@ class ZenTest
         end
 
         the_methods.each do |meth|
-          klassmethods[meth] = true
+          klassmethods[meth.to_s] = true
         end
       end
     end
@@ -326,14 +329,20 @@ class ZenTest
     @missing_methods[klassname][methodname] = true
   end
 
+  # looks up the methods and the corresponding test methods
+  # in the collection already built.  To reduce duplication
+  # and hide implementation details.
+  def methods_and_tests(klassname, testklassname)
+    return @klasses[klassname], @test_klasses[testklassname]
+  end
+
   # Checks, for the given class klassname, that each method
   # has a corrsponding test method. If it doesn't this is
   # added to the information for that class
   def analyze_impl(klassname)
     testklassname = self.convert_class_name(klassname)
     if @test_klasses[testklassname] then
-      methods = @klasses[klassname]
-      testmethods = @test_klasses[testklassname]
+      methods, testmethods = methods_and_tests(klassname,testklassname)
 
       # check that each method has a test method
       @klasses[klassname].each_key do | methodname |
@@ -371,8 +380,7 @@ class ZenTest
     end
 
     if @klasses[klassname] then
-      methods = @klasses[klassname]
-      testmethods = @test_klasses[testklassname]
+      methods, testmethods = methods_and_tests(klassname,testklassname)
 
       # check that each test method has a method
       testmethods.each_key do | testmethodname |
@@ -414,6 +422,19 @@ class ZenTest
     end # @klasses[klassname]
   end
 
+  # create a given method at a given
+  # indentation. Returns an array containing
+  # the lines of the method.
+  def create_method(indentunit, indent, name)
+    meth = []
+    meth.push indentunit*indent + "def #{name}"
+    meth.last << "(*args)" unless name =~ /^test/
+    indent += 1
+    meth.push indentunit*indent + "raise NotImplementedError, 'Need to write #{name}'"
+    indent -= 1
+    meth.push indentunit*indent + "end"
+    return meth
+  end
    
   # Walk each known class and test that each method has
   # a test method
@@ -477,25 +498,13 @@ class ZenTest
       meths = []
 
       cls_methods.sort.each do |method|
-        meth = []
-        meth.push indentunit*indent + "def #{method}"
-        meth.last << "(*args)" unless method =~ /^test/
-        indent += 1
-        meth.push indentunit*indent + "raise NotImplementedError, 'Need to write #{method}'"
-        indent -= 1
-        meth.push indentunit*indent + "end"
+        meth = create_method(indentunit, indent, method)
         meths.push meth.join("\n")
       end
 
       methods.keys.sort.each do |method|
         next if method =~ /pretty_print/
-        meth = []
-        meth.push indentunit*indent + "def #{method}"
-        meth.last << "(*args)" unless method =~ /^test/
-        indent += 1
-        meth.push indentunit*indent + "raise NotImplementedError, 'Need to write #{method}'"
-        indent -= 1
-        meth.push indentunit*indent + "end"
+        meth = create_method(indentunit, indent, method)
         meths.push meth.join("\n")
       end
 

data/lib/zentest_mapping.rb

@@ -59,7 +59,7 @@ module ZenTestMapping
   # taking into account names composed of metacharacters
   # (used for arithmetic, etc
   def normal_to_test(name)
-    name = name.dup # wtf?
+    name = name.to_s.dup # wtf?
     is_cls_method = name.sub!(/^self\./, '')
     name = @@method_map[name] if @@method_map.has_key? name
     name = name.sub(/=$/, '_equals')
@@ -74,6 +74,8 @@ module ZenTestMapping
   # symbolic names which may have been anglicised by
   # #normal_to_test().
   def test_to_normal(name, klassname=nil)
+    name = name.to_s
+
     known_methods = (@inherited_methods[klassname] || {}).keys.sort.reverse
 
     mapped_re = @@orig_method_map.values.sort_by { |k| k.length }.map {|s| Regexp.escape(s)}.reverse.join("|")

data/test/test_autotest.rb

@@ -269,6 +269,7 @@ test_error2(#{@test_class}):
     # non-rails
     util_path_to_classname 'TestBlah', 'test/test_blah.rb'
     util_path_to_classname 'TestOuter::TestInner', 'test/outer/test_inner.rb'
+    util_path_to_classname 'TestRuby2Ruby', 'test/test_ruby2ruby.rb'
   end
 
   def test_tests_for_file

data/test/test_help.rb

@@ -2,7 +2,7 @@
 module ActionController; end
 module ActionController::Flash; end
 class ActionController::Flash::FlashHash < Hash; end
-class ActionController::TestSession; end
+class ActionController::TestSession < Hash; end
 
 class ActionController::TestRequest
   attr_accessor :session

data/test/test_rails_view_test_case.rb

@@ -5,7 +5,7 @@ $TESTING_RTC = true
 
 module Rails
   module VERSION
-    STRING = '99.99.99'
+    STRING = '99.99.99' unless defined? STRING # HACK
   end
 end
 
@@ -165,10 +165,10 @@ class TestRailsViewTestCase < Test::Rails::ViewTestCase
 
     assert_equal 2, @assert_select.length
 
-    assert_equal ["select[name='game[location_id]'] option[value='2']",
-                  { :text => 'Guaymas' }], @assert_select.shift
-    assert_equal ["select[name='game[location_id]'] option[value='1']",
-                  { :text => 'Ballet' }], @assert_select.shift
+    assert_include ["select[name='game[location_id]'] option[value='2']",
+                   { :text => 'Guaymas' }], @assert_select
+    assert_include ["select[name='game[location_id]'] option[value='1']",
+                   { :text => 'Ballet' }], @assert_select
   end
 
   def test_assert_select_tag_form
@@ -177,12 +177,12 @@ class TestRailsViewTestCase < Test::Rails::ViewTestCase
 
     assert_equal 4, @assert_select.length
 
-    assert_equal ["form[action='/game/save']"], @assert_select.shift
-    assert_equal ["select[name='game[location_id]'] option[value='2']",
-                  { :text => 'Guaymas' }], @assert_select.shift
-    assert_equal ["form[action='/game/save']"], @assert_select.shift
-    assert_equal ["select[name='game[location_id]'] option[value='1']",
-                  { :text => 'Ballet' }], @assert_select.shift
+    assert_include ["form[action='/game/save']"], @assert_select
+    assert_include ["select[name='game[location_id]'] option[value='2']",
+                   { :text => 'Guaymas' }], @assert_select
+    assert_include ["form[action='/game/save']"], @assert_select
+    assert_include ["select[name='game[location_id]'] option[value='1']",
+                   { :text => 'Ballet' }], @assert_select
   end
 
   def test_assert_submit

data/test/test_zentest.rb

@@ -7,6 +7,10 @@ $TESTING = true
 # I do this so I can still run ZenTest against the tests and itself...
 require 'zentest' unless defined? $ZENTEST
 
+class TrueClass # stupid YAML is breaking my tests. Enters via Test::Rails
+  remove_method :taguri, :taguri=, :to_yaml rescue nil
+end
+
 # These are just classes set up for quick testing.
 # TODO: need to test a compound class name Mod::Cls
 
@@ -340,9 +344,24 @@ end
     assert_equal(expected, missing)
   end
 
+  def test_create_method
+    list = @tester.create_method("  ", 1, "wobble")
+    assert_equal(["  def wobble(*args)",
+                  "    raise NotImplementedError, 'Need to write wobble'",
+                  "  end"],list)
+  end
+
+  def test_methods_and_tests
+    @tester.process_class("ZenTest")
+    @tester.process_class("TestZenTest")
+    m,t = @tester.methods_and_tests("ZenTest", "TestZenTest")
+    assert(m.include?("methods_and_tests"))
+    assert(t.include?("test_methods_and_tests"))
+  end
+
   def test_generate_code_simple
     self.util_simple_setup
-    
+
     @tester.analyze
     str = @tester.generate_code[1..-1].join("\n")
     exp = @generated_code
@@ -367,6 +386,7 @@ end
 
   def test_get_inherited_methods_for_subclass_full
     expect = Object.instance_methods + %w( inherited overridden )
+    expect.map! { |m| m.to_s }
     result = @tester.get_inherited_methods_for("LowlyOne", true)
 
     assert_equal(expect.sort, result.keys.sort)
@@ -380,7 +400,7 @@ end
   end
 
   def test_get_inherited_methods_for_superclass_full
-    expect = Object.instance_methods
+    expect = Object.instance_methods.map { |m| m.to_s }
     result = @tester.get_inherited_methods_for("SuperDuper", true)
 
     assert_equal(expect.sort, result.keys.sort)

data/test/test_zentest_mapping.rb

@@ -5,9 +5,9 @@ $TESTING = true
 # I do this so I can still run ZenTest against the tests and itself...
 require 'zentest' unless defined? $ZENTEST
 
-class TestZenTestMapping < Test::Unit::TestCase
+class TestZentestMapping < Test::Unit::TestCase
   def setup
-    @tester = ZenTest.new # FIX: just inject the module
+    @tester = ZenTest.new
   end
 
   def util_simple_setup

metadata

@@ -1,34 +1,43 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.6.1
-date: 2007-07-23 00:00:00 -07:00
-summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails."
-require_paths: 
-- lib
-email: ryand-ruby@zenspider.com
-homepage: http://www.zenspider.com/ZSS/Products/ZenTest/
-rubyforge_project: zentest
-description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking!  Test::Rails helps you build industrial-strength Rails code."
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 3.7.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Ryan Davis
 - Eric Hodel
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-22 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
+description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking!  Test::Rails helps you build industrial-strength Rails code."
+email: ryand-ruby@zenspider.com
+executables: 
+- autotest
+- multiruby
+- rails_test_audit
+- unit_diff
+- zentest
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- LinuxJournalArticle.txt
+- Manifest.txt
+- README.txt
+- example.txt
 files: 
 - History.txt
 - LinuxJournalArticle.txt
@@ -38,8 +47,6 @@ files:
 - bin/autotest
 - bin/multiruby
 - bin/rails_test_audit
-- bin/ruby_fork
-- bin/ruby_fork_client
 - bin/unit_diff
 - bin/zentest
 - example.txt
@@ -49,6 +56,7 @@ files:
 - lib/autotest.rb
 - lib/autotest/autoupdate.rb
 - lib/autotest/camping.rb
+- lib/autotest/cctray.rb
 - lib/autotest/discover.rb
 - lib/autotest/emacs.rb
 - lib/autotest/fixtures.rb
@@ -67,7 +75,6 @@ files:
 - lib/autotest/snarl.rb
 - lib/autotest/timestamp.rb
 - lib/functional_test_matrix.rb
-- lib/ruby_fork.rb
 - lib/test/rails.rb
 - lib/test/rails/controller_test_case.rb
 - lib/test/rails/functional_test_case.rb
@@ -88,11 +95,37 @@ files:
 - test/test_rails_controller_test_case.rb
 - test/test_rails_helper_test_case.rb
 - test/test_rails_view_test_case.rb
-- test/test_ruby_fork.rb
 - test/test_unit_diff.rb
 - test/test_zentest.rb
 - test/test_zentest_assertions.rb
 - test/test_zentest_mapping.rb
+has_rdoc: true
+homepage: http://www.zenspider.com/ZSS/Products/ZenTest/
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: zentest
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails."
 test_files: 
 - test/test_autotest.rb
 - test/test_help.rb
@@ -100,39 +133,7 @@ test_files:
 - test/test_rails_controller_test_case.rb
 - test/test_rails_helper_test_case.rb
 - test/test_rails_view_test_case.rb
-- test/test_ruby_fork.rb
 - test/test_unit_diff.rb
 - test/test_zentest.rb
 - test/test_zentest_assertions.rb
 - test/test_zentest_mapping.rb
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- History.txt
-- LinuxJournalArticle.txt
-- Manifest.txt
-- README.txt
-- example.txt
-executables: 
-- autotest
-- multiruby
-- rails_test_audit
-- ruby_fork
-- ruby_fork_client
-- unit_diff
-- zentest
-extensions: []
-
-requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.2
-    version: