Added ohl util, removed ohl2html and ohl2bemjson utils, bemjson block…

… renamed to "ohl"

GNUmakefile

@@ -20,16 +20,16 @@ lib/ometa-highlighter.js: src
 		; done
 
 tests: FORCE
-	./bin/ohl2html -i $@/bla.js -o $@/bla.html -f js
-	cat $@/bla.js | ./bin/ohl2html -f js > $@/bla.html.stdout
-	
-	./bin/ohl2html -i $@/test.xml -o $@/test.html -f xml
-	cat $@/test.xml | ./bin/ohl2html -f xml > $@/test.html.stdout
-	
-	./bin/ohl2bemjson -i $@/bla.js -o $@/bla.bemjson.js -f js
-	cat $@/bla.js | ./bin/ohl2bemjson -f js > $@/bla.bemjson.js.stdout
-	
-	./bin/ohl2bemjson -i $@/test.xml -o $@/test.bemjson.js -f xml
-	cat $@/test.xml | ./bin/ohl2bemjson -f xml > $@/test.bemjson.js.stdout
+	./bin/ohl -i $@/bla.js -o $@/bla.html -l js -f html
+	cat $@/bla.js | ./bin/ohl -l js -f html > $@/bla.html.stdout
+
+	./bin/ohl -i $@/test.xml -o $@/test.html -l xml -f html
+	cat $@/test.xml | ./bin/ohl -l xml -f html > $@/test.html.stdout
+
+	./bin/ohl -i $@/bla.js -o $@/bla.bemjson.js -l js -f bemjson
+	cat $@/bla.js | ./bin/ohl -l js -f bemjson > $@/bla.bemjson.js.stdout
+
+	./bin/ohl -i $@/test.xml -o $@/test.bemjson.js -l xml -f bemjson
+	cat $@/test.xml | ./bin/ohl -l xml -f bemjson > $@/test.bemjson.js.stdout
 
 .PHONY: all FORCE

bin/ohl

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../lib/cli').main();

lib/cli.js

@@ -0,0 +1,103 @@
+exports.main = function () {
+
+    var sys = require('sys'),
+        fs = require('fs');
+
+    require('coa').Cmd()
+        .name(process.argv[1])
+        .title('OMeta Highlighter command line utility')
+        .helpful()
+        .opt()
+            .name('version')
+            .title('Show version')
+            .long('version')
+            .flag()
+            .act(function(opts) {
+                this.exit(
+                    JSON.parse(require('fs').readFileSync(__dirname + '/../package.json'))
+                        .version);
+            })
+            .end()
+        .opt()
+            .name('input')
+            .title('Input file. Defaults to stdin')
+            .short('i')
+            .long('input')
+            .end()
+        .opt()
+            .name('output')
+            .title('Output file. Defaults to stdout')
+            .short('o')
+            .long('output')
+            .end()
+        .opt()
+            .name('lang')
+            .title('Language: js, xml')
+            .short('l')
+            .long('lang')
+            .req()
+            .val(function(value) {
+                (['js', 'xml'].indexOf(value) == -1) && this.end()
+                    .errorExit('Wrong language "' + value + '" specified, must be one of "js" or "xml"');
+                return value;
+            })
+            .end()
+        .opt()
+            .name('format')
+            .title('Output format: html, bemjson. Defaults to html')
+            .short('f')
+            .long('format')
+            .def('html')
+            .val(function(value) {
+                (['html', 'bemjson'].indexOf(value) == -1) && this.end()
+                    .errorExit('Wrong output format "' + value + '" specified, must be one of "html" or "bemjson"');
+                return value;
+            })
+            .end()
+        .opt()
+            .name('verbose')
+            .title('Show verbose output')
+            .long('verbose')
+            .short('v')
+            .flag()
+            .end()
+        .act(function(opts) {
+            (opts.input ?
+                // if input file
+                function(inputFn) {
+                    fs.readFile(opts.input, 'utf8', function(err, input){
+                        if (err) throw err;
+                        inputFn(input);
+                    });
+                } :
+                // if STDIN
+                function(inputFn) {
+                    var input = '';
+                    process.openStdin()
+                        .on('data', function(s) { input += s })
+                        .on('end', function() { inputFn(input) });
+                })(function(input){
+                    try {
+                        var ohl = require('./ometa-highlighter'),
+                            ast = ohl.OmetaHighlighter.matchAll(input, opts.lang),
+                            result = (opts.format == 'html' ?
+                                ohl.OmetaHighlighterToHtml.match(ast, 'topLevel') :
+                                JSON.stringify(ohl.OmetaHighlighterToBemjson.match(ast, 'topLevel'), null, 4) + '\n');
+                        opts.output ?
+                            fs.writeFile(opts.output, result, 'utf8', function(err) {
+                                    if (err) throw err;
+                                    opts.verbose && sys.error('  create : ' + opts.output);
+                                }) :
+                            process.stdout.write(result);
+                    } catch (e) {
+                        e.errorPos != undefined &&
+                            sys.error(
+                                input.slice(0, e.errorPos) +
+                                "\n--- Parse error ->" +
+                                input.slice(e.errorPos) + '\n');
+                        throw e;
+                    }
+                });
+        })
+        .parse(process.argv.slice(2));
+};

package.json

@@ -10,10 +10,10 @@
     },
     "main" : "./lib/ometa-highlighter",
     "directories" : { "lib" : "./lib" },
-    "bin" : { "ohl2html" : "./bin/ohl2html", "ohl2bemjson" : "./bin/ohl2bemjson" },
+    "bin" : { "ohl" : "./bin/ohl" },
     "dependencies" : {
         "ometajs" : ">= 2.0.1"
     },
-    "engines" : { "node" : ">=0.2.0" },
+    "engines" : { "node" : ">=0.4.0" },
     "licenses" : [ { "type" : "AS IS" } ]
 }

src/ometa-highlighter2bemjson.ometajs

@@ -4,7 +4,7 @@ ometa OmetaHighlighterToBemjson {
             | :c -> OmetaHighlighterToBemjson._escape(c),
     tokens = [token*:c] -> c,
 
-    topLevel = [:lang tokens:c] -> { block: 'b-code', mods: { 'lang': lang }, content: c }
+    topLevel = [:lang tokens:c] -> { block: 'ohl', mods: { 'lang': lang }, content: c }
 }
 
 OmetaHighlighterToBemjson._escape = (function(){

tests/bla.bemjson.js

@@ -1,5 +1,5 @@
 {
-    "block": "b-code",
+    "block": "ohl",
     "mods": {
         "lang": "js"
     },

tests/bla.bemjson.js.stdout

@@ -1,5 +1,5 @@
 {
-    "block": "b-code",
+    "block": "ohl",
     "mods": {
         "lang": "js"
     },

tests/test.bemjson.js

@@ -1,5 +1,5 @@
 {
-    "block": "b-code",
+    "block": "ohl",
     "mods": {
         "lang": "xml"
     },

tests/test.bemjson.js.stdout

@@ -1,5 +1,5 @@
 {
-    "block": "b-code",
+    "block": "ohl",
     "mods": {
         "lang": "xml"
     },