lib/yq.rb in yq-0.4.0 vs lib/yq.rb in yq-0.4.1

@@ -1,64 +1,62 @@
-require "yq/version"
+require 'yq/version'
 require 'open3'
 require 'stringio'
 require 'yaml'
 require 'json'
 require 'timeout'
 
 module Yq
   def self.which(cmd)
     exts = ENV['PATH'] ? ENV['PATH'].split(':') : ['']
-    exts.each { |ext|
+    exts.each do |ext|
       exe = File.join(ext, cmd)
       return exe if File.executable?(exe) && !File.directory?(exe)
-    }
-    return nil
+    end
+    nil
   end
 
   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_json = search(query, req_json)
       json_to_yaml(resp_json)
     end
   end
 
   def self.search(query, json, flags: [])
     cmd = [which('jq')] + flags + [query]
     input = json
-    output = ""
+    output = ''
     LOGGER.debug "sending jq #{cmd}"
 
     Open3.popen2(*cmd) do |i, o, t|
-      begin
-        pid = t.pid
+      pid = t.pid
 
-        if input
-          i.puts input
-          i.close
-        end
+      if input
+        i.puts input
+        i.close
+      end
 
-        Timeout.timeout(5) do
-          o.each { |v|
-            output << v
-          }
+      Timeout.timeout(5) do
+        o.each do |v|
+          output << v
         end
-      rescue Timeout::Error
-        LOGGER.warn "Timing out #{t.inspect} after 1 second"
-        Process.kill(15, pid)
-      ensure
-        status = t.value
-        raise "JQ failed to exit cleanly" unless status.success?
       end
+    rescue Timeout::Error
+      LOGGER.warn "Timing out #{t.inspect} after 1 second"
+      Process.kill(15, pid)
+    ensure
+      status = t.value
+      raise 'JQ failed to exit cleanly' unless status.success?
     end
-    return output
+    output
   end
 
   def self.yaml_to_json(yaml)
     a = yaml_to_hash(yaml)
     hash_to_json(a)
@@ -78,11 +76,11 @@
   end
 
   def self.json_to_hash(json)
     JSON.parse(json)
   rescue JSON::ParserError
-    LOGGER.debug "Non JSON output from jq. Interpreting."
+    LOGGER.debug 'Non JSON output from jq. Interpreting.'
     interpret_non_json_output(json)
   end
 
   def self.hash_to_json(hash)
     hash.to_json
@@ -92,15 +90,13 @@
     regex = /(^\{.+?^\}|^\[.+?\]|^".+?")/m
     matches = string.scan(regex)
 
     without_the_wrapping_array = matches.map(&:first)
     without_the_wrapping_array.map do |line|
-      begin
-        JSON.parse(line)
-      rescue JSON::ParserError
-        LOGGER.debug "Assuming #{line} is a string."
-        obj = JSON.parse(%Q[{ "value": #{line} }])
-        obj["value"]
-      end
+      JSON.parse(line)
+    rescue JSON::ParserError
+      LOGGER.debug "Assuming #{line} is a string."
+      obj = JSON.parse(%({ "value": #{line} }))
+      obj['value']
     end
   end
 end