solea 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8892aed1a89ac7902cd0354accfb10e6c6d69c0
-  data.tar.gz: 907bd4155ed61518e04f5e2298f396e5c9756f81
+  metadata.gz: d9b5cf91a34deb5d67c30c7c3ce38e088a269d70
+  data.tar.gz: 197fc14c95d0f2572229d8db066a0fe96f937951
 SHA512:
-  metadata.gz: a820bdddf834207afafb11a29fca10a7d0e597ee62a758b018b88126cd1bd7d0c887427a9f271ce2e497763a9d6c0c707c5b475a9a59edd8397da98f0b058313
-  data.tar.gz: 04d3c9988dba0e5c4dbf59ed34cac7f0d40d45e5995bad5160c00c5b60b21c117e43a16f04c3678ee0b33647e2de5a867c426801c170ab5ea02f35448259ef4b
+  metadata.gz: 5d869ecd75a04511d01b70d2f8aa537b0b3e6a5cb5a89099fb88c7aee9f28911d838270b5bf43ddf7fdddb90437661f00558cc704676cc94c8dfaa0ccea50ffa
+  data.tar.gz: 7b49fcd52fe62ac61636a8a0d7343271a50908232a87eba73f94291916e45416209086fe6d2a8193201f8589b1e5781454d415b7d742e707a9df27f620f296de

data/bin/solea

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'solea.rb'
+
+if ARGV[0]
+  if ARGV[0].match(/.+\.rb\z/)
+    file_name = ARGV[0]
+  else
+    dir_name = ARGV[0]
+  end
+end
+if ARGV[1]
+  class_test = Solea.module_eval(File.read(file_name))
+  requested  = class_test.tests.flatten.find do |test|
+    test.metadata[:lineno] == ARGV[1].to_i
+  end
+  if ARGV[2]
+    print requested.metadata[ARGV[2].to_sym], "\n"
+  else
+    puts "Report requested".center(145, "-"), requested.report
+  end
+else
+  tests = {}
+  if file_name
+    file_path = file_name
+  else
+    dir_name ||= 'spec'
+    file_path = "#{dir_name}/**/*_spec.rb"
+  end
+  Dir.glob(file_path).each do |file|
+    class_test = Solea.module_eval(File.read(file))
+    tests[file] = class_test.tests
+  end
+  puts "\nFiles loaded: #{tests.keys.join(", ")}"
+  puts Solea.report(tests)
+end

data/lib/solea.rb

@@ -1,162 +1,176 @@
-class ClassTest
-  def initialize(class_name, &block)
-    @class_name = class_name
-    @tests = []
-    block.call(self)
-    print report
-  end
-
-  def test_method(method_name, &block)
-    method_test = MethodTest.new(method_name)
-    block.call(method_test)
-    @tests << method_test.tests
-  end
-
-  def report
-    @tests = @tests.flatten
-    @passing_tests = @tests.select{|test| test.pass}
-    @failing_tests = @tests.select{|test| !test.pass}
-    text_color = (@failing_tests.any? ? "37;41;1" : "37;47;1")
-    message = "\n\e[#{text_color}m" + "#{@passing_tests.count} of #{@tests.count} tests passed.".center(145) + "\e[0m\n\n" +
-              "| lineno: pass/fail |".center(145, "-") + "\n\n|"
-    @tests.each_with_index do |test, i|
-      text_color = (test.pass ? "0" : "37;41;1")
-      status     = (test.pass ? "pass" : "fail")
-      message   += "\e[#{text_color}m #{"%3d" % test.state[:hypothesis_caller].lineno}: #{status} \e[0m|"
-      message   += "\n|" if (i + 1) % 12 == 0
-    end
-    message += "\n\nFor detailed information on any test, try \"m.print{|t| t.report}\" after the test's expect/assert statement."
-    "#{message}\n\n"
-  end
-end
-
-class MethodTest
-  attr_accessor :method_name, :pass, :tests
-
-  def initialize(method_name)
-    @method_name = method_name
-    @tests       = []
-    @exceptions  = []
-    @notes       = []
-  end
-
-  def before(&block)
-    @before = yield
-  end
-
-  def describe(&block)
-    @description = yield
-    @notes = []
-  end
-
-  def note(&block)
-    @notes << yield
-  end
-
-  def example(&block)
-    @example_caller = caller_locations(1,1)[0]
-    @exceptions = []
-    begin
-      @example = block.call(@before)
-    rescue Exception => e
-      @example = block
-      @exceptions << [e, @example_caller]
+module Solea
+  def self.report(tests)
+    all_tests     = []
+    passing_tests = []
+    tests.each do |filename, tests_array|
+      tests_array     = tests_array.flatten
+      all_tests      << tests_array
+      passing_tests  << tests_array.select{|test| test.pass }
+      tests[filename] = tests_array.select{|test| !test.pass }
     end
+    all_tests, passing_tests = all_tests.flatten, passing_tests.flatten
+    text_color = (all_tests.count == passing_tests.count ? "37;47;1" : "37;41;1")
+    message = "\n\e[#{text_color}m" + "#{passing_tests.count} of #{all_tests.count} tests passed.".center(145) + "\e[0m\n\n"
+    unless all_tests.count == passing_tests.count
+      message += "Failing tests: \"file path: lineno\"".center(145, "-")
+      tests.each do |filename, failing_tests|
+        if failing_tests.any?
+          message += "\n" + failing_tests.map do |test|
+            "#{filename} #{test.metadata[:lineno]}"
+          end.join("\n") + "\n\n"
+        end
+      end
+    end
+    message
   end
 
-  def assert(&block)
-    @hypothesis_caller = caller_locations(1,1)[0]
-    begin
-      @pass = block.call(@example)
-    rescue Exception => e
-      @pass = false
-      @exceptions << [e, @hypothesis_caller]
-    end
-    @tests << self.dup
-  end
+  class ClassTest
+    attr_accessor :tests
 
-  def assert!(&block)
-    @hypothesis_caller = caller_locations(1,1)[0]
-    begin
-      @pass = !block.call(@example)
-    rescue Exception => e
-      @pass = false
-      @exceptions << [e, @hypothesis_caller]
-    end
-    @tests << self.dup
+    def initialize(class_name, &block)
+      @class_name = class_name
+      @tests      = []
+      instance_exec &block
+    end
+  
+    def test_method(method_name, &block)
+      method_test = MethodTest.new(method_name)
+      method_test.execute &block
+      @tests << method_test.tests
+    end
+  
+    def report
+      Solea.report({ @filename => @tests })
+    end
   end
+  
+  class MethodTest
+    attr_accessor :method_name, :pass, :tests
+ 
+    def initialize(method_name)
+      @method_name = method_name
+      @tests       = []
+      @exceptions  = []
+      @notes       = []
+    end
+ 
+    def execute(&block)
+      instance_exec &block
+    end
 
-  def expect(exception_expected = nil, &block)
-    @hypothesis_caller = caller_locations(1,1)[0]
-    if exception_expected
-      test_for_exception(exception_expected, block)
-    else
+    def before(&block)
+      @before = yield
+    end
+ 
+    def describe(&block)
+      @description = yield
+      @notes = []
+    end
+ 
+    def note(&block)
+      @notes << yield
+    end
+ 
+    def example(&block)
+      @example_caller = caller_locations(1,1)[0]
+      @exceptions = []
+      begin
+        @example = block.call(@before)
+      rescue Exception => e
+        @example = block
+        @exceptions << [e, @example_caller]
+      end
+    end
+ 
+    def assert(&block)
+      @hypothesis_caller = caller_locations(1,1)[0]
       begin
-        @pass = yield == @example
+        @pass = block.call(@example)
       rescue Exception => e
         @pass = false
         @exceptions << [e, @hypothesis_caller]
       end
+      @tests << self.dup
+    end
+ 
+    def assert!(&block)
+      @hypothesis_caller = caller_locations(1,1)[0]
+      begin
+        @pass = !block.call(@example)
+      rescue Exception => e
+        @pass = false
+        @exceptions << [e, @hypothesis_caller]
+      end
+      @tests << self.dup
+    end
+ 
+    def expect(exception_expected = nil, &block)
+      @hypothesis_caller = caller_locations(1,1)[0]
+      if exception_expected
+        test_for_exception(exception_expected, block)
+      else
+        begin
+          @pass = yield == @example
+        rescue Exception => e
+          @pass = false
+          @exceptions << [e, @hypothesis_caller]
+        end
+      end
+      @tests << self.dup
+    end
+ 
+    def expect!(&block)
+      @hypothesis_caller = caller_locations(1,1)[0]
+      begin
+        @pass = yield != @example
+      rescue Exception => e
+        @pass = false
+        @exceptions << [e, @hypothesis_caller]
+      end
+      @tests << self.dup
+    end
+ 
+    def test_for_exception(exception_expected, block)
+      begin
+        block_code = block.call(@example)
+      rescue Exception => e
+        block_code = block
+        @exceptions << [e, @hypothesis_caller]
+      end
+      if block_code.nil?
+        test = @example.is_a?(Proc)
+      else
+        test = block_code.is_a?(Proc)
+      end
+      @pass = test  if exception_expected == :fail
+      @pass = !test if exception_expected == :pass
+    end
+ 
+    def metadata
+      { :before      => @before,
+        :description => @description,
+        :example     => @example,
+        :lineno      => (@hypothesis_caller.lineno if @hypothesis_caller),
+        :exceptions  => @exceptions,
+        :notes       => @notes,
+        :pass        => @pass
+      }
+    end
+ 
+    def print(&block)
+      puts block.call(self)
+    end
+ 
+    def report
+      report_caller = caller_locations(1,1)[0]
+      report = "method name: #{" " * ("description".length - "method name".length)}\"#{@method_name}\"\n"
+      metadata.each do |k, v|
+        spaces = " " * ("description".length - k.length)
+        v = "\"#{v}\"" if v.is_a?(String)
+        v = "[#{"." * v.length}]" if v.is_a?(Array) || v.is_a?(Hash)
+        report += "#{k}: #{spaces}#{v}\n"
+      end
+      report
     end
-    @tests << self.dup
-  end
-
-  def expect!(&block)
-    @hypothesis_caller = caller_locations(1,1)[0]
-    begin
-      @pass = yield != @example
-    rescue Exception => e
-      @pass = false
-      @exceptions << [e, @hypothesis_caller]
-    end
-    @tests << self.dup
-  end
-
-  def test_for_exception(exception_expected, block)
-    begin
-      block_code = block.call(@example)
-    rescue Exception => e
-      block_code = block
-      @exceptions << [e, @hypothesis_caller]
-    end
-    if block_code.nil?
-      test = @example.is_a?(Proc)
-    else
-      test = block_code.is_a?(Proc)
-    end
-    @pass = test  if exception_expected == :fail
-    @pass = !test if exception_expected == :pass
-  end
-
-  def state
-    { :before            => @before,
-      :description       => @description,
-      :example           => @example,
-      :example_caller    => @example_caller,
-      :exceptions        => @exceptions,
-      :hypothesis_caller => @hypothesis_caller,
-      :notes             => @notes,
-      :pass              => @pass
-    }
-  end
-
-  def print(&block)
-    puts block.call(self)
-  end
-
-  def report
-    report_caller = caller_locations(1,1)[0]
-    report = "\n" + "Report requested on line #{report_caller.lineno}".center(145, "-") + "\n\n" +
-             "-Except for \"method name\", each of the terms in the lefthand column below is a key in the #state hash.\n" +
-             "-Thus, for example, the @exceptions array can be accessed for more information with \"m.print{|t| t.state[:exceptions]}\".\n" +
-             "-Arrays and hashes are abbreviated below; the number of dots represents their length.\n\n" +
-             "method name: #{" " * ("hypothesis_caller".length - "Method name".length)}\"#{@method_name}\"\n"
-    state.each do |k, v|
-      spaces = " " * ("hypothesis_caller".length - k.length)
-      v = "\"#{v}\"" if v.is_a?(String)
-      v = "[#{"." * v.length}]" if v.is_a?(Array) || v.is_a?(Hash)
-      report += "#{k}: #{spaces}#{v}\n"
-    end
-    report
   end
 end

metadata

@@ -1,22 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: solea
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Joseph Swetnam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies: []
 description: A simple, streamlined unit testing gem.
 email: jbswetnam@gmail.com
-executables: []
+executables:
+- solea
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/solea.rb
+- bin/solea
 homepage: https://github.com/crownyx/solea
 licenses: []
 metadata: {}