hotdog 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620323cd9db295c0d65d974f1161550aa8f3f5e0
-  data.tar.gz: 6ea419f4716a1b4672d4576e25185eeb54586f05
+  metadata.gz: 994ffc110fca456fa2aafe2c680b5336fb469989
+  data.tar.gz: 2a68fa27a1dab929c0b9ff5e63d031bd7747dbef
 SHA512:
-  metadata.gz: b3d6b14d0ba95834736734681fcdc40df1b5579b05818fd6324eacb2c8655771d6a5516a71e317f56fca6aa83b2920be0e1ad082308506a0515a98b274b8d32e
-  data.tar.gz: b2e2a01aa4dbdaf7095504c1ce3be093d8d1ef4ea70629f1118b301464040058ac51d74d5e7a201b91719d560b6fdf536f652fdf7fd8ffb809896679d17acd4f
+  metadata.gz: 5afa560d648757a26676dadce8fb39aac67e43ae92aa707467b1bb681e1465b1303a7937a86ba8e9f64e1a5b07a6570715704aab9dfd8db02f25b064c47093ad
+  data.tar.gz: 1f747ae6f4e3cd107484c09372051e2dcc60e837c9c5faa00479acef6895a4cca791730d0349e4341f915469753e217f8dffa5a213ad229a8e3db99da72dda2e

data/lib/hotdog/commands/search.rb

@@ -1113,7 +1113,7 @@ module Hotdog
         end
 
         def maybe_fallback(options={})
-          fallback = GlobNode.new(maybe_glob(identifier), separator).maybe_query(options)
+          fallback = GlobNode.new(maybe_glob(identifier), separator)
           if query = fallback.maybe_query(options)
             QueryExpressionNode.new(query, fallback.condition_values(options))
           else

data/lib/hotdog/commands.rb

@@ -146,9 +146,18 @@ module Hotdog
             ]
             fields.map { |tag_name|
               if tag_name == "host"
-                host_names.fetch(host_id, "")
+                host_names.fetch(host_id, nil)
               else
-                tag_values.fetch(tag_name, "")
+                tag_value = tag_values.fetch(tag_name, nil)
+                if tag_value
+                  if tag_value.empty?
+                    tag_name # use `tag_name` as `tag_value` for the tags without any values
+                  else
+                    tag_value
+                  end
+                else
+                  nil
+                end
               end
             }
           }

data/lib/hotdog/formatters/csv.rb

@@ -6,7 +6,7 @@ module Hotdog
   module Formatters
     class Csv < BaseFormatter
       def format(result, options={})
-        result = result.dup
+        result = prepare(result)
         if options[:headers] and options[:fields]
           result.unshift(options[:fields])
         end

data/lib/hotdog/formatters/json.rb

@@ -6,11 +6,11 @@ module Hotdog
   module Formatters
     class Json < BaseFormatter
       def format(result, options={})
-        result = result.dup
+        result = prepare(result)
         if options[:headers] and options[:fields]
           result.unshift(options[:fields])
         end
-        JSON.pretty_generate(result) + "\n"
+        JSON.pretty_generate(result) + newline
       end
     end
   end

data/lib/hotdog/formatters/ltsv.rb

@@ -4,14 +4,17 @@ module Hotdog
   module Formatters
     class Ltsv < BaseFormatter
       def format(result, options={})
+        result = prepare(result)
         if options[:fields]
           result.map { |row|
-            options[:fields].zip(row).map { |column| column.join(":") }.join("\t")
-          }.join("\n") + "\n"
+            options[:fields].zip(row).map { |(field, column)|
+              "#{field}:#{column}"
+            }.join("\t")
+          }.join(newline) + newline
         else
           result.map { |row|
             row.join("\t")
-          }.join("\n") + "\n"
+          }.join(newline) + newline
         end
       end
     end

data/lib/hotdog/formatters/plain.rb

@@ -7,10 +7,11 @@ module Hotdog
         if options[:print0]
           sep = "\0"
         elsif options[:print1]
-          sep = "\n"
+          sep = newline
         else
           sep = " "
         end
+        result = prepare(result)
         if options[:print1] and options[:headers] and options[:fields]
           field_length = (0...result.last.length).map { |field_index|
             result.reduce(0) { |length, row|
@@ -36,7 +37,7 @@ module Hotdog
         if s.empty? or options[:print0]
           s
         else
-          s + "\n"
+          s + newline
         end
       end
 

data/lib/hotdog/formatters/tsv.rb

@@ -4,13 +4,13 @@ module Hotdog
   module Formatters
     class Tsv < BaseFormatter
       def format(result, options={})
-        result = result.dup
+        result = prepare(result)
         if options[:headers] and options[:fields]
           result.unshift(options[:fields])
         end
         result.map { |row|
           row.join("\t")
-        }.join("\n") + "\n"
+        }.join(newline) + newline
       end
     end
   end

data/lib/hotdog/formatters/yaml.rb

@@ -6,7 +6,7 @@ module Hotdog
   module Formatters
     class Yaml < BaseFormatter
       def format(result, options={})
-        result = result.dup
+        result = prepare(result)
         if options[:headers] and options[:fields]
           result.unshift(options[:fields])
         end

data/lib/hotdog/formatters.rb

@@ -6,6 +6,15 @@ module Hotdog
       def format(result, options={})
         raise(NotImplementedError)
       end
+
+      private
+      def prepare(result)
+        result.map { |row| row.map { |column| column or "<nil>" } }
+      end
+
+      def newline()
+        "\n"
+      end
     end
   end
 end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Yamashita Yuu