frails 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e800d031dda8188539dcd2de1a7a39dcb8a8b92febb17f15c17584822d7413
-  data.tar.gz: 571f9743b449c15ad36138f304921c8bce4b2749195699378dd63fe51cfca378
+  metadata.gz: a93cf0d24b2623de0992aac2576ee6644a6619b7ef19215fe9bb064c20420bcb
+  data.tar.gz: e7763d77d31ff21d4dd636a399e5877354eab31c09bf2a74354661afd8d18599
 SHA512:
-  metadata.gz: c488c6f79278e55cc8597958119fa9584d62fa3c092886297096601a290103f1b31b3cba2278f0530f54370f36a7cd5e7682e99e1f756344bef26a70fcb00d9b
-  data.tar.gz: a870cde84bdc3672353ad26197271159db22eeefa429a027e584babc2eb6499aaf035812adee88e36e2fae3feb28534ad46ea677ed31d7b4045f93ddcd18d5ea
+  metadata.gz: be38da133a5c64aeb15315341a14c267b8cf8c6af32097b3f01ab52341e7156854ed26c75ff231ce313b52753b8d53729014c20816e7909cebff28522ca1c805
+  data.tar.gz: 475867a9abb8594a0649cc9f770994f8b9c6b7530b6044e816d64445a7fb5c3e542598366c0ae922474c6a421a2042b9646db5fad82a1c4c9452c25c6d393138

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frails (0.8.1)
+    frails (0.8.2)
       activesupport (>= 6.0)
       nokogiri (>= 1.10.4)
       rack-proxy (>= 0.6.5)

data/lib/frails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Frails
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frails",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "A Modern [F]ront End on [Rails] and Webpack",
   "main": "index.js",
   "repository": "git@github.com:joelmoss/frails.git",

data/package/config.js

@@ -1,7 +1,10 @@
 const spawnSync = require("child_process").spawnSync;
 const path = require("path");
 
-const configFromRails = railsRun("print Frails.config_as_json");
+const ioDelimiter = "__FRAILS_RAILS_RUNNER_DELIMETER__";
+const configFromRails = railsRun(
+  `puts "${ioDelimiter}#{Frails.config_as_json}${ioDelimiter}"`
+);
 const rootPath = process.cwd();
 
 module.exports = {
@@ -20,10 +23,18 @@ function railsRun(argument) {
   const result = spawnSync("./bin/rails", ["runner", argument]);
 
   if (result.status === 0) {
-    return JSON.parse(result.stdout.toString());
+    // Output is delimited to filter out unwanted warnings or other output
+    // that we don't want in our files.
+    const sourceRegex = new RegExp(ioDelimiter + "([\\s\\S]+)" + ioDelimiter);
+    const matches = result.stdout.toString().match(sourceRegex);
+    if (matches) {
+      return JSON.parse(matches[1]);
+    } else {
+      throw "Rails runner failed having been unable to parse the output.";
+    }
   } else if (result.signal !== null) {
     throw `Rails runner was terminated with signal: ${result.signal}`;
   } else {
-    throw `Rails runner failed with '${result.error.toString()}'.`;
+    throw `Rails runner failed with '${result.stderr.toString()}'.`;
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frails
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Joel Moss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport