assert 1.1.0 → 2.0.0.rc.1

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "1.1.0"
+  VERSION = "2.0.0.rc.1"
 end

data/lib/assert/view.rb

@@ -0,0 +1,23 @@
+require 'assert/view/default_view'
+
+module Assert::View
+
+  # this method is used to bring in custom user-specific views
+  # require views by passing either a full path to the view ruby file
+  # or passing the name of a view installed in ~/.assert/views
+
+  def self.require_user_view(view)
+    views_file = File.join(Assert.config.user_test_dir, 'views', view, 'lib', view)
+
+    if File.exists?(view) || File.exists?(view+'.rb')
+      require view
+    elsif File.exists?(views_file+'.rb')
+      require views_file
+    else
+      msg = "[WARN] Can't find or require #{view.inspect} view."
+      msg << " Did you install it in `~/.assert/views`?" if !view.match(/\A\//)
+      warn msg
+    end
+  end
+
+end

data/lib/assert/view/base.rb

@@ -1,38 +1,29 @@
 require 'assert/result'
-require 'assert/options'
 
 module Assert::View
 
   class Base
 
-    # setup some default options for all views
-
-    include Assert::Options
-    options do
-      default_pass_abbrev   '.'
-      default_fail_abbrev   'F'
-      default_ignore_abbrev 'I'
-      default_skip_abbrev   'S'
-      default_error_abbrev  'E'
-    end
-
     # include a bunch of common helper methods
 
     require 'assert/view/helpers/common'
     include Helpers::Common
 
-    attr_accessor :suite, :output_io
+    # setup options and their default values
 
-    def initialize(output_io, suite=Assert.suite)
-      @output_io = output_io
-      @suite     = suite
+    option 'pass_abbrev',   '.'
+    option 'fail_abbrev',   'F'
+    option 'ignore_abbrev', 'I'
+    option 'skip_abbrev',   'S'
+    option 'error_abbrev',  'E'
 
-      if @output_io.respond_to?(:sync=)
-        @output_io.sync = true
-      end
+    def initialize(output_io, suite=nil)
+      @output_io, @suite = output_io, suite
+      @output_io.sync = true if @output_io.respond_to?(:sync=)
     end
 
     def view; self; end
+    def suite; @suite || Assert.suite; end
 
     def fire(callback, *args)
       self.send(callback, *args)

data/lib/assert/view/default_view.rb

@@ -6,19 +6,23 @@ module Assert::View
   # designed for terminal viewing.
 
   class DefaultView < Base
-    require 'assert/view/helpers/capture_output'
-    include Helpers::CaptureOutput
-
     require 'assert/view/helpers/ansi_styles'
     include Helpers::AnsiStyles
 
-    options do
-      styled         true
-      pass_styles    :green
-      fail_styles    :red, :bold
-      error_styles   :yellow, :bold
-      skip_styles    :cyan
-      ignore_styles  :magenta
+    # setup options and their default values
+
+    option 'styled',        true
+    option 'pass_styles',   :green
+    option 'fail_styles',   :red, :bold
+    option 'error_styles',  :yellow, :bold
+    option 'skip_styles',   :cyan
+    option 'ignore_styles', :magenta
+
+    def before_load(test_files)
+      if Assert.config.debug
+        puts "Loading test files:"
+        test_files.each{ |f| puts "  #{f}" }
+      end
     end
 
     def after_load
@@ -32,7 +36,7 @@ module Assert::View
     end
 
     def on_result(result)
-      result_abbrev = options.send("#{result.to_sym}_abbrev")
+      result_abbrev = self.send("#{result.to_sym}_abbrev")
       styled_abbrev = ansi_styled_msg(result_abbrev, result_ansi_styles(result))
 
       print styled_abbrev
@@ -55,6 +59,7 @@ module Assert::View
             output = details.output
             puts captured_output(output) if output && !output.empty?
 
+            # add an empty line between each result detail
             puts
           end
         end

data/lib/assert/view/helpers/ansi_styles.rb

@@ -5,7 +5,7 @@ module Assert::View::Helpers
   module AnsiStyles
 
     def result_ansi_styles(result)
-      view.options.styled ? view.options.send("#{result.to_sym}_styles") : []
+      view.styled ? view.send("#{result.to_sym}_styles") : []
     end
 
     def ansi_styled_msg(msg, styles=[])

data/lib/assert/view/helpers/common.rb

@@ -1,18 +1,10 @@
 module Assert::View::Helpers
 
-  class ResultDetails
-
-    attr_reader :result, :test_index, :test, :output
+  module Common
 
-    def initialize(result, test, test_index)
-      @result = result
-      @test = test
-      @test_index = test_index
-      @output = test.output
+    def self.included(receiver)
+      receiver.class_eval{ extend ClassMethods }
     end
-  end
-
-  module Common
 
     # get the formatted suite run time
     def run_time(format='%.6f')
@@ -20,7 +12,7 @@ module Assert::View::Helpers
     end
 
     def runner_seed
-      self.suite.runner_seed
+      Assert.config.runner_seed
     end
 
     def count(type)
@@ -63,11 +55,10 @@ module Assert::View::Helpers
       tests.collect do |test|
         test_index += 1
 
-        details = test.results.
-          collect { |result| ResultDetails.new(result, test, test_index) }
-
+        details = test.results.collect do |result|
+          ResultDetails.new(result, test, test_index)
+        end
         details.reverse! if result_order == :reversed
-
         details
       end.compact.flatten
     end
@@ -95,6 +86,13 @@ module Assert::View::Helpers
       ([:skip, :ignore].include?(result.to_sym) && result.message)
     end
 
+    # show any captured output
+    def captured_output(output)
+      "--- stdout ---\n"\
+      "#{output}"\
+      "--------------"
+    end
+
     # return a list of result symbols that have actually occurred
     def ocurring_result_types
       @result_types ||= [
@@ -149,6 +147,29 @@ module Assert::View::Helpers
       end
     end
 
+    class ResultDetails
+      attr_reader :result, :test_index, :test, :output
+
+      def initialize(result, test, test_index)
+        @result = result
+        @test = test
+        @test_index = test_index
+        @output = test.output
+      end
+    end
+
+    module ClassMethods
+      def option(name, *default_vals)
+        default = default_vals.size > 1 ? default_vals : default_vals.first
+        define_method(name) do |*args|
+          if !(value = args.size > 1 ? args : args.first).nil?
+            instance_variable_set("@#{name}", value)
+          end
+          (val = instance_variable_get("@#{name}")).nil? ? default : val
+        end
+      end
+    end
+
   end
 
 end

data/test/assert_test.rb

@@ -1,30 +1,45 @@
 require 'assert'
-
-require 'assert/options'
 require 'assert/view/default_view'
 require 'assert/runner'
 require 'assert/suite'
 
 module Assert
-  class AssertOptionsTest < Assert::Context
-    desc "options for Assert"
-    subject { Assert.options }
 
-    should "be an Options::Base object" do
-      assert_kind_of Assert::Options::Base, subject
-    end
+  class BaseTests < Assert::Context
+    desc "the Assert module"
+    subject { Assert }
+
+    should have_imeths :view, :suite, :runner, :config, :configure, :init
 
-    should "default the view option" do
-      assert_kind_of Assert::View::DefaultView, subject.default_view
+    should "know its config singleton" do
+      assert_same Config, subject.config
     end
 
-    should "default the suite option" do
-      assert_kind_of Assert::Suite, subject.default_suite
+    should "map its view, suite and runner to its config" do
+      assert_same subject.config.view,   subject.view
+      assert_same subject.config.suite,  subject.suite
+      assert_same subject.config.runner, subject.runner
     end
 
-    should "default the runner option" do
-      assert_equal Assert::Runner, subject.default_runner
+    # Note: don't really need to explicitly test the configure/init meths
+    # nothing runs as expected if they aren't working
+
+  end
+
+  class ConfigTests < Assert::Context
+    desc "the Assert Config singleton"
+    subject { Config }
+
+    should have_imeths :suite, :view, :runner, :test_dir, :test_helper
+    should have_imeths :runner_seed, :show_output, :halt_on_fail, :debug
+    should have_imeths :apply
+
+    should "default the view, suite, and runner" do
+      assert_kind_of Assert::View::DefaultView, subject.view
+      assert_kind_of Assert::Suite,  subject.suite
+      assert_kind_of Assert::Runner, subject.runner
     end
 
   end
+
 end

data/test/context/class_methods_test.rb

@@ -6,13 +6,13 @@ class Assert::Context
     desc "Assert context class"
     setup do
       @orig_assert_suite = Assert.suite
-      Assert.options.suite TEST_ASSERT_SUITE
+      Assert.config.suite TEST_ASSERT_SUITE
       @test = Factory.test
       @context_class = @test.context_class
     end
     teardown do
       TEST_ASSERT_SUITE.tests.clear
-      Assert.options.suite @orig_assert_suite
+      Assert.config.suite @orig_assert_suite
     end
     subject{ @context_class }
 

data/test/context_test.rb

@@ -91,37 +91,37 @@ class Assert::Context
 
 
 
-  class FailTests < BasicTest
-    desc "fail method"
+  class FlunkTests < BasicTest
+    desc "flunk method"
     setup do
-      @result = @context.fail
+      @flunk_msg = "It flunked."
+      @result = @context.flunk(@flunk_msg)
     end
     subject{ @result }
 
     should "create a fail result" do
       assert_kind_of Assert::Result::Fail, subject
     end
-    should "set the calling backtrace on the result" do
-      assert_kind_of Array, subject.backtrace
-      assert_equal Factory.context_info_called_from, subject.trace
+    should "set the message passed to it on the result" do
+      assert_equal @flunk_msg, subject.message
     end
+
   end
 
-  class FlunkTest < BasicTest
-    desc "flunk method"
+  class FailTests < BasicTest
+    desc "fail method"
     setup do
-      @flunk_msg = "It flunked."
-      @result = @context.flunk(@flunk_msg)
+      @result = @context.fail
     end
     subject{ @result }
 
     should "create a fail result" do
       assert_kind_of Assert::Result::Fail, subject
     end
-    should "set the message passed to it on the result" do
-      assert_equal @flunk_msg, subject.message
+    should "set the calling backtrace on the result" do
+      assert_kind_of Array, subject.backtrace
+      assert_equal Factory.context_info_called_from, subject.trace
     end
-
   end
 
   class StringMessageTests < FailTests
@@ -150,57 +150,35 @@ class Assert::Context
 
   end
 
-
-
-
-
-
-  class SaveRestoreHaltOnFailTests < BasicTest
-    desc "when not halting on fails"
+  class HaltOnFailTests < FailTests
+    desc "when halting on fails"
     setup do
-      @prev_halt_option = Assert::Test.options.halt_on_fail
-      @prev_halt_envvar = ENV['halt_on_fail']
+      @orig_halt_fail = Assert.config.halt_on_fail
+      @fail_msg = "something failed"
     end
     teardown do
-      Assert::Test.options.halt_on_fail @prev_halt_option
-      ENV['halt_on_fail'] = @prev_halt_envvar
-    end
-  end
-
-  class HaltOnFailTests < SaveRestoreHaltOnFailTests
-    setup do
-      ENV['halt_on_fail'] = 'true'
-      Assert::Test.options.halt_on_fail true
+      Assert.config.halt_on_fail @orig_halt_fail
     end
-  end
+    subject{ @result }
 
-  class HaltFailTests < HaltOnFailTests
-    desc "fail method"
-    setup do
-      @fail_msg = "something failed"
-      begin
+    should "raise an exception with the failure's message" do
+      Assert.config.halt_on_fail true
+      err = begin
         @context.fail @fail_msg
-      rescue Exception => @exception
+      rescue Exception => exception
+        exception
       end
-      @result = Assert::Result::Fail.new(Factory.test("something"), @exception)
-    end
-    subject{ @result }
+      assert_kind_of Assert::Result::TestFailure, err
+      assert_equal @fail_msg, err.message
 
-    should "raise a test failure exception when called" do
-      assert_kind_of Assert::Result::TestFailure, @exception
-    end
-    should "raise the exception with the message passed to it" do
-      assert_equal @fail_msg, @exception.message
-    end
-    should "set the message passed to it on the result" do
-      assert_equal @fail_msg, subject.message
+      result = Assert::Result::Fail.new(Factory.test("something"), err)
+      assert_equal @fail_msg, result.message
     end
 
   end
 
 
 
-
   class AssertTest < BasicTest
     desc "assert method"
     setup do

data/test/helper.rb

@@ -27,8 +27,10 @@ end
 # anywhere we test halt on fail behavior, we take care of it in the specific context
 class Assert::Context
   def setup
-    ENV['halt_on_fail'] = 'false'
-    Assert::Test.options.halt_on_fail false
+    Assert.config.halt_on_fail false
+    # Note: don't mess with `Assert.config.output` in this setup block - it will
+    # break the capture output tests.  If you really need to set it one way or
+    # another, do it in the `.assert.rb` local settings file.
   end
 end
 

data/test/runner_test.rb

@@ -10,14 +10,15 @@ class Assert::Runner
     desc "a basic runner"
     setup do
       @suite  = Assert::Suite.new
-      @view   = Assert::View::Base.new(@suite, StringIO.new("", "w+"))
+      @view   = Assert::View::Base.new(StringIO.new("", "w+"), @suite)
+      @runner = Assert::Runner.new
     end
-    subject { Assert::Runner.new(@suite, @view) }
+    subject { @runner }
 
-    should have_instance_methods :run, :count
+    should have_instance_methods :run
 
     should "return an integer exit code" do
-      assert_equal 0, subject.run
+      assert_equal 0, subject.run(@suite, @view)
     end
 
   end