xmp2assert 8 → 9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c558b16e211cc2198f003c708b87acebe83406
-  data.tar.gz: ed3a7c00a1d6b5bda7e734b00d0cd43ba1954acb
+  metadata.gz: 5ae8c02650ca81c693170d40a67874a8622a3601
+  data.tar.gz: 4a9dbbc7a6138af3430254152e545e605a742177
 SHA512:
-  metadata.gz: ff38753c94e6c2b553efca12c639c77d91c4872cb5d539f26bb862e92dba881288e469c7fd67063a055b884b0f94863aed614befe7693aa61b74728c12bdaefe
-  data.tar.gz: ce410e98585873f3064f901d6803a86b69f1af44aa0053017b429f7ef8d01e2ef713ab883142d5a06f2fbbe49604fdfe3b39451dd42667b0fbd0e61afdbe8af3
+  metadata.gz: 9bf2ea17492c7442179e9c6fb2ea43e0975a99e506d7c4bee1dfacf934a224da6e785fa391355d1ebe88f66d6a576406512ad77c9e2b29bbe9a3de1b70f30cf4
+  data.tar.gz: 1ecb3f324149b5cccc53ceb0a8bc5e404c6a76b8b4863f9736430523779c2d1ce6db425a7e2975b80cef5ccd6920626aeb095dfcaa8118bf5d4fc04d6c43ca5f

data/.rubocop.yml

@@ -78,6 +78,9 @@ Style/ClassAndModuleChildren:
 Style/ClassVars:
   Enabled: false
 
+Style/ConstantName:
+  Enabled: false
+
 Style/ElseAlignment:
   Enabled: false
 
@@ -129,9 +132,15 @@ Style/MultilineIfThen:
 Style/MultilineMethodCallIndentation:
   Enabled: false
 
+Style/MutableConstant:
+  Enabled: false
+
 Style/Not:
   Enabled: false
 
+Style/NumericLiterals:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
 

data/lib/xmp2assert/assertions.rb

@@ -29,6 +29,7 @@ require 'test/unit/assertion-failed-error'
 require_relative 'namespace'
 require_relative 'quasifile'
 require_relative 'xmp2rexp'
+require_relative 'converter'
 require_relative 'renderer'
 require_relative 'spawn'
 
@@ -46,7 +47,6 @@ module XMP2Assert::Assertions
   #
   # @param script     [Quasifile]     a ruby script.
   # @param message    [String]        extra failure message.
-  # @param rubyopts   [Array<String>] extra opts to pass to ruby process.
   # @param stdin_data [String]        extra stdin to pass to ruby process.
   # @param opts       [Hash]          extra opts to pass to Kernel.spawn.
   def assert_xmp script, message = nil, stdin_data: '', **opts

data/lib/xmp2assert/converter.rb

@@ -339,9 +339,16 @@ class XMP2Assert::Converter
           xmp = tok
         end
       when :comment then
+        re = /^#\s*/
         if xmp then
-          xmp.to_s.concat tok.to_s.sub(/^#/, '')
-          tok.yylval = "#\n"
+          space = re.match(tok.to_s).to_s.length
+          if xmp.__COLUMN__ + 5 <= tok.__COLUMN__ + space # 5 is `# => `
+            xmp.to_s.concat tok.to_s.sub(re, ' ')
+            tok.yylval = "#\n"
+          else
+            # dedent
+            xmp = nil
+          end
         else
           xmp = nil
         end

data/lib/xmp2assert/parser.rb

@@ -63,7 +63,7 @@ class XMP2Assert::Parser < Ripper
 
   def on_comment c
     case c
-    when /^# ([~=!>]>) / then
+    when /^# ([~=!>]>)(?: |$)/ then
       yylex = $1.intern
       yylval = $'
     else

data/lib/xmp2assert/version.rb

@@ -24,4 +24,4 @@
 # SOFTWARE.
 ;
 
-XMP2Assert::VERSION = 8
+XMP2Assert::VERSION = 9

data/lib/xmp2assert/xmp2rexp.rb

@@ -48,7 +48,7 @@ module XMP2Assert::XMP2Rexp
     # :NOTE: we are  editing regular expressions using  regular expressions. In
     # order  to hack  this method  you must  be a  seasoned regular  expression
     # craftsperson who can count backslashes at ease.
-    src = Regexp.escape xmp.chomp
+    src = Regexp.escape xmp.strip
     src.gsub!(/([^\\])(\\n|\\ )+/, '\\1\s+')
     src.gsub!(/(#<[\w:]+?:)0x[0-9a-f]+/, '\\10x[0-9a-f]+')
     src.gsub!(/\\\.rb:\d+/, '\\.rb:\d+')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmp2assert
 version: !ruby/object:Gem::Version
-  version: '8'
+  version: '9'
 platform: ruby
 authors:
 - Urabe, Shyouhei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler