yq 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff4345f8c77a644d5a97600d15eb5f7ae59f49f
-  data.tar.gz: cac6d3daacb77f74e0b09a8ab3931a8f7498e6cf
+  metadata.gz: 19dc75e5f483ae1a839dd25c5709ac1e2ace615c
+  data.tar.gz: de6afd26f5e16c93db90e12835c808e7ee2c466e
 SHA512:
-  metadata.gz: 7b91f9ad0bf43aae28d98fca8b8d3a4c3dae4f095c997c4815d04b38e6e275a4872b1030077870bc037bb5f73c850e7cbe2c63feca0a08ad779aeca514a39a79
-  data.tar.gz: ca2b430365ff2b01d3d85f60d4432382273d43ccc2699abfb7a43fd9f22c7d4a3c589fbb5a457e945e846f3bf323b2fbe8f018cc41daed44941ce778f2b86515
+  metadata.gz: e4cede22d2c30f2aa9abe105270da7cb271929fd54d63e6b470b0345d927d345b205c8d640a656585c1e622734045b134029c84b56c8747d2ec3f26fc4b52aaa
+  data.tar.gz: b4f4c255edf8118bd025610295127870dd129b713aa3d3fa3fdae1f746a4848a7e29fbda5a93d8896587ea59507847826d233d35d113862be2ea3a270800e20b

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'contracts'
-
 group :development, :test do 
   gem 'pry'
   gem 'rspec', '~> 3.3'

data/README.md

@@ -1,6 +1,6 @@
 # Yq
 
-Use `yq` to parse YAML documents using [JMESPath](http://jmespath.org/). This gem is a simple wrapper around the [jmespath gem](https://github.com/jmespath/jmespath.rb). 
+Use `yq` to parse YAML documents using [jq](https://stedolan.github.io/jq/). This gem is a simple wrapper around the executable. `jq` should be available in your path to use this gem. 
 
 ## Installation
 
@@ -29,7 +29,7 @@ stuff:
   foo: 
     bar: baz
    
-$ cat stuff.yml | yq 'stuff.foo'
+$ cat stuff.yml | yq '.stuff.foo'
 ---
 bar: baz
     
@@ -37,7 +37,7 @@ bar: baz
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/yq/fork )
+1. Fork it ( https://github.com/jim80net/yq/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/yq.rb

@@ -1,6 +1,5 @@
 require "yq/version"
 require 'open3'
-require 'contracts'
 require 'stringio'
 require 'yaml'
 require 'json'
@@ -74,9 +73,19 @@ module Yq
 
   def self.json_to_hash(json)
     JSON.parse(json)
+  rescue JSON::ParserError => e
+    LOGGER.debug "Non JSON output from jq. Interpreting."
+    interpret_non_json_output(json)
   end
 
   def self.hash_to_json(hash)
     hash.to_json
   end
+
+  def self.interpret_non_json_output(string)
+    string.split("\n").map do |line|
+      obj = JSON.parse(%Q[{ "value": #{line} }])
+      obj["value"]
+    end
+  end
 end

data/lib/yq/version.rb

@@ -1,3 +1,3 @@
 module Yq
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/spec/yq_spec.rb

@@ -19,6 +19,19 @@ EOF
 {
   "baz": "value"
 }
+EOF
+
+  let(:jq_non_json_response) {<<EOF}
+"foo"
+"bar"
+"baz"
+EOF
+
+  let(:yaml_from_non_json_response) {<<EOF}
+---
+- foo
+- bar
+- baz
 EOF
 
   describe '.search' do
@@ -28,14 +41,16 @@ EOF
 
     it 'passes it through to jq' do
       allow(Yq).to receive(:which).with('jq').and_return('/bin/jq')
-      expect(Open3).to receive(:popen2).with('/bin/jq .foo.bar').and_return(jq_response)
+      expect(Open3).to receive(:popen2).with(%q[/bin/jq '.foo.bar']).and_return(jq_response)
       subject
     end
 
-    subject { described_class.search'.foobar', json }
+    context 'unclean exit' do
+      subject { described_class.search'.foobar', json }
 
-    it 'stops processing when jq exits uncleanly' do
-      # not mocking at this level, see implementation
+      it 'stops processing when jq exits uncleanly' do
+        # not mocking at this level, see implementation
+      end
     end
   end
 
@@ -57,6 +72,11 @@ EOF
   describe '.json_to_yaml' do
     subject { described_class.json_to_yaml(json) }
     it { is_expected.to match(yaml) }
+
+    context 'non-json response' do
+      subject { described_class.json_to_yaml(jq_non_json_response) }
+      it {is_expected.to match(yaml_from_non_json_response)}
+    end
   end
 
   describe '.search_yaml' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yq
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Jim Park
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler