speckle 0.1.26 → 0.1.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjg4ZTg5NmMyMTIyNjIxY2Y2ZjZlMjNmNDU2MTE5ODYxZWFhMTM5MA==
+    MzQwM2I1M2QyNDM1ZWVhY2M4MGZiNzU5MGY0NmQyMzI3MjVhMDlmMQ==
   data.tar.gz: !binary |-
-    OGVkYzU5NjI0YTE0MDI2N2Q0N2FhZGY0YjE3MDY1ODg4MmE5NDUxYg==
+    OTNhMWFlZTY4NTBmNzJiMjI1OGI1OTdhYmNhYzU1NjVjZjY3OGU4OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTFjOTU2YmZjNmNhOTlhNTdjZjc4NTlkYjQwMjhmN2E2NjMwMWFmYjAxYTQ4
-    YWUzMWQ1ODdmNGRiNmNiMzU4ZmYyYWExMDNlOTQ2ZDU0MWU3OTMzNGZlOGNl
-    ZDA5MTgzYTAwY2RiODhlNWM1OTUwMGMzMTIxMWU4ZDNmMjYwMDQ=
+    OGFjNDRlMzI1YjVkY2E2MDJiNmU1MDE1ZTRhMDdiNjE5YTBhYmFhOTQ4MzA1
+    ZTcwMGNlZDY2ZGQ1NzBhZjU1YjNmYjVkZjkzM2YxZmM0OTVlOGFjZDU2ZGJk
+    YTFiN2FmYWExYTFjZWZjMGY5OWUyNGFkNzUyNGMxODg5ZGU3ZDk=
   data.tar.gz: !binary |-
-    NmI0YjQ1YjVkYzRiMTFiM2FiODE4ZWExZTI0NTk3NTExODM0ZTU3MDUwMDA2
-    ODE3MTdmYTY3Yjg1YzdmYzI0NjRiMjZhZmJlZTU4MTUzNThkNDZlYWIyZTY1
-    ODk2NmY1Y2IzZGM2MjllN2Q0MWI4Y2EyMTU5OWYzMDFjMWNlNmM=
+    MWNhNGRkZmEwNzM2NWJiOWQ0NTcxZjU5YTMyZjAxNzMxNDJkNGE1N2U3ZmZm
+    ZTYzM2FmZjllNTc1ZGJjNmI1MTIxMzExMWFiNDAwZGMzNDBjNTJlZTI5ZWI5
+    OGUyYTQzOWUzZWM2NjY1YmM4ZTNmYWM2OWI2NDBlMzM1Y2FkNTM=

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Changelog
+
+### 0.1.27
+
+* Fixes build_riml_path for empty directories.
+* Adds Ctrl-C support to halt riml compilation.

data/Rakefile

@@ -143,16 +143,19 @@ namespace :speckle do
     require 'riml'
 
     opts = get_riml_opts(libs, build_dir)
+    Riml::FileRollback.trap(:INT, :QUIT, :KILL) { $stderr.print("\n"); exit(1) }
     verbose true do
       #sh "bundle exec riml -c #{t} -I #{TEST_LIBS} -o #{BUILD_DIR}"
-      TEST_SOURCES.each do |t|
-        puts "Compiling: #{t} "
-        Riml.compile_files(t, opts)
-
-        spec_dir = "#{BUILD_DIR}/#{File.dirname(t)}"
-        verbose DEBUG do
-          mkdir_p "#{spec_dir}"
-          mv "#{BUILD_DIR}/#{File.basename(t).ext('vim')}", "#{spec_dir}"
+      Riml::FileRollback.guard do
+        TEST_SOURCES.each do |t|
+          puts "Compiling: #{t} "
+          Riml.compile_files(t, opts)
+
+          spec_dir = "#{BUILD_DIR}/#{File.dirname(t)}"
+          verbose DEBUG do
+            mkdir_p "#{spec_dir}"
+            mv "#{BUILD_DIR}/#{File.basename(t).ext('vim')}", "#{spec_dir}"
+          end
         end
       end
     end
@@ -221,13 +224,13 @@ namespace :speckle do
     begin
       verbose DEBUG do
         launch_file = get_launch_cmd_file()
-        File.delete(TEST_LOG) if File.exist?(TEST_LOG)
-        File.delete(TEST_EXIT_FILE) if File.exist?(TEST_EXIT_FILE)
-        File.delete(PROFILE_PATH) if File.exist?(PROFILE_PATH)
+        File.delete(TEST_LOG) if File.exists?(TEST_LOG)
+        File.delete(TEST_EXIT_FILE) if File.exists?(TEST_EXIT_FILE)
+        File.delete(PROFILE_PATH) if File.exists?(PROFILE_PATH)
 
         sh "#{TEST_VIM} #{get_vim_options()} -S #{launch_file.path}"
         launch_file.unlink
-        if File.exist?(TEST_EXIT_FILE)
+        if File.exists?(TEST_EXIT_FILE)
           sh "cat #{TEST_LOG}"
           if PROFILE
             puts ''

data/lib/dsl.riml

@@ -1,4 +1,4 @@
-if !exists("g:speckle_env")
+unless g:speckle_env?
   g:speckle_env = {}
   g:speckle_env.matchers = g:MatchersConstructor()
   g:speckle_env.assertions = 0
@@ -9,7 +9,7 @@ def expect(actual)
   env.actual = actual
   matchers = env.matchers
 
-  expectation = g:ExpectationConstructor(a:actual)
+  expectation = g:ExpectationConstructor(actual)
   expectation.load(matchers)
 
   return expectation
@@ -28,11 +28,11 @@ def define_matcher(ok_name, not_ok_name, matcher)
 end
 
 def get_logger()
-  unless exists('g:logger')
+  unless g:logger?
     g:logger = g:LoggerConstructor()
   end
 
   return g:logger
 end
 
-logger = get_logger()
+s:logger = get_logger()

data/lib/expectation.riml

@@ -13,7 +13,7 @@ class g:Expectation
     for match_item in match_items
       func_name = "g:Expectation_#{match_item.name}"
       matcher_func = <<EOS
-function! #{func_name}(...) dict  
+function! #{func_name}(...) dict
   if a:0 == 0
     let expected = 'null'
   else
@@ -22,10 +22,10 @@ function! #{func_name}(...) dict
 
   let matcher_name = '#{match_item.name}'
   let match_tester = g:MatchTesterConstructor()
-  call match_tester.test_from_env(matcher_name, expected)"
-endfunction"   
+  call match_tester.test_from_env(matcher_name, expected)
+endfunction
 EOS
-      :exe matcher_func
+      exec matcher_func
 
       self[match_item.name] = function(func_name)
     end

data/lib/logger/logger.riml

@@ -23,6 +23,30 @@ class Logger
     self.colors.off = 0
   end
 
+  defm debug(*args)
+    self.do_log(args, 'debug')
+  end
+
+  defm info(*args)
+    self.do_log(args, 'info')
+  end
+
+  defm log(*args)
+    self.do_log(args, 'info')
+  end
+
+  defm warn(*args)
+    self.do_log(args, 'warn')
+  end
+
+  defm error(*args)
+    self.do_log(args, 'error')
+  end
+
+  defm fatal(*args)
+    self.do_log(args, 'fatal')
+  end
+
   defm add_log_writer(log_writer)
     add(self.log_writers, log_writer)
   end
@@ -43,18 +67,20 @@ class Logger
     return self.get_level_num(level) >= self.get_level_num(self.level)
   end
 
-  defm do_log(args, level)
+  " private methods
+
+  def do_log(args, level)
     if self.is_loggable(level)
       msg = self.args_to_message(args)
       self.send_log(msg, level)
     end
   end
 
-  defm args_to_message(args)
+  def args_to_message(args)
     return join(args, ' ')
   end
 
-  defm send_log(msg, level)
+  def send_log(msg, level)
     color_msg = self.to_color(msg, level)
 
     for log_writer in self.log_writers
@@ -66,7 +92,7 @@ class Logger
     end
   end
 
-  defm to_color(msg, level)
+  def to_color(msg, level)
     color = self.colors[level]
     if color != 0
       return "[#{color}#{msg}"
@@ -75,39 +101,11 @@ class Logger
     end
   end
 
-  defm debug(...)
-    self.do_log(a:000, 'debug')
-  end
-
-  defm info(...)
-    self.do_log(a:000, 'info')
-  end
-
-  defm log(...)
-    self.do_log(a:000, 'info')
-  end
-
-  defm warn(...)
-    self.do_log(a:000, 'warn')
-  end
-
-  defm error(...)
-    self.do_log(a:000, 'error')
-  end
-
-  defm fatal(...)
-    self.do_log(a:000, 'fatal')
-  end
-
 end
 
 def get_logger()
-  unless exists('g:logger')
-    g:logger = new Logger()
-  end
-
+  g:logger = new Logger() unless g:logger?
   return g:logger
 end
 
-logger = get_logger()
-
+s:logger = get_logger()

data/lib/matchers/between_matcher.riml

@@ -1,19 +1,16 @@
 class BetweenMatcher
   defm match(bounds, actual)
-    min = bounds[0]
-    max = bounds[1]
+    [min, max] = bounds
     return actual >= min && actual <= max
   end
 
   defm failure_message_for_match(bounds, actual)
-    min = bounds[0]
-    max = bounds[1]
+    [min, max] = bounds
     return "expected “#{actual}” to be between “#{min} .. #{max}”"
   end
 
   defm failure_message_for_mismatch(bounds, actual)
-    min = bounds[0]
-    max = bounds[1]
+    [min, max] = bounds
     return "expected “#{actual}” to not be between “#{min} .. #{max}”"
   end
 end

data/lib/matchers/boolean_matcher.riml

@@ -1,6 +1,6 @@
 class BooleanMatcher
   defm match(expected, actual)
-    return actual == true
+    return actual === true
   end
 
   defm failure_message_for_match(expected, actual)

data/lib/matchers/equality_matcher.riml

@@ -47,23 +47,25 @@ class EqualityMatcher
     return "expected “#{actual_str}” to not equal “#{expected_str}”"
   end
 
-  defm type_mismatch_message(expected, actual)
+  " private methods
+
+  def type_mismatch_message(expected, actual)
     actual_type = self.typeof(actual)
     expected_type = self.typeof(expected)
 
-    return "type mismatch, actual(#{string(actual)}) is “#{actual_type}”, expected(#{string(expected)}) is “#{expected_type}”"
+    return "type mismatch, actual(#{string(actual)}) is “#{actual_type}”, "
+      \ "expected(#{string(expected)}) is “#{expected_type}”"
   end
 
-  " helpers "
-  defm typeof(variable)
+  def typeof(variable)
     return self.type_to_str(type(variable))
   end
 
-  defm type_to_str(num)
+  def type_to_str(num)
     return self.types[num]
   end
 
-  defm stringify(value)
+  def stringify(value)
     value_type = type(value)
 
     if value_type == type('') || value_type == type(1)

data/lib/matchers/length_matcher.riml

@@ -1,7 +1,7 @@
 class LengthMatcher
   defm match(expected, actual)
     self.result = len(actual)
-    return self.result == expected
+    return self.result === expected
   end
 
   defm failure_message_for_match(expected, actual)

data/lib/matchers/match_tester.riml

@@ -8,11 +8,10 @@ class g:MatchTester
     matcher = match_item.matcher
     actual = env.actual
 
-    tester = new g:MatchTester()
-    tester.test(matcher, negate, a:expected, actual)
+    self.test(matcher, negate, expected, actual)
   end
 
-  defm test(matcher, negate, expected, actual)
+  def test(matcher, negate, expected, actual)
     result = matcher.match(expected, actual)
     g:speckle_env.assertions += 1
     if negate

data/lib/matchers/within_matcher.riml

@@ -1,28 +1,26 @@
 class WithinMatcher
   defm match(expected, actual)
-    delta = expected[0]
-    num = expected[1]
+    [delta, num] = expected
     self.result = abs(num - actual)
     return self.result <= delta
   end
 
   defm failure_message_for_match(expected, actual)
-    delta = expected[0]
-    num = expected[1]
-    actual_str = printf("%f", actual)
-    delta_str = printf("%f", delta)
-    num_str = printf("%f", num)
-    result_str = printf('%f', self.result)
+    [actual_str, delta_str, num_str, result_str] = self.numeric_string_values(expected, actual)
     return "expected “#{actual_str}” to be within +/- “#{delta_str}” of “#{num_str}”, delta was “#{result_str}”"
   end
 
   defm failure_message_for_mismatch(expected, actual)
-    delta = expected[0]
-    num = expected[1]
+    [actual_str, delta_str, num_str, result_str] = self.numeric_string_values(expected, actual)
+    return "expected “#{actual_str}” to not be within +/- “#{delta_str}” of “#{num_str}”, delta was “#{result_str}”"
+  end
+
+  def numeric_string_values(expected, actual)
+    [delta, num] = expected
     actual_str = printf("%f", actual)
     delta_str = printf("%f", delta)
     num_str = printf("%f", num)
     result_str = printf('%f', self.result)
-    return "expected “#{actual_str}” to not be within +/- “#{delta_str}” of “#{num_str}”, delta was “#{result_str}”"
+    return [actual_str, delta_str, num_str, result_str]
   end
 end

data/lib/reporters/base_reporter.riml

@@ -1,5 +1,5 @@
 class BaseReporter
-  def initialize()
+  def initialize
     self.colorize_output = true
     self.log_buffer = []
   end
@@ -32,14 +32,14 @@ class BaseReporter
 
   defm on_spec_failure(meta, err, stats)
   end
-  
+
   defm on_spec_error(meta, err, stats)
   end
 
   defm on_spec_pending(meta, stats)
   end
 
-  defm duration_to_str(duration)
+  def duration_to_str(duration)
     time = a:duration
     if time >= 1000
       time = time / 1000

data/lib/reporters/dotmatrix_reporter.riml

@@ -1,7 +1,7 @@
 class DotMatrixReporter < BaseReporter
 
-  def initialize()
-    super()
+  def initialize
+    super
     self.dots = 0
     self.line_buffer = []
     self.log_messages = []
@@ -29,7 +29,7 @@ class DotMatrixReporter < BaseReporter
     context = meta.get_context()
     add(self.line_buffer, self.to_red("#{context} ##{name}"))
     add(self.line_buffer, self.to_red("    #{err.get_message()}"))
-    
+
     self.print_stacktrace(err)
 
     add(self.line_buffer, '')
@@ -39,7 +39,7 @@ class DotMatrixReporter < BaseReporter
     self.on_spec_failure(meta, err, stats)
   end
 
-  defm write_epilogue_separator()
+  defm write_epilogue_separator
     self.flush_log_buffer()
 
     self.writer.writeln('')

data/lib/reporters/fivemat_reporter.riml

@@ -1,7 +1,7 @@
 class FivematReporter < BaseReporter
 
-  def initialize()
-    super()
+  def initialize
+    super
     self.indents = 0
     self.log_buffer = []
     self.current_index = 0
@@ -82,7 +82,7 @@ class FivematReporter < BaseReporter
     self.show_error('Error', meta, err, stats)
   end
 
-  defm indent_to_str()
+  defm indent_to_str
     return repeat("  ", self.indents)
   end
 
@@ -94,15 +94,15 @@ class FivematReporter < BaseReporter
     self.indents -= size
   end
 
-  defm write_epilogue_separator()
+  defm write_epilogue_separator
     self.writer.writeln('')
-    super()
+    super
   end
 
   defm write_log_line(line)
     self.write_errorln(" log: #{line}")
   end
-  
+
   defm write_stacktrace_line(line)
     self.write_errorln(" " . line)
   end

data/lib/reporters/min_reporter.riml

@@ -6,18 +6,18 @@ class MinReporter < BaseReporter
     self.writer.writeln(self.to_red("#{context} ##{name} - #{err.get_message()}"))
     self.print_stacktrace(err)
   end
-  
+
   defm on_spec_error(meta, err, stats)
     self.on_spec_failure(meta, err, stats)
   end
 
-  defm write_epilogue_separator()
+  defm write_epilogue_separator
     self.flush_log_buffer()
-    super()
+    super
   end
 
   defm write_stacktrace_line(line)
     self.writer.writeln("  #{line}")
   end
-  
+
 end

data/lib/reporters/spec_reporter.riml

@@ -1,7 +1,7 @@
 class SpecReporter < BaseReporter
 
-  def initialize()
-    super()
+  def initialize
+    super
     self.indents = 0
     self.log_buffer = []
   end
@@ -48,7 +48,7 @@ class SpecReporter < BaseReporter
     self.on_spec_failure(meta, err, stats)
   end
 
-  defm indent_to_str()
+  defm indent_to_str
     return repeat("  ", self.indents)
   end
 
@@ -60,15 +60,15 @@ class SpecReporter < BaseReporter
     self.indents -= size
   end
 
-  defm write_epilogue_separator()
+  defm write_epilogue_separator
     self.writer.writeln('')
-    super()
+    super
   end
 
   defm write_log_line(line)
     self.write("log: #{line}")
   end
-  
+
   defm write_stacktrace_line(line)
     self.write(line)
   end

data/lib/runners/runner.riml

@@ -1,5 +1,5 @@
 class Runner
-  def initialize()
+  def initialize
     self.specs = []
     self.halt = false
     self.stopped = false
@@ -11,7 +11,7 @@ class Runner
     self.bail = bail
   end
 
-  defm get_bail()
+  defm get_bail
     return self.bail
   end
 
@@ -19,7 +19,7 @@ class Runner
     self.tag = tag
   end
 
-  defm get_tag()
+  defm get_tag
     return self.tag
   end
 
@@ -53,7 +53,7 @@ class Runner
     reporter.on_end(timer.get_duration(), stats)
   end
 
-  defm stop()
+  defm stop
     self.stopped = true
   end
 

data/lib/runners/spec_runner.riml

@@ -107,7 +107,13 @@ class SpecRunner
     reporter.on_context_end(context, stats)
   end
 
-  defm report_hook_error(hook, context, reporter, stats)
+  defm stop
+    self.stopped = true
+  end
+
+  " private methods
+
+  def report_hook_error(hook, context, reporter, stats)
     meta = new SpecMeta(context, hook)
 
     reporter.on_spec_start(meta, stats)
@@ -117,7 +123,7 @@ class SpecRunner
     reporter.on_spec_error(meta, error, stats)
   end
 
-  defm call_hook(hook)
+  def call_hook(hook)
     if has_key(self.spec, hook)
       return call(self.spec[hook], [], self.spec)
     else
@@ -125,19 +131,7 @@ class SpecRunner
     end
   end
 
-  defm stop()
-    self.stopped = true
-  end
-
-  defm is_test_method(method)
-    return method =~ '^it'
-  end
-
-  defm is_tagged(method)
-    return method =~ "_#{self.tag}$"
-  end
-
-  defm can_run_test_for(method)
+  def can_run_test_for(method)
     if self.tag == ''
       return self.is_test_method(method)
     else
@@ -145,6 +139,13 @@ class SpecRunner
     end
   end
 
+  def is_test_method(method)
+    return method =~ '^it'
+  end
+
+  def is_tagged(method)
+    return method =~ "_#{self.tag}$"
+  end
 end
 
 class SpecError
@@ -156,11 +157,11 @@ class SpecError
     self.throwpoint = v:throwpoint
   end
 
-  defm get_message()
+  defm get_message
     return self.message
   end
 
-  defm get_stacktrace()
+  defm get_stacktrace
     unless has_key(self, 'stacktrace')
       self.build_stacktrace()
     end
@@ -168,7 +169,7 @@ class SpecError
     return self.stacktrace
   end
 
-  defm build_stacktrace()
+  def build_stacktrace
     str = substitute(self.throwpoint, '\v(function )', '', '')
     self.stacktrace = split(str, '\.\.')
     self.stacktrace = map(self.stacktrace, '"at " . v:val')

data/lib/speckle/cli/environment.rb

@@ -164,9 +164,11 @@ module Speckle
       def build_riml_path(dirs, pattern = /.*\.riml$/, spec_pattern = /.*_spec\.riml$/)
         libs = []
         dirs.each do |dir|
-          Find.find(dir) do |path|
-            if path =~ pattern && path !~ spec_pattern
-              libs << File.dirname(path)
+          if File.directory?(dir)
+            Find.find(dir) do |path|
+              if path =~ pattern && path !~ spec_pattern
+                libs << File.dirname(path)
+              end
             end
           end
         end

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.26"
+  VERSION = "0.1.27"
 end

data/lib/speckle.riml

@@ -63,13 +63,13 @@ class g:Speckle
     self.options(options_map)
   end
 
-  defm options(options_map)
+  def options(options_map)
     for [name, value] in items(options_map)
       self.option(name, value)
     end
   end
 
-  defm option(variable, default)
+  def option(variable, default)
     if !exists("g:speckle_#{variable}")
       execute("let g:speckle_#{variable} = #{default}")
     end

data/lib/utils/spec_timer.riml

@@ -17,7 +17,7 @@ class SpecTimer
     return self.duration
   end
 
-  defm time_to_ms(time)
+  def time_to_ms(time)
     duration_str = reltimestr(time)
     duration_split = split(duration_str, '\.')
     seconds = str2nr(duration_split[0])

data/lib/writers/buffer_writer.riml

@@ -7,10 +7,6 @@ class BufferWriter
     self.writer.set_output_file(output_file)
   end
 
-  defm strip_colors(line)
-    return substitute(line, '\e\[[0-9;]\+[mK]', '', 'g')
-  end
-
   defm write(line)
     self.writer.write(line)
 
@@ -34,4 +30,10 @@ class BufferWriter
   defm flush_line()
     self.writer.flush_line()
   end
+
+  " private methods
+
+  def strip_colors(line)
+    return substitute(line, '\e\[[0-9;]\+[mK]', '', 'g')
+  end
 end

data/spec/stacktrace_spec.riml

@@ -6,7 +6,7 @@ class StacktraceSpec
   end
 
   defm it_can_display_stacktrace_stacktrace
-    unless exists('g:speckle_tag') && g:speckle_tag == 'stacktrace'
+    unless g:speckle_tag? && g:speckle_tag == 'stacktrace'
       return
     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.5'
+  s.add_dependency 'riml', '~> 0.3.6'
   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.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Darshan Sawardekar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-10 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.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - .editorconfig
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md