speckle 0.1.14 → 0.1.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmEwMDlhYjVmMzYyMmI3NThhNGU3NzRiYjA5ZDM3ZmE2NDU5ZTIwYQ==
+    NmU1MWRkNzE3NzIxM2Q2ZGQyZWFmYzQ5ODM5YzgxY2RmMjk3YmY5Yg==
   data.tar.gz: !binary |-
-    NjQ4OTFjNDU1MGI3OWU0N2I1NGI4ODc3NDBmZmZkMTYyYmM3OGNiNA==
+    OGUzYzcyZWU0MWViNTQyNjQyNWFmZmU3NWJkNWI0MGNiODUxNDNmNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjU3NWJjZjE3NmY5MWMzNGYwYTJjNGEzOTU0ZDgzNWM3OGZiZjEzYjY3MGU0
-    MjBmYjFmMTgyOWM1YjQxNTIzNDM5ZTE0MjU0N2I2ZWEwMjUwYTdhNjk4MzQz
-    ZGY1MDY1ZGJlOTJiMTNjMWQ5M2FkOTlkZTBkNDA2ZjM3MmNkNTU=
+    MDcwOGMxZGQ1YzIwOTIxOGE2NWMxMmU1ODRkOGZkN2JiYTlkYTY4OWQxNTI1
+    ZWI1YWE3NjE4ZTJiMTVkN2YzNjU2YjhjODIwNTQ3MDIxZmI4NTg3ZGI2ODIw
+    ZDBjMjEyYWY4ODQwMWNmMmY3ZjFiNDM3N2Q3NTVlNDc2YzA3NDE=
   data.tar.gz: !binary |-
-    NTMzYzdkNmJhZjNjNjdjN2I0NmZlMWVkNjY3NGU3MzgxNmYxMTkwNzg3MjFk
-    YWM0ZDk5NmEzNjBkMjg0MmEwNWZkOGI1MWIzMTkyODg1MWI4ODA5YTI3YTFi
-    YTg0ZDI0N2FkODlkZmRiNzk0ZWJhMmVjMGIyMzVkZmVlYTk0NzQ=
+    NjYyMjk0MDI4MzM3MzlkMWFlZmIyZmU1YzhiNGI2YTgzZTNiMDg1NDgzMDk3
+    Mzk0MmRlYTY1OTBjMmNiOWNjZDJiYTQyM2E2MTdlNzMxZDA3MzMzYjIzZjc1
+    YTEwNzVhNzI0MjVmMzQ2ZmJhNzEwM2I0MDhjNzQ3OTZlMmQyNDU=

data/lib/reporters/base_reporter.riml

@@ -152,5 +152,20 @@ class BaseReporter
   defm write_log_line(line)
     self.writer.writeln("log: #{line}")
   end
+
+  " stacktrack "
+  defm print_stacktrace(err)
+    if has_key(err, 'is_vim_error')
+      lines = err.get_stacktrace()
+
+      for line in lines
+        self.write_stacktrace_line(line)
+      end
+    end
+  end
+
+  defm write_stacktrace_line(line)
+    self.writer.writeln(line)
+  end
 end
 

data/lib/reporters/dotmatrix_reporter.riml

@@ -28,7 +28,10 @@ class DotMatrixReporter < BaseReporter
     name = meta.get_sentence()
     context = meta.get_context()
     add(self.line_buffer, self.to_red("#{context} ##{name}"))
-    add(self.line_buffer, self.to_red("    #{err}"))
+    add(self.line_buffer, self.to_red("    #{err.get_message()}"))
+    
+    self.print_stacktrace(err)
+
     add(self.line_buffer, '')
   end
 
@@ -47,4 +50,8 @@ class DotMatrixReporter < BaseReporter
     self.writer.writeln("")
   end
 
+  defm write_stacktrace_line(line)
+    add(self.line_buffer, "       #{line}")
+  end
+
 end

data/lib/reporters/min_reporter.riml

@@ -3,7 +3,8 @@ class MinReporter < BaseReporter
   defm on_spec_failure(meta, err, stats)
     name = meta.get_sentence()
     context = meta.get_context()
-    self.writer.writeln(self.to_red("#{context} ##{name} - #{err}"))
+    self.writer.writeln(self.to_red("#{context} ##{name} - #{err.get_message()}"))
+    self.print_stacktrace(err)
   end
   
   defm on_spec_error(meta, err, stats)
@@ -14,5 +15,9 @@ class MinReporter < BaseReporter
     self.flush_log_buffer()
     super()
   end
+
+  defm write_stacktrace_line(line)
+    self.writer.writeln("  #{line}")
+  end
   
 end

data/lib/reporters/spec_reporter.riml

@@ -34,7 +34,12 @@ class SpecReporter < BaseReporter
   defm on_spec_failure(meta, err, stats)
     self.write("#{self.get_cross()} #{self.to_red(meta.get_sentence())}")
     self.indent(2)
-    self.write(self.to_red(err))
+    self.write(self.to_red(err.get_message()))
+
+    self.indent(1)
+    self.print_stacktrace(err)
+    self.unindent(1)
+
     self.flush_log_buffer()
     self.unindent(2)
   end
@@ -63,5 +68,9 @@ class SpecReporter < BaseReporter
   defm write_log_line(line)
     self.write("log: #{line}")
   end
+  
+  defm write_stacktrace_line(line)
+    self.write(line)
+  end
 
 end

data/lib/reporters/tap_reporter.riml

@@ -19,15 +19,13 @@ class TAPReporter < BaseReporter
   defm on_spec_failure(meta, err, stats)
     name = meta.get_sentence()
     preamble = self.get_preamble('not ok', stats.get_count(), meta.get_context())
-    self.writer.writeln("#{preamble} ##{name} - #{err}")
+    self.writer.writeln("#{preamble} ##{name} - #{err.get_message()}")
+    self.print_stacktrace(err)
     self.flush_log_buffer()
   end
 
   defm on_spec_error(meta, err, stats)
-    name = meta.get_sentence()
-    preamble = self.get_preamble('not ok', stats.get_count(), meta.get_context())
-    self.writer.writeln("#{preamble} ##{name} - #{err}")
-    self.flush_log_buffer()
+    self.on_spec_failure(meta, err, stats)
   end
 
   defm on_spec_pending(meta, stats)
@@ -37,4 +35,8 @@ class TAPReporter < BaseReporter
     msg = "#{status} #{count} - #{context}"
     return msg
   end
+
+  defm write_stacktrace_line(line)
+    self.writer.writeln("  #{line}")
+  end
 end

data/lib/runners/spec_runner.riml

@@ -53,21 +53,25 @@ class SpecRunner
         catch /Unknown function.*expect/
           did_fail = true
           stats.inc_failures()
-          exception = 'DSLError: expect() not found, dsl.riml may not be included'
-          reporter.on_spec_failure(meta, exception, stats)
+          error = new DSLError('expect() not found, dsl.riml may not be included')
+          reporter.on_spec_failure(meta, error, stats)
         catch /Unknown function.*define_matcher/
           did_fail = true
           stats.inc_failures()
-          exception = 'DSLError: define_matcher() not found, dsl.riml may not be included'
-          reporter.on_spec_failure(meta, exception, stats)
+          error = new DSLError('define_matcher() not found, dsl.riml may not be included')
+          reporter.on_spec_failure(meta, error, stats)
         catch /^AssertionError/
           did_fail = true
           stats.inc_failures()
-          reporter.on_spec_failure(meta, v:exception, stats)
+
+          " exeption carries the assertion failure message "
+          error = new AssertionError(v:exception)
+          reporter.on_spec_failure(meta, error, stats)
         catch /.*/
           did_fail = true
           stats.inc_errors()
-          reporter.on_spec_error(meta, v:exception, stats)
+          error = new VimError(v:exception)
+          reporter.on_spec_error(meta, error, stats)
         end
 
         reporter.on_spec_end(meta, stats)
@@ -114,3 +118,52 @@ class SpecRunner
   end
 
 end
+
+class SpecError
+  def initialize(message)
+    self.is_spec_error = true
+    self.message = message
+
+    self.exception = v:exception
+    self.throwpoint = v:throwpoint
+  end
+
+  defm get_message()
+    return self.message
+  end
+
+  defm get_stacktrace()
+    unless has_key(self, 'stacktrace')
+      self.build_stacktrace()
+    end
+
+    return self.stacktrace
+  end
+
+  defm build_stacktrace()
+    str = substitute(self.throwpoint, '\v(function )', '', '')
+    self.stacktrace = split(str, '\.\.')
+    self.stacktrace = map(self.stacktrace, '"at " . v:val')
+  end
+end
+
+class DSLError < SpecError
+  def initialize(message)
+    super(message)
+    self.is_dsl_error = true
+  end
+end
+
+class AssertionError < SpecError
+  def initialize(message)
+    super(message)
+    self.is_assertion_error = true
+  end
+end
+
+class VimError < SpecError
+  def initialize(message)
+    super(message)
+    self.is_vim_error = true
+  end
+end

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/spec/stacktrace_spec.riml

@@ -0,0 +1,15 @@
+riml_include 'dsl.riml'
+
+class StacktraceSpec
+  defm describe
+    return 'StacktraceSpec'
+  end
+
+  defm it_can_display_stacktrace_stacktrace
+    unless exists('g:speckle_tag') && g:speckle_tag == 'stacktrace'
+      return
+    end
+
+    some_unknown_function('a')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: speckle
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Darshan Sawardekar
@@ -183,6 +183,7 @@ files:
 - spec/speckle/list/file_content_filter_spec.rb
 - spec/speckle/list/pattern_filter_spec.rb
 - spec/speckle_mode_spec.riml
+- spec/stacktrace_spec.riml
 - spec/tagged_spec.riml
 - speckle.gemspec
 homepage: http://github.com/dsawardekar/speckle
@@ -235,4 +236,5 @@ test_files:
 - spec/speckle/list/file_content_filter_spec.rb
 - spec/speckle/list/pattern_filter_spec.rb
 - spec/speckle_mode_spec.riml
+- spec/stacktrace_spec.riml
 - spec/tagged_spec.riml