vhdl_doctest 0.0.3 → 0.0.4

data/lib/vhdl_doctest/test_parser.rb

@@ -52,7 +52,10 @@ module VhdlDoctest
     end
 
     def test_definitions(vhdl)
-      lines = vhdl.match(/-- TEST\n(.*)-- \/TEST/m)[1].split("\n")
+      lines = vhdl.match(/-- TEST\n(.*)-- \/TEST/m)[1].
+        gsub(/\#.*$/, '').     # remove comments
+        gsub(/--\s*\n/m, '').  # remove blank lines
+        split("\n")
       lines.partition { |l| l.include? 'alias' }
     rescue
       raise "Test definition not found"
@@ -85,6 +88,16 @@ module VhdlDoctest
         port_names << port_name
         prev = ''
         radix = radix(attr)
+        body.select! do |l|
+          if l.empty?
+            false
+          elsif ! l[idx]
+            warn l.join(" | ") + " does not have enough columns"
+            false
+          else
+            true
+          end
+        end
         body.each do |l|
           if l[idx].empty?
             l[idx] = prev

data/lib/vhdl_doctest/version.rb

@@ -1,3 +1,3 @@
 module VhdlDoctest
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/test_parser_spec.rb

@@ -139,6 +139,7 @@ module VhdlDoctest
 -- TEST
 -- a   | b   | control | zero # header
 -- 10  | -10 | 2       | 1    # case1
+-- # whole comment line
 -- 10  |     | 2       | 1    # case2 # important
 -- /TEST
 }}
@@ -151,6 +152,7 @@ module VhdlDoctest
       let(:input) { %q{
 -- TEST
 -- alias TRUE 1
+-- # comment between alias
 -- alias FALSE 0
 -- a   | b   | control | zero
 -- 10  | -10 | 2       | TRUE
@@ -161,5 +163,17 @@ module VhdlDoctest
       specify { cases.first.should assert(zero: 1) }
       specify { cases.last.should assert(zero: 0) }
     end
+
+    describe 'not enough fields' do
+      let(:input) { %q{
+-- TEST
+-- a   | b   | control | zero
+-- 10  | -10 | 2       | 0
+-- 10  | 10
+-- /TEST
+}}
+
+      specify { cases.should  have(1).item }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vhdl_doctest
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -473783249
+      hash: -47820915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -473783249
+      hash: -47820915
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24