solea 0.9.30 → 0.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02c0aa46738e7fc3cfe0cf9245e396a9954cdc14
-  data.tar.gz: cd6a77dfb14847d494a47cd93ab782a357d8e810
+  metadata.gz: 95e5e163b9fcdd8e1d03b1ce15dbfcf62420cf4f
+  data.tar.gz: 0d9025310246448d84a1c09491e93e6eb67c5fbc
 SHA512:
-  metadata.gz: 7e5a5112311544591975fbcb9ebd1f59d497752a8b481c64c347448bd635c4e048ab31ab4e95d4217511dafb73c755ebf73401d1edb3d1fe4b1a0a9db506f49f
-  data.tar.gz: 718328dfc79569323029af8146c8d22e8366998407277164bde2641b656c948d5dd0934d3063e11974a14733331877c3570ac3ac6d63a872df8374f90a452c68
+  metadata.gz: 028ccdde7c82470b8923247b9e3d2715410019c9e262ac73b85040d292d7aa78705d6023dd5f088415b793b1b8687d5c64962e45b1a2ead36f2ad5d213908899
+  data.tar.gz: f2044c39cfd90e7b91493f69869aeec18e6c18b276b1ee95a9bddd07a3d124f511876a71a5fdb1fefd869e10088e9ed548e1e0989413421199de70edb7c3ed46

data/bin/solea

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'solea.rb'
+require 'solea'
 
 if ARGV[0]
   if ARGV[0].match(/.+\.rb\z/)
@@ -9,9 +9,10 @@ if ARGV[0]
     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|
+  load file_name
+  requested  = Solea.tests.flatten.find do |test|
     test.metadata[:lineno] == ARGV[1].to_i
   end
   if ARGV[2]
@@ -20,7 +21,7 @@ if ARGV[1]
     puts "Report requested".center(145, "-"), requested.report
   end
 else
-  tests = {}
+  files_loaded = []
   if file_name
     file_path = file_name
   else
@@ -28,9 +29,9 @@ else
     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
+    load file
+    files_loaded << file
   end
-  puts "\nFiles loaded: #{tests.keys.join(", ")}"
-  puts Solea.report(tests)
+  puts "\nFiles loaded: #{files_loaded.join(", ")}"
+  puts Solea.report
 end

data/lib/solea.rb

@@ -1,47 +1,43 @@
 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
+  class << self
+    attr_accessor :tests
+  end
+
+  def self.report
+    all_tests     = @tests.flatten
+    passing_tests = all_tests.select{|test| test.pass }
+    failing_tests = all_tests.select{|test| !test.pass }
+    text_color    = failing_tests.none? ? "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"
+    if failing_tests.any?
+      message += "Failing tests: \"file path: lineno\"".center(145, "-") + "\n" +
+      failing_tests.map do |test|
+        "#{test.metadata[:filename]} #{test.metadata[:lineno]}"
+      end.join("\n") + "\n\n"
     end
     message
   end
 
+  def self.test_class(class_name, &block)
+    @tests ||= []
+    class_test = ClassTest.new(class_name)
+    class_test.instance_exec &block
+    @tests << class_test.tests
+  end
+
   class ClassTest
     attr_accessor :tests
 
-    def initialize(class_name, &block)
+    def initialize(class_name)
       @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
+      method_test.instance_exec &block
       @tests << method_test.tests
     end
-  
-    def report
-      Solea.report({ @filename => @tests })
-    end
   end
   
   class MethodTest
@@ -53,10 +49,6 @@ module Solea
       @exceptions  = []
       @notes       = []
     end
- 
-    def execute(&block)
-      instance_exec &block
-    end
 
     def before(&block)
       @before = yield
@@ -150,6 +142,7 @@ module Solea
       { :before      => @before,
         :description => @description,
         :example     => @example,
+        :filename    => (@hypothesis_caller.path if @hypothesis_caller),
         :lineno      => (@hypothesis_caller.lineno if @hypothesis_caller),
         :exceptions  => @exceptions,
         :notes       => @notes,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solea
 version: !ruby/object:Gem::Version
-  version: 0.9.30
+  version: 0.9.31
 platform: ruby
 authors:
 - Joseph Swetnam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies: []
 description: A simple, streamlined unit testing gem.
 email: jbswetnam@gmail.com