etest 0.1 → 0.3.1

data/Manifest

@@ -1,13 +0,0 @@
-Manifest
-Rakefile
-etest.gemspec
-init.rb
-lib/dlog_ext.rb
-lib/etest.rb
-lib/etest/assertions.rb
-lib/etest/grep.rb
-lib/module_ext.rb
-lib/string_ext.rb
-script/console
-script/rebuild
-test/test.rb

data/Rakefile

@@ -12,18 +12,6 @@ task :rdoc do
   sh "rdoc -o doc/rdoc"
 end
 
-require 'rubygems'  
-require 'rake'  
-require 'echoe'  
-
-Echoe.new('etest', '0.1') do |p|  
-  p.description     = "Embedded tests"  
-  p.url             = "http://github.com/pboy/etest"  
-  p.author          = "pboy"  
-  p.email           = "eno-pboy@open-lab.org"  
-  p.ignore_pattern  = ["tmp/*"]  
-  # p.runtime_dependencies = %w(nokogiri htmlentities rdiscount)
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| 
+  puts ext
+  load ext }

data/VERSION

@@ -0,0 +1,2 @@
+0.3.1
+

data/etest.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{etest}
-  s.version = "0.1"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["pboy"]
-  s.date = %q{2010-02-28}
-  s.description = %q{Embedded tests}
+  s.date = %q{2010-05-23}
+  s.description = %q{Embedded testing}
   s.email = %q{eno-pboy@open-lab.org}
-  s.extra_rdoc_files = ["lib/dlog_ext.rb", "lib/etest.rb", "lib/etest/assertions.rb", "lib/etest/grep.rb", "lib/module_ext.rb", "lib/string_ext.rb"]
-  s.files = ["Manifest", "Rakefile", "etest.gemspec", "init.rb", "lib/dlog_ext.rb", "lib/etest.rb", "lib/etest/assertions.rb", "lib/etest/grep.rb", "lib/module_ext.rb", "lib/string_ext.rb", "script/console", "script/rebuild", "test/test.rb"]
+  s.extra_rdoc_files = ["lib/dlog_ext.rb", "lib/etest.rb", "lib/etest/assertions.rb", "lib/etest/comparison_assertions.rb", "lib/etest/grep.rb", "lib/module_ext.rb", "lib/string_ext.rb", "tasks/echoe.rake"]
+  s.files = ["Manifest", "Rakefile", "VERSION", "gem.yml", "init.rb", "lib/dlog_ext.rb", "lib/etest.rb", "lib/etest/assertions.rb", "lib/etest/comparison_assertions.rb", "lib/etest/grep.rb", "lib/module_ext.rb", "lib/string_ext.rb", "script/console", "script/rebuild", "tasks/echoe.rake", "test/test.rb", "etest.gemspec"]
   s.homepage = %q{http://github.com/pboy/etest}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Etest"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{etest}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Embedded tests}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Embedded testing}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/gem.yml

@@ -0,0 +1,12 @@
+gem:
+  description: Embedded testing
+  url: http://github.com/pboy/etest  
+  author: pboy
+  email: eno-pboy@open-lab.org  
+  ignore_pattern:
+    - "tmp/*"
+    - "**/.*"
+  # runtime_dependencies:
+  #   - nokogiri
+  #   - htmlentities
+  #   - rdiscount

data/lib/dlog_ext.rb

@@ -14,14 +14,49 @@ module Dlog
   
   HOME = ENV["HOME"] + "/"
   
+  def self.release!
+    @release = true
+  end
+
+  def self.release?
+    @release
+  end
+      
+  def self.debug!
+    @release = false
+  end
+
+  def self.debug?
+    !@release
+  end
+
+  def self.quiet!
+    @quiet = true
+  end
+
+  def self.quiet?
+    @quiet
+  end
+
   def dlog(*args)
+    return if Dlog.quiet?
+    
     msg = ""
     was_string = true
     args.map do |s|
       msg += was_string ? " " : ", " unless msg.empty?
       msg += ((was_string = s.is_a?(String)) ? s : s.inspect)
     end
-    STDERR.puts "#{dlog_caller}: #{msg}"
+    STDERR.puts "#{Dlog.release? ? rlog_caller : dlog_caller} #{msg}"
+  end
+
+  def rlog_caller
+    if caller[1] =~ /^(.*):(\d+)/
+      file, line = $1, $2
+      "[" + File.basename(file).sub(/\.[^\.]*$/, "") + "]"
+    else
+      "[log]"
+    end
   end
 
   def dlog_caller
@@ -32,9 +67,9 @@ module Dlog
       file.gsub!(ROOT, ".") or
       file.gsub!(HOME, "~/")
     
-      "#{file}(#{line})"
+      "#{file}(#{line}):"
     else
-      "<dlog>"
+      "<dlog>:"
     end
   end
 end

data/lib/etest/assertions.rb

@@ -2,6 +2,10 @@
 #
 # Some assertions
 module Etest::Assertions
+  def assert_not_equal(unexpected, actual)
+    assert unexpected != actual, "#{actual} equals #{unexpected}, when it shouldn't"
+  end
+    
   def assert_respond_to(obj, *args)
     raise ArgumentError, "Missing argument(s)" if args.length < 1
   
@@ -45,6 +49,7 @@ module Etest::Assertions
   #
   #
   def assert_valid_xml(*args)
+    return unless libxml_installed?
     args.push @response.body if args.empty?
     
     args.each do |xml|
@@ -52,8 +57,27 @@ module Etest::Assertions
     end
   end
 
+  def assert_invalid_xml(*args)
+    return unless libxml_installed?
+    args.push @response.body if args.empty?
+    
+    args.each do |xml|
+      assert !xml_valid?(xml), "XML should not be valid: #{xml}"
+    end
+  end
+
+  def libxml_installed?
+    return @libxml_installed unless @libxml_installed.nil?
+    @libxml_installed = begin
+      require "libxml"
+      true
+    rescue LoadError
+      STDERR.puts "*** Skipping xml_validation. Please install the 'libxml' gem"
+      false
+    end
+  end
+  
   def xml_valid?(xml)
-    require "libxml"
     LibXML::XML::Error.reset_handler
     
     LibXML::XML::Document.io StringIO.new(xml)
@@ -62,49 +86,99 @@ module Etest::Assertions
     false
   end
   
-  def assert_invalid_xml(*args)
-    args.push @response.body if args.empty?
-    
-    args.each do |xml|
-      assert !xml_valid?(xml), "XML should not be valid: #{xml}"
-    end
-  end
-
   def assert_route(uri_path, params)
     assert_recognizes params, uri_path
   end
 
-  def assert_raises_kind_of(klass, &block)
-    begin
-      yield
-      assert false, "Should raise a #{klass} exception, but didn't raise at all"
-    rescue klass
-      assert $!.is_a?(klass), "Should raise a #{klass} exception, but raised a #{$!.class.name} exception"
+  def catch_exception_on(&block)
+    yield
+    nil
+  rescue Exception
+    $!
+  end
+  
+  def assert_raise(klass, msg=nil, &block)
+    ex = catch_exception_on(&block)
+    if ex.nil?
+      assert false, msg || "Should raise a #{klass} exception, but didn't raise at all"
+    else
+      assert ex.class.name == klass.name, msg || "Should raise a #{klass} exception, but raised a #{ex.class.name} exception"
     end
   end
-end
-
-
-module Etest::Assertions::Etest
-  #
-  # this actually tests the existance of an assertion and one successful
-  # assertion, nothing less, and nothing more...
-  def test_asserts
-    assert_respond_to "nsn", :upcase
-    assert respond_to?(:assert_invalid)
-    assert respond_to?(:assert_valid)
+  
+  def assert_nothing_raised(msg=nil, &block)
+    ex = catch_exception_on(&block)
+    assert ex.nil?, msg || "Should not raise an exception, but raised a #{ex.class.name} exception"
+  end
+  
+  def assert_raises_kind_of(klass, msg=nil, &block)
+    ex = catch_exception_on(&block)
+    if ex.nil?
+      assert false, msg || "Should raise a #{klass} exception, but didn't raise at all"
+    else
+      assert ex.is_a?(klass), msg || "Should raise a #{klass} exception, but raised a #{ex.class.name} exception"
+    end
+  end
+  
+  def assert_not_nil(v)
+    assert !v.nil?, "Should be nil, but is an #{v.class.name} object"
   end
 
-  class TestError < RuntimeError; end
+  def assert_file_exist(*paths)
+    paths.flatten.each do |path|
+      assert File.exist?(path), "Missing file: #{path}"
+    end
+  end
   
-  def test_assert_raises_kind_of
-    assert_raises_kind_of RuntimeError do 
-      raise TestError
+  def assert_file_doesnt_exist(*paths)
+    paths.flatten.each do |path|
+      assert !File.exist?(path), "File should not exist: #{path}"
     end
   end
   
-  def test_xml
-    assert_valid_xml <<-XML
+  def assert_not_equal(unexpected, actual)
+    assert unexpected != actual, "#{actual.inspect} should be != #{unexpected.inspect}"
+  end
+
+  def assert_not_nil(actual)
+    assert !actual.nil?, "#{actual.inspect} should not be nil"
+  end
+
+  def assert_nil(actual)
+    assert actual.nil?, "#{actual.inspect} should be nil"
+  end
+end
+
+class MiniTest::Unit::TestCase
+  include Etest::Assertions
+end
+
+unless defined?(ETEST_TEST)
+
+  module Etest::Assertions::Etest
+    #
+    # this actually tests the existance of an assertion and one successful
+    # assertion, nothing less, and nothing more...
+    def test_asserts
+      assert_respond_to "nsn", :upcase
+      assert respond_to?(:assert_invalid)
+      assert respond_to?(:assert_valid)
+    end
+
+    class TestError < RuntimeError; end
+
+    def test_assert_raises_kind_of
+      assert_raises_kind_of RuntimeError do 
+        raise TestError
+      end
+    end
+
+    def test_assert_file_exist
+      assert_file_exist __FILE__
+    end
+  
+    def test_xml
+      assert_valid_xml <<-XML
 <root>
 <p> lkhj </p>
 </root>
@@ -114,5 +188,7 @@ XML
 <root>
 <p> lkhj </p>
 XML
+    end
   end
 end
+

data/lib/etest/comparison_assertions.rb

@@ -0,0 +1,47 @@
+module Etest::ComparisonAssertions
+  def assert_lt(p1, p2)
+    assert(p1 < p2, "#{p1.inspect} should be less than #{p2.inspect} but is not")
+  end
+
+  def assert_le(p1, p2)
+    assert(p1 <= p2, "#{p1.inspect} should be less than or equal #{p2.inspect} but is not")
+  end
+
+  def assert_ge(p1, p2)
+    assert(p1 >= p2, "#{p1.inspect} should be greater than or equal #{p2.inspect} but is not")
+  end
+
+  def assert_gt(p1, p2)
+    assert(p1 > p2, "#{p1.inspect} should be greater than #{p2.inspect} but is not")
+  end
+
+  # for reasons of API completeness and orthogonality only.
+
+  def assert_eq(p1, p2)
+    assert_equal(p1, p2)
+  end
+
+  def assert_ne(p1, p2)
+    assert_not_equal(p1, p2)
+  end
+end
+
+class MiniTest::Unit::TestCase
+  include ::Etest::ComparisonAssertions
+end
+
+unless defined?(ETEST_TEST)
+
+  module Etest::ComparisonAssertions::Etest
+    # I don't know how to test asserts. This, at least, give (fake) C0 coverage
+    def test_comparision_assertions
+      assert_lt 1, 2
+      assert_le 1, 1
+      assert_ge 2, 2
+      assert_gt 2, 1
+      assert_eq 2, 2
+      assert_ne 1, 2
+    end
+  end
+
+end

data/lib/etest.rb

@@ -10,24 +10,38 @@ require File.dirname(__FILE__) + "/dlog_ext"
 # The Etest module contains methods to run etests.
 # 
 module Etest
+  VERSION=File.read(File.dirname(__FILE__) + "/../VERSION")
 end
 
 require File.dirname(__FILE__) + "/etest/assertions"
+require File.dirname(__FILE__) + "/etest/comparison_assertions"
 
 class MiniTest::Unit::TestCase
   def self.run_etests(*test_cases)
+    outside_etests = @@test_suites
+    reset
+    
     MiniTest::Unit::TestCase.reset
     
     test_cases.each do |test_case|
       MiniTest::Unit::TestCase.inherited test_case
     end
 
-    MiniTest::Unit.new.run([])
-    MiniTest::Unit::TestCase.reset
+    MiniTest::Unit.new.run(ARGV.dup)
+  ensure
+    @@test_suites = outside_etests
   end
 end
 
 module Etest
+  
+  class TestCase < MiniTest::Unit::TestCase
+  end
+  
+  def self.autorun
+    auto_run
+  end
+  
   def self.auto_run
     #
     # find all modules that are not named /::Etest$/, and try to load
@@ -56,11 +70,14 @@ module Etest
   #
   # convert an Etest moodule into a MiniTest testcase
   def self.to_test_case(mod)
-    klass = Class.new MiniTest::Unit::TestCase
+    klass = Class.new TestCase
     klass.send :include, mod
     klass.send :include, Assertions
 
-    mod.const_set("TestCase", klass)
+    Kernel.silent do
+      mod.const_set("TestCase", klass)
+    end
     klass
   end
 end
+

data/lib/module_ext.rb

@@ -1,3 +1,12 @@
+module Kernel
+  def self.silent(&block)
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end
+end
+
 # 
 # TDD helpers for modules. 
 class Module
@@ -19,14 +28,12 @@ class Module
   #
   # load a module by name. 
   def self.by_name(name)                                  #:nodoc:
-    old_verbose, $VERBOSE = $VERBOSE, nil
-    
-    r = eval(name, nil, __FILE__, __LINE__)
-    r if r.is_a?(Module) && r.name == name
+    Kernel.silent do
+      r = eval(name, nil, __FILE__, __LINE__)
+      r if r.is_a?(Module) && r.name == name
+    end
   rescue NameError, LoadError
     nil
-  ensure
-    $VERBOSE = old_verbose
   end
   
   #

data/lib/string_ext.rb

@@ -13,15 +13,18 @@ class String
   end
 end
 
-module String::Etest
-  def test_camelize
-    assert_equal "x", "X".underscore
-    assert_equal "xa_la_nder", "XaLaNder".underscore
-  end
+unless defined?(TEST_ETEST)
+  
+  module String::Etest
+    def test_camelize
+      assert_equal "x", "X".underscore
+      assert_equal "xa_la_nder", "XaLaNder".underscore
+    end
 
-  def test_underscore
-    assert_equal "X", "x".camelize
-    assert_equal "XaLaNder", "xa_la_nder".camelize
+    def test_underscore
+      assert_equal "X", "x".camelize
+      assert_equal "XaLaNder", "xa_la_nder".camelize
+    end
   end
-end
 
+end

data/tasks/echoe.rake

@@ -0,0 +1,31 @@
+#
+# GEM settings
+#
+GEM_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..")
+if gem_config = YAML.load(File.read("#{GEM_ROOT}/gem.yml"))["gem"]
+  require 'echoe'  
+
+  GEM_NAME = File.basename(GEM_ROOT)
+  Echoe.new(File.basename(GEM_ROOT), File.read("#{GEM_ROOT}/VERSION")) do |p|  
+    gem_config.each do |k,v|
+      p.send "#{k}=",v
+    end
+  end
+
+  desc "Rebuild and install the gem"
+  task :rebuild => %w(manifest default build_gemspec package) do
+    gem = Dir.glob("pkg/*.gem").sort_by do |filename|
+      File.new(filename).mtime
+    end.last
+
+    puts "============================================="
+    puts "Installing gem..."
+
+    system "gem install #{gem} > /dev/null 2>&1"
+
+    puts ""
+    puts "I built and installed the gem for you. To upload, run "
+    puts
+    puts "    gem push #{gem}"
+  end
+end

data/test/test.rb

@@ -2,10 +2,15 @@
 DIRNAME = File.expand_path File.dirname(__FILE__)
 Dir.chdir(DIRNAME)
 
+ETEST_TEST=true
+
 #
 # initialize the gem
 require '../init'
 
+require "#{DIRNAME}/etest_assertions.rb"
+require "#{DIRNAME}/etest_string.rb"
+
 require 'logger'
 require 'rubygems'
 require 'ruby-debug'
@@ -20,6 +25,7 @@ RAILS_ENV="test"
 RAILS_ROOT="#{DIRNAME}"
 
 if !defined?(RAILS_DEFAULT_LOGGER)
+  require "fileutils"
   FileUtils.mkdir_p File.dirname(LOGFILE)
   RAILS_DEFAULT_LOGGER = Logger.new(LOGFILE)
   RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
@@ -46,7 +52,7 @@ end
 
 $etests_did_run = false
 Etest.reload
-Etest.auto_run
+Etest.autorun
 
 unless $etests_did_run
   STDERR.puts "Something's wrong with etests :(" 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: etest
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - pboy
@@ -9,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 +01:00
+date: 2010-05-23 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: Embedded tests
+description: Embedded testing
 email: eno-pboy@open-lab.org
 executables: []
 
@@ -23,23 +28,29 @@ extra_rdoc_files:
 - lib/dlog_ext.rb
 - lib/etest.rb
 - lib/etest/assertions.rb
+- lib/etest/comparison_assertions.rb
 - lib/etest/grep.rb
 - lib/module_ext.rb
 - lib/string_ext.rb
+- tasks/echoe.rake
 files: 
 - Manifest
 - Rakefile
-- etest.gemspec
+- VERSION
+- gem.yml
 - init.rb
 - lib/dlog_ext.rb
 - lib/etest.rb
 - lib/etest/assertions.rb
+- lib/etest/comparison_assertions.rb
 - lib/etest/grep.rb
 - lib/module_ext.rb
 - lib/string_ext.rb
 - script/console
 - script/rebuild
+- tasks/echoe.rake
 - test/test.rb
+- etest.gemspec
 has_rdoc: true
 homepage: http://github.com/pboy/etest
 licenses: []
@@ -56,20 +67,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: etest
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Embedded tests
+summary: Embedded testing
 test_files: []