etest-unit 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 745dc1a9f7cead3a0e68b343e0d78a3f2b2cbee4
-  data.tar.gz: 1063ea79bc5898059e9445d1a2a411f877e18519
+  metadata.gz: 49dfedc6f41677d57a5ce8e51e96e2e0fe49aa8e
+  data.tar.gz: ab68e4038e4073c622b70c2199ab88cbf6deddea
 SHA512:
-  metadata.gz: 41d0fdde8e558a673d66a9d5baf2b7d94469289fc8c8a38faa1bc856a7cd66b1b7cae780b240deab5259c496f5dce2899ee7022a22ccb52c71e294126957b439
-  data.tar.gz: 49ac104c599a0e2e9f5dbb3fe45d2c95ef601e27ac95c2f381c9c900be0fed24e1b32a0a736442e17d0e4467ee871b81e533feca8b6edd38a7dd8464b09cbc93
+  metadata.gz: 908583233e0479c17aea478dc9a2f984b710e87794e0c837044cbf8f89f81151041ccb228bdc43f1962415d92d9e75c49c4e85ac815a80035d138fe868cd0f60
+  data.tar.gz: bbc9b111a7407bb1818f59f40d614b983734bfa57b3df649acc0e5336b3f3fe11dda3ede23bdb486bbf9408aea9ca1f1c68476632cf268837f378495633f19c1

data/lib/etest-unit/version.rb

@@ -1,3 +1,3 @@
 module EtestUnit
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/lib/module_ext.rb

@@ -7,50 +7,57 @@ module Kernel
   end
 end
 
-module EtestReloader
-  extend self
-  
-  def reload(module_name)
-    reload_file("#{module_name.underscore}.rb") || begin
-      STDERR.puts("Warning: Cannot reload module #{module_name}")
-      false
-    end
-  end
-
-  private
-  
-  def reload_file(file)
-    begin
-      if load(file)
-        STDERR.puts("Loaded #{file}")
-        file
-      end
-    rescue LoadError
-      nfile = file.gsub(/\/[^\/]+\.rb/, ".rb")
-      nfile != file && reload_file(nfile)
-    end
-  end
-end
-
 # 
 # TDD helpers for modules. 
 class Module
   #
   # reloads the module, and runs the module's etests.
   def etest(*args)
-    EtestReloader.reload(name)
-    if etests = const_get("Etest")
-      EtestReloader.reload(etests.name)
-    end
-  
+    etests = const_get("Etest")
+    modules = [ self, etests ]
+    Reloader.reload *modules
     ::EtestUnit.run etests, *args
   end
   
+  module Reloader
+    def self.reload(*mods)
+      source_files = mods.map(&:source_files).flatten.uniq
+
+      # Skip files that live in .gem and .rvm directories.
+      source_files.reject! do |source_file|
+        source_file =~ /\/\.gem\// ||
+        source_file =~ /\/\.rvm\//
+      end
+
+      source_files.each do |source_file|
+        reload_file(source_file)
+      end
+    end
+
+    def self.reload_file(file)
+      r = load(file)
+      STDERR.puts("load #{file.inspect}: #{r ? "OK" : r.inspect}")
+      !!r
+    rescue LoadError
+      STDERR.puts "load #{file.inspect}: raised #{$!}"
+      false
+    end
+  end
+
   def reload
-    EtestReloader.reload(name)
+    Reloader.reload(self)
     self
   end
   
+  def source_files
+    public_instance_methods(false).
+      map do |method_name| instance_method(method_name) end.
+      map(&:source_location).compact.
+      map(&:first).
+      uniq.
+      sort
+  end
+
   #
   # returns all instances of a module
   def instances                                           #:nodoc:

data/test/etest_test.inc.rb

@@ -0,0 +1,28 @@
+module String::Etest
+  def test_underscore
+    $etest_stats[:underscore] += 1
+
+    assert_equal "x", "X".underscore
+    assert_equal "xa_la_nder", "XaLaNder".underscore
+  end
+
+  def test_camelize
+    $etest_stats[:camelize] += 1
+
+    assert_equal "X", "x".camelize
+    assert_equal "XaLaNder", "xa_la_nder".camelize
+  end
+
+  def test_camelize_lower
+    assert_equal "x", "x".camelize(:lower)
+    assert_equal "xaLaNder", "xa_la_nder".camelize(:lower)
+  end
+end
+
+module Fixnum::Etest
+  def test_success
+    $etest_stats[:success] += 1
+
+    assert true
+  end
+end

data/test/etest_test.rb

@@ -1,44 +1,22 @@
 #!/usr/bin/env ruby
-DIRNAME = File.expand_path File.dirname(__FILE__)
+if !defined?(DIRNAME)
+  DIRNAME = File.expand_path File.dirname(__FILE__)
+end
+
 Dir.chdir(DIRNAME)
 
-ETEST_TEST=true
+if !defined?(ETEST_TEST)
+  ETEST_TEST=true
+end
 
 require "etest-unit"
 require "expectation"
 
 # ---------------------------------------------------------------------
 
-$etest_stats = Hash.new(0)
-
-module String::Etest
-  def test_underscore
-    $etest_stats[:underscore] += 1
+require_relative "./etest_test.inc.rb"
 
-    assert_equal "x", "X".underscore
-    assert_equal "xa_la_nder", "XaLaNder".underscore
-  end
-
-  def test_camelize
-    $etest_stats[:camelize] += 1
-
-    assert_equal "X", "x".camelize
-    assert_equal "XaLaNder", "xa_la_nder".camelize
-  end
-
-  def test_camelize_lower
-    assert_equal "x", "x".camelize(:lower)
-    assert_equal "xaLaNder", "xa_la_nder".camelize(:lower)
-  end
-end
-
-module Fixnum::Etest
-  def test_success
-    $etest_stats[:success] += 1
-
-    assert true
-  end
-end
+$etest_stats = Hash.new(0)
 
 begin
   String.etest

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: etest-unit
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - radiospiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Build your tests alongside your code.
@@ -30,11 +30,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/etest-unit/version.rb
+- README.md
 - lib/etest-unit.rb
+- lib/etest-unit/version.rb
 - lib/module_ext.rb
 - lib/string_ext.rb
-- README.md
+- test/etest_test.inc.rb
 - test/etest_test.rb
 homepage: http://github.com/radiospiel/etest
 licenses: []
@@ -45,17 +46,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Build your tests alongside your code.