jsonpp 1.1.0.rc2 → 1.1.0

data/bin/jsonpp

@@ -105,14 +105,13 @@ class JSONPP < PrettyPrint
   end
 
   def objenc(obj)
-    group(1, red('{'), red('}')) do
-      seplist(obj, nil, :each_pair) do |k, v|
+    bgroup(2, red('{'), red('}'), 1, 1) do
+      seplist(obj.keys.sort) do |k|
         group do
           pp k
-          text ':'
-          group(1) do
-            breakable ''
-            pp v
+          text ': '
+          group do
+            pp obj[k]
           end
         end
       end
@@ -120,13 +119,34 @@ class JSONPP < PrettyPrint
   end
 
   def arrenc(arr)
-    group(1, green('['), green(']')) do
+    bgroup(2, green('['), green(']'), 1, 1) do
       seplist(arr) do |v|
         pp v
       end
     end
   end
 
+  def text(obj, width=nil)
+    if width.nil?
+      # Remove the ANSI codes
+      nocolor = obj.gsub(/\033\[[0-9;]*m/,'')
+      width = nocolor.length
+    end
+    super(obj, width)
+  end
+
+  def bgroup(indent=0, open_obj='', close_obj='', open_width=open_obj.length, close_width=close_obj.length)
+    text open_obj, open_width
+    group_sub {
+      nest(indent) {
+        breakable ''
+        yield
+      }
+    }
+    breakable ''
+    text close_obj, close_width
+  end
+
   def comma_breakable
     text blue(',')
     breakable

metadata

@@ -1,73 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jsonpp
-version: !ruby/object:Gem::Version 
-  hash: 81367277
-  prerelease: 6
-  segments: 
-  - 1
-  - 1
-  - 0
-  - rc
-  - 2
-  version: 1.1.0.rc2
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jonas Pfenniger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-13 00:00:00 +00:00
-default_executable: 
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies: []
-
 description: A really small gem that prints your `curl` output nicely
 email: jonas@pfenniger.name
-executables: 
+executables:
 - jsonpp
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - bin/jsonpp
 - okjson.rb
-has_rdoc: true
 homepage: https://github.com/zimbatm/jsonpp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Command-line JSON pretty-printer
 test_files: []
-