grntest 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abb970522c59544eb9373c89c179835bdb0818d
-  data.tar.gz: ad7f18e703fe092758eab01541f271b7ca1aa485
+  metadata.gz: 623111bd9759dab5b911292fabd306b098813483
+  data.tar.gz: f58cccf27785ee89309f43ad765108daf4efb82d
 SHA512:
-  metadata.gz: 245b5e6849384cff5959aec6b6cc75bb188b4cb58b7f354531df756b86fbf060e97d149d0b5849d026d93be50a65b9225480f0fe8a5b70786c9d701586f35025
-  data.tar.gz: 78483e2708e13fe1bc4ce3e6b423a42976626d0dc1d7f6753b5352965b6a368d3326f424bce54deac2749f284cd951ab85e51b3e26768a591dd795e20280ea00
+  metadata.gz: f0580f314af0dccf1649b8516ecc9e487f738def148ca6ad3720b9bf308d194156a1e6873da73d9ccc1399202a44b3cb5fb8500f02f3c11da6f50939c00381ba
+  data.tar.gz: 66f8421596ee261fa921e5e9c92375faded61ebf21d18ac522e6e0eb70f5693d28382865404662af0a71c03153accc8425d77795953d42f8363d23323d25080c

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.2.6: 2017-08-16
+
+### Improvements
+
+  * Added `db_directory` variable.
+
+  * Added `disk_usage` response body value normalization support.
+
 ## 1.2.5: 2017-08-15
 
 ### Improvements

data/lib/grntest/test-runner.rb

@@ -675,15 +675,37 @@ http {
           exception["message"] = normalize_error_message(message)
           body.merge("exception" => exception)
         else
-          body.each do |key, value|
-            case value
-            when Hash
-              path = value["path"]
-              value["path"] = normalize_plugin_path(path) if path
+          normalize_body_recursive(body)
+        end
+      else
+        body
+      end
+    end
+
+    def normalize_body_recursive(body)
+      case body
+      when Array
+        body.collect do |value|
+          normalize_body_recursive(value)
+        end
+      when Hash
+        normalized_body = {}
+        body.each do |key, value|
+          case key
+          when "path"
+            if value
+              normalized_value = normalize_plugin_path(value)
+            else
+              normalized_value = value
             end
+            normalized_body[key] = normalized_value
+          when "disk_usage"
+            normalized_body[key] = 0
+          else
+            normalized_body[key] = normalize_body_recursive(value)
           end
-          body
         end
+        normalized_body
       else
         body
       end

data/lib/grntest/variable-expander.rb

@@ -24,6 +24,8 @@ module Grntest
         case $1
         when "db_path"
           @context.db_path.to_s
+        when "db_directory"
+          @context.db_path.parent.to_s
         when "base_directory"
           @context.base_directory.to_s
         else

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json