lookout 2.1.3 → 2.1.4

data/lib/lookout/expectation.rb

@@ -13,7 +13,7 @@ module Lookout::Expectation
   end
 
   def initialize(expected, file, line, &block)
-    @expected, @file, @line, @block = expected, file, line.to_i, block
+    @expected, @file, @line, @block = expected, file, line, block
   end
 
   def evaluate

data/lib/lookout/expectations.rb

@@ -7,6 +7,7 @@ class Lookout::Expectations
   def initialize(results = Lookout::Results::Unsuccessful.new, line = nil)
     @results, @line = results, line
     @previous = nil
+    @ran_previous = false
   end
 
   def mock
@@ -38,14 +39,16 @@ class Lookout::Expectations
   end
 
   def expect(expected, &block)
-    file, line = /\A(.*):(\d+)(?::in .*)?\z/.match(caller.first)[1..2]
-    expectation = Lookout::Expectation.on(expected, file, line, &block)
+    expectation = Lookout::Expectation.on(expected, *Lookout.location(caller.first), &block)
     if @line
-      if @previous and @previous.line <= @line and expectation.line > @line
-        @results << @previous.evaluate
-        @previous = nil
-      else
-        @previous = expectation
+      unless @ran_previous
+        if @previous and @previous.line <= @line and expectation.line > @line
+          @results << @previous.evaluate
+          @ran_previous = true
+          @previous = nil
+        else
+          @previous = expectation
+        end
       end
     else
       @results << expectation.evaluate

data/lib/lookout/runners/console.rb

@@ -25,7 +25,7 @@ class Lookout::Runners::Console
     raise
   rescue Exception => e
     raise unless location = Array(e.backtrace).first
-    file, line = /\A(.*):(\d+)(?::in .*)?\z/.match(location)[1..2]
+    file, line = Lookout.location(location)
     raise unless file and line
     @results << Lookout::Results::Error.new(file, line, nil, e)
   end

data/lib/lookout/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Lookout
-  Version = '2.1.3'
+  Version = '2.1.4'
 end

data/lib/lookout.rb

@@ -20,6 +20,11 @@ module Lookout
   autoload :XML, 'lookout/xml'
   
   class << self
+    def location(location)
+      return nil, nil unless match = /\A(.*):(\d+)(?::in .*)?\z/.match(location)
+      [match[1], match[2].to_i]
+    end
+
     def runner(runner = nil)
       return @runner = runner if runner
       @runner ||= Lookout::Runners::Console.new.install

data/test/unit/lookout.rb

@@ -4,4 +4,28 @@ Expectations do
   expect Lookout.runner.to.receive.expectations_eval do
     Expectations{ }
   end
+
+  expect [nil, nil] do
+    Lookout.location('abc')
+  end
+
+  expect ['abc.rb', 123] do
+    Lookout.location('abc.rb:123')
+  end
+
+  expect ['abc.rb', 123] do
+    Lookout.location('abc.rb:123:in def')
+  end
+
+  expect [String, Integer] do
+    Lookout.location(caller.first)
+  end
+
+  expect [__FILE__, __LINE__ + 2] do
+    begin
+      raise 'hell'
+    rescue => e
+      Lookout.location(e.backtrace.first)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lookout
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 2
   - 1
-  - 3
-  version: 2.1.3
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - Nikolai Weibull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 +02:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -411,8 +411,8 @@ files:
 - lib/lookout/aphonic.rb
 - lib/lookout/recorder.rb
 - lib/lookout/recorders.rb
-- lib/lookout/version.rb
 - lib/lookout/expectation.rb
+- lib/lookout/version.rb
 - lib/lookout/expectations.rb
 - lib/lookout/equalities/object.rb
 - lib/lookout/equalities/include.rb
@@ -431,7 +431,6 @@ files:
 - lib/lookout/result.rb
 - lib/lookout/equalities.rb
 - lib/lookout.rb
-- test/unit/lookout.rb
 - test/unit/lookout/diff.rb
 - test/unit/lookout/diff/algorithms/difflib.rb
 - test/unit/lookout/diff/algorithms/difflib/position.rb
@@ -469,6 +468,7 @@ files:
 - test/unit/lookout/results.rb
 - test/unit/lookout/expectations.rb
 - test/unit/examples.rb
+- test/unit/lookout.rb
 - README
 - Rakefile
 has_rdoc: true