update for travis/macos

.travis.yml

@@ -8,6 +8,7 @@ branches:
     # Pull request automation is not constrained to this set of branches.
     only:
         - master
+        - solcjs-standard
 matrix:
   fast_finish: true
   include:

solcjs

@@ -52,18 +52,12 @@ function abort (msg) {
 
 if (argv['standard-json']) {
   if (!solc.supportsStandard) {
-    abort('Compiler does not support Standard JSON I/O');
+    abort('Compiler does not support Standard JSON I/O!');
   }
 
-  var size = fs.fstatSync(process.stdin.fd).size;
-
-  if (size <= 0) {
-    abort('Empty input was read');
-  }
-
-  var input = fs.readSync(process.stdin.fd, size)[0];
-
-  console.log(solc.compileStandard(input));
+  // this locks until end of stdin is signaled with ctrl+D , works fine for piped stuff
+  var stdinBuffer = fs.readFileSync(0); // STDIN_FILENO = 0
+  console.log(solc.compileStandard(stdinBuffer.toString()));
   process.exit(0);
 } else if (files.length === 0) {
   console.error('Must provide a file');

test/cli.js

@@ -56,4 +56,33 @@ tape('CLI', function (t) {
     spt.succeeds();
     spt.end();
   });
+
+  t.test('standard json', function (st) {
+    var input = {
+      'language': 'Solidity',
+      'settings': {
+        'outputSelection': {
+          '*': {
+            '*': [ 'evm.bytecode', 'userdoc' ]
+          }
+        }
+      },
+      'sources': {
+        'Contract.sol': {
+          'content': 'pragma solidity ^0.4.0; contract Contract { function f() pure public {} }'
+        }
+      }
+    };
+    var spt = spawn(st, './solcjs --standard-json');
+    spt.stdin.setEncoding('utf-8');
+    spt.stdin.write(JSON.stringify(input));
+    spt.stdin.end();
+    spt.stdin.on('finish', function () {
+      spt.stderr.empty();
+      spt.stdout.match(/Contract.sol/);
+      spt.stdout.match(/userdoc/);
+      spt.succeeds();
+      spt.end();
+    });
+  });
 });