sfp 0.3.5 → 0.3.6

data/README.md

@@ -1,7 +1,7 @@
 SFP Language Parser
 ===================
 - Author: Herry (herry13@gmail.com)
-- Version: 0.3.5
+- Version: 0.3.6
 - License: [BSD License](https://github.com/herry13/sfp-ruby/blob/master/LICENSE)
 
 A Ruby gem that provides a Ruby interface to parse [SFP language](https://github.com/herry13/nuri/wiki/SFP-language), a declarative language to specify a planning task.
@@ -23,7 +23,7 @@ Requirements
 ------------
 - Ruby (>= 1.8.7)
 - Rubygems
-	- antlr3
+	- antlr3 (<= 1.8.12)
 	- json
 
 

data/bin/sfp

@@ -2,6 +2,7 @@
 
 libdir = File.expand_path(File.dirname(__FILE__))
 require "#{libdir}/../lib/sfp"
+require 'yaml'
 
 opts = Trollop::options do
 	version "sfp 0.3.5 (c) 2013 Herry"
@@ -12,7 +13,8 @@ Usage:
        sfp <file>
 EOS
 
-	opt :pretty, "Print the result in pretty JSON format.", :default => false
+	opt :pretty, "Print the result in pretty JSON format.", :short => '-r'
+	opt :yaml, "Print the result in YAML format.", :short => '-y'
 end
 
 def parse(filepath)
@@ -24,7 +26,11 @@ end
 
 filepath = ARGV[0].to_s
 if filepath != ''
-	puts parse(filepath).to_json({:pretty => opts[:pretty]})
+	if opts[:yaml]
+		puts YAML.dump(JSON[parse(filepath).to_json({:pretty => opts[:pretty]})])
+	else
+		puts parse(filepath).to_json({:pretty => opts[:pretty]})
+	end
 else
 	Trollop::help
 end