rroonga 1.0.5 → 1.0.7

data/test-unit/test/test_assertions.rb

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
+#
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
-#             Copyright (c) 2009 Kouhei Sutou.
+#             Copyright (c) 2009-2010 Kouhei Sutou. All rights reserved.
 # License:: Ruby license.
 
 require 'test/unit'
@@ -311,6 +313,21 @@ EOM
         end
       end
 
+      def test_assert_equal_with_different_encoding
+        utf8_string = "こんにちは"
+        unless utf8_string.respond_to?(:force_encoding)
+          omit("encoding test is for Ruby >= 1.9")
+        end
+        ascii_8bit_string = utf8_string.dup.force_encoding("ascii-8bit")
+        message = <<-EOM.chomp
+<"こんにちは">("UTF-8") expected but was
+<#{ascii_8bit_string.inspect}>("ASCII-8BIT").
+EOM
+        check_fails(message) do
+          assert_equal(utf8_string, ascii_8bit_string)
+        end
+      end
+
       def test_assert_raise_success
         return_value = nil
         check_nothing_fails(true) do
@@ -811,13 +828,19 @@ EOM
           end
           assert_in_delta(0.1, float_thing, 0.1)
         }
-        check_fails("message.\n<0.5> and\n<0.4> expected to be within\n<0.05> of each other.") {
+        check_fails("message.\n" +
+                    "<0.5> expected but was\n" +
+                    "<0.4> (tolerance <0.05>).\n" +
+                    "\n" +
+                    "Relation:\n" +
+                    "<<0.4> < <0.5>-<0.05>(0.45) <= <0.5>+<0.05>(0.55)>") {
           assert_in_delta(0.5, 0.4, 0.05, "message")
         }
         object = Object.new
+        inspected_object = AssertionMessage.convert(object)
         check_fails("The arguments must respond to to_f; " +
                     "the first float did not.\n" +
-                    "<#{object.inspect}>.respond_to?(:to_f) expected\n" +
+                    "<#{inspected_object}>.respond_to?(:to_f) expected\n" +
                     "(Class: <Object>)") {
           assert_in_delta(object, 0.4, 0.1)
         }
@@ -1121,17 +1144,40 @@ EOM
           assert_alias_method(object, :other, :original_method)
         end
 
-        check_fails("<#{object.inspect}>.nonexistent doesn't exist\n" +
+        inspected_object = AssertionMessage.convert(object)
+        check_fails("<#{inspected_object}>.nonexistent doesn't exist\n" +
                     "(Class: <Object>)") do
           assert_alias_method(object, :nonexistent, :original_method)
         end
 
-        check_fails("<#{object.inspect}>.nonexistent doesn't exist\n" +
+        check_fails("<#{inspected_object}>.nonexistent doesn't exist\n" +
                     "(Class: <Object>)") do
           assert_alias_method(object, :alias_method, :nonexistent)
         end
       end
 
+      def test_assert_path_exist
+        check_nothing_fails do
+          assert_path_exist(__FILE__)
+        end
+
+        nonexistent_file = __FILE__ + ".nonexistent"
+        check_fails("<#{nonexistent_file.inspect}> expected to exist") do
+          assert_path_exist(nonexistent_file)
+        end
+      end
+
+      def test_assert_path_not_exist
+        nonexistent_file = __FILE__ + ".nonexistent"
+        check_nothing_fails do
+          assert_path_not_exist(nonexistent_file)
+        end
+
+        check_fails("<#{__FILE__.inspect}> expected to not exist") do
+          assert_path_not_exist(__FILE__)
+        end
+      end
+
       private
       def add_failure(message, location=caller, options=nil)
         unless @catch_assertions

data/test-unit/test/ui/test_tap.rb

@@ -0,0 +1,33 @@
+require 'stringio'
+require 'test/unit/ui/tap/testrunner'
+
+class TestTap < Test::Unit::TestCase
+  def test_run
+    fail_line = nil
+    test_case = Class.new(Test::Unit::TestCase) do
+      def test_success
+        assert_equal(3, 1 + 2)
+      end
+
+      def test_fail; assert_equal(3, 1 - 2); end; fail_line = __LINE__
+    end
+    output = StringIO.new
+    runner = Test::Unit::UI::Tap::TestRunner.new(test_case.suite,
+                                                 :output => output)
+    result = runner.start; start_line = __LINE__
+    assert_equal(<<-EOR, output.string.gsub(/[\d\.]+ seconds/, "0.001 seconds"))
+1..2
+not ok 1 - test_fail(): <3> expected but was
+# Failure:
+# test_fail()
+#     [#{__FILE__}:#{fail_line}:in `test_fail'
+#      #{__FILE__}:#{start_line}:in `test_run']:
+# <3> expected but was
+# <-1>.
+ok 2 - test_success()
+# Finished in 0.001 seconds.
+# 2 tests, 2 assertions, 1 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications
+EOR
+    assert_true(result.passed?)
+  end
+end

data/test-unit/test/util/test-output.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+
+class TestUnitOutput < Test::Unit::TestCase
+  def test_capture_output
+    assert_equal(["stdout\n", "stderr\n"],
+                 capture_output do
+                   puts("stdout")
+                   warn("stderr")
+                 end)
+  end
+end

data/test-unit-notify/Rakefile

@@ -0,0 +1,47 @@
+# -*- ruby -*-
+
+require 'pathname'
+
+base_dir = Pathname(__FILE__).dirname.expand_path
+test_unit_dir = (base_dir.parent + "test-unit").expand_path
+test_unit_lib_dir = test_unit_dir + "lib"
+lib_dir = base_dir + "lib"
+
+$LOAD_PATH.unshift(test_unit_lib_dir.to_s)
+$LOAD_PATH.unshift(lib_dir.to_s)
+
+require 'test/unit/notify'
+
+require 'rubygems'
+require 'hoe'
+
+Test::Unit.run = true
+
+version = Test::Unit::Notify::VERSION
+ENV["VERSION"] = version
+Hoe.spec('test-unit-notify') do
+  self.version = version
+  self.rubyforge_name = "test-unit"
+
+  developer('Kouhei Sutou', 'kou@clear-code.com')
+
+  extra_deps << ["test-unit"]
+end
+
+task :docs do
+  doc_dir = base_dir + "doc"
+  doc_screenshot_dir = doc_dir + "screenshot"
+  mkdir_p(doc_screenshot_dir.to_s)
+  (base_dir + "screenshot").children.each do |file|
+    next if file.directory?
+    cp(file.to_s, doc_screenshot_dir.to_s)
+  end
+end
+
+task :tag do
+  message = "Released Test::Unit::Notify #{version}!"
+  base = "svn+ssh://#{ENV['USER']}@rubyforge.org/var/svn/test-unit/extensions/test-unit-notify/"
+  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
+end
+
+# vim: syntax=Ruby

data/test-unit-notify/lib/test/unit/notify.rb

@@ -0,0 +1,104 @@
+#--
+#
+# Author:: Kouhei Sutou
+# Copyright::
+#   * Copyright (c) 2010 Kouhei Sutou <kou@clear-code.com>
+# License:: Ruby license.
+
+require 'pathname'
+require 'erb'
+require 'test/unit'
+
+module Test
+  module Unit
+    AutoRunner.setup_option do |auto_runner, options|
+      options.on("--[no-]notify",
+                 "Notify test result at the last.") do |use_notify|
+        auto_runner.listeners.reject! do |listener|
+          listener.is_a?(Notify::Notifier)
+        end
+        auto_runner.listeners << Notify::Notifier.new if use_notify
+      end
+    end
+
+    module Notify
+      VERSION = "0.0.2"
+
+      class Notifier
+        include ERB::Util
+
+        base_dir = Pathname(__FILE__).dirname.parent.parent.parent.expand_path
+        ICON_DIR = base_dir + "data" + "icons"
+        def initialize
+          @theme = "kinotan"
+        end
+
+        def attach_to_mediator(mediator)
+          mediator.add_listener(UI::TestRunnerMediator::STARTED,
+                                &method(:started))
+          mediator.add_listener(UI::TestRunnerMediator::FINISHED,
+                                &method(:finished))
+        end
+
+        def started(result)
+          @result = result
+        end
+
+        def finished(elapsed_time)
+          case RUBY_PLATFORM
+          when /mswin|mingw|cygwin/
+            # how?
+          when /darwin/
+            # growl?
+          else
+            notify_by_notify_send(elapsed_time)
+          end
+        end
+
+        def notify_by_notify_send(elapsed_time)
+          icon = guess_suitable_icon
+          args = ["notify-send",
+                  "--expire-time", "5000",
+                  "--urgency", urgency]
+          args.concat(["--icon", icon.to_s]) if icon
+          title = "%s [%g%%] (%gs)" % [@result.status,
+                                       @result.pass_percentage,
+                                       elapsed_time]
+          args << title
+          args << h(@result.summary)
+          system(*args)
+        end
+
+        def guess_suitable_icon
+          icon_dir = ICON_DIR + @theme
+          status = @result.status
+          icon_base_names = [status]
+          if @result.passed?
+            icon_base_names << "pass"
+          else
+            case status
+            when "failure"
+              icon_base_names << "error"
+            when "error"
+              icon_base_names << "failure"
+            end
+          end
+          icon_base_names << "default"
+          icon_base_names.each do |base_name|
+            icon = icon_dir + "#{base_name}.png"
+            return icon if icon.exist?
+          end
+          nil
+        end
+
+        def urgency
+          if @result.passed?
+            "normal"
+          else
+            "critical"
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +09:00
+date: 2010-12-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,22 @@ dependencies:
         version: 1.0.7
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  version_requirements: *id002
 description: |-
   rroonga is a extension library to use groonga's DB-API
   layer. rroonga provides Rubyish readable and writable
@@ -51,12 +67,12 @@ executables: []
 extensions: 
 - extconf.rb
 extra_rdoc_files: 
-- README.ja.rdoc
-- NEWS.ja.rdoc
 - text/tutorial.ja.rdoc
 - text/expression.rdoc
-- README.rdoc
 - NEWS.rdoc
+- README.rdoc
+- README.ja.rdoc
+- NEWS.ja.rdoc
 files: 
 - AUTHORS
 - NEWS.ja.rdoc
@@ -74,7 +90,6 @@ files:
 - ext/.gitignore
 - ext/groonga/extconf.rb
 - ext/groonga/groonga.def
-- ext/groonga/mkmf.log
 - ext/groonga/rb-grn-accessor.c
 - ext/groonga/rb-grn-array-cursor.c
 - ext/groonga/rb-grn-array.c
@@ -141,12 +156,25 @@ files:
 - license/LGPL
 - misc/grnop2ruby.rb
 - rroonga-build.rb
+- test-unit-notify/Rakefile
+- test-unit-notify/lib/test/unit/notify.rb
+- test-unit/COPYING
+- test-unit/GPL
+- test-unit/PSFL
 - test-unit/Rakefile
 - test-unit/TODO
 - test-unit/bin/testrb
-- test-unit/html/classic.html
+- test-unit/html/bar.svg
+- test-unit/html/developer.svg
+- test-unit/html/favicon.ico
+- test-unit/html/favicon.svg
+- test-unit/html/heading-mark.svg
 - test-unit/html/index.html
 - test-unit/html/index.html.ja
+- test-unit/html/install.svg
+- test-unit/html/logo.svg
+- test-unit/html/test-unit.css
+- test-unit/html/tutorial.svg
 - test-unit/lib/test/unit.rb
 - test-unit/lib/test/unit/assertionfailederror.rb
 - test-unit/lib/test/unit/assertions.rb
@@ -184,6 +212,7 @@ files:
 - test-unit/lib/test/unit/util/backtracefilter.rb
 - test-unit/lib/test/unit/util/method-owner-finder.rb
 - test-unit/lib/test/unit/util/observable.rb
+- test-unit/lib/test/unit/util/output.rb
 - test-unit/lib/test/unit/util/procwrapper.rb
 - test-unit/lib/test/unit/version.rb
 - test-unit/sample/adder.rb
@@ -213,8 +242,10 @@ files:
 - test-unit/test/test_testresult.rb
 - test-unit/test/test_testsuite.rb
 - test-unit/test/testunit-test-util.rb
+- test-unit/test/ui/test_tap.rb
 - test-unit/test/ui/test_testrunmediator.rb
 - test-unit/test/util/test-method-owner-finder.rb
+- test-unit/test/util/test-output.rb
 - test-unit/test/util/test_backtracefilter.rb
 - test-unit/test/util/test_observable.rb
 - test-unit/test/util/test_procwrapper.rb

data/ext/groonga/mkmf.log

@@ -1,99 +0,0 @@
-checking for GCC... -------------------- yes
-
-"gcc -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/rroonga.18/ext/groonga    -fno-strict-aliasing -g -g -O2  -fPIC     -c conftest.c"
-checked program was:
-/* begin */
-1: /*top*/
-2: #ifndef __GNUC__
-3: # error
-4: >>>>>> __GNUC__ undefined <<<<<<
-5: #endif
-/* end */
-
---------------------
-
-checking for Win32 OS... -------------------- no
-
---------------------
-
-have_macro: checking for HAVE_RUBY_ST_H in ruby.h... -------------------- no
-
-"gcc -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/rroonga.18/ext/groonga    -fno-strict-aliasing -g -g -O2  -fPIC   -Wall -I/tmp/local/include/groonga     -c conftest.c"
-conftest.c:4:3: error: #error 
-conftest.c:5: error: expected identifier or ‘(’ before ‘>>’ token
-checked program was:
-/* begin */
-1: #include <ruby.h>
-2: /*top*/
-3: #ifndef HAVE_RUBY_ST_H
-4: # error
-5: >>>>>> HAVE_RUBY_ST_H undefined <<<<<<
-6: #endif
-/* end */
-
---------------------
-
-have_header: checking for ruby/st.h... -------------------- no
-
-"gcc -E -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/rroonga.18/ext/groonga    -fno-strict-aliasing -g -g -O2  -fPIC   -Wall -I/tmp/local/include/groonga    conftest.c -o conftest.i"
-conftest.c:1:21: error: ruby/st.h: そのようなファイルやディレクトリはありません
-checked program was:
-/* begin */
-1: #include <ruby/st.h>
-/* end */
-
---------------------
-
-have_func: checking for rb_errinfo() in ruby.h... -------------------- no
-
-"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/rroonga.18/ext/groonga    -fno-strict-aliasing -g -g -O2  -fPIC   -Wall -I/tmp/local/include/groonga   conftest.c  -L. -L/usr/lib -L.  -rdynamic -Wl,-export-dynamic -L/tmp/local/lib     -lgroonga   -lruby1.8-static  -lgroonga   -lpthread -lrt -ldl -lcrypt -lm   -lc"
-conftest.c: In function ‘t’:
-conftest.c:5: error: ‘rb_errinfo’ undeclared (first use in this function)
-conftest.c:5: error: (Each undeclared identifier is reported only once
-conftest.c:5: error: for each function it appears in.)
-checked program was:
-/* begin */
-1: #include <ruby.h>
-2: 
-3: /*top*/
-4: int main() { return 0; }
-5: int t() { void ((*volatile p)()); p = (void ((*)()))rb_errinfo; return 0; }
-/* end */
-
-"gcc -o conftest -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/rroonga.18/ext/groonga    -fno-strict-aliasing -g -g -O2  -fPIC   -Wall -I/tmp/local/include/groonga   conftest.c  -L. -L/usr/lib -L.  -rdynamic -Wl,-export-dynamic -L/tmp/local/lib     -lgroonga   -lruby1.8-static  -lgroonga   -lpthread -lrt -ldl -lcrypt -lm   -lc"
-conftest.c: In function ‘t’:
-conftest.c:5: warning: implicit declaration of function ‘rb_errinfo’
-/tmp/ccjMtfaX.o: In function `t':
-/home/kou/work/ruby/rroonga.18/ext/groonga/conftest.c:5: undefined reference to `rb_errinfo'
-collect2: ld returned 1 exit status
-checked program was:
-/* begin */
-1: #include <ruby.h>
-2: 
-3: /*top*/
-4: int main() { return 0; }
-5: int t() { rb_errinfo(); return 0; }
-/* end */
-
---------------------
-
-have_type: checking for enum ruby_value_type in ruby.h... -------------------- no
-
-"gcc -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/rroonga.18/ext/groonga    -fno-strict-aliasing -g -g -O2  -fPIC   -Wall -I/tmp/local/include/groonga     -c conftest.c"
-conftest.c:5: error: invalid application of ‘sizeof’ to incomplete type ‘conftest_type’ 
-conftest.c:5: error: size of array ‘conftestval’ is negative
-checked program was:
-/* begin */
-1: #include <ruby.h>
-2: 
-3: /*top*/
-4: typedef enum ruby_value_type conftest_type;
-5: int conftestval[sizeof(conftest_type)?1:-1];
-/* end */
-
---------------------
-
-checking for debug flag... -------------------- no
-
---------------------
-

data/test-unit/html/classic.html

@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Test::Unit (Classic)</title>
-</head>
-<body bgcolor="red">
-<p style="text-align: center">
-  <img height="161" width="308" src="test-unit-classic.png">
-  <br>
-  <br>
-  <br>
-  Read the <a href="classic/test-unit/">rdoc</a>
-</p>
-</body>
-</html>