speckle 0.1.10 → 0.1.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWU1NDkzZWQ5ZDRhZGRmZWFlN2IwZmFmYTkxN2ZiODc3YTJmYWM2OA==
+    OGZjMjdkZTQ4NmZlZTI0NjIxYTMxYmI2ZTFmYTUxMDBmMTNhNTc1Zg==
   data.tar.gz: !binary |-
-    MjRjZTM1NmZiYWJlZjA0ZWNkZmVkMGQ3YjAxNmUyNGY5ZDY2YjdjZg==
+    ZDU0ZmUxZWY1MGU2ODJmMTMzMDQ3OTEwMWU0OTQ1MGQ4NjdkNzhiYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjRkN2RkZDhjYTg0YzQzMGVhMmE0NTMxOWMxOWJiYzA3YjBjYmRkMjBjN2M0
-    OGJjMDE4NWRjYzFjYzI4NDVjOTg2Yjc0Y2Y3YmMxYTYzYjBmNGUxZThkMzA5
-    YmViZjU4OTEwZGFlYzM5NTc1NDI5NmQ0NGUxNDA3ZTBmYWE4ZGQ=
+    ZjI3MWU4OTBhMzc0NDI0MzA4OTE1OWI1YmVjZTU2NGI5NDg4NWUxYzFkN2Vh
+    MzlhYWM4NmZhZjhiOWU3NWNiN2Q1NzA3YTc3M2ZlZGUwMjFlZTNlOGZhYzVh
+    ZjVkMWUwMmVjYWMxZDVhNmI5OGUwYzJmNjMyNTM4MTk4Mjk3OWU=
   data.tar.gz: !binary |-
-    MDhkOTQ2MGI3NzQ1ZmJmYjQxMjA4ODU0MGY2YmJhYmNiNDFhOTIwY2MwMGU1
-    YjNmZTI5ZTVhZjczM2IzMjg1ZTMzZDk4YzE2NTczNjIyYTIxNzE3NjJmZDA4
-    ODQ5YWI2MjMxNGExNTMyYmYyY2QzZTgxNTc3MjRlNjUwNWE4NDU=
+    OWMxYTk3MGEzZGYyNzJmNjFjYjI4ZWFjNWIxNmQzZDJjNjI1NWYwZmRiN2Rj
+    YTYyMDAyYWYwMDcxOTUzYWVmN2Q0MzBiMjBmOGYzNDE1ZjdkZGZiYzZiNmZk
+    ZjNhZDQ3ZGJhZGUwY2IyMjRiNWYyMGEzOTVmOGQ5MGM5YzI3YTY=

data/Rakefile

@@ -1,16 +1,30 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
 
 desc 'Default task :compile_and_test'
 task :default => :test
 
-# :spec task from rspec
-desc "Run speckle's rspec tests"
-RSpec::Core::RakeTask.new(:spec)
+# We need the RSpec rake tasks to run spec
+# but we don't want users of speckle to need rspec
+# Eventually we want to switch from the cli calling
+# the Rakefile to the Rakefile calling the cli.
+begin
+  # :spec task from rspec
+  require 'rspec/core/rake_task'
+  desc "Run speckle's rspec tests"
+  RSpec::Core::RakeTask.new(:spec)
+
+  desc 'Run rspec and speckle tests'
+  task :test => [:spec, 'speckle:vim_version', 'speckle:compile_and_test']
+rescue LoadError
+  if ENV.has_key?('DEBUG')
+    puts 'rspec/core/rake_task not found'
+  end
 
-desc 'Run rspec and speckle tests'
-task :test => [:spec, 'speckle:vim_version', 'speckle:compile_and_test']
+  # no spec task in chain without rspec
+  desc 'Run rspec and speckle tests'
+  task :test => ['speckle:vim_version', 'speckle:compile_and_test']
+end
 
 desc 'Clean temporary files'
 task :clean => ['speckle:clean']
@@ -176,6 +190,8 @@ namespace :speckle do
       cmd += "-u NONE -i NONE"
     end
 
+    cmd += " --cmd 'let g:speckle_mode = 1'"
+
     cmd
   end
 

data/lib/dsl.riml

@@ -4,7 +4,6 @@ if !exists("g:speckle_env")
   g:speckle_env.assertions = 0
 end
 
-
 def expect(actual)
   env = g:speckle_env
   env.actual = actual
@@ -27,3 +26,13 @@ def define_matcher(ok_name, not_ok_name, matcher)
   matchers = get_matchers()
   matchers.define_pair(ok_name, not_ok_name, matcher)
 end
+
+def get_logger()
+  unless exists('g:logger')
+    g:logger = g:LoggerConstructor()
+  end
+
+  return g:logger
+end
+
+logger = get_logger()

data/lib/logger/echo_log_writer.riml

@@ -0,0 +1,10 @@
+class EchoLogWriter
+  defm get_colorize()
+    return false
+  end
+
+  defm log(message)
+    echo message
+  end
+end
+

data/lib/logger/file_log_writer.riml

@@ -0,0 +1,27 @@
+class FileLogWriter
+  def initialize
+    self.writer = new FileWriter()
+    self.colorize = true
+  end
+
+  defm set_log_file(log_file)
+    self.writer.set_output_file(log_file)
+  end
+
+  defm set_colorize(colorize)
+    self.colorize = colorize
+  end
+
+  defm get_colorize()
+    return self.colorize
+  end
+
+  defm log(message)
+    self.writer.writeln(message)
+  end
+
+  defm flush()
+    self.writer.flush()
+  end
+end
+

data/lib/logger/logger.riml

@@ -0,0 +1,114 @@
+class Logger
+  def initialize
+    self.messages = []
+    self.log_writers = []
+    self.level = 'info'
+
+    self.levels = {}
+    self.levels.all = 0
+    self.levels.debug = 1
+    self.levels.info = 2
+    self.levels.warn = 3
+    self.levels.error = 4
+    self.levels.fatal = 5
+    self.levels.off = 6
+
+    self.colors = {}
+    self.colors.all = 0
+    self.colors.debug = 0
+    self.colors.info = 0
+    self.colors.warn = '31m'
+    self.colors.error = '31m'
+    self.colors.fatal = '31m'
+    self.colors.off = 0
+  end
+
+  defm add_log_writer(log_writer)
+    add(self.log_writers, log_writer)
+  end
+
+  defm set_level(level)
+    self.level = level
+  end
+
+  defm get_level
+    return self.level
+  end
+
+  defm get_level_num(level)
+    return self.levels[level]
+  end
+
+  defm is_loggable(level)
+    return self.get_level_num(level) >= self.get_level_num(self.level)
+  end
+
+  defm 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)
+    return join(args, ' ')
+  end
+
+  defm send_log(msg, level)
+    color_msg = self.to_color(msg, level)
+
+    for log_writer in self.log_writers
+      if log_writer.get_colorize()
+        log_writer.log(color_msg)
+      else
+        log_writer.log(msg)
+      end
+    end
+  end
+
+  defm to_color(msg, level)
+    color = self.colors[level]
+    echo "msg=#{msg}, color=#{color}"
+    if color != 0
+      return "[#{color}#{msg}"
+    else
+      return msg
+    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
+
+  return g:logger
+end
+
+logger = get_logger()
+

data/lib/reporters/base_reporter.riml

@@ -1,6 +1,7 @@
 class BaseReporter
   def initialize()
     self.colorize_output = true
+    self.log_buffer = []
   end
 
   defm set_writer(writer)
@@ -122,5 +123,34 @@ class BaseReporter
     return self.to_red(self.get_cross_icon())
   end
 
+  " log writer interface "
+  defm get_colorize
+    return self.get_colorize_output()
+  end
+
+  defm log(message)
+    add(self.log_buffer, message)
+  end
+
+  defm has_logs
+    return len(self.log_buffer) > 0
+  end
+
+  defm flush_log_buffer
+    if self.has_logs()
+      self.writer.writeln('')
+
+      for line in self.log_buffer
+        self.write_log_line(line)
+      end
+
+      self.writer.writeln('')
+      self.log_buffer = []
+    end
+  end
+
+  defm write_log_line(line)
+    self.writer.writeln("log: #{line}")
+  end
 end
 

data/lib/reporters/dotmatrix_reporter.riml

@@ -4,6 +4,7 @@ class DotMatrixReporter < BaseReporter
     super()
     self.dots = 0
     self.line_buffer = []
+    self.log_messages = []
   end
 
   defm write(msg)
@@ -36,6 +37,8 @@ class DotMatrixReporter < BaseReporter
   end
 
   defm write_epilogue_separator()
+    self.flush_log_buffer()
+
     self.writer.writeln('')
     for line in self.line_buffer
       self.writer.writeln(line)

data/lib/reporters/min_reporter.riml

@@ -9,5 +9,10 @@ class MinReporter < BaseReporter
   defm on_spec_error(meta, err, stats)
     self.on_spec_failure(meta, err, stats)
   end
+
+  defm write_epilogue_separator()
+    self.flush_log_buffer()
+    super()
+  end
   
 end

data/lib/reporters/spec_reporter.riml

@@ -3,6 +3,7 @@ class SpecReporter < BaseReporter
   def initialize()
     super()
     self.indents = 0
+    self.log_buffer = []
   end
 
   defm write(msg)
@@ -25,12 +26,16 @@ class SpecReporter < BaseReporter
   defm on_spec_pass(meta, stats)
     duration_msg = self.get_duration_msg(meta)
     self.write("#{self.get_tick()} #{meta.get_sentence()} #{duration_msg}")
+    self.indent(2)
+    self.flush_log_buffer()
+    self.unindent(2)
   end
 
   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.flush_log_buffer()
     self.unindent(2)
   end
 
@@ -55,4 +60,8 @@ class SpecReporter < BaseReporter
     super()
   end
 
+  defm write_log_line(line)
+    self.write("log: #{line}")
+  end
+
 end

data/lib/reporters/tap_reporter.riml

@@ -13,25 +13,27 @@ class TAPReporter < BaseReporter
     duration_msg = self.get_duration_msg(meta)
     preamble = self.get_preamble('ok', stats.get_count(), meta.get_context())
     self.writer.writeln("#{preamble} ##{name} #{duration_msg}")
+    self.flush_log_buffer()
   end
 
   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.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()
   end
 
   defm on_spec_pending(meta, stats)
   end
 
   defm get_preamble(status, count, context)
-    ""status = status . repeat(' ', 6 - len(status))
     msg = "#{status} #{count} - #{context}"
     return msg
   end

data/lib/runners/spec_runner.riml

@@ -40,13 +40,12 @@ class SpecRunner
         result = 0
 
         try
-          timer.start()
-
           self.call_hook('before_each')
+          timer.start()
           eval("spec.#{method}()")
+          timer.stop()
           self.call_hook('after_each')
 
-          timer.stop()
           meta.set_duration(timer.get_duration())
 
           stats.inc_passes()

data/lib/speckle/cli/environment.rb

@@ -128,7 +128,7 @@ module Speckle
             end
           end
 
-          options.inputs = args
+          options.inputs = args.uniq
         rescue OptionParser::InvalidOption => e
           options.error = e
           options.action = :show_invalid_option

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/speckle.riml

@@ -1,4 +1,6 @@
 "" utils
+riml_include 'logger.riml'
+riml_include 'echo_log_writer.riml'
 riml_include 'spec_timer.riml'
 riml_include 'spec_meta.riml'
 riml_include 'statistician.riml'
@@ -27,6 +29,7 @@ riml_include 'file_writer.riml'
 riml_include 'console_writer.riml'
 riml_include 'buffer_writer.riml'
 riml_include 'writer_factory.riml'
+riml_include 'file_log_writer.riml'
 
 "" reporters
 riml_include 'base_reporter.riml'
@@ -87,6 +90,9 @@ class Speckle
     reporter = factory.get_reporter(self.get_reporter_name())
     reporter.set_writer(writer)
 
+    logger = get_logger()
+    logger.add_log_writer(reporter)
+
     return reporter
   end
 

data/lib/writers/file_writer.riml

@@ -13,8 +13,8 @@ class FileWriter
   end
 
   defm writeln(line)
-    self.flush_line()
-    add(self.lines, line)
+    add(self.lines, "#{self.current_line}#{line}")
+    self.current_line = ''
   end
 
   defm flush_line()

data/spec/logger/logger_spec.riml

@@ -0,0 +1,15 @@
+riml_include 'dsl.riml'
+
+class LoggerSpec
+  defm describe
+    return 'LoggerSpec'
+  end
+
+  defm it_logs_a_message
+    logger = get_logger()
+    logger.info('Hello World')
+    logger.debug('A debug message')
+    logger.warn('A test warning')
+    logger.error('An error warning')
+  end
+end

data/spec/speckle/cli/environment_spec.rb

@@ -261,10 +261,16 @@ module Speckle
         expect('').to_not have_default_option('tag')
       end
 
-      it 'takes tag fram --tag' do
+      it 'takes tag from --tag' do
         expect(['--tag', 'focus']).to yield_option_value('tag', 'focus')
       end
 
+      it 'does not have duplicate inputs', :foo => true do
+        env = Environment.new
+        opts = env.load(['spec', 'spec'])
+        expect(opts.inputs.length).to eq(1)
+      end
+
     end
 
     describe 'Complete CLI options' do
@@ -300,5 +306,6 @@ module Speckle
       end
 
     end
+
   end
 end

data/spec/speckle_mode_spec.riml

@@ -0,0 +1,12 @@
+riml_include 'dsl.riml'
+
+class SpeckleModeSpec
+  defm describe
+    return 'SpeckleModeSpec'
+  end
+
+  defm it_has_speckle_mode
+    expect(g:speckle_mode).to_be_true()
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speckle
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Darshan Sawardekar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riml
@@ -110,6 +110,9 @@ files:
 - bin/speckle
 - lib/dsl.riml
 - lib/expectation.riml
+- lib/logger/echo_log_writer.riml
+- lib/logger/file_log_writer.riml
+- lib/logger/logger.riml
 - lib/matchers/above_matcher.riml
 - lib/matchers/atleast_matcher.riml
 - lib/matchers/atmost_matcher.riml
@@ -157,6 +160,7 @@ files:
 - lib/writers/writer_factory.riml
 - spec/after_hooks_spec.riml
 - spec/before_hooks_spec.riml
+- spec/logger/logger_spec.riml
 - spec/matchers/above_matcher_spec.riml
 - spec/matchers/atleast_matcher_spec.riml
 - spec/matchers/atmost_matcher_spec.riml
@@ -178,6 +182,7 @@ files:
 - spec/speckle/list/extension_transformer_spec.rb
 - spec/speckle/list/file_content_filter_spec.rb
 - spec/speckle/list/pattern_filter_spec.rb
+- spec/speckle_mode_spec.riml
 - spec/tagged_spec.riml
 - speckle.gemspec
 homepage: http://github.com/dsawardekar/speckle
@@ -207,6 +212,7 @@ summary: Compiles *_spec.riml spec files into *.vim files and runs them inside v
 test_files:
 - spec/after_hooks_spec.riml
 - spec/before_hooks_spec.riml
+- spec/logger/logger_spec.riml
 - spec/matchers/above_matcher_spec.riml
 - spec/matchers/atleast_matcher_spec.riml
 - spec/matchers/atmost_matcher_spec.riml
@@ -228,4 +234,5 @@ test_files:
 - spec/speckle/list/extension_transformer_spec.rb
 - spec/speckle/list/file_content_filter_spec.rb
 - spec/speckle/list/pattern_filter_spec.rb
+- spec/speckle_mode_spec.riml
 - spec/tagged_spec.riml