summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rwxr-xr-xprettyml13
-rwxr-xr-xprettyson14
3 files changed, 22 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 64603af..6a05b79 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ I'll assume I'm the only user.
Version 1.20160502+git, not yet released
----------------------------------------
+* prettyson and prettyml now read from stdin by default.
Version 1.20160502, released 2016-05-02
----------------------------------------
diff --git a/prettyml b/prettyml
index fe9f468..f4fbb5e 100755
--- a/prettyml
+++ b/prettyml
@@ -4,8 +4,15 @@ import sys
import yaml
+def inputs(args):
+ if args:
+ for filename in args:
+ with open(filename) as f:
+ yield filename, f
+ else:
+ yield '-', sys.stdin
+
objs = []
-for filename in sys.argv[1:]:
- with open(filename) as f:
- objs.append(yaml.safe_load(f))
+for filename, f in inputs(sys.argv[1:]):
+ objs.append(yaml.safe_load(f))
yaml.safe_dump_all(objs, stream=sys.stdout, indent=4, default_flow_style=False)
diff --git a/prettyson b/prettyson
index 367cff8..0a327ad 100755
--- a/prettyson
+++ b/prettyson
@@ -2,8 +2,16 @@
import sys, json
+def inputs(args):
+ if args:
+ for filename in args:
+ with open(filename) as f:
+ yield filename, f
+ else:
+ yield '-', sys.stdin
+
objs = []
-for filename in sys.argv[1:]:
- with open(filename) as f:
- objs.append(json.load(f))
+for filename, f in inputs(sys.argv[1:]):
+ objs.append(json.load(f))
json.dump(objs, sys.stdout, indent=4)
+sys.stdout.write('\n')