kintama 0.1.3 → 0.1.5

data/lib/kintama.rb

@@ -1,3 +1,6 @@
+require "ostruct"
+require "optparse"
+
 module Kintama
   autoload :Runnable, 'kintama/runnable'
   autoload :Context, 'kintama/context'
@@ -59,12 +62,44 @@ module Kintama
       default_context.extend(mod)
     end
 
+    def options
+      unless @options
+        @options = OpenStruct.new(
+          :reporter => Kintama::Reporter.default,
+          :runner => Kintama::Runner.default
+        )
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: ruby <test_file> [options]"
+
+          opts.separator ""
+          opts.separator "Specific options:"
+
+          opts.on("-r", "--reporter NAME",
+                  "Use the given reporter (inline or verbose)") do |reporter|
+                  puts "reporter!"
+            options.reporter = Kintama::Reporter.called(reporter)
+            p options.reporter
+          end
+          opts.on("-l", "--line LINE",
+                  "Run the test or context on the given line") do |line|
+            options.runner = Kintama::Runner::Line.new(line)
+          end
+          opts.on_tail("-h", "--help", "Show this message") do
+            puts opts
+            exit
+          end
+        end
+        opts.parse!(ARGV)
+      end
+      @options
+    end
+
     # Adds the hook to automatically run all known tests using #run when
     # ruby exits; this is most useful when running a test file from the command
     # line or from within an editor
     def add_exit_hook
       return if @__added_exit_hook
-      at_exit { exit(Runner.from_args(ARGV, Kintama.default_context.subcontexts).run ? 0 : 1) }
+      at_exit { exit(options.runner.with(Kintama.default_context).run(options.reporter) ? 0 : 1) }
       @__added_exit_hook = true
     end
 

data/lib/kintama/context.rb

@@ -14,10 +14,10 @@ module Kintama
 
       # Create a new context. If this is called within a context, a new subcontext
       # will be created. Aliases are 'testcase' and 'describe'
-      def context(name, parent=self, &block)
+      def context(name=nil, parent=self, &block)
         c = Class.new(parent)
         c.send(:include, Kintama::Context)
-        c.name = name.to_s
+        c.name = name.to_s if name
         c.definition = caller.find { |line| line =~ /^#{block.__file__}:(\d+)$/ }
         c.class_eval(&block)
         c
@@ -84,7 +84,9 @@ module Kintama
 
       # Defines the subject of any matcher-based tests.
       def subject(&block)
-        define_method(:subject, &block)
+        define_method(:subject) do
+          @__subject ||= yield
+        end
       end
 
       # Define a test to run in this context.

data/lib/kintama/reporter.rb

@@ -5,6 +5,17 @@ module Kintama
       Verbose.new(colour=$stdin.tty?)
     end
 
+    def self.called(name)
+      case name.to_s
+      when /verbose/i
+        default
+      when /inline/i
+        Inline.new
+      else
+        default
+      end
+    end
+
     class Base
       attr_reader :runner
 
@@ -41,7 +52,6 @@ module Kintama
       end
 
       def show_results
-        puts
         puts test_summary
         puts "\n" + failure_messages.join("\n\n") if runner.failures.any?
       end
@@ -90,13 +100,17 @@ module Kintama
       end
 
       def context_started(context)
-        print indent + context.name + "\n" if context.name
-        @current_indent_level += 1
+        unless context == Kintama.default_context || context.name == nil
+          print indent + context.name + "\n" if context.name
+          @current_indent_level += 1
+        end
       end
 
       def context_finished(context)
-        @current_indent_level -= 1
-        puts if @current_indent_level == 0 && context != runner.runnables.last
+        unless context == Kintama.default_context || context.name == nil
+          @current_indent_level -= 1
+          puts if @current_indent_level == 0 && context != runner.runnables.last
+        end
       end
 
       def test_started(test)

data/lib/kintama/runner.rb

@@ -1,21 +1,23 @@
 module Kintama
   class Runner
-    def self.from_args(args, runnables)
-      if args[0] == "--line"
-        Kintama::Runner::Line.new(args[1], runnables)
-      else
-        Kintama::Runner::Default.new(runnables)
-      end
+
+    def self.default
+      Default.new
     end
 
     class Base
       attr_reader :runnables
 
-      def initialize(runnables)
+      def initialize
+        @runnables = []
+      end
+
+      def with(*runnables)
         @runnables = runnables
+        self
       end
 
-      def run(reporter=Kintama::Reporter.default, args=ARGV)
+      def run(reporter=Kintama::Reporter.default)
         reporter.started(self)
         @ran_runnables = run_tests(reporter)
         reporter.finished
@@ -48,8 +50,7 @@ module Kintama
 
     # Runs only the test or context which contains the provided line
     class Line < Base
-      def initialize(line, runnables)
-        super(runnables)
+      def initialize(line)
         @line = line.to_i
       end
 
@@ -65,11 +66,15 @@ module Kintama
             end
             heirarchy.each { |context| reporter.context_started(context) }
             runnable.parent.run_tests([runnable], false, reporter)
+            heirarchy.reverse.each { |context| reporter.context_finished(context) }
             [runnable.parent]
           else
             runnable.run(reporter)
             [runnable]
           end
+        else
+          puts "Nothing runnable found on line #{@line}"
+          exit -1
         end
       end
     end

data/test/line_based_running_test.rb

@@ -45,7 +45,7 @@ class LineBasedRunningTest < Test::Unit::TestCase
           end
         end
       end}
-    assert_match /#{passing("should run this test")}\n#{passing("should run this test too")}\n\n\n2 tests/, run_test(test_file, "--line 6")
+    assert_match /#{passing("should run this test")}\n#{passing("should run this test too")}\n\n2 tests/, run_test(test_file, "--line 6")
   end
 
   def test_should_be_able_to_run_a_test_defined_in_a_second_top_level_context
@@ -59,7 +59,7 @@ class LineBasedRunningTest < Test::Unit::TestCase
         should "run this test" do
         end
       end}
-    assert_match /#{passing("should run this test")}\n\n\n1 tests/, run_test(test_file, "--line 8")
+    assert_match /#{passing("should run this test")}\n\n1 tests/, run_test(test_file, "--line 8")
   end
 
   def test_should_print_out_the_full_nested_test_name
@@ -83,6 +83,28 @@ class LineBasedRunningTest < Test::Unit::TestCase
     assert_no_match /1 pending/, run_test(test_file, "--line 3")
   end
 
+  def test_should_be_able_to_target_a_top_level_context
+  def test_should_not_show_pending_tests_in_the_same_context_as_pending_when_not_targeted
+    test_file = %{
+      context "given a context with a pending test" do
+        should "run this" do
+        end
+        should "run this too" do
+        end
+      end}
+    assert_match /2 tests/, run_test(test_file, "--line 2")
+  end
+  end
+
+  def test_should_report_if_nothing_runnable_can_be_found_for_that_line
+    test_file = %{
+      context "given a short context" do
+        should "not run this" do
+        end
+      end}
+    assert_match /Nothing runnable found on line 1/, run_test(test_file, "--line 1")
+  end
+
   private
 
   def write_test(string, path)

data/test/matcher_test.rb

@@ -35,6 +35,21 @@ class MatcherTest < Test::Unit::TestCase
     assert_match /^Expected 456, but got 123/, c.failures.first.failure_message
   end
 
+  def test_should_use_a_single_instance_of_the_subject_within_a_test
+    c = context "x" do
+      subject { Array.new }
+      should "allow me to poke around with subject like it was a variable" do
+        subject << 1
+        assert_equal [1], subject
+      end
+      should "now be empty again" do
+        assert subject.empty?
+      end
+    end
+    c.run
+    assert c.passed?
+  end
+
   def test_should_allow_negation_of_matchers
     c = context "x" do
       subject { 123 }

data/test/reporters/base_reporter_test.rb

@@ -151,7 +151,7 @@ class BaseReporterTest < Test::Unit::TestCase
   private
 
   def runner(*args)
-    Kintama::Runner::Default.new(args)
+    Kintama::Runner::Default.new.with(*args)
   end
 
 end

data/test/reporters/inline_reporter_test.rb

@@ -63,6 +63,6 @@ class InlineReporterTest < Test::Unit::TestCase
   private
 
   def runner(*args)
-    Kintama::Runner::Default.new(args)
+    Kintama::Runner::Default.new.with(*args)
   end
 end

data/test/reporters/verbose_reporter_test.rb

@@ -98,6 +98,19 @@ class VerboseReporterTest < Test::Unit::TestCase
     end
   end
 
+  def test_should_treat_a_context_as_transparent_if_it_has_no_name
+    c1 = context "given something" do
+      context do
+        should "pass" do
+          assert true
+        end
+      end
+    end
+    assert_output(/^given something\n  should pass: \./) do
+      runner(c1).run(@reporter)
+    end
+  end
+
   def test_should_print_out_test_names_in_colour_if_colour_is_set
     c = context "given something" do
       should "be red" do
@@ -129,6 +142,6 @@ class VerboseReporterTest < Test::Unit::TestCase
   private
 
   def runner(*args)
-    Kintama::Runner::Default.new(args)
+    Kintama::Runner::Default.new.with(*args)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kintama
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 17
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - James Adam
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: It's for writing tests.