groonga-command 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 825e111ecaa00e1ab59e8d94d960c7d0c74ed1c5
-  data.tar.gz: 8cd981a313f1ff936e55f381b34103cf07bf6d7f
+  metadata.gz: 3d4468aae3fdfadaab5cbe95c1e3605bc63ee415
+  data.tar.gz: 2314bcb34ab6bf0a616d9ab62b471d20a4df2505
 SHA512:
-  metadata.gz: aa021d38662c0d566a6ef81beb5eda9167cbae3b51372f394266ce54636a432bc371166d6239c1a37e4398564352c6b6fe8b9eade91e70fd61f96a2697edf250
-  data.tar.gz: 1a95dfb5a3edbe0153e91d8620724ae09cb75ddced9dac0ff24480d288642bc1d6f5ae8e94524cf6e58ba45400ce8fa56056aa1cac22f077130517e05427cbab
+  metadata.gz: 51145199df5284fc194db4d9041dfda31a8a1fa3cd1000b72f04a2f5d2c1f49392e0eb5a376b2fb425956c8288cc8b76c6fd6eb257d4fa1bdb54cf4cbd9e0cfa
+  data.tar.gz: 9eccabfcd2fe3817695f9dba33822f6584e52fd5fb4b6854a6cafcea803047991b10d4c3d551152f093bd0a8b37e60588f7b0dcb1f0042962c35f79dbfc91e3b

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.3.2: 2017-01-18
+
+### Improvements
+
+  * {Groonga::Command::Format::Command}: Supported pretty print.
+
 ## 1.3.1: 2016-12-08
 
 ### Improvements

data/lib/groonga/command/base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -148,8 +148,9 @@ module Groonga
         Format::URI.new(@path_prefix, @command_name, normalized_arguments).path
       end
 
-      def to_command_format
-        Format::Command.new(@command_name, normalized_arguments).command_line
+      def to_command_format(options={})
+        format = Format::Command.new(@command_name, normalized_arguments)
+        format.command_line(options)
       end
 
       private

data/lib/groonga/command/format/command.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -42,16 +40,20 @@ module Groonga
           @arguments = arguments
         end
 
-        def command_line
+        def command_line(options={})
+          pretty_print = options[:pretty_print]
           components = [@name]
           sorted_arguments = @arguments.sort_by do |name, _|
             name.to_s
           end
           sorted_arguments.each do |name, value|
-            components << "--#{name}"
-            components << self.class.escape_value(value)
+            components << "--#{name} #{self.class.escape_value(value)}"
+          end
+          if pretty_print
+            components.join(" \\\n  ")
+          else
+            components.join(" ")
           end
-          components.join(" ")
         end
       end
     end

data/lib/groonga/command/select.rb

@@ -114,6 +114,9 @@ module Groonga
         @slices ||= parse_slices
       end
 
+      # TODO: We should return `::Array` instead of raw
+      #   `output_columns` value. But it breaks backward
+      #   compatibility...
       def output_columns
         self[:output_columns]
       end

data/lib/groonga/command/version.rb

@@ -16,6 +16,6 @@
 
 module Groonga
   module Command
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/test/command/test-base.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2014  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -108,6 +106,20 @@ class BaseCommandTest < Test::Unit::TestCase
       assert_equal("select --output_type \"json\" --table \"Users\"",
                    select.to_command_format)
     end
+
+    def test_pretty_print
+      select = Groonga::Command::Base.new("select",
+                                          :table => "Users",
+                                          :filter => "_key == 29",
+                                          :output_type => "json")
+      command = select.to_command_format(:pretty_print => true)
+      assert_equal(<<-COMMAND.chomp, command)
+select \\
+  --filter "_key == 29" \\
+  --output_type "json" \\
+  --table "Users"
+      COMMAND
+    end
   end
 
   sub_test_case("#[]") do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json