speckle 0.1.16 → 0.1.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjYyNmMzN2NkYzljNmIzMGFmZDExYjY5MTc0Mzg5M2M0NDIyMWZkMg==
+    M2M1N2NiYTNlMDU4MmJlOWY0MjI0NzEwNjJiN2M3MWEwY2QwN2ViYg==
   data.tar.gz: !binary |-
-    ZDdmZThhY2RmOTE3ODU5NDI0OTcwNzNmZGZkZDEzMjM1ZWJiOGZkYg==
+    MTEwMjU5OTQzYWEyMDdjZDVlOTViZDdmZGQ4ODZjNTExODdmMDU0NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjViNjUzOGMyODJkOGJlOTQ4NDRmZjM4YzE0Mzc3NmI4YmEwNmFhMjU3OTY5
-    OTE2ZjZhOGVkNTRiNTVkYTQ1ZjZlMTk5MWRmNmI3OGIwODc3MWI3OGUwZDcw
-    NjdlMWYwMzMwODRhN2Y3ODBkODYzYjhmYjYyODViOGJjMmMzYzk=
+    OTM2MzdlMTE1YTUwZDliMTE1MjhhNGRhZjc0MDg1OTk4NTE5MjUyZjc5MzE1
+    MWNmMThlNzY5NDhkOTE4ZGZkMDkzOTFmYzgxMDI1YjEzMDQ3MDcxMWVmMGZl
+    MGZlMWJkYjRmNGFlMDc2Yjc5ZWRmOGMwZGQ4MGZhNTMzZTEwZTM=
   data.tar.gz: !binary |-
-    YWMwM2JiNGExNmZjMmZlMWUzMDcwOTVjZjA3ZWM2ZTU0NjdjNmQ0Njg5YzQ1
-    YjY1YjU0MDUxNjNmNTEyYTQ5Mjc4ZjMyMjYwNjllZDU0OTc3NjZjMzYxMTJk
-    MzliNWI2YzEwM2I3NTE5NmVhMGY4OThlOGI0NDRhMjhkNWUyOTY=
+    YWFjZjI4MmIyN2JkZDBmM2U2MDg3ZWRjODM4MWJiYjJkNWRlZWM5ZTY5N2Mz
+    OTEzZDVjMjgyMDA3MDgyMzNkODE3YjM2MTRlYzc5NTFhMTQwODZmOGVhMDA5
+    Mzg5Y2YxOTZmZjNmYWM3NmM2ZjcyODI2NjE0MGE3NjJiMTNhNDA=

data/lib/matchers/length_matcher.riml

@@ -5,10 +5,10 @@ class LengthMatcher
   end
 
   defm failure_message_for_match(expected, actual)
-    return "expected length of “#{actual}” to be “#{expected}”, but was #{self.result}"
+    return "expected length of “#{string(actual)}” to be “#{expected}”, but was #{self.result}"
   end
 
   defm failure_message_for_mismatch(expected, actual)
-    return "expected length of “#{actual}” to not be “#{expected}”, but was #{self.result}"
+    return "expected length of “#{string(actual)}” to not be “#{expected}”, but was #{self.result}"
   end
 end

data/lib/reporters/fivemat_reporter.riml

@@ -0,0 +1,122 @@
+class FivematReporter < BaseReporter
+
+  def initialize()
+    super()
+    self.indents = 0
+    self.log_buffer = []
+    self.current_index = 0
+    self.error_buffer = []
+  end
+
+  defm writeln(msg)
+    line = "#{self.indent_to_str()}#{msg}"
+    self.writer.writeln(line)
+  end
+
+  defm write(msg)
+    line = "#{self.indent_to_str()}#{msg}"
+    self.writer.write(line)
+  end
+
+  defm write_errorln(msg)
+    add(self.error_buffer, self.indent_to_str() . msg)
+  end
+
+  defm has_error_lines
+    return len(self.error_buffer) > 0
+  end
+
+  defm flush_error_buffer
+    if self.has_error_lines()
+      for line in self.error_buffer
+        self.writeln(line)
+      end
+
+      self.error_buffer = []
+    end
+  end
+
+  defm on_start(stats)
+  end
+
+  defm on_context_start(context, stats)
+    self.current_index = 0
+    self.write("#{context} ")
+  end
+
+  defm on_context_end(context, stats)
+    self.writeln('')
+    self.flush_error_buffer()
+  end
+
+  defm on_spec_pass(meta, stats)
+    duration_msg = self.get_duration_msg(meta)
+    self.write('.')
+    self.flush_log_buffer()
+  end
+
+  defm show_error(type, meta, err, stats)
+    char = type[0]
+    self.write(self.to_red(char))
+
+    self.indent(1)
+
+    self.write_errorln("#{self.current_index}) #{type}: #{meta.get_sentence()}")
+
+    self.indent(1)
+    self.write_errorln(" ". self.to_red(err.get_message()))
+    self.indent(1)
+    self.print_stacktrace(err)
+    self.flush_log_buffer()
+    self.unindent(3)
+    self.write_errorln('')
+  end
+
+  defm on_spec_failure(meta, err, stats)
+    self.current_index += 1
+    self.show_error('Failure', meta, err, stats)
+  end
+
+  defm on_spec_error(meta, err, stats)
+    self.current_index += 1
+    self.show_error('Error', meta, err, stats)
+  end
+
+  defm indent_to_str()
+    return repeat("  ", self.indents)
+  end
+
+  defm indent(size)
+    self.indents += size
+  end
+
+  defm unindent(size)
+    self.indents -= size
+  end
+
+  defm write_epilogue_separator()
+    self.writer.writeln('')
+    super()
+  end
+
+  defm write_log_line(line)
+    self.write_errorln(" log: #{line}")
+  end
+  
+  defm write_stacktrace_line(line)
+    self.write_errorln(" " . line)
+  end
+
+  defm flush_log_buffer
+    if self.has_logs()
+      self.write_errorln('')
+
+      for line in self.log_buffer
+        self.write_log_line(line)
+      end
+
+      self.log_buffer = []
+    end
+  end
+
+end

data/lib/reporters/reporter_factory.riml

@@ -8,6 +8,8 @@ class ReporterFactory
       return new TAPReporter()
     elseif reporter_name == 'dot'
       return new DotMatrixReporter()
+    elseif reporter_name == 'fivemat'
+      return new FivematReporter()
     else
       return new SpecReporter()
     end

data/lib/runners/spec_runner.riml

@@ -25,7 +25,13 @@ class SpecRunner
     did_fail = false
     context = self.call_hook('describe')
     reporter.on_context_start(context, stats)
-    self.call_hook('before')
+
+    try
+      self.call_hook('before')
+    catch /.*/
+      self.report_hook_error('before', context, reporter, stats)
+      self.stopped = true
+    end
 
     for method in keys(spec)
       if self.stopped
@@ -42,7 +48,7 @@ class SpecRunner
         try
           self.call_hook('before_each')
           timer.start()
-          eval("spec.#{method}()")
+          res = call(self.spec[method], [], self.spec)
           timer.stop()
           self.call_hook('after_each')
 
@@ -84,14 +90,30 @@ class SpecRunner
       end
     end
 
-    self.call_hook('after')
+    try
+      unless self.stopped
+        self.call_hook('after')
+      end
+    catch /.*/
+      self.report_hook_error('after', context, reporter, stats)
+    end
+
     reporter.on_context_end(context, stats)
   end
 
+  defm report_hook_error(hook, context, reporter, stats)
+    meta = new SpecMeta(context, hook)
+
+    reporter.on_spec_start(meta, stats)
+
+    stats.inc_errors()
+    error = new VimError(v:exception)
+    reporter.on_spec_error(meta, error, stats)
+  end
+
   defm call_hook(hook)
-    spec = self.spec
-    if has_key(spec, hook)
-      return eval("spec.#{hook}()");
+    if has_key(self.spec, hook)
+      return call(self.spec[hook], [], self.spec)
     else
       return "Undefined hook: #{hook}"
     end
@@ -105,7 +127,7 @@ class SpecRunner
     return method =~ '^it'
   end
 
-  defm is_method_tagged(method)
+  defm is_tagged(method)
     return method =~ "_#{self.tag}$"
   end
 
@@ -113,7 +135,7 @@ class SpecRunner
     if self.tag == ''
       return self.is_test_method(method)
     else
-      return self.is_test_method(method) && self.is_method_tagged(method)
+      return self.is_test_method(method) && self.is_tagged(method)
     end
   end
 

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/lib/speckle.riml

@@ -37,6 +37,7 @@ riml_include 'spec_reporter.riml'
 riml_include 'min_reporter.riml'
 riml_include 'tap_reporter.riml'
 riml_include 'dotmatrix_reporter.riml'
+riml_include 'fivemat_reporter.riml'
 riml_include 'reporter_factory.riml'
 
 "" runners
@@ -138,7 +139,7 @@ class g:Speckle
 
     functions = ''
     :redir => functions
-    :silent function /SpecConstructor$/
+    :silent function /Spec\(_.*Constructor\|Constructor\)$/
     :redir END
 
     self.add_specs(runner, functions)

data/spec_errors/hook_errors_spec.riml

@@ -0,0 +1,54 @@
+riml_include 'dsl.riml'
+
+class BeforeErrorHookSpec_err
+  defm describe
+    return 'BeforeErrorHookSpec'
+  end
+
+  defm before
+    a = c
+  end
+
+end
+
+class BeforeEachHookSpec_err
+  defm describe
+    return 'Before_each hooks'
+  end
+
+  defm before_each
+    a = b
+  end
+
+  defm it_has_stuff_from_before_each
+    expect(self.stuff).to_equal('foo')
+  end
+
+end
+
+class AfterErrorHookSpec_err
+  defm describe
+    return 'AfterErrorHookSpec'
+  end
+
+  defm after
+    a = b
+  end
+
+end
+
+class AfterEachHookSpec_err
+  defm describe
+    return 'Before_each hooks'
+  end
+
+  defm after_each
+    a = b
+  end
+
+  defm it_has_stuff_from_before_each
+    expect(self.stuff).to_equal('foo')
+  end
+
+end
+

data/spec_errors/various_errors_spec.riml

@@ -0,0 +1,29 @@
+riml_include 'dsl.riml'
+
+class VariousErrorsSpec
+
+  defm describe
+    return 'VariousErrorsSpec'
+  end
+
+  defm it_has_unknown_variable
+    get_logger().info('unknown variable')
+    a = b
+  end
+
+  defm it_has_custom_throw
+    get_logger().info('custom throw')
+    throw 'some error'
+  end
+
+  defm it_has_unknown_function
+    get_logger().error('unknown_function')
+    CallFooFunction()
+  end
+
+  defm it_has_assertion_error
+    get_logger().info('regular assertion')
+    expect(true).to_be_false()
+  end
+
+end

data/speckle.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_dependency 'riml', '~> 0.3.0'
+  s.add_dependency 'riml', '~> 0.3.1'
   s.add_dependency 'rake', '~> 10.1.0'
   s.add_dependency 'bundler', '~> 1.3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speckle
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Darshan Sawardekar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riml
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ files:
 - lib/matchers/within_matcher.riml
 - lib/reporters/base_reporter.riml
 - lib/reporters/dotmatrix_reporter.riml
+- lib/reporters/fivemat_reporter.riml
 - lib/reporters/min_reporter.riml
 - lib/reporters/reporter_factory.riml
 - lib/reporters/spec_reporter.riml
@@ -185,6 +186,8 @@ files:
 - spec/speckle_mode_spec.riml
 - spec/stacktrace_spec.riml
 - spec/tagged_spec.riml
+- spec_errors/hook_errors_spec.riml
+- spec_errors/various_errors_spec.riml
 - speckle.gemspec
 homepage: http://github.com/dsawardekar/speckle
 licenses: