xmp2assert 11 → 12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45061563c460b60b3b9b9a9c9cdc08fdd00da562
-  data.tar.gz: 0af4015708d764defe90793c4d3be3fb9e5384d0
+  metadata.gz: b2f9ee081b57585fdaa4fc1c04b600b67ed9fcd5
+  data.tar.gz: b32bbf297c76a0934b71281fb5e90f94608eb894
 SHA512:
-  metadata.gz: 9c7e59307031b64e753d3252fb94dd733c820077aaf794320eec65e288bd1166bb52ef9d556d44fb039c150b080a26854e80f3a95df24e6c230ea2b0c3c4f820
-  data.tar.gz: b519801bad8bd7f1193fe5957e9547e9c3d5ee1555d7a5bdd5644578fa8f6ce0f88fd02236c63b5571ef82dfd81afbad9071c947a294292c36dfcca5c91ffada
+  metadata.gz: b1cb6e90a0cd31ed34c49e85cf2c3c8cd0bd1c0311ba1b9d689f7ee0de19aa7a40feba7bb124025879f51fa53d64404f2037e96cafb80325197bda38e2325821
+  data.tar.gz: 4a47c5aedb2283c6a0acaf7832d3c8bbf525afeb613080ec24cbbbf4796f1dd87051526ce66c211d182218930ffef7e0cc4d579255631c9a55532e073af996f2

data/.rubocop.yml

@@ -35,6 +35,10 @@ Lint/AmbiguousBlockAssociation:
 Lint/EmptyWhen:
   Enabled: false
 
+Lint/HandleExceptions:
+  # I KNOW WHAT I DO. Please stop annoying me.
+  Enabled: false
+
 Metrics/ParameterLists:
   Enabled: false
 

data/lib/xmp2assert/assertions.rb

@@ -36,8 +36,6 @@ require_relative 'spawn'
 # Helper module that implements assertions.
 module XMP2Assert::Assertions
   include Test::Unit::Assertions
-  include XMP2Assert::XMP2Rexp
-  include XMP2Assert::Renderer
 
   # Run a ruby script and assert for its comment.  This is the main API.
   #
@@ -52,7 +50,7 @@ module XMP2Assert::Assertions
   def assert_xmp script, message = nil, stdin_data: '', **opts
     qscript        = XMP2Assert::Quasifile.new script
     qf, qo, qe, qx = XMP2Assert::Converter.convert qscript
-    render qf, qx do |f|
+    XMP2Assert::Renderer.render qf, qx do |f|
       XMP2Assert::Spawn.new f, **opts do |_, i, o, e, r, t|
         i.write stdin_data
         i.close
@@ -73,13 +71,14 @@ module XMP2Assert::Assertions
         end
         assert_xmp_raw qo, out.value, message unless qo.empty?
         assert_xmp_raw qe, err.value, message unless qe.empty?
+        stderr_pass_through qe, err
       end
     end
   end
 
   # :TODO: tbw
   def assert_xmp_raw xmp, actual, message = nil
-    expected = xmp2rexp xmp
+    expected = XMP2Assert::XMP2Rexp.xmp2rexp xmp
 
     raise unless expected.match actual
   rescue
@@ -96,4 +95,13 @@ module XMP2Assert::Assertions
   else
     return self # or...?
   end
+
+  private
+
+  def stderr_pass_through qe, err
+    return unless $-w
+    return unless qe.empty?
+    return if err.value.empty?
+    STDERR.puts err.value
+  end
 end

data/lib/xmp2assert/renderer.rb

@@ -30,12 +30,12 @@ require_relative 'namespace'
 require_relative 'quasifile'
 
 # Compiles a {XMP2Assert::Quasifile} into a separate ruby script.
-module XMP2Assert::Renderer
+class XMP2Assert::Renderer
 
   # I learned this handy "super-private" maneuver from @a_matsuda
   # cf: https://github.com/rails/rails/pull/27363/files
   using Module.new {
-    refine XMP2Assert::Renderer do
+    refine XMP2Assert::Renderer.singleton_class do
       private
 
       myself = Pathname.new __FILE__
@@ -59,7 +59,7 @@ module XMP2Assert::Renderer
   # @param exception [String]    :TBD:
   # @return          [File]      rendered file, if no block is given.
   # @yieldparam      [File]      rendered file, if block is given.
-  def render qfile, exception = nil
+  def self.render qfile, exception = nil
     s = erb qfile, exception
     if defined? yield
       Tempfile.create '' do |f|

data/lib/xmp2assert/spawn.rb

@@ -50,11 +50,16 @@ class XMP2Assert::Spawn
     begin
       pid = Process.spawn(*argv, opts)
       theirs.each(&:close)
-      stdin, stdout, stdrrr, rx, tx = * ours
+      stdin, stdout, stdrrr, rx, tx = *ours
       yield pid, stdin, stdout, stdrrr, rx, tx
     ensure
-      ours.each(&:close)
-      Process.waitpid pid if pid
+      begin
+        ours.each(&:close)
+      rescue IOError
+        # OK, nothing can be done by us for closed streams.
+      ensure
+        Process.waitpid pid if pid
+      end
     end
   end
 

data/lib/xmp2assert/template.erb

@@ -32,38 +32,19 @@ saved_binding = TOPLEVEL_BINDING.dup
 rx = IO.for_fd ARGV.shift.to_i, 'rb'
 tx = IO.for_fd ARGV.shift.to_i, 'wb'
 
-using Module.new {
-  refine Kernel do
+private
 
-    private
-
-    Kernel.class_variable_set('@@rx', rx)
-    Kernel.class_variable_set('@@tx', tx)
-
-    def assert_xmp_send *argv
-      rx  = Kernel.class_variable_get('@@rx')
-      tx  = Kernel.class_variable_get('@@tx')
-      str = Marshal.dump argv
-      tx.puts str.length
-      tx.write str
-      tx.flush
-      if rx.gets then
-        return true
-      else
-        Process.exit false
-      end
-    end
+define_method :xmp2assert_assert do |xmp, expr, bt = caller(3)|
+  bt.reject! {|i| i.start_with? __FILE__ }
+  str = Marshal.dump [xmp, expr.inspect, bt]
+  tx.puts str.length
+  tx.write str
+  tx.flush
+  if rx.gets then
+    return true
+  else
+    Process.exit false
   end
-}
-
-# Simulates test-unit.
-# @param xmp      [String] expected pattern of inspect.
-# @param expr     [Object] object to check.
-# @param message  [String] extra failure message.
-# @note  assertion is done in parent process, not in it.
-def xmp2assert_assert xmp, expr, c = caller(3)
-  c.reject! {|i| i.start_with? __FILE__ }
-  return assert_xmp_send xmp, expr.inspect, c
 end
 
 # Here we go.

data/lib/xmp2assert/version.rb

@@ -24,4 +24,4 @@
 # SOFTWARE.
 ;
 
-XMP2Assert::VERSION = 11
+XMP2Assert::VERSION = 12

data/lib/xmp2assert/xmp2rexp.rb

@@ -38,13 +38,11 @@ require_relative 'namespace'
 # To  reroute  the problem,  here  we  convert a  XMP  comment  into a  regular
 # expression.  The  idea behind this  is the  diff process hook  implemented in
 # https://github.com/ruby/chkbuild
-module XMP2Assert::XMP2Rexp
-  module_function
-
+class XMP2Assert::XMP2Rexp
   # Generates a regular expression that roughly matches the input.
   # @param xmp [String] example.
   # @return    [Regexp] converted regular expression.
-  def xmp2rexp xmp
+  def self.xmp2rexp xmp
     # :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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmp2assert
 version: !ruby/object:Gem::Version
-  version: '11'
+  version: '12'
 platform: ruby
 authors:
 - Urabe, Shyouhei
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: auto-generate assertions from `# =>` comments