matest 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757f28ddf171609ce80b736adeb1f5accd410436
-  data.tar.gz: ae5cbf1f29b8a645562602bcc1f6a5745e7b4703
+  metadata.gz: cc5e86300096a6ca0547c40b070f248c80fc96f6
+  data.tar.gz: 41808bf9b7fef44040c2aeec06c042944ed511d4
 SHA512:
-  metadata.gz: 875366326b041e3112a33032f02efefd1f7ba823ce85ec776a205deb00e26dd35633e47f55c8a56cfcadefb25fff7b50a289eee2c0e613b43617a2d7cb48e981
-  data.tar.gz: a03d705697f14ca9298290183d1c6343a566b111bcd69ca8457b1478ff7c5d966ae15b7b948530cc55e715200140910cef5b2aea651583b723f349d64ed42adc
+  metadata.gz: 228a61e509a3f3bd31a7a442f26eeb0c8c4bc1870bf1ff348107e27a981815ee7123c2313c125e82e37115b14498f83e245aa8bafb204b8a65e3126c72c89e28
+  data.tar.gz: 9361c7f168c71f3bb22cb1a267909b40873b09fc373118f8e631531e821fb258e989a99fcf4af3d1c28d82bb56ddefb70b852f0babb12675dbe006bc8f6c2481

data/lib/matest/example_block.rb

@@ -11,7 +11,7 @@ class ExampleBlock
   def initialize(block)
     @block = block
 
-    @code = generate_code
+    @code =  generate_code
 
     @sexp = Ripper::SexpBuilder.new(code).parse.last
     @assertion_sexp = @sexp.last
@@ -46,6 +46,8 @@ class ExampleBlock
     valid_lines = [lines[lineno-1]].join
     code = Ripper::SexpBuilder.new(valid_lines).parse.last.last.last.last
     Sorcerer.source(code)
+  rescue Sorcerer::Resource::NotSexpError => e
+    "Matest::SkipMe.new"
   end
 
   def lines

data/lib/matest/example_group.rb

@@ -15,10 +15,15 @@ module Matest
     end
 
     def spec(description=nil, &block)
-      current_example = block_given? ? block : ->(*args) { Matest::SkipMe.new }
+      current_example = block_given? ? block : Matest::SkipMe.new(caller)
       specs << Example.new(current_example, description, lets)
     end
 
+    def xspec(description=nil, &block)
+      current_example = Matest::SkipMe.new(caller)
+      specs << Example.new(current_example, description, [])
+    end
+
     def execute!
       instance_eval(&scope_block)
       specs.shuffle.each do |spec, desc|
@@ -28,10 +33,6 @@ module Matest
 
     end
 
-    def xspec(description=nil, &block)
-      spec(description)
-    end
-
     alias :it :spec
     alias :xit :xspec
 
@@ -41,7 +42,6 @@ module Matest
     alias :example :spec
     alias :xexample :xspec
 
-
     def self.let(var_name, &block)
       define_method(var_name) do
         instance_variable_set(:"@#{var_name}", block.call)

data/lib/matest/skip_me.rb

@@ -1,3 +1,16 @@
 module Matest
-  class SkipMe; end
+  class SkipMe
+    attr_reader :source_location
+    def initialize(the_caller=nil)
+      if the_caller
+        @the_caller = the_caller
+        file, lineno = the_caller.first.split(":")
+        @source_location = [file, lineno.to_i]
+      end
+    end
+
+    def to_proc
+      proc { SkipMe.new }
+    end
+  end
 end

data/lib/matest/skipped_example_group.rb

@@ -46,7 +46,7 @@ module Matest
     alias :xgroup :xscope
 
     def spec(description=nil, &block)
-      current_example = ->(*args) { Matest::SkipMe.new }
+      current_example = Matest::SkipMe.new(caller)
       specs << Example.new(current_example, description, [])
     end
     alias :xspec :spec

data/lib/matest/spec_printer.rb

@@ -5,7 +5,7 @@ module Matest
     include Color
 
     def print(res)
-      super send(colors[res.class], res.to_s)
+      send(colors[res.class], res.to_s)
     end
 
     def print_messages(runner)

data/lib/matest/version.rb

@@ -1,3 +1,3 @@
 module Matest
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

data/spec/matest_specs/skip_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+scope do
+  spec do
+    true
+  end
+
+  xspec do
+    true
+  end
+
+  spec "Skip!!"
+end
+
+xscope do
+  spec do
+    true
+  end
+
+  xspec do
+    true
+  end
+
+  spec "Skip!!"
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matest
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Federico Iachetti
@@ -107,6 +107,7 @@ files:
 - spec/matest_specs/printing_assertion_spec.rb
 - spec/matest_specs/scope_spec.rb
 - spec/matest_specs/scoping_stuff_spec.rb
+- spec/matest_specs/skip_spec.rb
 - spec/matest_specs/slow_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -143,5 +144,6 @@ test_files:
 - spec/matest_specs/printing_assertion_spec.rb
 - spec/matest_specs/scope_spec.rb
 - spec/matest_specs/scoping_stuff_spec.rb
+- spec/matest_specs/skip_spec.rb
 - spec/matest_specs/slow_spec.rb
 - spec/spec_helper.rb