json_cat 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73da8c08a289821edb8b450b72eabdb224adcaf
-  data.tar.gz: 37ba4d1809d1200c220303b6a8f50e7ef27e2e3d
+  metadata.gz: c85bbe2eaf7e7864c651518dd06808c7154e04fe
+  data.tar.gz: 283627cc99f79c29e915a9725eef4df9356176bd
 SHA512:
-  metadata.gz: c792d7c1e68af9bb0af9dbddb1c4c43cfc57cc735834598739006bcdf60b0d212e6ac176047a7ed0611be1fe26bddbd0083ff50584c8c0dbc93d0d445e3e8d23
-  data.tar.gz: ffdf6313d8f24af0ac1a40dfbfa352f66ba1ef449511a3fda60731f7b72740dcdda34bcaff272eb7fdbdcdd6d54dac70bf9a241cb3cffee71ae06cde07216627
+  metadata.gz: e92ec93685d139c8924414e7b8ae94f58fbd3c6266bc18dc2837904331daa7b5ec6cec855fe34db3e587012a3dec61956b4381bea9332604cb4d0372e586f562
+  data.tar.gz: 76652b97d4c3b3160ea0474619dca218c8d98e25ccb44868ef806faa659056536c35cca4c8348fe16a9b17710a9827ba8fa0b3b3a6c2cf8e1aabfc52ae7c5f9e

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
-require "bundler/setup"
-require "json_cat"
+require 'bundler/setup'
+require 'json_cat'
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/json_cat

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
+require 'english'
 require 'optparse'
 
 require 'json_cat'
 
-
 options = {
   grep: nil,
   omit: [],
@@ -14,52 +15,48 @@ options = {
 }
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: json_cat [options]"
+  opts.banner = 'Usage: json_cat [options]'
 
-  opts.on("-c", "--[no-]color", "Colorize output (default: --color)") do |c|
+  opts.on('-c', '--[no-]color', 'Colorize output (default: --color)') do |c|
     Rainbow.enabled = c
   end
 
-  opts.on("--grep key", "Filter out JSON without key") do |key|
+  opts.on('--grep key', 'Filter out JSON without key') do |key|
     options[:grep] = key
   end
 
-  opts.on("-h", "--help", "Prints this help") do
+  opts.on('-h', '--help', 'Prints this help') do
     puts opts
     exit
   end
 
-  opts.on("-o", "--omit key[,key]", Array, "Omit keys from JSON") do |keys|
+  opts.on('-o', '--omit key[,key]', Array, 'Omit keys from JSON') do |keys|
     options[:omit] = keys
   end
 
-  opts.on("-p", "--parse key[,key]", Array, "Parse Key-value as JSON") do |keys|
+  opts.on('-p', '--parse key[,key]', Array, 'Parse Key-value as JSON') do |keys|
     options[:parse] = keys
   end
 
-  opts.on("-s", "--[no-]sort", "Sort keys") do |s|
+  opts.on('-s', '--[no-]sort', 'Sort keys') do |s|
     options[:sort] = s
   end
 
-  opts.on("-t", "--[no-]timestamp", "Timestamp lines") do |t|
+  opts.on('-t', '--[no-]timestamp', 'Timestamp lines') do |t|
     options[:timestamp] = t
   end
 end.parse!
 
-
 jp = JsonCat::JsonPrettyPrinter.new(options)
-
 begin
-  if ARGV.length > 0
+  if !ARGV.empty?
     ARGV.each do |filename|
       File.open(filename) do |f|
         f.each_line { |line| jp.print line }
       end
     end
   else
-    while gets()
-      jp.print $_
-    end
+    jp.print $LAST_READ_LINE while gets
   end
 rescue Interrupt
 end

data/json_cat.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Pretty print JSON files and standard input}
   spec.description   = %q{Format JSON to be easier to read; colorize, sort keys, etc. }
-  spec.homepage      = "https://github.com/sanscore/./"
+  spec.homepage      = "https://github.com/sanscore/json_cat/"
 
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = 'https://rubygems.org'

data/lib/json_cat/ext/array.rb

@@ -1,21 +1,33 @@
+# encoding: utf-8
 
 class Array
   def rainbow_print(level=0)
     indent = ' ' * (level * 2)
-    if self.length == 0
-      return "#{indent}#{Rainbow("[]").color(JsonCat::COLORS[level])}"
+    if length == 0
+      return "#{indent}#{Rainbow('[]').color(JsonCat::COLORS[level])}"
     end
 
-    open_br = "#{indent}#{Rainbow("[").color(JsonCat::COLORS[level])}"
-    close_br = "#{indent}#{Rainbow("]").color(JsonCat::COLORS[level])}"
+    rainbow_print_build(level)
+  end
+
+private
+
+  def rainbow_print_open_bracket(level)
+    Rainbow('[').color(JsonCat::COLORS[level])
+  end
+
+  def rainbow_print_close_bracket(level)
+    Rainbow(']').color(JsonCat::COLORS[level])
+  end
 
-    ret = [open_br]
-    self.each do |k|
+  def rainbow_print_build(level)
+    ret = [rainbow_print_open_bracket(level)]
+    each do |k|
       indent = ' ' * ((level + 1) * 2)
-      rkey = k.rainbow_print(level+1).lstrip
+      rkey = k.rainbow_print(level + 1).lstrip
       ret << "#{indent}#{rkey},"
     end
-    ret << close_br
-    return ret.join("\n")
+    ret << rainbow_print_close_bracket(level)
+    ret.join("\n")
   end
 end

data/lib/json_cat/ext/hash.rb

@@ -1,22 +1,34 @@
+# encoding: utf-8
 
 class Hash
   def rainbow_print(level=0)
     indent = ' ' * (level * 2)
-    if self.length == 0
-      return "#{indent}#{Rainbow("{}").color(JsonCat::COLORS[level])}"
+    if length == 0
+      return "#{indent}#{Rainbow('{}').color(JsonCat::COLORS[level])}"
     end
 
-    open_br = "#{indent}#{Rainbow("{").color(JsonCat::COLORS[level])}"
-    close_br = "#{indent}#{Rainbow("}").color(JsonCat::COLORS[level])}"
+    rainbow_print_build(level)
+  end
+
+private
+
+  def rainbow_print_open_bracket(level)
+    Rainbow('{').color(JsonCat::COLORS[level])
+  end
+
+  def rainbow_print_close_bracket(level)
+    Rainbow('}').color(JsonCat::COLORS[level])
+  end
 
-    ret = [open_br]
-    self.each do |k, v|
+  def rainbow_print_build(level)
+    ret = [rainbow_print_open_bracket(level)]
+    each do |k, v|
       indent = ' ' * ((level + 1) * 2)
-      rkey = k.rainbow_print(level+1)
-      rval = v.rainbow_print(level+2).lstrip
+      rkey = k.rainbow_print(level + 1)
+      rval = v.rainbow_print(level + 2).lstrip
       ret << "#{indent}#{rkey}: #{rval},"
     end
-    ret << close_br
-    return ret.join("\n")
+    ret << rainbow_print_close_bracket(level)
+    ret.join("\n")
   end
 end

data/lib/json_cat/ext/kernel.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 module Kernel
   def bow_print(obj)

data/lib/json_cat/ext/object.rb

@@ -1,6 +1,7 @@
+# encoding: utf-8
 
 class Object
-  def rainbow_print(level=0)
-    return "#{Rainbow(self.to_json).color(JsonCat::COLORS[level])}"
+  def rainbow_print(level = 0)
+    Rainbow(to_json).color(JsonCat::COLORS[level])
   end
 end

data/lib/json_cat/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module JsonCat
-  VERSION = "0.1.1"
+  VERSION = '0.1.2'.freeze
 end

data/lib/json_cat.rb

@@ -1,22 +1,24 @@
+# encoding: utf-8
+
 require 'json'
 require 'rainbow'
 
-require "json_cat/version"
-require "json_cat/ext/array"
-require "json_cat/ext/hash"
-require "json_cat/ext/kernel"
-require "json_cat/ext/object"
+require 'json_cat/version'
+require 'json_cat/ext/array'
+require 'json_cat/ext/hash'
+require 'json_cat/ext/kernel'
+require 'json_cat/ext/object'
 
 module JsonCat
   COLORS = %i(blue chartreuse cornflower red green darkviolet
-    orangered magenta yellow cyan coral limegreen dodgerblue
-    gold indigo)
+              orangered magenta yellow cyan coral limegreen dodgerblue
+              gold indigo).freeze
 
   class JsonPrettyPrinter
     attr_accessor :count, :grep, :omit, :parse, :sort, :timestamp
     def initialize(**opts)
       self.count = 0
-      opts.each { |k,v| self.instance_variable_set("@#{k}", v) }
+      opts.each { |k, v| instance_variable_set("@#{k}", v) }
     end
 
     def print(line)
@@ -29,17 +31,16 @@ module JsonCat
     end
 
   private
+
     def print_hash(json)
-      return if grep and not json[grep]
+      return if grep && !json[grep]
       self.count += 1
 
-      x = json.delete_if { |k,v| omit.include?(k) }
-      x.each {|k,v| x[k] = parse.include?(k) ? json_parse(v) : v }
+      x = json.delete_if { |k, _v| omit.include?(k) }
+      x.each { |k, v| x[k] = parse.include?(k) ? json_parse(v) : v }
       x = x.sort.to_h if sort
 
-      if timestamp
-        x = {"timestamp": Time.now.httpdate, "line-#{count}": x}
-      end
+      x['__json_cat_ts'] = Time.now.httpdate if timestamp
       bow_print x
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_cat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Grant Welch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -105,7 +105,7 @@ files:
 - lib/json_cat/ext/object.rb
 - lib/json_cat/version.rb
 - tags
-homepage: https://github.com/sanscore/./
+homepage: https://github.com/sanscore/json_cat/
 licenses:
 - Apache-2.0
 metadata: