speckle 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2UzZDM1NWI2ZDUzYWRiM2M0MDk3OWUwYzc1Zjc0ZGVlYjQ2NzYxNg==
+    MzY3MDJkNzRiOWQ1NWQ5YTQ1NjQyYzVlNjFiN2NlYjM2ZDc2YWJmZQ==
   data.tar.gz: !binary |-
-    ZjFiNmMyNGZkODFkYjA4YmFlMzUxMjYyMjI1NTczZmFjNDljYWEyYg==
+    ZGMxNTE2MDI2NDQ5OGE3MTUwNjE3MWQ3ZTk4ZjRjZmYyMjgzMDUyMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDVmMjVlZTZkZTcxYjZlMjExZDgzNTQ2NzUxZWQxNTc0ZjA0ZWU1NGM1ODk2
-    OTA2MDgwNWRhMmFiMWVjNDBlM2M3Y2M2N2U5YjZlMjYxMjI1NGQ2MTlmMDFl
-    YzlhOTFlYzgxZTQ2NGZhZjRiYjE1ODhlYTIxMDFjY2M5YjU3ZjM=
+    YjA5M2I4ZmUzMmQwYjk2ZjdjNmZjODE1ZmZiMzhiODljYTBjNDIxNTZlYTdh
+    NzMyOTE3YjFhOTgxNGMyYjMwOTM0NWVlNmVhYWEyNDdjODFlNDU4OTRiNGJh
+    ZTY5MDBmZmMzNjE5MWVkOWEzN2Y0ZGFkYzdhZWFkMjY1NjY0YmI=
   data.tar.gz: !binary |-
-    NDJjZGY1Y2YyNGI0M2I3OTE1ZTA4OTRjNzg0MjczYTExNmIwMGZiOWQ4ZWUx
-    MzM4NGZhZTc1MGJlZjY3ODQyODQ1MTQ2ZGRkYWZmOTZmN2I1NGEyZWMxNWQ4
-    YWZkYmI0NDcyMDc5YzM2NzBhMDE1OTQzNGNkZDA0NWJkNDc0MjQ=
+    Mjk4MDM3N2NlMWEyMzk3NDJhMDY3ZTNhYTYwYzE3MjhlOTcwZjI3YzE0MDE3
+    MmRlMjU1MTBkOGZiYWZlNjZkNTAwNDU5MzM0Mzg3MjJkNjBmYTg3YmU1MmIz
+    Y2JkYjQ0YjUyNTgyMTg4NzU5NzA5NWRlMTAwNzg5OWFiODNjMjE=

data/Rakefile

@@ -34,6 +34,8 @@ namespace :speckle do
   SKIP_VIMRC = ENV['SKIP_VIMRC'] == '1' || false
   COLORIZE = ENV['COLORIZE'] || 1
   BAIL = ENV['BAIL'] || 0
+  TAG = ENV['TAG'] || false
+  CI = ENV['CI'] || false
 
   # speckle sources
   SPECKLE_DIR = File.dirname(__FILE__)
@@ -61,6 +63,7 @@ namespace :speckle do
   TEST_VIM = ENV['TEST_VIM'] || 'vim'
   TEST_REPORTER = ENV['TEST_REPORTER'] || 'spec'
   TEST_LOG = "#{BUILD_DIR}/speckle.log"
+  DEBUG_LOG = "#{BUILD_DIR}/debug.log"
   TEST_SOURCES  = FileList.new do |fl|
     sources = ENV['TEST_SOURCES']
     if sources
@@ -72,7 +75,6 @@ namespace :speckle do
       fl.include('spec/**/*_spec.riml')
     end
   end
-
   TEST_COMPILED = FileList.new do |fl|
     fl.exclude("#{SPECKLE_OUTPUT}")
     compiled = ENV['TEST_COMPILED']
@@ -86,6 +88,22 @@ namespace :speckle do
     end
   end
 
+  TAGGED_TEST_SOURCES = FileList.new do |fl|
+    TEST_SOURCES.each do |s|
+      if TAG and File.readlines(s).grep(Regexp.new(TAG)).size > 0
+        fl.include(s)
+      end
+    end
+  end
+
+  TAGGED_TEST_COMPILED = FileList.new do |fl|
+    TEST_SOURCES.each do |s|
+      if TAG and File.readlines(s).grep(Regexp.new(TAG)).size > 0
+        fl.include("#{BUILD_DIR}/#{s.ext('vim')}")
+      end
+    end
+  end
+
   desc 'All tasks'
   task :all => [:clean, :compile, :compile_tests, :test]
 
@@ -122,7 +140,7 @@ namespace :speckle do
 
   desc "Compile specs"
   task :compile_tests => [:build] do
-    TEST_SOURCES.each do |t|
+    get_test_sources.each do |t|
       verbose VERBOSE do
         puts "Compiling: #{t} "
         sh "bundle exec riml -c #{t} -I #{TEST_LIBS}"
@@ -147,7 +165,9 @@ namespace :speckle do
   
   desc 'Shows vim --version'
   task :vim_version do
-    sh "#{TEST_VIM} --version"
+    if CI
+      sh "#{TEST_VIM} --version"
+    end
   end
 
   desc "Launch test runner"
@@ -167,6 +187,22 @@ namespace :speckle do
     puts '--- TODO ---'
   end
 
+  def get_test_sources
+    if TAG
+      return TAGGED_TEST_SOURCES
+    else
+      return TEST_SOURCES
+    end
+  end
+
+  def get_test_compiled
+    if TAG
+      return TAGGED_TEST_COMPILED
+    else
+      return TEST_COMPILED
+    end
+  end
+
   def get_vim_options
     cmd = ''
     if SKIP_VIMRC
@@ -198,19 +234,28 @@ namespace :speckle do
       source #{SPECKLE_OUTPUT}
 CMD
 
-    TEST_COMPILED.each do |t|
+    get_test_compiled.each do |t|
       launch_cmd += <<CMD
       source #{t}
 CMD
     end
 
     launch_cmd += <<CMD
+      let &verbosefile = '#{DEBUG_LOG}'
       let g:speckle_file_mode = 1
       let g:speckle_output_file = '#{TEST_LOG}'
       let g:speckle_reporter_name = '#{TEST_REPORTER}'
       let g:speckle_slow_threshold = #{SLOW_THRESHOLD}
       let g:speckle_colorize = #{COLORIZE}
       let g:speckle_bail = #{BAIL}
+CMD
+    if TAG
+      launch_cmd += <<CMD
+      let g:speckle_tag = '#{TAG}'
+CMD
+    end
+
+    launch_cmd += <<CMD
       let speckle = g:SpeckleConstructor()
       :autocmd VimEnter * :call speckle.run()
       :q!

data/lib/runners/runner.riml

@@ -4,6 +4,7 @@ class Runner
     self.halt = false
     self.stopped = false
     self.bail = false
+    self.tag = ''
   end
 
   defm set_bail(bail)
@@ -14,6 +15,14 @@ class Runner
     return self.bail
   end
 
+  defm set_tag(tag)
+    self.tag = tag
+  end
+
+  defm get_tag()
+    return self.tag
+  end
+
   defm add(spec)
     add(self.specs, spec)
   end
@@ -31,6 +40,7 @@ class Runner
 
       spec_runner = new SpecRunner(spec)
       spec_runner.set_bail(self.get_bail())
+      spec_runner.set_tag(self.get_tag())
       spec_runner.start(reporter, stats)
 
       if spec_runner.has_bailed()

data/lib/runners/spec_runner.riml

@@ -5,12 +5,17 @@ class SpecRunner
     self.stopped = false
     self.bail = false
     self.bailed = false
+    self.tag = ''
   end
 
   defm set_bail(bail)
     self.bail = bail
   end
 
+  defm set_tag(tag)
+    self.tag = tag
+  end
+
   defm has_bailed()
     return self.bailed
   end
@@ -27,7 +32,7 @@ class SpecRunner
         break
       end
 
-      if method =~ '^it'
+      if self.can_run_test_for(method)
         timer = new SpecTimer()
         meta = new SpecMeta(context, method)
 
@@ -93,4 +98,20 @@ class SpecRunner
     self.stopped = true
   end
 
+  defm is_test_method(method)
+    return method =~ '^it'
+  end
+
+  defm is_method_tagged(method)
+    return method =~ "_#{self.tag}$"
+  end
+
+  defm can_run_test_for(method)
+    if self.tag == ''
+      return self.is_test_method(method)
+    else
+      return self.is_test_method(method) && self.is_method_tagged(method)
+    end
+  end
+
 end

data/lib/speckle/cli/environment.rb

@@ -25,6 +25,7 @@ module Speckle
         options.slow_threshold = 10
         options.colorize = true
         options.bail = false
+        options.tag = nil
 
         parser = OptionParser.new do |opts|
           options.opts = opts
@@ -58,6 +59,10 @@ module Speckle
             options.grep_invert = true
           end
 
+          opts.on('--tag <tag>', 'Only run tests matching tag') do |tag|
+            options.tag = tag
+          end
+
           opts.on('-r', '--reporter <reporter>', 'Specify the reporter to use (spec, min, dot, tap)') do |reporter|
             options.reporter = reporter.strip
           end

data/lib/speckle/cli/rake_app.rb

@@ -58,6 +58,7 @@ module Speckle
         rake_env('SKIP_VIMRC', to_int(@options.skip_vimrc))
         rake_env('COLORIZE', to_int(@options.colorize))
         rake_env('BAIL', to_int(@options.bail))
+        rake_env('TAG', @options.tag)
 
         if @options.verbose
           rake_env('VERBOSE', 'yes')

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/speckle.riml

@@ -52,7 +52,8 @@ class Speckle
       \ 'reporter_name': '"spec"',
       \ 'slow_threshold': '10',
       \ 'colorize': '1',
-      \ 'bail': '0'
+      \ 'bail': '0',
+      \ 'tag': '""'
     \}
 
     self.options(options_map)
@@ -112,6 +113,10 @@ class Speckle
   defm get_bail
     return g:speckle_bail
   end
+  
+  defm get_tag
+    return g:speckle_tag
+  end
 
   defm run()
     self.configure()
@@ -120,10 +125,12 @@ class Speckle
     stats = new Statistician()
     reporter = self.get_reporter(writer)
     reporter.set_colorize_output(self.get_colorize())
+
     runner = new Runner()
     runner.set_bail(self.get_bail())
-    functions = ''
+    runner.set_tag(self.get_tag())
 
+    functions = ''
     :redir => functions
     :silent function /SpecConstructor$/
     :redir END

data/spec/speckle/cli/environment_spec.rb

@@ -257,6 +257,14 @@ module Speckle
         expect(['--reporter', 'min']).to yield_option_value('reporter', 'min')
       end
 
+      it 'does not have tag by default' do
+        expect('').to_not have_default_option('tag')
+      end
+
+      it 'takes tag fram --tag' do
+        expect(['--tag', 'focus']).to yield_option_value('tag', 'focus')
+      end
+
     end
 
     describe 'Complete CLI options' do

data/spec/tagged_spec.riml

@@ -0,0 +1,11 @@
+riml_include 'dsl.riml'
+
+class TaggedSpec
+  defm describe
+    return 'TaggedSpec'
+  end
+
+  defm it_has_a_tag_focus
+    expect(true).to_be_true()
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speckle
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Darshan Sawardekar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riml
@@ -166,6 +166,7 @@ files:
 - spec/matchers/within_matcher_spec.riml
 - spec/spec_helper.rb
 - spec/speckle/cli/environment_spec.rb
+- spec/tagged_spec.riml
 - speckle.gemspec
 homepage: http://github.com/dsawardekar/speckle
 licenses:
@@ -209,3 +210,4 @@ test_files:
 - spec/matchers/within_matcher_spec.riml
 - spec/spec_helper.rb
 - spec/speckle/cli/environment_spec.rb
+- spec/tagged_spec.riml