json2yaml 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e46194deb17804a4272e56ed0bd0b3b07886d9fe
-  data.tar.gz: 03533791357b43d1abcedeadbc6072bda1334921
+  metadata.gz: f0c939abcc658d8470f0099f083631effed64548
+  data.tar.gz: 130fd19abd47da39896cd0c0564386cb572729be
 SHA512:
-  metadata.gz: 2cb1e19c2b1eb75b24a9066deecae9d73695d6f979861680a0a962abe318ee43c4f5f8d2318427510415c5675460698d969f468d3fe9d4cc5d1c2690f07e5f16
-  data.tar.gz: dd940815742d9a40863d8c93307190cb132ddfd8f7bd44cd146db27203609064fc8a6e150a3438460d22ced74b9e3862a398dda1cf3fb797d0b6ff00920f3f35
+  metadata.gz: e7134526de4f9ab1e2d47a3b316807e6b3f19e110cc698bfb5e016663c1bf7fe5df199229a8114ecbf82db19de488ed59b12e739c292b110dd3cd6c78586ffa2
+  data.tar.gz: 9177b778c9cff036305864acde21a862a28477c0d54f16813fe0594f6323c34235adc3ca2d3b7341f53d00e85214c53d0e520e34a4adf867e5fc4b51cfc431e3

data/README.md

@@ -13,6 +13,8 @@ Convert between JSON and YAML in CLI
 
 Now, you can use `json2yaml` and `yaml2json`
 
+### Read from STDIN
+
 ```
 $ echo '{ "a" : 123 }' | json2yaml
 #=>
@@ -29,6 +31,14 @@ $ cat bar.yml | yaml2json > bar.json
 
 ```
 
+### Read from files
+
+```
+$ json2yaml log1.json log2.json > log.yaml
+
+$ yaml2json log1.yaml log2.yaml > log.json
+```
+
 ## Contributing
 
 1. Fork it

data/bin/json2yaml

@@ -3,6 +3,6 @@
 
 require 'json2yaml'
 
-Json2yaml.to_yaml(STDIN).each do |yaml|
+Json2yaml.to_yaml(STDIN, ARGV).each do |yaml|
   print yaml
 end

data/bin/yaml2json

@@ -3,6 +3,6 @@
 
 require 'json2yaml'
 
-Json2yaml.to_json(STDIN).each do |json|
+Json2yaml.to_json(STDIN, ARGV).each do |json|
   print json
 end

data/lib/json2yaml.rb

@@ -3,18 +3,26 @@ require 'yajl/json_gem'
 require 'yaml'
 
 module Json2yaml
-  def self.to_yaml(json_stream)
+  def self.to_yaml(json_stream, argv)
+    inputs = argv.empty? ? [json_stream] : argv.map{|file| open(file) }
+
     Enumerator.new do |yielder|
-      Yajl::Parser.new.parse(json_stream) do |d|
-        yielder.yield d.to_yaml
+      inputs.each do |input|
+        Yajl::Parser.new.parse(input) do |d|
+          yielder.yield d.to_yaml
+        end
       end
     end
   end
 
-  def self.to_json(yaml_stream)
+  def self.to_json(yaml_stream, argv)
+    inputs = argv.empty? ? [yaml_stream] : argv.map{|file| open(file) }
+
     Enumerator.new do |yielder|
-      YAML.load_stream(yaml_stream) do |d|
-        yielder.yield d.to_json + "\n"
+      inputs.each do |input|
+        YAML.load_stream(input) do |d|
+          yielder.yield d.to_json + "\n"
+        end
       end
     end
   end

data/lib/json2yaml/version.rb

@@ -1,3 +1,3 @@
 module Json2yaml
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/fixtures/test1.json

@@ -0,0 +1,2 @@
+{"foo":"bar","foobar":"baz"}
+{"qux":"quux"}

data/spec/fixtures/test1.yaml

@@ -0,0 +1,5 @@
+---
+foo: bar
+foobar: baz
+---
+qux: quux

data/spec/fixtures/test2.json

@@ -0,0 +1 @@
+[1,true,false,null]

data/spec/fixtures/test2.yaml

@@ -0,0 +1,4 @@
+- 1
+- true
+- false
+- 

data/spec/json2yaml_spec.rb

@@ -1,17 +1,19 @@
 require 'spec_helper'
 
 describe Json2yaml do
+  FIXTURES_DIR = File.join(File.dirname(__FILE__), 'fixtures')
+
   context "with single data" do
     let(:json_str) { "{\"a\":\"b\"}\n" }
     let(:yaml_str) { "---\na: b\n" }
     let(:json_io)  { StringIO.new(json_str, "r") }
     let(:yaml_io)  { StringIO.new(yaml_str, "r") }
     context '.to_json' do
-      it { expect(Json2yaml.to_yaml(json_io).reduce(&:+)).to eq(yaml_str) }
+      it { expect(Json2yaml.to_yaml(json_io, []).reduce(&:+)).to eq(yaml_str) }
     end
 
     context '.to_yaml' do
-      it { expect(Json2yaml.to_json(yaml_io).reduce(&:+)).to eq(json_str) }
+      it { expect(Json2yaml.to_json(yaml_io, []).reduce(&:+)).to eq(json_str) }
     end
   end
 
@@ -21,11 +23,43 @@ describe Json2yaml do
     let(:json_io)  { StringIO.new(json_str, "r") }
     let(:yaml_io)  { StringIO.new(yaml_str, "r") }
     context '.to_json' do
-      it { expect(Json2yaml.to_yaml(json_io).reduce(&:+)).to eq(yaml_str) }
+      it { expect(Json2yaml.to_yaml(json_io, []).reduce(&:+)).to eq(yaml_str) }
     end
 
     context '.to_yaml' do
-      it { expect(Json2yaml.to_json(yaml_io).reduce(&:+)).to eq(json_str) }
+      it { expect(Json2yaml.to_json(yaml_io, []).reduce(&:+)).to eq(json_str) }
+    end
+  end
+
+  context "load by arguments" do
+    let(:test1_json_as_yaml) { "---\nfoo: bar\nfoobar: baz\n---\nqux: quux\n" }
+    let(:test2_json_as_yaml) { "---\n- 1\n- true\n- false\n- \n" }
+    let(:test1_yaml_as_json) { "{\"foo\":\"bar\",\"foobar\":\"baz\"}\n{\"qux\":\"quux\"}\n" }
+    let(:test2_yaml_as_json) { "[1,true,false,null]\n" }
+    let(:empty_io) { StringIO.new }
+
+    context "with single argument" do
+      context '.to_json' do
+        let(:argv) { [File.join(FIXTURES_DIR, 'test1.yaml')] }
+        it { expect(Json2yaml.to_json(empty_io, argv).reduce(&:+)).to eq(test1_yaml_as_json) }
+      end
+
+      context '.to_yaml' do
+        let(:argv) { [File.join(FIXTURES_DIR, 'test1.json')] }
+        it { expect(Json2yaml.to_yaml(empty_io, argv).reduce(&:+)).to eq(test1_json_as_yaml) }
+      end
+    end
+
+    context "with multiple arguments" do
+      context '.to_json' do
+        let(:argv) { [File.join(FIXTURES_DIR, 'test1.yaml'), File.join(FIXTURES_DIR, 'test2.yaml')] }
+        it { expect(Json2yaml.to_json(empty_io, argv).reduce(&:+)).to eq(test1_yaml_as_json + test2_yaml_as_json) }
+      end
+
+      context '.to_yaml' do
+        let(:argv) { [File.join(FIXTURES_DIR, 'test1.json'), File.join(FIXTURES_DIR, 'test2.json')] }
+        it { expect(Json2yaml.to_yaml(empty_io, argv).reduce(&:+)).to eq(test1_json_as_yaml + test2_json_as_yaml) }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json2yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -88,6 +88,10 @@ files:
 - json2yaml.gemspec
 - lib/json2yaml.rb
 - lib/json2yaml/version.rb
+- spec/fixtures/test1.json
+- spec/fixtures/test1.yaml
+- spec/fixtures/test2.json
+- spec/fixtures/test2.yaml
 - spec/json2yaml_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/fukayatsu/json2yaml
@@ -115,6 +119,10 @@ signing_key:
 specification_version: 4
 summary: Convert between JSON and YAML in CLI
 test_files:
+- spec/fixtures/test1.json
+- spec/fixtures/test1.yaml
+- spec/fixtures/test2.json
+- spec/fixtures/test2.yaml
 - spec/json2yaml_spec.rb
 - spec/spec_helper.rb
 has_rdoc: