ki_format 0.0.1 → 0.0.5

data/bin/ki_format

@@ -12,18 +12,22 @@ module KiFormat
     main do |arg|
       input = arg.nil? ? $stdin : File.open(arg, 'r')
       command = Command.new(input)
-      if options[:pretty]
-        command.print_pretty
-      elsif options[:list]
-        command.print_list
-      elsif options.has_key?(:table)
-        keys = (options[:table] || "").split(",")
-        command.print_table(*keys)
-      elsif options.has_key?(:select)
-        keys = (options[:select] || "").split(",")
-        command.print_selected(*keys)
+      if options[:keys]
+        command.print_keys
       else
-        help_now! "No option given"
+        if options[:pretty]
+          command.print_pretty
+        elsif options[:list]
+          command.print_list
+        elsif options.has_key?(:table)
+          keys = (options[:table] || "").split(",")
+          command.print_table(*keys)
+        elsif options.has_key?(:select)
+          keys = (options[:select] || "").split(",")
+          command.print_selected(*keys)
+        else
+          help_now! "No option given"
+        end
       end
     end
 
@@ -35,6 +39,7 @@ module KiFormat
     on("--list", "Print each JSON object on one line")
     on("--table [key1,key2]", "Print JSON as table. Optionally include keys")
     on("--select [key1,key2]", "Select specific keys")
+    on("--keys", "Show a list of keys")
     go!
   end
 

data/lib/ki_format/command.rb

@@ -16,6 +16,14 @@ module KiFormat
       end
     end
 
+    def print_keys
+      json_in do |data|
+        data = wrap(data)
+        keys = data.inject({}) { |r,e| r.merge(e) }.keys
+        output.puts keys.join("\n")
+      end
+    end
+
     def print_list
       json_in do |data|
         data = wrap(data)
@@ -55,10 +63,25 @@ module KiFormat
         data = MultiJson.load(json)
         yield data
       rescue MultiJson::DecodeError
-        error.puts "Invalid JSON"
+        begin
+          data = try_as_array(json)
+          yield data
+        rescue MultiJson::DecodeError
+          error.puts "Invalid JSON"
+        end
       end
     end
 
+    def try_as_array(json)
+      array = []
+      parts = json.split("\n")
+      parts.each do |part|
+        array << MultiJson.load(part)
+      end
+      array
+    end
+
   end
 
+
 end

data/lib/ki_format/version.rb

@@ -1,3 +1,3 @@
 module KiFormat
-  VERSION = "0.0.1"
+  VERSION = "0.0.5"
 end

data/spec/integration/commands_spec.rb

@@ -53,6 +53,27 @@ EOS
     out.should == expected_json_out
   end
 
+  it "accepts array-like json" do
+    input =<<-JSON
+      { "foo" : "bar" }
+      { "foo" : "baz" }
+    JSON
+    expected_json_out =<<-EOS
+[
+  {
+    "foo": "bar"
+  },
+  {
+    "foo": "baz"
+  }
+]
+EOS
+    out, err = with_command(input) do |command|
+      command.print_pretty
+    end
+    out.should == expected_json_out
+  end
+
   it "can print objects in array on different lines" do
     input =<<-JSON
       [ { "foo" : "bar" }, { "baz" : "baz" } ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki_format
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000Z
+date: 2012-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70206829817800 !ruby/object:Gem::Requirement
+  requirement: &70155507580720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70206829817800
+  version_requirements: *70155507580720
 - !ruby/object:Gem::Dependency
   name: methadone
-  requirement: &70206829817300 !ruby/object:Gem::Requirement
+  requirement: &70155507580220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70206829817300
+  version_requirements: *70155507580220
 - !ruby/object:Gem::Dependency
   name: map
-  requirement: &70206829816840 !ruby/object:Gem::Requirement
+  requirement: &70155507579760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 4.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70206829816840
+  version_requirements: *70155507579760
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70206829816380 !ruby/object:Gem::Requirement
+  requirement: &70155507579300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70206829816380
+  version_requirements: *70155507579300
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70206856634200 !ruby/object:Gem::Requirement
+  requirement: &70155507578840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70206856634200
+  version_requirements: *70155507578840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70206856633740 !ruby/object:Gem::Requirement
+  requirement: &70155507578380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70206856633740
+  version_requirements: *70155507578380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206856633280 !ruby/object:Gem::Requirement
+  requirement: &70155507577920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70206856633280
+  version_requirements: *70155507577920
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70206856632820 !ruby/object:Gem::Requirement
+  requirement: &70155507577460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *70206856632820
+  version_requirements: *70155507577460
 description: Formats JSON
 email:
 - ben@freeagent.com