groonga-query-log 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0419d5711633814c977ad580360a83a79452e0d6
-  data.tar.gz: eebf8ea3c3c40a6282c97a373cdc9f57069ad3f0
+  metadata.gz: 59cb88a84b56af904292b29bd1a4cb9c28325c61
+  data.tar.gz: 92f954ad66d8b38eb2bd36172d083acfa4aea45f
 SHA512:
-  metadata.gz: 50d316f1fc627b6fd6e7f0bd86e78800b591a9e36a7753a4b2fdd75a1e24f3ffd571b0110cface8befb1b584900241918f37915c99d51b2454d2da6b61a22338
-  data.tar.gz: 4a5a0545f91800ad90a3d82916c9eb18904105911352c8ea15ae52ddeda1272160543cf17c707b6c20a11a3c28eab68ce0122c708cb84077512eea607401b41c
+  metadata.gz: db4ed883687a08851ba4d140dd5974240a0dc5085bb215145ef82f79908edc7be16c8188fe1998e3096d5f1fa0e9ca08569cb416d22cf5290ff8681126d88dda
+  data.tar.gz: 9e78b432f2eec919f7e35d6d7fdb81c55b44b86de1949cf3f2a05236c3be9211bd39f79cc1273d8a052c258f1cc9305bcb61cde46f1e2a6752937ce68dbcbfd2

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 1.1.0: 2014-10-31
+
+### Improvements
+
+  * groonga-query-log-run-regression-test: Supported log output on
+    loading data.
+
 ## 1.0.9: 2014-09-09
 
 ### Improvements

data/lib/groonga/query-log/command/format-regression-test-logs.rb

@@ -76,42 +76,50 @@ module Groonga
               response1 = $POSTMATCH.chomp
             when /\Aresponse2: /
               response2 = $POSTMATCH.chomp
-              parse_failed = false
-              begin
-                JSON.parse(response1)
-              rescue JSON::ParserError
-                puts(command)
-                puts("failed to parse response1: #{$!.message}")
-                puts(response1)
-                parse_failed = true
-              end
+              next unless valid_entry?(command, response1, response2)
+              report_diff(command, repsponse1, response2)
+            end
+          end
+        end
 
-              begin
-                JSON.parse(response2)
-              rescue JSON::ParserError
-                puts(command)
-                puts("failed to parse response2: #{$!.message}")
-                puts(response2)
-                parse_failed = true
-              end
+        def valid_entry?(command, response1, response2)
+          valid = true
+
+          begin
+            JSON.parse(response1)
+          rescue JSON::ParserError
+            puts(command)
+            puts("failed to parse response1: #{$!.message}")
+            puts(response1)
+            valid = false
+          end
+
+          begin
+            JSON.parse(response2)
+          rescue JSON::ParserError
+            puts(command)
+            puts("failed to parse response2: #{$!.message}")
+            puts(response2)
+            valid = false
+          end
 
-              next if parse_failed
+          valid
+        end
 
-              next if response1 == response2
+        def report_diff(command, response1, response2)
+          return if response1 == response2
 
-              base_name = File.basename(path, ".*")
-              Tempfile.open("response1-#{base_name}") do |response1_file|
-                PP.pp(JSON.parse(response1), response1_file)
-                response1_file.flush
-                Tempfile.open("response2-#{base_name}") do |response2_file|
-                  PP.pp(JSON.parse(response2), response2_file)
-                  response2_file.flush
-                  puts(command)
-                  system("diff",
-                         "-u",
-                         response1_file.path, response2_file.path)
-                end
-              end
+          base_name = File.basename(path, ".*")
+          Tempfile.open("response1-#{base_name}") do |response1_file|
+            PP.pp(JSON.parse(response1), response1_file)
+            response1_file.flush
+            Tempfile.open("response2-#{base_name}") do |response2_file|
+              PP.pp(JSON.parse(response2), response2_file)
+              response2_file.flush
+              puts(command)
+              system("diff",
+                     "-u",
+                     response1_file.path, response2_file.path)
             end
           end
         end

data/lib/groonga/query-log/command/run-regression-test.rb

@@ -232,7 +232,11 @@ module Groonga
             FileUtils.mkdir_p(@database_path.dirname.to_s)
             system(@groonga, "-n", @database_path.to_s, "quit")
             grn_files.each do |grn_file|
-              command = [@groonga, @database_path.to_s]
+              command = [
+                @groonga,
+                "--log-path", log_path.to_s,
+                @database_path.to_s,
+              ]
               command_line = "#{command.join(' ')} < #{grn_file}"
               puts("Running...: #{command_line}")
               pid = spawn(*command, :in => grn_file.to_s)

data/lib/groonga/query-log/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   module QueryLog
-    VERSION = "1.0.9"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser