drntest 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b3b80ccd126e2d0a6a7ad3e382dba7b649e8bdd
-  data.tar.gz: 357a79d56578bbcd180923738cb4347b939b1da7
+  metadata.gz: 6f726abaf99e69946e00326d0c793453418bab22
+  data.tar.gz: 06482427d09d7a13fc941195c563dcb53b1f0e72
 SHA512:
-  metadata.gz: 6be667ad7d2f5cc435c094c598290e70f91711c846daa547fe68351972b2084aff707b0ad3558fa59dfe154f8a67d4442bf8f88b65391e07e45cc689bb273ccf
-  data.tar.gz: 4e89a601e6f3f91a71eaeb488d0155fa8a27a07a2d7e4f9fdfe50e8aedec952914acce61ea8ada086c9458da253b89a0724d2a143d96e7dff7243fa55e56a42c
+  metadata.gz: 275fd9a91d5049eee3c5b3c7008b7a81e12dd1f9cb7336dc10dc991ecb262e43782c43aefb3daf5e9a2bf5c7d2ac29180a159b2fc4bbcd3e4f88f2cb72940f0f
+  data.tar.gz: 54f655562fb16f1ecfad673864ab9c04dc833664100dee4e12d9825c4dbcc1741ab318ed4db1a7c0c26852e468a2e27fb0400e45b40f1f77d554305e5f98dbf1

data/lib/drntest/engine.rb

@@ -43,13 +43,32 @@ module Drntest
 
     private
     def prepare
-      if catalog_file.exist?
-        catalog_json = JSON.parse(catalog_file.read, :symbolize_names => true)
-        zone = catalog_json[:zones].first
+      return unless catalog_file.exist?
+
+      catalog_json = JSON.parse(catalog_file.read)
+      case catalog_json["version"]
+      when 1
+        zone = catalog_json["zones"].first
         /\A([^:]+):(\d+)\/(.+)\z/ =~ zone
         @config.host = "localhost" # $1
         @config.port = $2.to_i
         @config.tag  = $3
+      when 2
+        catch do |tag|
+          datasets = catalog_json["datasets"]
+          datasets.each do |name, dataset|
+            dataset["replicas"].each do |replica|
+              replica["slices"].each do |slice|
+                if /\A([^:]+):(\d+)\/([^.]+)/ =~ slice["volume"]["address"]
+                  @config.host = "localhost" # $1
+                  @config.port = $2.to_i
+                  @config.tag  = $3
+                  throw(tag)
+                end
+              end
+            end
+          end
+        end
       end
     end
 

data/lib/drntest/response-normalizer.rb

@@ -78,6 +78,7 @@ module Drntest
     end
 
     def normalize_groonga_command_header!(header)
+      return unless header.is_a?(Array)
       normalized_start_time = 0.0
       normalized_elapsed = 0.0
       header[1] = normalized_start_time if valid_start_time?(header[1])

data/lib/drntest/tester.rb

@@ -52,15 +52,6 @@ module Drntest
         test_suites_result.test_results << test_runner.run
       end
 
-      puts
-      puts "==== Test Results ===="
-      test_suites_result.test_results.each do |result|
-        puts "%s: %s" % [
-          result.name,
-          result.status
-        ]
-      end
-
       puts
       puts "==== Summary ===="
       p test_suites_result.summary

data/lib/drntest/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Droonga Project
+# Copyright (C) 2013-2014  Droonga Project
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Drntest
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drntest
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json