lax 0.0.1 → 0.0.2

data/README.md

@@ -24,7 +24,7 @@ yes but why
 -----------
 * Everything about a test is independently scopeable - methods, arguments, receivers, blocks, expectations, hooks, and any metadata you might care to attach. Testing that one method call satisfies three conditions is as natural as testing that one condition is satisfied by three different method calls. Write tests in whatever way makes sense.
 * No hardcoded constraints on terminal output, handling of failed tests, w/e - it's all done with user-configurable hooks.
-* Support for concurrent testing (via threads - not currently threadsafe in JRuby).
+* Support for (optional) concurrent testing (via threads - not currently known to be threadsafe in JRuby).
 * Code footprint so small, it's hardly there at all (< 200 SLOC).
 * Does not pollute your toplevel namespace or infect the entire Ruby object hierarchy with its code.
 

data/lib/lax/version.rb

@@ -1,3 +1,3 @@
 module Lax
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/lax.rb

@@ -1,18 +1,171 @@
 require 'lax/version'
 module Lax
-  autoload :Tree,     'lax/tree'
-  autoload :RakeTask, 'lax/rake_task'
-  autoload :Runner,   'lax/runner'
-  autoload :CB,       'lax/cb'
   class << self
     @@cases = []
-    def test(c={})
-      yield(group = Tree.new(Hash===c ? c : {obj: c}))
-      @@cases += group.cases
+    def test(c={},&b)
+      @@cases += Tree.new(c).tap(&b).leaves
     end
 
     def go(runner_opts={})
-      Runner.new(@@cases.shift(@@cases.size), runner_opts).go
+      Runner.new(@@cases, runner_opts).go
+    end
+  end
+
+  class Case < Hash
+    def run
+      self[:before] and self[:before][self]
+      self[:pass] = begin
+        self[:cond][self[:value]=self[:obj].__send__(self[:msg],*self[:args],&self[:blk])]
+      rescue self[:xptn] => e
+        true
+      rescue => e
+        self[:xptn] = e
+        false
+      end
+      self[:after] and self[:after][self]
+    end
+  end
+
+  class Tree < Array
+    attr_reader :tc
+    def initialize(tc={})
+      @tc = Case.new.merge tc
+    end
+
+    def on(obj,&b)
+      where({obj: obj},&b)
+    end
+
+    def calling(msg,&b)
+      where({msg: msg},&b)
+    end
+
+    def with(*args,&b)
+      where({args: args},&b)
+    end
+
+    def with_block(blk=nil,&b)
+      blk  ? where({blk: blk},&b)   : where(blk: b)
+    end
+
+    def satisfies(cond=nil,&b)
+      cond ? where({cond: cond},&b) : where(cond: b)
+    end
+
+    def before(bef=nil,&b)
+      bef ? where({before: bef},&b) : where(before: b)
+    end
+
+    def after(aft=nil,&b)
+      aft ? where({after: aft},&b)  : where(after: b)
+    end
+
+    def raises(xptn=StandardError,&b)
+      where({xptn: xptn},&b)
+    end
+
+    def it
+      calling(:tap).with_block {}
+    end
+
+    def returns(v,&b)
+      satisfies ->(e){e==v}, &b
+    end
+
+    def where(h)
+      g=Tree.new tc.merge h 
+      yield g if block_given?
+      push(g).last
+    end
+
+    def leaves
+      any?? map(&:leaves).flatten : [tc]
+    end
+  end
+
+  # Runner for test cases. Handles callbacks, concurrency, etc.
+  class Runner
+    attr_reader :cases
+    # Takes an array of test cases and an optional hash of options.
+    def initialize(cases, opts={})
+      @cases, @opts = cases, {threads: 1}.merge(opts)
+    end
+
+    def go
+      @opts[:start][self] if @opts[:start]
+      todo = cases.dup
+      (1..@opts[:threads]).map do
+        Thread.new {run todo.shift while todo.any?}
+      end.each &:join
+      @opts[:finish][self] if @opts[:finish]
+      self
+    end
+
+    private
+    def run(c)
+      @opts[:before][c] if @opts[:before]
+      c.run
+      @opts[:after][c] if @opts[:after]
+    end
+  end
+
+  class Hook < Proc
+    def <<(cb); Hook.new {|e| self[cb[e]]}    end
+    def +(cb);  Hook.new {|e| self[e]; cb[e]} end
+
+    StartTime = Hook.new do |rn|
+      rn.extend(Module.new {attr_accessor :start, :stop}).start = Time.now
+    end
+
+    StopTime  = Hook.new {|rn| rn.stop = Time.now }
+
+    SimpleOut = Hook.new {|tc| $stdout.write(tc[:pass] ? "\x1b[32m=\x1b[0m" : "\x1b[31m#\x1b[0m")}
+
+    Summary   = Hook.new do |rn|
+      puts "\nFinished #{(cs=rn.cases).size} tests" <<
+        " in #{(rn.stop - rn.start).round 10} seconds" <<
+        " with #{(cs.reject{|c|c[:pass]}).size} failures"
+    end
+
+    FailList  = Hook.new do |rn|
+      rn.cases.reject {|c|c[:pass]}.each do |f|
+        puts "  #{Module===f[:obj] ? "#{f[:obj]}::" : "#{f[:obj].class}#"}#{f[:msg]}" <<
+          "#{?(+[*f[:args]]*', '+?) if f[:args]} " << (f.has_key?(:value) ? "#=> #{f[:value]}" : "raised unhandled #{f[:xptn].class}")
+      end
+    end
+  end
+
+  class Task
+    include Rake::DSL
+    def initialize(opts = {})
+      dir = opts.delete(:dir) || :test
+      runner_opts = {
+          start:  Hook::StartTime,
+          after:  Hook::SimpleOut,
+          finish: Hook::StopTime + Hook::Summary + Hook::FailList
+      }.merge opts
+      make_tasks dir, runner_opts
+    end
+
+    private
+    def make_tasks(dir, runner_opts)
+      namespace dir do
+        desc "[Lax] load all test files"
+        task load: make_groups(dir)
+        desc "[Lax] run all loaded tests"
+        task(:run) { Lax.go runner_opts }
+      end
+      desc "[Lax] load and run all tests"
+      task dir => ["#{dir}:load","#{dir}:run"]
+    end
+
+    def make_groups(dir)
+      FileList["#{dir}/**/*"].select {|f| File.directory? f}.map do |group|
+        name = group.sub(/^#{dir}\//,'').gsub(/\//,?:)
+        desc "[Lax] load files in #{group}"
+        task(name) { Dir["#{group}/*.rb"].each {|file| load file} }
+        [dir,name]*?:
+      end
     end
   end
 end

data/rakefile

@@ -2,6 +2,6 @@ $LOAD_PATH << File.expand_path('../lib', __FILE__)
 require 'rake'
 require 'lax'
 
-Lax::RakeTask.new
+Lax::Task.new
 task default: :test
 

data/test/case/cases.rb

@@ -7,7 +7,7 @@ class TestCases
   end
 end
 
-Lax.test(TestCases.new) {|assert|
+Lax.test(obj: TestCases.new) {|assert|
   assert.calling(:a_number).satisfies {|n| Fixnum===n}
   assert.calling(:an_exception).raises
 }

data/test/case/control.rb

@@ -1,4 +1,4 @@
-Lax.test(1) {|that|
+Lax.test(obj: 1) {|that|
   that.calling(:/).with(0).raises ZeroDivisionError
   that.calling(:**) {|exponentiation|
     exponentiation.with(1).satisfies {|n|n==1}
@@ -11,25 +11,24 @@ Lax.test { |assert|
   assert.returns(1) { |assert_equal_to_one|
     assert_equal_to_one.on(0).calling(:+).with 1
     assert_equal_to_one.on(1) {|identity_on_one|
-      identity_on_one.calling(:*).with  1
+      identity_on_one.calling(:* ).with 1
       identity_on_one.calling(:**).with 2
-      identity_on_one.calling(:+).with  0
+      identity_on_one.calling(:+ ).with 0
     }
   }
 }
 
-Lax.test {|claim|
-  claim.calling(:object_id).satisfies(->(v){Fixnum===v}) {|_|
+Lax.test(msg: :object_id) {|id|
+  id.satisfies(->(v){Fixnum===v}) {|_|
     _.on 1
     _.on 'asdf'
     _.on String
     _.on Lax
+    _.calling(:size).on([1,2,3])
   }
-
-  claim.calling(:size).on([1,2,3]).satisfies {|n|n==3}
 }
 
-Lax.test(222) {|that|
+Lax.test(obj: 222) {|that|
   that.it.returns 222
 }
 

data/test/unit/callbacks.rb

@@ -1,6 +1,6 @@
 @array = []
 
-Lax.test(@array) {|that|
+Lax.test(obj: @array) {|that|
   that.before {@array << 1}.calling(:size) {|_|
     _.returns 1
     _.returns 2

data/test/unit/test.rb

@@ -2,7 +2,7 @@ Lax.test {|assert|
   assert.calling(:upcase).on('asdf').returns('ASDF')
 }
 
-Lax.test('asdf') {|test_that|
+Lax.test(obj: 'asdf') {|test_that|
   test_that.satisfies {|n| n=='ASDF'}.calling(:upcase)
 }
 

data/test/unit/thread.rb

@@ -1,11 +1,11 @@
 before = proc {sleep 0.01}
-cases = Lax::Tree.new.tap {|tree|
+cases = Lax::Tree.new(Lax::Case.new).tap {|tree|
   1.upto(100) do |n|
     tree.on(n).it.returns n
   end
-}.cases
+}.leaves
 
-Lax.test(Lax::Runner.new(cases, threads: 100, before: before)) {|that|
+Lax.test(obj: Lax::Runner.new(cases, threads: 100, before: before)) {|that|
   that.calling(:go).satisfies {|runner|
     runner.cases.size == 100 and
     runner.cases.all? {|c| c[:pass]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lax
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies: []
 description: A testing framework that tries to stay out of your way.
 email: feivel@sdf.org
@@ -19,11 +19,7 @@ extra_rdoc_files: []
 files:
 - lax.gemspec
 - lib/lax.rb
-- lib/lax/rake_task.rb
 - lib/lax/version.rb
-- lib/lax/runner.rb
-- lib/lax/cb.rb
-- lib/lax/tree.rb
 - README.md
 - LICENSE
 - rakefile

data/lib/lax/cb.rb

@@ -1,28 +0,0 @@
-module Lax
-  class CB < Proc
-    def <<(cb); CB.new {|e| self[cb[e]]}    end
-    def +(cb);  CB.new {|e| self[e]; cb[e]} end
-
-    StartTime = CB.new { @start = Time.now }
-    StopTime  = CB.new { @stop  = Time.now }
-
-    SimpleOut = CB.new do |tc|
-      $stdout.write(tc[:pass] ? "\x1b[32m=\x1b[0m" : "\x1b[31m#\x1b[0m")
-    end
-
-    Summary   = CB.new do |rn|
-      puts "\nFinished #{(cs=rn.cases).size} tests" <<
-        " in #{(@stop - @start).round 10} seconds" <<
-        " with #{(fs=cs.select{|c|!c[:pass]}).size} failures"
-    end
-
-    FailList  = CB.new do |rn|
-      fs = rn.cases.select{|c|!c[:pass]}
-      fs.each do |f|
-        puts "  #{Module===f[:obj] ? "#{f[:obj]}::" : "#{f[:obj].class}#"}#{f[:msg]}" <<
-          "#{?(+[*f[:args]]*', '+?) if f[:args]} " << (f.has_key?(:value) ? "#=> #{f[:value]}" : "raised unhandled #{f[:xptn].class}")
-      end
-    end
-  end
-end
-

data/lib/lax/rake_task.rb

@@ -1,38 +0,0 @@
-module Lax
-  class RakeTask
-    include Rake::DSL
-    def initialize(opts = {})
-      dir = opts.delete(:dir) || :test
-      runner_opts = {
-          start:  CB::StartTime,
-          after:  CB::SimpleOut,
-          finish: CB::StopTime + CB::Summary  + CB::FailList
-      }.merge opts
-      make_tasks dir, runner_opts
-    end
-
-    private
-    def make_tasks(dir, runner_opts)
-      namespace dir do
-        desc "[Lax] load all test files"
-        task load: make_test_groups(dir)
-        desc "[Lax] run all loaded tests"
-        task(:run) { Lax.go runner_opts }
-      end
-      desc "[Lax] load and run all tests"
-      task dir => ["#{dir}:load","#{dir}:run"]
-    end
-
-    def make_test_groups(dir)
-      FileList["#{dir}/**/*"].select {|f| File.directory? f}.map do |group|
-        name = group.sub(/^#{dir}\//,'').gsub(/\//,?:)
-        desc "[Lax] load files in #{group}"
-        task name do
-          Dir["#{group}/*.rb"].each {|file| load file }
-        end
-        "#{dir}:#{name}"
-      end
-    end
-  end
-end
-

data/lib/lax/runner.rb

@@ -1,45 +0,0 @@
-module Lax
-  # Runner for test cases. Handles callbacks, concurrency, etc.
-  # TODO: DRb support!
-  class Runner
-    attr_reader :cases
-    # Takes an array of test cases and an optional hash of options.
-    def initialize(cases, opts={})
-      @cases, @opts = cases, {threads: 1}.merge(opts)
-    end
-
-    def go
-      (start=@opts[:start]) and start[self]
-      todo = @cases.dup
-      (1..@opts[:threads]).map do
-        Thread.new {after run before todo.shift while todo.any?}
-      end.each &:join
-      (finish=@opts[:finish]) and finish[self]
-      self
-    end
-
-    private
-    def run(c)
-      begin
-        c[:pass] = c[:cond][c[:value]=c[:obj].__send__(c[:msg],*c[:args],&c[:blk])]
-      rescue c[:xptn] => e
-        c[:pass] = true
-      rescue => e
-        c[:pass] = false
-        c[:xptn] = e
-      end
-      c 
-    end
-
-    def before(c)
-      [@opts,c].each {|h| h[:before] and h[:before][c]}
-      c
-    end
-
-    def after(c)
-      [c,@opts].each {|h| h[:after] and h[:after][c]}
-      c
-    end
-  end
-end
-

data/lib/lax/tree.rb

@@ -1,60 +0,0 @@
-module Lax
-  class Tree < Array
-    attr_reader :tc
-    def initialize(tc={})
-      @tc=tc
-    end
-
-    def on(obj,&b)
-      where({obj: obj},&b)
-    end
-
-
-    def calling(msg,&b)
-      where({msg: msg},&b)
-    end
-
-    def with(*args,&b)
-      where({args: args},&b)
-    end
-
-    def with_block(blk=nil,&b)
-      blk  ? where({blk: blk},&b)   : where(blk: b)
-    end
-
-    def satisfies(cond=nil,&b)
-      cond ? where({cond: cond},&b) : where(cond: b)
-    end
-
-    def before(bef=nil,&b)
-      bef ? where({before: bef},&b) : where(before: b)
-    end
-
-    def after(aft=nil,&b)
-      aft ? where({after: aft},&b)  : where(after: b)
-    end
-
-    def raises(xptn=StandardError,&b)
-      where({xptn: xptn},&b)
-    end
-
-    def it
-      calling(:tap).with_block {}
-    end
-
-    def returns(v,&b)
-      satisfies ->(e){e==v}, &b
-    end
-
-    def where(h)
-      g=Tree.new tc.merge h 
-      yield g if block_given?
-      push(g).last
-    end
-
-    def cases
-      any?? map {|n| n.any? ? n.cases : n.tc}.flatten : [tc]
-    end
-  end
-end
-