jrq 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d3571a66564b647465f6499eb27770f86428de
-  data.tar.gz: c1a9ee0b4fb2513d30fd4d417447c53b72f2ea11
+  metadata.gz: c50da8bff7d688714e46391f660f01693c761cdf
+  data.tar.gz: dc060d85212b1fcc81e9fce6cf33530334d6aec0
 SHA512:
-  metadata.gz: 721a56c3b13d64b56c15f767d00ecff66ab4e0edbd7a2240c483e4697e8c127a450eb93c72d3dfab8061530e7addc67d008961bfcd6080547133c76b040fd255
-  data.tar.gz: 0fc08ed23e392b70c77f34872095be244dfba8008b3135f95f836fdb799b4fb345a15b6120f1b57671e9394ce96b9a992926f4892b2826d2b536444a409e4e63
+  metadata.gz: d8ea8fe85f67a70dfe125ebc0ed01b2040ef11b12ed26a1fbd42896ae5ea443e1de73c8081cdd85b20aef33aa9b4f988bef9bdfa3d6c06896038c95b4ce614a3
+  data.tar.gz: 7103a8048974c7f3bb7e395dc7225d079edd1415354562a732f37e609adc51ce06d064109d0bf82b74aebf9526e1b16a3418ce3af771ffb496bcf853aad98d2f

data/exe/jrq

@@ -1,31 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'jrq'
-
-require 'json'
 require 'optparse'
 require 'ostruct'
-require 'hashie'
-require 'awesome_print'
-
-_ = JSON.load(STDIN.read)
-_ = Hashie::Mash.new(_)
-
-def display(o, options)
-  if o.is_a? Hash
-    puts JSON.pretty_generate(o)
-  else
-    if options.raw
-      puts o
-    else
-      ap o
-    end
-  end
-end
 
 options = OpenStruct.new
-display(_, options) and exit 0 if ARGV.length.zero?
-
 oparser = OptionParser.new do |opts|
   opts.on('-r', '--raw', 'display output without quotations') do |raw|
     options.raw = raw
@@ -33,4 +12,4 @@ oparser = OptionParser.new do |opts|
 end
 args = oparser.parse!(ARGV)
 
-display(eval(args.first), options) # first かどうかがわからん, と
+Jrq::Cli.new.run(args, options)

data/jrq.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'hashie', '~> 3.4'
-  spec.add_runtime_dependency 'awesome_print', '~> 1.6'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/jrq/version.rb

@@ -1,3 +1,3 @@
 module Jrq
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/jrq.rb

@@ -1,5 +1,40 @@
 require "jrq/version"
 
+require 'json'
+require 'hashie'
+
 module Jrq
-  # Your code goes here...
+
+  class Cli
+
+    def run(args, opts)
+      _ = JSON.load(stdin)
+      _ = Hashie::Mash.new(_) # is_a Hash
+      if args.length.zero?
+        display(_, opts)
+      else
+        display(eval(args.first), opts)
+      end
+    end
+
+    def stdin
+      STDIN.read
+    end
+
+    def display(o, options)
+      if options.raw
+        if o.is_a?(Hash)
+          puts JSON.pretty_generate(o)
+        elsif o.is_a?(Array) && o.any?{|ob| ob.is_a?(Hash) }
+          puts JSON.pretty_generate(o)
+        else
+          puts o
+        end
+      else
+        puts JSON.pretty_generate(o) rescue puts o
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrq
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - memerelics
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement