yq 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7da72514fc6d9279b20ea0f0604a7583e5e204a4
-  data.tar.gz: f200c7ce3ed94224c50afacf6d8c8841f9d58866
+SHA256:
+  metadata.gz: d07d7b73032c8c61bbf2f18b8b9de799c52cbddeef69386953ebeb74fad9b009
+  data.tar.gz: 35fd24192ad40d080f3b0a1a3217930ff41b0f96ad3f57e32bfc0ad990f04e27
 SHA512:
-  metadata.gz: e156fdc0dcb88c17ba4be467c0c36386b166b56709363195d80e6bbc16631970551c46a89d9f3c97106c12e39b79688e76d2caeec42f9419f188d915d4a7abd5
-  data.tar.gz: 6a1e145d4159bcf11e9ebd0491bc21b6232ab12dbb56b31454c53b5789c2516b5e3ea4ef0c134cf9b68c43a53a41bb64a1ae4cb0aa7e71d9ebe8f64048280136
+  metadata.gz: 31b279062178bf1b4179de42208cc6e8eb98d831cdf7ffd75bc5a4e6ad8fc963f2a6871f52ecb72bc1efa4fcac2e1a5483f25b1c730c0c8b134bb5adcba75055
+  data.tar.gz: b52bbb79b6ee17a28a6fce17ca0c5c4354b1c9b4a899afcb869bd46376ea8b319b85f9ba136aeae6ceacd8c00dea19c739c0209bc4e18649ed3f22b54c0b5da8

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.1.0
+  - 2.0
+  - 2.4
+  - 2.5
   - ruby-head
 # uncomment this line if your project needs to run something other than `rake`:
 script: bundle exec rspec --require spec_helper --color --format documentation spec

data/bin/yq

@@ -9,16 +9,16 @@ require 'yq'
 
 $stdout.sync = $stderr.sync = true
 unless defined?(LOGGER)
-  LOGGER = Logger.new($stderr) 
+  LOGGER = Logger.new($stderr)
 end
 LOGGER.level = Logger::INFO
 
 @options = {
-  context: :main_loop
+  context: :main_loop,
+  output: :yaml
 }
 
-
-def prereqs 
+def prereqs
   ARGV << '--help' if ARGV.empty?
 
   opts = OptionParser.new do |opts|
@@ -28,15 +28,21 @@ def prereqs
       puts opts
       exit 0
     end
-    opts.on('--verbose', '-v', 'verbose') do 
+    opts.on('--verbose', '-v', 'verbose') do
       LOGGER.level = Logger::DEBUG
     end
     opts.on("--develop", "Run in developer mode") do
       @options[:context] = :develop
     end
+    opts.on('-r', '--raw-output') do
+      @options[:output] = :raw
+    end
+    opts.on('--json-output') do
+      @options[:output] = :json
+    end
   end
   opts.parse!
-  
+
   required_vars = %w[
   ]
   required_vars.each do |v|
@@ -51,7 +57,7 @@ def start
   begin
     @yaml = $stdin.read
 
-    puts Yq.search_yaml(ARGV[0], @yaml)
+    puts Yq.search_yaml(ARGV[0], @yaml, output: @options[:output])
 
   rescue => e
     LOGGER.error "Unhandled exception #{e.class}: #{e.message}"
@@ -76,4 +82,4 @@ end
 
 
 prereqs
-self.send(@options[:context]) 
+self.send(@options[:context])

data/lib/yq.rb

@@ -15,20 +15,26 @@ module Yq
     return nil
   end
 
-  def self.search_yaml(query, yaml)
+  def self.search_yaml(query, yaml, output: :yaml)
     req_json = yaml_to_json(yaml)
+    case output
+    when :raw
+      search(query, req_json, flags: ['--raw-output'])
+    when :json
+      search(query, req_json)
+    when :yaml
     resp_json = search(query, req_json)
-    resp_yaml = json_to_yaml(resp_json)
-    return resp_yaml
+      json_to_yaml(resp_json)
+    end
   end
 
-  def self.search(query, json)
-    cmd = which('jq') + %Q[ '#{query}']
+  def self.search(query, json, flags: [])
+    cmd = [which('jq')] + flags + [query]
     input = json
     output = ""
     LOGGER.debug "sending jq #{cmd}"
 
-    Open3.popen2(cmd) do |i, o, t|
+    Open3.popen2(*cmd) do |i, o, t|
       begin
         pid = t.pid
 

data/lib/yq/version.rb

@@ -1,3 +1,3 @@
 module Yq
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/yq_spec.rb

@@ -2,22 +2,31 @@ describe Yq do
   subject { described_class }
 
   let(:hash) {
-    { "foo" => { "bar" => { "baz" => "value" }}}
+    { "foo" => { "bar" => { "'" => "value" }}}
   }
 
   let(:yaml) {<<EOF}
 foo:
   bar:
-    baz: value
+    "'": value
+EOF
+
+  # support equivalent YAML syntaxes (depends on ruby version)
+  let(:yaml_regexp) {<<EOF}
+foo:
+  bar:
+    ("'"|''''|! ''''): value
 EOF
 
   let(:json) {<<EOF.chomp}
-{"foo":{"bar":{"baz":"value"}}}
+{"foo":{"bar":{"'":"value"}}}
 EOF
 
+  let(:jq_query) { %q({"\\t": .foo.bar["'"]}) }
+
   let(:jq_response) {<<EOF}
 {
-  "baz": "value"
+  "\\t": "value"
 }
 EOF
 
@@ -73,13 +82,14 @@ EOF
 EOF
 
   describe '.search' do
-    subject { described_class.search('.foo.bar', json) }
+
+    subject { described_class.search(jq_query, json) }
 
     it { is_expected.to match(jq_response) }
 
     it 'passes it through to jq' do
       allow(Yq).to receive(:which).with('jq').and_return('/bin/jq')
-      expect(Open3).to receive(:popen2).with(%q[/bin/jq '.foo.bar']).and_return(jq_response)
+      expect(Open3).to receive(:popen2).with('/bin/jq' , jq_query).and_return(jq_response)
       subject
     end
 
@@ -99,7 +109,7 @@ EOF
 
   describe '.hash_to_yaml' do
     subject { described_class.hash_to_yaml(hash) }
-    it { is_expected.to match(yaml) }
+    it { is_expected.to match(yaml_regexp) }
   end
 
   describe '.yaml_to_json' do
@@ -109,7 +119,7 @@ EOF
 
   describe '.json_to_yaml' do
     subject { described_class.json_to_yaml(json) }
-    it { is_expected.to match(yaml) }
+    it { is_expected.to match(yaml_regexp) }
 
     context 'non-json response' do
       subject { described_class.json_to_yaml(jq_non_json_response) }
@@ -125,7 +135,7 @@ EOF
   describe '.search_yaml' do
     subject { described_class.search_yaml('.foo.bar', yaml) }
 
-    it { is_expected.to match("baz: value") }
+    it { is_expected.to match(/("'"|''''|! ''''): value/) }
   end
 
 

data/yq.gemspec

@@ -23,6 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", '~> 3.3'
   spec.add_development_dependency "pry"
-
-  spec.add_runtime_dependency "json2yaml"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yq
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jim Park
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json2yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |-
   This unceremoniously shells out to a jq available in $PATH.
     Please make sure jq is installed.
@@ -125,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A JQ wrapper for YAML