hotdog 0.22.1 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a119b57eb88edbf96274e510fccff8dac8cec163
-  data.tar.gz: 97cb6d850508a644026ef397928f90391938f8de
+  metadata.gz: f79366fbd1f7a1759cf63ebd5b503338a5a0c2d1
+  data.tar.gz: d4fea09cef3558cf3543020c530c0950dd5bc5eb
 SHA512:
-  metadata.gz: 6b4c12bc02f80a836ab9c7635258f0fe4be78942b6f390675092500ccc10c5549075792ea7b6045e3da0a84f0274f75dd8378eade4800a1b55649e3e6d4dcc39
-  data.tar.gz: eccae2d625eb64c21c8d703e505c7e02457106f687c17d7cc05860908c3bd527f65045975eaa3aeb2fce0dcbd37e8aeda9a2a0227a225cdf093eb6dc47223e54
+  metadata.gz: c5fa35cc842fdae8a5221fe883797d3c4336e7adde177ac21340d6bfebeccd470110ecf350e6de6c3c65baabe370b3cc8f67ce53079de37bfc666d3008be544e
+  data.tar.gz: bdeae0ef080e8750363939b9018e7be0d3441ac8481763014581645c76aff140e8182169ba3790b45f3ef5da2d67fe06561265c3e54728942f379456a96d8dc5

data/lib/hotdog/application.rb

@@ -28,7 +28,7 @@ module Hotdog
         expiry: 3600,
         fixed_string: false,
         force: false,
-        format: "plain",
+        format: "text",
         headers: false,
         listing: false,
         logger: @logger,
@@ -36,6 +36,7 @@ module Hotdog
         offline: false,
         print0: false,
         print1: true,
+        print2: false,
         primary_tag: nil,
         tags: [],
         display_search_tags: false,
@@ -96,12 +97,7 @@ module Hotdog
       rescue Errno::EPIPE => error
         STDERR.puts(error)
       rescue => error
-        STDERR.puts("#{error.class}: #{error} at #{caller.first}")
-        if @options[:debug]
-          raise # to show error stacktrace
-        else
-          exit(1)
-        end
+        raise # to show error stacktrace
       end
     end
 
@@ -144,9 +140,18 @@ module Hotdog
       end
       @optparse.on("-0", "--null", "Use null character as separator") do |v|
         options[:print0] = v
+        options[:print1] = !v
+        options[:print2] = !v
       end
       @optparse.on("-1", "Use newline as separator") do |v|
+        options[:print0] = !v
         options[:print1] = v
+        options[:print2] = !v
+      end
+      @optparse.on("-2", "Use space as separator") do |v|
+        options[:print0] = !v
+        options[:print1] = !v
+        options[:print2] = v
       end
       @optparse.on("-d", "--[no-]debug", "Enable debug mode") do |v|
         options[:debug] = v

data/lib/hotdog/expression/semantics.rb

@@ -138,13 +138,13 @@ module Hotdog
         case @op
         when :AND
           left_values = @left.evaluate(environment, options).tap do |values|
-            environment.logger.debug("lhs: #{values.length} value(s)")
+            environment.logger.debug("lhs(#{values.length})")
           end
           if left_values.empty?
             []
           else
             right_values = @right.evaluate(environment, options).tap do |values|
-              environment.logger.debug("rhs: #{values.length} value(s)")
+              environment.logger.debug("rhs(#{values.length})")
             end
             if right_values.empty?
               []
@@ -159,16 +159,16 @@ module Hotdog
                       "WHERE ? <= id AND id < ? AND ( id IN (%s) AND id IN (%s) );"
                 environment.execute(q % [left_selected.map { "?" }.join(", "), right_selected.map { "?" }.join(", ")], [range.first, range.last] + left_selected + right_selected).map { |row| row.first }
               }.tap do |values|
-                environment.logger.debug("lhs AND rhs: #{values.length} value(s)")
+                environment.logger.debug("lhs(#{left_values.length}) AND rhs(#{right_values.length}) => #{values.length}")
               end
             end
           end
         when :OR
           left_values = @left.evaluate(environment, options).tap do |values|
-            environment.logger.debug("lhs: #{values.length} value(s)")
+            environment.logger.debug("lhs(#{values.length})")
           end
           right_values = @right.evaluate(environment, options).tap do |values|
-            environment.logger.debug("rhs: #{values.length} value(s)")
+            environment.logger.debug("rhs(#{values.length})")
           end
           if left_values.empty?
             right_values
@@ -186,16 +186,16 @@ module Hotdog
                       "WHERE ? <= id AND id < ? AND ( id IN (%s) OR id IN (%s) );"
                 environment.execute(q % [left_selected.map { "?" }.join(", "), right_selected.map { "?" }.join(", ")], [range.first, range.last] + left_selected + right_selected).map { |row| row.first }
               }.tap do |values|
-                environment.logger.debug("lhs OR rhs: #{values.length} value(s)")
+                environment.logger.debug("lhs(#{left_values.length}) OR rhs(#{right_values.length}) => #{values.length}")
               end
             end
           end
         when :XOR
           left_values = @left.evaluate(environment, options).tap do |values|
-            environment.logger.debug("lhs: #{values.length} value(s)")
+            environment.logger.debug("lhs(#{values.length})")
           end
           right_values = @right.evaluate(environment, options).tap do |values|
-            environment.logger.debug("rhs: #{values.length} value(s)")
+            environment.logger.debug("rhs(#{values.length})")
           end
           if left_values.empty?
             right_values
@@ -215,7 +215,7 @@ module Hotdog
                 rq = right_selected.map { "?" }.join(", ")
                 environment.execute(q % [lq, rq, lq, rq], [range.first, range.last] + left_selected + right_selected + left_selected + right_selected).map { |row| row.first }
               }.tap do |values|
-                environment.logger.debug("lhs XOR rhs: #{values.length} value(s)")
+                environment.logger.debug("lhs(#{left_values.length}) XOR rhs(#{right_values.length}) => #{values.length}")
               end
             end
           end

data/lib/hotdog/formatters/plain.rb

@@ -1,51 +1,10 @@
 #!/usr/bin/env ruby
 
+require "hotdog/formatters/text"
+
 module Hotdog
   module Formatters
-    class Plain < BaseFormatter
-      def format(result, options={})
-        if options[:print0]
-          sep = "\0"
-        elsif options[:print1]
-          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|
-              [length, row[field_index].to_s.length, options[:fields][field_index].to_s.length].max
-            }
-          }
-          header_fields = options[:fields].zip(field_length).map { |field, length|
-            field.to_s + (" " * (length - field.length))
-          }
-          result = [
-            header_fields,
-            header_fields.map { |field|
-              "-" * field.length
-            },
-          ] + result.map { |row|
-            row.zip(field_length).map { |field, length|
-              padding = length - ((field.nil?) ? 0 : field.to_s.length)
-              field.to_s + (" " * padding)
-            }
-          }
-        end
-        s = _format(result, sep, options)
-        if s.empty? or options[:print0]
-          s
-        else
-          s + newline
-        end
-      end
-
-      def _format(result, sep, options={})
-        result.map { |row|
-          row.join(" ")
-        }.join(sep)
-      end
+    class Plain < Text
     end
   end
 end

data/lib/hotdog/formatters/text.rb

@@ -1,10 +1,53 @@
 #!/usr/bin/env ruby
 
-require "hotdog/formatters/plain"
-
 module Hotdog
   module Formatters
-    class Text < Plain
+    class Text < BaseFormatter
+      def format(result, options={})
+        if options[:print0]
+          sep = "\0"
+        elsif options[:print1]
+          sep = newline
+        elsif options[:print2]
+          sep = " "
+        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|
+              [length, row[field_index].to_s.length, options[:fields][field_index].to_s.length].max
+            }
+          }
+          header_fields = options[:fields].zip(field_length).map { |field, length|
+            field.to_s + (" " * (length - field.length))
+          }
+          result = [
+            header_fields,
+            header_fields.map { |field|
+              "-" * field.length
+            },
+          ] + result.map { |row|
+            row.zip(field_length).map { |field, length|
+              padding = length - ((field.nil?) ? 0 : field.to_s.length)
+              field.to_s + (" " * padding)
+            }
+          }
+        end
+        s = _format(result, sep, options)
+        if s.empty? or options[:print0]
+          s
+        else
+          s + newline
+        end
+      end
+
+      def _format(result, sep, options={})
+        result.map { |row|
+          row.join(" ")
+        }.join(sep)
+      end
     end
   end
 end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.22.1"
+  VERSION = "0.23.0"
 end

data/spec/formatter/plain_spec.rb

@@ -12,6 +12,7 @@ describe "plain" do
       headers: false,
       print0: true,
       print1: false,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1\0bar bbb 2\0baz ccc 3")
   end
@@ -22,6 +23,7 @@ describe "plain" do
       fields: ["key1", "key2", "val1"],
       print0: true,
       print1: false,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1\0bar bbb 2\0baz ccc 3")
   end
@@ -31,6 +33,7 @@ describe "plain" do
       headers: false,
       print0: false,
       print1: true,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq(<<-EOS)
 foo aaa 1
@@ -45,6 +48,7 @@ baz ccc 3
       fields: ["key1", "key2", "val1"],
       print0: false,
       print1: true,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq(<<-EOS)
 key1 key2 val1
@@ -60,6 +64,7 @@ baz  ccc  3
       headers: false,
       print0: false,
       print1: false,
+      print2: true,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1 bar bbb 2 baz ccc 3\n")
   end
@@ -70,6 +75,7 @@ baz  ccc  3
       fields: ["key1", "key2", "val1"],
       print0: false,
       print1: false,
+      print2: true,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1 bar bbb 2 baz ccc 3\n")
   end

data/spec/formatter/text_spec.rb

@@ -12,6 +12,7 @@ describe "text" do
       headers: false,
       print0: true,
       print1: false,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1\0bar bbb 2\0baz ccc 3")
   end
@@ -22,6 +23,7 @@ describe "text" do
       fields: ["key1", "key2", "val1"],
       print0: true,
       print1: false,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1\0bar bbb 2\0baz ccc 3")
   end
@@ -31,6 +33,7 @@ describe "text" do
       headers: false,
       print0: false,
       print1: true,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq(<<-EOS)
 foo aaa 1
@@ -45,6 +48,7 @@ baz ccc 3
       fields: ["key1", "key2", "val1"],
       print0: false,
       print1: true,
+      print2: false,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq(<<-EOS)
 key1 key2 val1
@@ -60,6 +64,7 @@ baz  ccc  3
       headers: false,
       print0: false,
       print1: false,
+      print2: true,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1 bar bbb 2 baz ccc 3\n")
   end
@@ -70,6 +75,7 @@ baz  ccc  3
       fields: ["key1", "key2", "val1"],
       print0: false,
       print1: false,
+      print2: true,
     }
     expect(fmt.format([["foo", "aaa", 1], ["bar", "bbb", 2], ["baz", "ccc", 3]], options)).to eq("foo aaa 1 bar bbb 2 baz ccc 3\n")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler