print_json_response 1.0.1 → 2.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.0
+
+* Major enhancement:
+  * Added djr "diff json response", diff the output of two json results
+
 === 1.0 / ??
 
 * Major Enhancement

data/Manifest.txt

@@ -2,5 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/djr
 bin/pjr
 lib/print_json_response.rb

data/README.txt

@@ -5,6 +5,7 @@
 == DESCRIPTION
 
 A simple script to grab JSON from a URI and view it in a readable manner.
+Also, diff the JSON result of two URIs.
 
 == SYNOPSIS:
 
@@ -36,6 +37,15 @@ pjr can jump into irb, instead of printing json
   irb(main):001:0> @response['what']
   => "oh hey look some pretty-printed json"
 
+djr can diff two JSON results:
+
+  $ djr http://one.example/some/path http://two.example/some/path
+
+pjr and djr can walk the JSON tree for more specific results:
+
+  $ pjr http://one.example/some/path a b c
+  $ djr http://one.example/some/path http://two.example/some/path a b c
+
 == INSTALL:
 
 * gem install print_json_response

data/bin/djr

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'print_json_response'
+
+PrintJsonResponse.run $0, ARGV
+

data/bin/pjr

@@ -2,5 +2,5 @@
 
 require 'print_json_response'
 
-PrintJsonResponse.run
+PrintJsonResponse.run $0, ARGV
 

data/lib/print_json_response.rb

@@ -6,20 +6,28 @@ require 'json'
 
 class PrintJsonResponse
 
-  VERSION = '1.0.1'
+  VERSION = '2.0'
 
   DEFAULT_HOST = 'http://127.0.0.1:3000'
 
   CONFIG_PATH = File.expand_path '~/.pjr'
 
-  def self.process_args argv
+  def self.process_args program_name, argv
     options = {}
+    options[:diff_opts] = '-u'
+
+    djr = program_name =~ /djr$/
 
     op = OptionParser.new do |opts|
-      opts.program_name = 'pjr'
+      opts.program_name = program_name
       opts.version = VERSION
-      opts.banner = <<-BANNER
-Usage: pjr [options] URL [PATH ...]
+      opts.banner = if djr then
+                      "Usage: #{program_name} [options] URL URL [PATH ...]"
+                    else
+                      "Usage: #{program_name} [options] URL [PATH ...]"
+                    end
+
+      opts.banner << <<-BANNER
 
 PATH is a path of keys in the JSON document you wish to descend.  Given a JSON
 document like:
@@ -30,6 +38,10 @@ document like:
 
       BANNER
 
+      opts.on '--diff-opts=DIFF_OPTS', 'Options for diff' do |value|
+        options[:diff_opts] = value
+      end if djr
+
       opts.on '--[no-]irb', 'Dump the results into @response in IRB' do |value|
         options[:irb] = value
       end
@@ -39,31 +51,34 @@ document like:
 
     abort op.to_s if argv.empty?
 
-    url = argv.shift
+    urls = argv.shift(djr ? 2 : 1)
 
     options[:path] = argv
 
-    return url, options
+    return urls, options
   end
 
-  def self.run argv = ARGV
-    url, options = process_args argv
+  def self.run program_name, argv = ARGV
+    urls, options = process_args program_name, argv
 
-    pjr = new url, options
+    pjr = new urls, options
 
     pjr.run
   end
 
-  def initialize url, options
-    unless url =~ /\Ahttp/i then
-      url = '/' + url unless url.start_with? '/'
-      url = default_host + url
-    end
+  def initialize urls, options
+    @urls = urls.map do |url|
+      unless url =~ /\Ahttp/i then
+        url = '/' + url unless url.start_with? '/'
+        url = default_host + url
+      end
 
-    @url = URI.parse url
+      URI.parse url
+    end
 
-    @irb  = options[:irb]
-    @path = options[:path]
+    @diff_opts = options[:diff_opts]
+    @irb       = options[:irb]
+    @path      = options[:path]
   end
 
   def default_host
@@ -75,23 +90,52 @@ document like:
     end
   end
 
-  def run
-    $stderr.puts "Retrieving #{@url}:" if $stdout.tty?
+  def diff results
+    require 'pp'
+    require 'tempfile'
+    require 'enumerator'
+
+    tempfiles = []
+
+    results.each_with_index do |result, i|
+      io = Tempfile.open "url_#{i}_"
+      io.puts result.pretty_inspect
+      io.flush
+
+      tempfiles << io
+    end
+
+    system "diff #{@diff_opts} #{tempfiles.map { |io| io.path}.join ' '}"
+  end
 
-    resp = Net::HTTP.get_response @url
+  def fetch url
+    $stderr.puts "Retrieving #{url}:" if $stdout.tty?
+
+    resp = Net::HTTP.get_response url
     json = JSON.parse resp.body
 
     json = @path.inject json do |data, item| data[item] end
+  end
+
+  def irb json
+    require 'irb'
+    @response = json
+    puts "JSON response is in @response"
+    IRB.start
+  end
+
+  def run
+    results = @urls.map do |url|
+      fetch url
+    end
 
-    if @irb then
-      require 'irb'
-      @response = json
-      puts "Loading IRB."
-      puts "JSON response is in @response"
-      IRB.start
+    if results.length == 2 then
+      diff results
+    elsif @irb then
+      irb results.first
     else
       require 'pp'
-      puts json.pretty_inspect
+      puts results.first.pretty_inspect
     end
   end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: print_json_response
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
-  - 1
-  version: 1.0.1
+  version: "2.0"
 platform: ruby
 authors: 
 - Jacob Dunphy
@@ -14,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +35,11 @@ dependencies:
   name: rubyforge
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -47,20 +51,25 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id003
-description: A simple script to grab JSON from a URI and view it in a readable manner.
+description: |-
+  A simple script to grab JSON from a URI and view it in a readable manner.
+  Also, diff the JSON result of two URIs.
 email: 
 - ""
 executables: 
+- djr
 - pjr
 extensions: []
 
@@ -73,6 +82,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/djr
 - bin/pjr
 - lib/print_json_response.rb
 has_rdoc: true
@@ -86,25 +96,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: print_json_response
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A simple script to grab JSON from a URI and view it in a readable manner.
+summary: A simple script to grab JSON from a URI and view it in a readable manner
 test_files: []