drntest 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebd36d8996038d558504ce87c1fede7b37ac353
-  data.tar.gz: fb1a2e73e9115bfc04e8cc0cb105481dd1b78281
+  metadata.gz: 04d9acd495e58d18289127e4bb88eb63b2a4ef6d
+  data.tar.gz: 233acd50bd676565e1ec6e0151184912d8068b8a
 SHA512:
-  metadata.gz: c9af6059cf9b7653295834f8005e4e651c4afa0241a49363c9e4461a5fbde00e9eb09e4b4ab7b071b4bef0bd1818048d7853b4627b18cb7bb36f0bf7441acbaa
-  data.tar.gz: ca4211497d4b62055b79259d88004be2f78e834431699f0a6b5dfa9a952aefd5f51b3a41f22b9eb2e98dcb5b5d23a1b560acd2fc9971d2ba6f08467b79b7798a
+  metadata.gz: 414223a7360b5f2502f9ea5da7ca759bfee4d8216e05ab6688ceb0a796b0f8da97e1dc1b8086ff82bdbc01e283f0e181ae4dff35be14e26f97e8a21a72a87b18
+  data.tar.gz: cbd23eb74bf5ae7bf7991d5b382cf453cd220ed02cfa882cc659a6fe1da562eec1595c7522d7c32590a446a26a3923e8ec1ec37a51574a2f45f3bdcc23d0c842

data/drntest.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("json")
   spec.add_runtime_dependency("yajl-ruby")
-  spec.add_runtime_dependency("droonga-client")
+  spec.add_runtime_dependency("droonga-client", ">= 0.1.0")
 
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("rake")

data/lib/drntest/directive.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2013  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Drntest
+  class Directive
+    attr_reader :type, :value
+
+    def initialize(type, value)
+      @type = normalize_type(type)
+      @value = value
+    end
+
+    private
+    def normalize_type(type)
+      type.gsub("-", "_").to_sym
+    end
+  end
+end

data/lib/drntest/json-loader.rb

@@ -0,0 +1,62 @@
+# Copyright (C) 2013  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "yajl"
+
+module Drntest
+  class JSONLoader
+    class << self
+      def report_error(path, data, error)
+        marker = "-" * 60
+        puts("Failed to load JSONs file: #{path}")
+        puts(marker)
+        puts(data)
+        puts(marker)
+        puts(error)
+        puts(marker)
+      end
+    end
+
+    attr_reader :objects
+
+    def initialize
+      @parser = Yajl::Parser.new
+      @objects = []
+      @parser.on_parse_complete = lambda do |object|
+        @objects << object
+      end
+    end
+
+    def <<(data)
+      @parser << data
+    end
+
+    def load(path)
+      path.open do |file|
+        data = ""
+        file.each_line do |line|
+          data << line
+          begin
+            self << line
+          rescue Yajl::ParseError => error
+            self.class.report_error(path, data, error)
+            break
+          end
+        end
+      end
+      @objects
+    end
+  end
+end

data/lib/drntest/path.rb

@@ -0,0 +1,21 @@
+# Copyright (C) 2013  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module Drntest
+  module Path
+    SUITE  = "suite"
+    CONFIG = "config"
+  end
+end

data/lib/drntest/{executor.rb → response-normalizer.rb}

@@ -13,48 +13,34 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "droonga/client"
-
 module Drntest
-  class Executor
-    attr_reader :owner, :request
-
-    def initialize(owner, request)
-      @owner = owner
+  class ResponseNormalizer
+    def initialize(request, response)
       @request = request
+      @response = response
     end
 
-    def execute
-      normalize_result(execute_commands)
-    end
-
-    private
-    def execute_commands
-      client = Droonga::Client.new(tag: owner.tag, port: owner.port)
-      client.connection.send(request, :response => :one)
-    end
+    def normalize
+      return @response if @response.nil?
 
-    def normalize_result(result)
-      return result if result.nil?
-
-      normalized_result = result.dup
-      normalize_envelope!(normalized_result)
-      normalize_body!(normalized_result)
-      normalized_result
+      normalized_response = @response.dup
+      normalize_envelope!(normalized_response)
+      normalize_body!(normalized_response)
+      normalized_response
     end
 
-    def normalize_envelope!(normalized_result)
+    private
+    def normalize_envelope!(normalized_response)
       normalized_start_time = 0
-      normalized_result[1] = normalized_start_time
+      normalized_response[1] = normalized_start_time
     end
 
-    def normalize_body!(normalized_result)
+    def normalize_body!(normalized_response)
       return unless groonga_command?
       begin
-        normalize_groonga_command_result!(normalized_result[2])
+        normalize_groonga_command_response!(normalized_response[2])
       rescue StandardError => error
         p error
-        normalized_result
       end
     end
 
@@ -64,11 +50,11 @@ module Drntest
       "select",
     ]
     def groonga_command?
-      GROONGA_COMMANDS.include?(request["type"])
+      GROONGA_COMMANDS.include?(@request["type"])
     end
 
-    def normalize_groonga_command_result!(result)
-      normalize_groonga_command_header!(result["body"][0])
+    def normalize_groonga_command_response!(response)
+      normalize_groonga_command_header!(response["body"][0])
     end
 
     def normalize_groonga_command_header!(header)

data/lib/drntest/test-executor.rb

@@ -0,0 +1,105 @@
+# Copyright (C) 2013  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "droonga/client"
+
+require "drntest/test-loader"
+require "drntest/response-normalizer"
+
+module Drntest
+  class TestExecutor
+    attr_reader :owner, :test_path
+
+    def initialize(owner, test_path)
+      @owner = owner
+      @test_path = test_path
+    end
+
+    def execute
+      Droonga::Client.open(tag: owner.tag, port: owner.port) do |client|
+        context = Context.new(client)
+        operations.each do |operation|
+          context.execute(operation)
+        end
+        context.finish
+        context.responses
+      end
+    end
+
+    private
+    def operations
+      loader = TestLoader.new(@owner, @test_path)
+      loader.load
+    end
+
+    class Context
+      attr_reader :responses
+
+      def initialize(client)
+        @client = client
+        @requests = []
+        @responses = []
+        @logging = true
+      end
+
+      def execute(operation)
+        case operation
+        when Directive
+          execute_directive(operation)
+        else
+          execute_request(operation)
+        end
+      end
+
+      def finish
+        consume_requests
+      end
+
+      private
+      def execute_directive(directive)
+        case directive.type
+        when :enable_logging
+          @logging = true
+          consume_requests
+        when :disable_logging
+          @logging = false
+        end
+      end
+
+      def execute_request(request)
+        if @logging
+          response = @client.connection.execute(request)
+          @responses << normalize_response(request, response)
+        else
+          @requests << @client.connection.execute(request,
+                                                  :connect_timeout => 2) do
+          end
+        end
+      end
+
+      def consume_requests
+        @requests.each do |request|
+          request.wait
+        end
+        @requests.clear
+      end
+
+      def normalize_response(request, response)
+        normalizer = ResponseNormalizer.new(request, response)
+        normalizer.normalize
+      end
+    end
+  end
+end

data/lib/drntest/test-loader.rb

@@ -0,0 +1,74 @@
+# Copyright (C) 2013  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "drntest/json-loader"
+require "drntest/directive"
+
+module Drntest
+  class TestLoader
+    attr_reader :owner, :test_path
+
+    def initialize(owner, test_path)
+      @owner = owner
+      @test_path = test_path
+    end
+
+    def load
+      load_test_file(@test_path)
+    end
+
+    private
+    def resolve_relative_path(path)
+      path = path.to_s
+      path = path[2..-1] if path[0..1] == "./"
+      Pathname(path).expand_path(@owner.base_path)
+    end
+
+    def load_test_file(path)
+      parser = Yajl::Parser.new
+      operations = []
+      parser.on_parse_complete = lambda do |operation|
+        operations << operation
+      end
+      data = ""
+      Pathname(path).read.each_line do |line|
+        data << line
+        case line.chomp
+        when /\A\#\@([^\s]+)(?:\s+(.+))?\z/
+          type = $1
+          value = $2
+          directive = Directive.new(type, value)
+          if directive.type == :include
+            included = resolve_relative_path(directive.value)
+            included_operations = load_test_file(included)
+            operations += included_operations
+          else
+            operations << directive
+          end
+        when /\A\#/
+          # comment
+        else
+          begin
+            parser << line
+          rescue Yajl::ParseError => error
+            JSONLoader.report_error(path, data, error)
+            raise error
+          end
+        end
+      end
+      operations
+    end
+  end
+end

data/lib/drntest/test-runner.rb

@@ -17,10 +17,13 @@ require "json"
 require "yajl"
 require "tempfile"
 require "pp"
-require "drntest/test-results"
-require "drntest/executor"
 require "fileutils"
 
+require "drntest/path"
+require "drntest/test-results"
+require "drntest/test-executor"
+require "drntest/json-loader"
+
 module Drntest
   class TestRunner
     attr_reader :owner, :base_path, :target_path
@@ -44,7 +47,7 @@ module Drntest
     end
 
     def config_dir
-      (@base_path + "config") + @owner.config
+      (@base_path + Path::CONFIG) + @owner.config
     end
 
     def config_file
@@ -68,12 +71,6 @@ module Drntest
     end
 
     private
-    def resolve_relative_path(path, base)
-      path = path.to_s
-      path = path[2..-1] if path[0..1] == "./"
-      Pathname(path).expand_path(base)
-    end
-
     def prepare
       if catalog_file.exist?
         catalog_json = JSON.parse(catalog_file.read, :symbolize_names => true)
@@ -88,8 +85,7 @@ module Drntest
     def setup
       return unless temporary_engine?
 
-      FileUtils.rm_rf(temporary_dir)
-      FileUtils.mkdir_p(temporary_dir)
+      setup_temporary_dir
 
       temporary_config = temporary_dir + "fluentd.conf"
       FileUtils.cp(config_file, temporary_config)
@@ -102,8 +98,6 @@ module Drntest
         *@owner.fluentd_options,
       ]
       engine_env = {
-        "RUBYOPT" => nil,
-        "BUNDLE_GEMFILE" => nil,
         "DROONGA_CATALOG" => temporary_catalog.to_s,
       }
       engine_options = {
@@ -123,11 +117,29 @@ module Drntest
       Process.kill(:TERM, @engine_pid)
       Process.wait(@engine_pid)
 
+      teardown_temporary_dir
+    end
+
+    def setup_temporary_dir
+      tmpfs = Pathname("/run/shm")
+      if tmpfs.directory? and tmpfs.writable?
+        FileUtils.rm_rf(temporary_base_dir)
+        FileUtils.ln_s(tmpfs.to_s, temporary_base_dir.to_s)
+      end
+      FileUtils.rm_rf(temporary_dir)
+      FileUtils.mkdir_p(temporary_dir)
+    end
+
+    def teardown_temporary_dir
       FileUtils.rm_rf(temporary_dir.to_s)
     end
 
+    def temporary_base_dir
+      @base_path + "tmp"
+    end
+
     def temporary_dir
-      config_dir + "tmp"
+      temporary_base_dir + "drntest"
     end
 
     def temporary_engine?
@@ -137,21 +149,8 @@ module Drntest
     def process_requests
       results = TestResults.new(@target_path)
 
-      logging = true
-      load_request_envelopes.each do |request|
-        if request.is_a?(Directive)
-          case request.type
-          when :enable_logging
-            logging = true
-          when :disable_logging
-            logging = false
-          end
-          next
-        end
-        executor = Executor.new(self, request)
-        response = executor.execute
-        results.actuals << response if logging
-      end
+      executor = TestExecutor.new(self, @target_path)
+      results.actuals = executor.execute
       if expected_exist?
         results.expecteds = load_expected_responses
       end
@@ -174,61 +173,13 @@ module Drntest
       results
     end
 
-    def load_request_envelopes
-      load_jsons(@target_path)
-    end
-
     def load_expected_responses
       load_jsons(expected_path)
     end
 
-    class Directive
-      MATCHER = /\A\#\@([^\s]+)(?:\s+(.+))?\z/.freeze
-
-      class << self
-        def directive?(source)
-          MATCHER =~ source.strip
-        end
-      end
-
-      attr_reader :type, :value
-
-      def initialize(source)
-        MATCHER =~ source.strip
-        @value = $2
-        @type = $1.gsub("-", "_").to_sym
-      end
-    end
-
-    def load_jsons(path, options={})
-      parser = Yajl::Parser.new
-      json_objects = []
-      parser.on_parse_complete = Proc.new do |json_object|
-        json_objects << json_object
-      end
-      Pathname(path).read.each_line do |line|
-        if line[0] == "#"
-          if Directive.directive?(line)
-            directive = Directive.new(line)
-            if directive.type == :include
-              included = resolve_relative_path(directive.value,
-                                               options[:base_path] || @base_path)
-              included_jsons = load_jsons(included)
-              json_objects += included_jsons
-            else
-              json_objects << directive
-            end
-          end
-        else
-          begin
-            parser << line
-          rescue StandardError => error
-            p "Failed to load JSONs file: #{path.to_s}"
-            raise error
-          end
-        end
-      end
-      json_objects
+    def load_jsons(path)
+      loader = JSONLoader.new
+      loader.load(path)
     end
 
     def expected_exist?
@@ -263,37 +214,17 @@ module Drntest
       puts "Saving received results as #{output_path}"
       File.open(output_path, "w") do |file|
         results.each do |result|
-          begin
-            json = JSON.pretty_generate(result)
-            file.puts(json)
-          rescue JSON::GeneratorError => error
-            p error
-            p result
-          end
+          file.puts(format_result(result))
         end
       end
     end
 
     def show_diff(expecteds, actuals)
-      expected_pretty = expecteds.collect do |expected|
-        begin
-          JSON.pretty_generate(expected)
-        rescue JSON::GeneratorError => error
-          p error
-          p expected
-        end
-      end.join("\n")
-      actual_pretty = actuals.collect do |actual|
-        begin
-          JSON.pretty_generate(actual)
-        rescue JSON::GeneratorError => error
-          p error
-          p actual
-        end
-      end.join("\n")
+      formatted_expected = format_results(expecteds)
+      formatted_actual = format_results(actuals)
 
-      create_temporary_file("expected", expected_pretty) do |expected_file|
-        create_temporary_file("actual", actual_pretty) do |actual_file|
+      create_temporary_file("expected", formatted_expected) do |expected_file|
+        create_temporary_file("actual", formatted_actual) do |actual_file|
           diff_options = [
             "-u",
             "--label", "(expected)", expected_file.path,
@@ -304,6 +235,24 @@ module Drntest
       end
     end
 
+    def format_results(results)
+      formatted_results = ""
+      results.each do |result|
+        formatted_results << format_result(result)
+        formatted_results << "\n"
+      end
+      formatted_results
+    end
+
+    def format_result(result)
+      return "" if result.nil?
+      begin
+        JSON.pretty_generate(result)
+      rescue JSON::GeneratorError
+        result.inspect
+      end
+    end
+
     def create_temporary_file(key, content)
       file = Tempfile.new("drntest-#{key}")
       file.write(content)

data/lib/drntest/tester.rb

@@ -16,7 +16,9 @@
 require "shellwords"
 require "optparse"
 require "pathname"
+
 require "drntest/version"
+require "drntest/path"
 require "drntest/test-runner"
 require "drntest/test-suites-result"
 
@@ -28,7 +30,6 @@ module Drntest
         tester = new
         option_parser = create_option_parser(tester)
         targets = option_parser.parse!(argv)
-        targets << tester.base_path + "suite" if targets.empty?
         tester.run(*targets)
       end
 
@@ -56,7 +57,7 @@ module Drntest
           tester.tag = tag
         end
 
-        parser.on("--base=PATH",
+        parser.on("--base-path=PATH",
                   "Path to the base directory including test suite, config and fixture",
                   "(#{tester.base_path})") do |base_path|
           tester.base_path = Pathname(base_path).expand_path(Dir.pwd)
@@ -140,6 +141,9 @@ module Drntest
     end
 
     def load_tests(*targets)
+      suite_path = @base_path + Path::SUITE
+      targets << suite_path if targets.empty?
+
       tests = []
       targets.each do |target|
         target_path = Pathname(target)
@@ -159,7 +163,8 @@ module Drntest
 
       unless @suite_pattern.nil?
         tests.select! do |test|
-          @suite_pattern === test.dirname.to_s.sub(@base_path.to_s, "")
+          test_suite_name = test.relative_path_from(suite_path).dirname.to_s
+          @suite_pattern === test_suite_name
         end
       end
 

data/lib/drntest/version.rb

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: drntest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: droonga-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -88,17 +88,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - README.md
 - Rakefile
-- bin/drntest
+- Gemfile
 - drntest.gemspec
-- lib/drntest/executor.rb
 - lib/drntest/test-results.rb
-- lib/drntest/test-runner.rb
+- lib/drntest/version.rb
+- lib/drntest/directive.rb
 - lib/drntest/test-suites-result.rb
+- lib/drntest/json-loader.rb
+- lib/drntest/test-loader.rb
 - lib/drntest/tester.rb
-- lib/drntest/version.rb
+- lib/drntest/path.rb
+- lib/drntest/response-normalizer.rb
+- lib/drntest/test-runner.rb
+- lib/drntest/test-executor.rb
+- bin/drntest
 homepage: https://github.com/droonga/drntest
 licenses:
 - GPLv3 or later
@@ -109,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Drntest is a testing framework for Droonga. You can write a test for Droonga