hotdog 0.27.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c50905e95a355910d2c5b79718f9eeb2a979b8b1
-  data.tar.gz: d1b32b0865160e303e6912125ae13a711b58fca3
+  metadata.gz: 767a3a461352d6a061a8a7541c63485b8aa93a82
+  data.tar.gz: d10b581aefae9b078c25560de2eac8f7102cdb36
 SHA512:
-  metadata.gz: 6b53a6a4ff7e6069d0238c1ad915af5678755e1152a761d3939a77056b149cd4ad77058137bbe111090e585d3dcd839927c820bf9844dcab7bcb23a95837a1a0
-  data.tar.gz: 794ec26214132db55833ba020452fb551baab5e7a5bebc4266b39c84ec8ae800ec7a72c9f3f7f645bd363b635cf3c2cf3f0aa4335588a0ba7ca0816a29a3b2c3
+  metadata.gz: d448f39a939e75d2063e435b6b883d5fc9b77b13070a7d7478505201cfad1e8f36fcce91b5088323fff2a7ba6bcfb1bcc44ae164804b1e6149983bd3c8f983e0
+  data.tar.gz: 130e2134cb73948d096006ac9b2443be9a0f3ceafae62c4fd6c004337e5ee697bd2327cd45ba53d4eceaacd8938e21067cb2bd5166b8117ac5d96dc867a55f29

data/lib/hotdog/application.rb

@@ -231,10 +231,13 @@ module Hotdog
       @optparse.on("--primary-tag TAG", "Use specified tag as the primary tag") do |tag|
         options[:primary_tag] = tag
       end
+      @optparse.on("-q", "--[no-]quiet", "Decrease verbosity") do |v|
+        options[:verbosity] -= 1
+      end
       @optparse.on("-x", "--display-search-tags", "Show tags used in search expression") do |v|
         options[:display_search_tags] = v
       end
-      @optparse.on("-V", "-v", "--[no-]verbose", "Enable verbose mode") do |v|
+      @optparse.on("-V", "-v", "--[no-]verbose", "Increase verbosity") do |v|
         options[:verbosity] += 1
       end
       @optparse.on("--[no-]offline", "Enable offline mode") do |v|

data/lib/hotdog/formatters/json.rb

@@ -8,9 +8,13 @@ module Hotdog
       def format(result, options={})
         result = prepare(result)
         if options[:headers] and options[:fields]
-          result.unshift(options[:fields])
+          result.map! do |record|
+            Hash[options[:fields].zip(record)]
+          end
+          JSON.pretty_generate(result) + newline
+        else
+          JSON.pretty_generate(result) + newline
         end
-        JSON.pretty_generate(result) + newline
       end
     end
   end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.27.1"
+  VERSION = "0.28.0"
 end

data/spec/formatter/json_spec.rb

@@ -40,26 +40,21 @@ describe "json" do
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq(<<-EOS)
 [
-  [
-    "key1",
-    "key2",
-    "val1"
-  ],
-  [
-    "foo",
-    "aaa",
-    1
-  ],
-  [
-    "bar",
-    "bbb",
-    2
-  ],
-  [
-    "baz",
-    "ccc",
-    3
-  ]
+  {
+    "key1": "foo",
+    "key2": "aaa",
+    "val1": 1
+  },
+  {
+    "key1": "bar",
+    "key2": "bbb",
+    "val1": 2
+  },
+  {
+    "key1": "baz",
+    "key2": "ccc",
+    "val1": 3
+  }
 ]
     EOS
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler