rroonga 1.2.3 → 1.2.4

data/README.textile

@@ -70,3 +70,4 @@ h2. Thanks
 * ono matope: sent bug reports.
 * @kamipo: send a bug report.
 * ongaeshi: sent a patch to build gem on Windows.
+* mallowlabs: send a patch.

data/Rakefile

@@ -226,6 +226,10 @@ def rsync_to_rubyforge(spec, source, destination, options={})
   sh("rsync #{rsync_args} #{source} #{host}:#{remote_dir}#{destination}")
 end
 
+def rake(*arguments)
+  ruby($0, *arguments)
+end
+
 namespace :reference do
   translate_languages = [:ja]
   supported_languages = [:en, *translate_languages]
@@ -260,6 +264,15 @@ namespace :reference do
         task :update => po_file
       end
     end
+
+    desc "Updates po files."
+    task :update do
+      ruby($0, "clobber")
+      ruby($0, "yard")
+      translate_languages.each do |language|
+        ruby($0, "reference:po:#{language}:update")
+      end
+    end
   end
 
   namespace :translate do
@@ -348,128 +361,3 @@ desc "Tag the current revision."
 task :tag do
   sh("git tag -a #{version} -m 'release #{version}!!!'")
 end
-
-namespace :win32 do
-  patches_dir = (Pathname.new(base_dir) + "patches").expand_path
-  if groonga_win32_i386_p
-    host = "i586-mingw32msvc"
-    mecab_patches = []
-  else
-    host = "x86_64-w64-mingw32"
-    mecab_patches = [
-      "mecab-0.98-mingw-w64.diff",
-      "mecab-0.98-not-use-locale-on-mingw.diff",
-    ]
-  end
-
-  desc "Build MeCab and groonga and install them into vendor/local/."
-  task(:build => [:build_mecab, :build_mecab_dict, :build_groonga])
-
-  desc "Build MeCab and install it into vendor/local/."
-  task(:build_mecab) do
-    tmp_dir = "tmp/mecab"
-    rm_rf(tmp_dir)
-    mkdir_p(tmp_dir)
-    require 'open-uri'
-    mecab_version = "0.98"
-    mecab_base = "mecab-#{mecab_version}"
-    mecab_tar_gz = "#{mecab_base}.tar.gz"
-    mecab_tar_gz_url = "http://sourceforge.net/projects/mecab/files/mecab/#{mecab_version}/#{mecab_tar_gz}/download"
-    Dir.chdir(tmp_dir) do
-      open(mecab_tar_gz_url) do |downloaded_tar_gz|
-        File.open(mecab_tar_gz, "wb") do |tar_gz|
-          tar_gz.print(downloaded_tar_gz.read)
-        end
-      end
-      sh("tar", "xzf", mecab_tar_gz) or exit(false)
-    end
-    Dir.chdir(File.join(tmp_dir, mecab_base)) do
-      mecab_patches.each do |patch|
-        sh("patch -p1 < #{patches_dir + patch}")
-      end
-      sh("./configure",
-         "--prefix=#{binary_dir}",
-         "--host=#{host}") or exit(false)
-      sh("env", "GREP_OPTIONS=--text", "nice", "make", "-j8") or exit(false)
-      sh("env", "GREP_OPTIONS=--text", "make", "install") or exit(false)
-
-      mecab_rc_path = File.join(binary_dir, "etc", "mecabrc")
-      win32_mecab_rc_path = File.join(binary_dir, "bin", "mecabrc")
-      mv(mecab_rc_path, win32_mecab_rc_path)
-
-      mecab_files_dir = File.join(vendor_dir, "mecab")
-      mkdir_p(mecab_files_dir)
-      files = ["AUTHORS", "BSD", "COPYING", "GPL", "LGPL"]
-      cp(files, mecab_files_dir)
-    end
-  end
-
-  task(:build_mecab_dict) do
-    tmp_dir = "tmp/mecab_dict"
-    rm_rf(tmp_dir)
-    mkdir_p(tmp_dir)
-    require 'open-uri'
-    naist_jdic_base = "mecab-naist-jdic-0.6.3-20100801"
-    naist_jdic_tar_gz = "#{naist_jdic_base}.tar.gz"
-    naist_jdic_tar_gz_url = "http://osdn.dl.sourceforge.jp/naist-jdic/48487/#{naist_jdic_tar_gz}"
-    Dir.chdir(tmp_dir) do
-      open(naist_jdic_tar_gz_url) do |downloaded_tar_gz|
-        File.open(naist_jdic_tar_gz, "wb") do |tar_gz|
-          tar_gz.print(downloaded_tar_gz.read)
-        end
-      end
-      sh("tar", "xzf", naist_jdic_tar_gz) or exit(false)
-    end
-    Dir.chdir(File.join(tmp_dir, naist_jdic_base)) do
-      sh("./configure",
-         "--with-dicdir=#{binary_dir}/share/mecab/dic/naist-jdic",
-         "--with-charset=utf-8") or exit(false)
-      sh("make", "-j8") or exit(false)
-      sh("make", "install-data") or exit(false)
-
-      naist_jdic_files_dir = File.join(vendor_dir, "mecab-naist-jdic")
-      mkdir_p(naist_jdic_files_dir)
-      files = ["AUTHORS", "COPYING"]
-      cp(files, naist_jdic_files_dir)
-    end
-    dictionary_dir = '$(rcpath)\..\share\mecab\dic\naist-jdic'
-    mecab_rc_path = File.join(binary_dir, "bin", "mecabrc")
-    mecab_rc_content = File.read(mecab_rc_path)
-    File.open(mecab_rc_path, "w") do |mecab_rc|
-      mecab_rc.print(mecab_rc_content.gsub(/^dicdir\s*=.+$/,
-                                           "dicdir = #{dictionary_dir}"))
-    end
-  end
-
-  desc "Build groonga and install it into vendor/local/."
-  task(:build_groonga) do
-    tmp_dir = "tmp/groonga"
-    rm_rf(tmp_dir)
-    mkdir_p(tmp_dir)
-    Dir.chdir(tmp_dir) do
-      sh("git", "clone", "git://github.com/groonga/groonga.git") or exit(false)
-    end
-    Dir.chdir(File.join(tmp_dir, "groonga")) do
-      sh("./autogen.sh") or exit(false)
-      mecab_config = File.join(binary_dir, "bin", "mecab-config")
-      args = ["./configure",
-              "--prefix=#{binary_dir}",
-              "--host=#{host}",
-              "--without-cutter",
-              "--disable-benchmark"]
-      if File.exist?(mecab_config)
-        args << "--with-mecab-config=#{mecab_config}"
-      else
-        args << "--without-mecab"
-      end
-      sh(*args) or exit(false)
-      sh("env", "GREP_OPTIONS=--text", "nice", "make", "-j8") or exit(false)
-      sh("env", "GREP_OPTIONS=--text", "make", "install") or exit(false)
-
-      groonga_files_dir = File.join(vendor_dir, "groonga")
-      mkdir_p(groonga_files_dir)
-      files = ["AUTHORS", "COPYING"]
-      cp(files, groonga_files_dir)
-    end
-  end
-end

data/bug.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'groonga'
+
+Groonga::Logger.log_path = "/tmp/groonga.log" 
+Groonga::Logger.query_log_path = "/tmp/groonga-query.log" 
+
+i = 0
+loop do
+  path = "/tmp/db/db" 
+  FileUtils.rm_rf(File.dirname(path))
+  FileUtils.mkdir_p(File.dirname(path))
+  Groonga::Context.default = nil
+  database = Groonga::Database.create(:path => path)
+  Groonga::Schema.define do |schema|
+    schema.create_table("Users",
+                        :type => :hash,
+                        :key_type => "ShortText") do |table|
+      table.uint32("name_length")
+    end
+  end
+
+  users = Groonga["Users"]
+  10.times do
+    i += 1
+    exit if i > 100
+    name = i.to_s
+    users.add(name, :name_length => name.length)
+  end
+  builder = Groonga::RecordExpressionBuilder.new(users, nil)
+  builder.query = "name_length:3" 
+  builder.build
+  database.close
+  GC.start
+end

data/crash.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'groonga'
+
+context = Groonga::Context.default
+context.connect(:port => 10042)
+
+10000.times do |i|
+  p i
+  GC.stress = true
+  result = context.select("Program")
+  result.records.each do |record|
+    record["_key"]
+    record["unknown"]
+  end
+  GC.stress = false
+end

data/ext/groonga/Makefile

@@ -3,7 +3,7 @@ SHELL = /bin/sh
 
 #### Start of system configuration section. ####
 
-srcdir = /home/yue/work/rroonga/ext/groonga
+srcdir = /home/kou/work/ruby/rroonga/ext/groonga
 topdir = /usr/include/ruby-1.9.1
 hdrdir = /usr/include/ruby-1.9.1
 arch_hdrdir = /usr/include/ruby-1.9.1/$(arch)
@@ -54,15 +54,15 @@ COUTFLAG = -o
 
 RUBY_EXTCONF_H = 
 cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O0
-debugflags = -ggdb3
+optflags = -O3
+debugflags = -ggdb
 warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long
-CFLAGS   = -fPIC -fno-strict-aliasing -ggdb3 -O0 -fPIC -Wall -I/tmp/local/include/groonga 
+CFLAGS   = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC -Wall -I/home/kou/work/ruby/rroonga/vendor/local/include/groonga 
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=1 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
+CPPFLAGS = -DRB_GRN_COMPILATION -DGRN_MAJOR_VERSION=1 -DGRN_MINOR_VERSION=2 -DGRN_MICRO_VERSION=3 -DHAVE_RB_ERRINFO -DHAVE_TYPE_ENUM_RUBY_VALUE_TYPE  $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) -fno-strict-aliasing -g
-ldflags  = -L.  -rdynamic -Wl,-export-dynamic -L/tmp/local/lib
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic -L/home/kou/work/ruby/rroonga/vendor/local/lib
 dldflags = 
 ARCH_FLAG = 
 DLDFLAGS = $(ldflags) $(dldflags)
@@ -105,8 +105,8 @@ extout_prefix =
 target_prefix = 
 LOCAL_LIBS = 
 LIBS = $(LIBRUBYARG_SHARED)  -lgroonga -lpthread -lrt -ldl -lcrypt -lm   -lc
-SRCS = rb-grn-snippet.c rb-grn-view.c rb-grn-query.c rb-grn-encoding-support.c rb-grn-record.c rb-grn-utils.c rb-grn-index-column.c rb-grn-index-cursor.c rb-grn-view-accessor.c rb-grn-object.c rb-grn-patricia-trie.c rb-grn-expression-builder.c rb-grn-variable.c rb-grn-hash-cursor.c rb-grn-fix-size-column.c rb-grn-variable-size-column.c rb-grn-table-key-support.c rb-grn-table.c rb-groonga.c rb-grn-table-cursor.c rb-grn-hash.c rb-grn-exception.c rb-grn-logger.c rb-grn-plugin.c rb-grn-encoding.c rb-grn-view-record.c rb-grn-view-cursor.c rb-grn-column.c rb-grn-procedure.c rb-grn-posting.c rb-grn-accessor.c rb-grn-operator.c rb-grn-type.c rb-grn-array.c rb-grn-patricia-trie-cursor.c rb-grn-context.c rb-grn-database.c rb-grn-array-cursor.c rb-grn-expression.c rb-grn-table-cursor-key-support.c
-OBJS = rb-grn-snippet.o rb-grn-view.o rb-grn-query.o rb-grn-encoding-support.o rb-grn-record.o rb-grn-utils.o rb-grn-index-column.o rb-grn-index-cursor.o rb-grn-view-accessor.o rb-grn-object.o rb-grn-patricia-trie.o rb-grn-expression-builder.o rb-grn-variable.o rb-grn-hash-cursor.o rb-grn-fix-size-column.o rb-grn-variable-size-column.o rb-grn-table-key-support.o rb-grn-table.o rb-groonga.o rb-grn-table-cursor.o rb-grn-hash.o rb-grn-exception.o rb-grn-logger.o rb-grn-plugin.o rb-grn-encoding.o rb-grn-view-record.o rb-grn-view-cursor.o rb-grn-column.o rb-grn-procedure.o rb-grn-posting.o rb-grn-accessor.o rb-grn-operator.o rb-grn-type.o rb-grn-array.o rb-grn-patricia-trie-cursor.o rb-grn-context.o rb-grn-database.o rb-grn-array-cursor.o rb-grn-expression.o rb-grn-table-cursor-key-support.o
+SRCS = rb-grn-procedure.c rb-grn-column.c rb-grn-index-column.c rb-grn-encoding-support.c rb-grn-variable.c rb-grn-table.c rb-grn-hash-cursor.c rb-grn-table-cursor-key-support.c rb-grn-object.c rb-grn-view-accessor.c rb-grn-table-key-support.c rb-grn-array.c rb-grn-patricia-trie.c rb-grn-utils.c rb-grn-record.c rb-grn-query.c rb-groonga.c rb-grn-exception.c rb-grn-variable-size-column.c rb-grn-encoding.c rb-grn-expression-builder.c rb-grn-operator.c rb-grn-snippet.c rb-grn-array-cursor.c rb-grn-type.c rb-grn-table-cursor.c rb-grn-fix-size-column.c rb-grn-view-cursor.c rb-grn-logger.c rb-grn-plugin.c rb-grn-database.c rb-grn-view-record.c rb-grn-patricia-trie-cursor.c rb-grn-index-cursor.c rb-grn-view.c rb-grn-accessor.c rb-grn-context.c rb-grn-posting.c rb-grn-expression.c rb-grn-hash.c
+OBJS = rb-grn-procedure.o rb-grn-column.o rb-grn-index-column.o rb-grn-encoding-support.o rb-grn-variable.o rb-grn-table.o rb-grn-hash-cursor.o rb-grn-table-cursor-key-support.o rb-grn-object.o rb-grn-view-accessor.o rb-grn-table-key-support.o rb-grn-array.o rb-grn-patricia-trie.o rb-grn-utils.o rb-grn-record.o rb-grn-query.o rb-groonga.o rb-grn-exception.o rb-grn-variable-size-column.o rb-grn-encoding.o rb-grn-expression-builder.o rb-grn-operator.o rb-grn-snippet.o rb-grn-array-cursor.o rb-grn-type.o rb-grn-table-cursor.o rb-grn-fix-size-column.o rb-grn-view-cursor.o rb-grn-logger.o rb-grn-plugin.o rb-grn-database.o rb-grn-view-record.o rb-grn-patricia-trie-cursor.o rb-grn-index-cursor.o rb-grn-view.o rb-grn-accessor.o rb-grn-context.o rb-grn-posting.o rb-grn-expression.o rb-grn-hash.o
 TARGET = groonga
 DLLIB = $(TARGET).so
 EXTSTATIC = 
@@ -154,36 +154,31 @@ install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
 pre-install-rb-default: Makefile
-pre-install-rb: $(RUBYLIBDIR)
-install-rb: $(RUBYLIBDIR)/groonga.rb
-$(RUBYLIBDIR)/groonga.rb: $(srcdir)/../../lib/groonga.rb
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga.rb $(@D)
 pre-install-rb: $(RUBYLIBDIR)/groonga
-install-rb: $(RUBYLIBDIR)/groonga/dumper.rb
-$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
+install-rb: $(RUBYLIBDIR)/groonga/schema.rb
+$(RUBYLIBDIR)/groonga/schema.rb: $(srcdir)/../../lib/groonga/schema.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/dumper.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/schema.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/pagination.rb
 $(RUBYLIBDIR)/groonga/pagination.rb: $(srcdir)/../../lib/groonga/pagination.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/pagination.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/schema.rb
-$(RUBYLIBDIR)/groonga/schema.rb: $(srcdir)/../../lib/groonga/schema.rb
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/schema.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/expression-builder.rb
-$(RUBYLIBDIR)/groonga/expression-builder.rb: $(srcdir)/../../lib/groonga/expression-builder.rb
+install-rb: $(RUBYLIBDIR)/groonga/view-record.rb
+$(RUBYLIBDIR)/groonga/view-record.rb: $(srcdir)/../../lib/groonga/view-record.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/expression-builder.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/view-record.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/patricia-trie.rb
 $(RUBYLIBDIR)/groonga/patricia-trie.rb: $(srcdir)/../../lib/groonga/patricia-trie.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/patricia-trie.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/view-record.rb
-$(RUBYLIBDIR)/groonga/view-record.rb: $(srcdir)/../../lib/groonga/view-record.rb
+install-rb: $(RUBYLIBDIR)/groonga/dumper.rb
+$(RUBYLIBDIR)/groonga/dumper.rb: $(srcdir)/../../lib/groonga/dumper.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/view-record.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/dumper.rb $(@D)
+install-rb: $(RUBYLIBDIR)/groonga/posting.rb
+$(RUBYLIBDIR)/groonga/posting.rb: $(srcdir)/../../lib/groonga/posting.rb
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/posting.rb $(@D)
 install-rb: $(RUBYLIBDIR)/groonga/context.rb
 $(RUBYLIBDIR)/groonga/context.rb: $(srcdir)/../../lib/groonga/context.rb
 	@-$(MAKEDIRS) $(@D)
@@ -192,16 +187,21 @@ install-rb: $(RUBYLIBDIR)/groonga/record.rb
 $(RUBYLIBDIR)/groonga/record.rb: $(srcdir)/../../lib/groonga/record.rb
 	@-$(MAKEDIRS) $(@D)
 	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/record.rb $(@D)
-install-rb: $(RUBYLIBDIR)/groonga/posting.rb
-$(RUBYLIBDIR)/groonga/posting.rb: $(srcdir)/../../lib/groonga/posting.rb
+install-rb: $(RUBYLIBDIR)/groonga/expression-builder.rb
+$(RUBYLIBDIR)/groonga/expression-builder.rb: $(srcdir)/../../lib/groonga/expression-builder.rb
 	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/posting.rb $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga/expression-builder.rb $(@D)
+pre-install-rb: $(RUBYLIBDIR)
+install-rb: $(RUBYLIBDIR)/groonga.rb
+$(RUBYLIBDIR)/groonga.rb: $(srcdir)/../../lib/groonga.rb
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_DATA) $(srcdir)/../../lib/groonga.rb $(@D)
 $(RUBYARCHDIR):
 	$(MAKEDIRS) $@
-$(RUBYLIBDIR):
-	$(MAKEDIRS) $@
 $(RUBYLIBDIR)/groonga:
 	$(MAKEDIRS) $@
+$(RUBYLIBDIR):
+	$(MAKEDIRS) $@
 
 site-install: site-install-so site-install-rb
 site-install-so: install-so

data/ext/groonga/extconf.rb

@@ -61,6 +61,77 @@ checking_for(checking_message("Win32 OS")) do
   win32
 end
 
+def install_groonga_locally(major, minor, micro)
+  require 'open-uri'
+  require 'shellwords'
+
+  tar_gz = "groonga-#{major}.#{minor}.#{micro}.tar.gz"
+  FileUtils.mkdir_p(local_groonga_base_dir)
+
+  install_dir = local_groonga_install_dir
+  Dir.chdir(local_groonga_base_dir) do
+    url = "http://packages.groonga.org/source/groonga/#{tar_gz}"
+    message("downloading %s...", url)
+    open(url, "rb") do |input|
+      File.open(tar_gz, "wb") do |output|
+        while (buffer = input.read(1024))
+          output.print(buffer)
+        end
+      end
+    end
+    message(" done\n")
+
+    message("extracting...")
+    if xsystem("tar xfz #{tar_gz}")
+      message(" done\n")
+    else
+      message(" failed\n")
+      exit 1
+    end
+
+    groonga_source_dir = "groonga-#{major}.#{minor}.#{micro}"
+    Dir.chdir(groonga_source_dir) do
+      message("configuring...")
+      prefix = Shellwords.escape(install_dir)
+      if xsystem("./configure CFLAGS='-g -O0' --prefix=#{prefix}")
+        message(" done\n")
+      else
+        message(" failed\n")
+        exit 1
+      end
+
+      message("building (maybe long time)...")
+      if xsystem("make")
+        message(" done\n")
+      else
+        message(" failed\n")
+        exit 1
+      end
+
+      message("installing...")
+      if [major, minor, micro] == [0, 1, 6]
+        make_install_args = " MKDIR_P='mkdir -p --'"
+      else
+        make_install_args = ""
+      end
+      if xsystem("make install#{make_install_args}")
+        message(" done\n")
+      else
+        message(" failed\n")
+        exit 1
+      end
+    end
+  end
+
+  prepend_pkg_config_path_for_local_groonga
+end
+
+unless PKGConfig.have_package(package_name, major, minor, micro)
+  unless have_local_groonga?(package_name, major, minor, micro)
+    install_groonga_locally(major, minor, micro)
+  end
+end
+
 unless PKGConfig.have_package(package_name, major, minor, micro)
   have_local_groonga?(package_name, major, minor, micro) or exit 1
   add_rpath_for_local_groonga

data/ext/groonga/rb-grn.h

@@ -69,7 +69,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 1
 #define RB_GRN_MINOR_VERSION 2
-#define RB_GRN_MICRO_VERSION 3
+#define RB_GRN_MICRO_VERSION 4
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/extconf.rb

@@ -18,96 +18,9 @@
 require 'English'
 require 'pathname'
 require 'fileutils'
-
-begin
-  require 'pkg-config'
-rescue LoadError
-  require 'rubygems'
-  require 'pkg-config'
-end
+require 'mkmf'
 
 base_dir = Pathname(__FILE__).dirname.realpath
-$LOAD_PATH.unshift(base_dir.to_s)
-
-require 'rroonga-build'
-
-include RroongaBuild
-
-package_name = "groonga"
-module_name = "groonga"
-major, minor, micro = RequiredGroongaVersion::VERSION
-
-def install_groonga_locally(major, minor, micro)
-  require 'open-uri'
-  require 'shellwords'
-
-  tar_gz = "groonga-#{major}.#{minor}.#{micro}.tar.gz"
-  FileUtils.mkdir_p(local_groonga_base_dir)
-
-  install_dir = local_groonga_install_dir
-  Dir.chdir(local_groonga_base_dir) do
-    url = "http://packages.groonga.org/source/groonga/#{tar_gz}"
-    message("downloading %s...", url)
-    open(url, "rb") do |input|
-      File.open(tar_gz, "wb") do |output|
-        while (buffer = input.read(1024))
-          output.print(buffer)
-        end
-      end
-    end
-    message(" done\n")
-
-    message("extracting...")
-    if xsystem("tar xfz #{tar_gz}")
-      message(" done\n")
-    else
-      message(" failed\n")
-      exit 1
-    end
-
-    groonga_source_dir = "groonga-#{major}.#{minor}.#{micro}"
-    Dir.chdir(groonga_source_dir) do
-      message("configuring...")
-      prefix = Shellwords.escape(install_dir)
-      if xsystem("./configure CFLAGS='-g -O0' --prefix=#{prefix}")
-        message(" done\n")
-      else
-        message(" failed\n")
-        exit 1
-      end
-
-      message("building (maybe long time)...")
-      if xsystem("make")
-        message(" done\n")
-      else
-        message(" failed\n")
-        exit 1
-      end
-
-      message("installing...")
-      if [major, minor, micro] == [0, 1, 6]
-        make_install_args = " MKDIR_P='mkdir -p --'"
-      else
-        make_install_args = ""
-      end
-      if xsystem("make install#{make_install_args}")
-        message(" done\n")
-      else
-        message(" failed\n")
-        exit 1
-      end
-    end
-  end
-
-  prepend_pkg_config_path_for_local_groonga
-end
-
-unless PKGConfig.have_package(package_name, major, minor, micro)
-  unless have_local_groonga?(package_name, major, minor, micro)
-    install_groonga_locally(major, minor, micro)
-    PKGConfig.have_package(package_name, major, minor, micro) or exit 1
-  end
-end
 
 source_ext_dir = Pathname("ext") + "groonga"
 FileUtils.mkdir_p(source_ext_dir.to_s)

data/rroonga-build.rb

@@ -19,7 +19,7 @@ module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 1
     MINOR = 2
-    MICRO = 0
+    MICRO = 2
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,10 +19,106 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 +09:00
-default_executable: grndump
-dependencies: []
-
+date: 2011-06-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: pkg-config
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-unit
+  prerelease: false
+  type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: test-unit-notify
+  prerelease: false
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  prerelease: false
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake-compiler
+  prerelease: false
+  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  prerelease: false
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: yard
+  prerelease: false
+  type: :development
+  requirement: *id007
 description: |-
   rroonga is an extension library to use groonga's DB-API
   layer. rroonga provides Rubyish readable and writable API
@@ -47,6 +143,8 @@ files:
 - benchmark/select.rb
 - benchmark/write-many-small-items.rb
 - bin/grndump
+- bug.rb
+- crash.rb
 - example/bookmark.rb
 - example/index-html.rb
 - ext/groonga/Makefile
@@ -108,53 +206,52 @@ files:
 - rroonga-build.rb
 - README.textile
 - TODO
-- test/test-database.rb
-- test/test-array.rb
-- test/test-table-offset-and-limit.rb
+- test/groonga-test-utils.rb
 - test/run-test.rb
-- test/test-schema-type.rb
-- test/test-remote.rb
-- test/test-table-cursor.rb
-- test/test-table-select.rb
+- test/test-accessor.rb
+- test/test-array.rb
+- test/test-column.rb
+- test/test-context-select.rb
+- test/test-context.rb
+- test/test-database-dumper.rb
+- test/test-database.rb
 - test/test-encoding.rb
-- test/test-type.rb
-- test/test-table.rb
-- test/test-query.rb
-- test/test-table-select-weight.rb
-- test/test-expression-builder.rb
 - test/test-exception.rb
+- test/test-expression-builder.rb
+- test/test-expression.rb
+- test/test-fix-size-column.rb
+- test/test-gqtp.rb
+- test/test-hash.rb
+- test/test-index-column.rb
+- test/test-index-cursor.rb
+- test/test-logger.rb
+- test/test-pagination.rb
+- test/test-patricia-trie.rb
 - test/test-plugin.rb
-- test/test-schema-view.rb
 - test/test-procedure.rb
+- test/test-query.rb
+- test/test-record.rb
+- test/test-remote.rb
+- test/test-schema-create-table.rb
+- test/test-schema-dumper.rb
+- test/test-schema-type.rb
+- test/test-schema-view.rb
+- test/test-schema.rb
 - test/test-snippet.rb
-- test/groonga-test-utils.rb
+- test/test-table-cursor.rb
+- test/test-table-dumper.rb
+- test/test-table-offset-and-limit.rb
+- test/test-table-select-mecab.rb
+- test/test-table-select-normalize.rb
+- test/test-table-select-weight.rb
+- test/test-table-select.rb
+- test/test-table.rb
+- test/test-type.rb
 - test/test-variable-size-column.rb
-- test/test-database-dumper.rb
-- test/test-pagination.rb
 - test/test-variable.rb
-- test/test-version.rb
-- test/test-table-dumper.rb
 - test/test-vector-column.rb
-- test/test-schema-dumper.rb
-- test/test-hash.rb
-- test/test-logger.rb
+- test/test-version.rb
 - test/test-view.rb
-- test/test-schema.rb
-- test/test-accessor.rb
-- test/test-table-select-mecab.rb
-- test/test-table-select-normalize.rb
-- test/test-index-cursor.rb
-- test/test-fix-size-column.rb
-- test/test-schema-create-table.rb
-- test/test-context-select.rb
-- test/test-expression.rb
-- test/test-gqtp.rb
-- test/test-context.rb
-- test/test-record.rb
-- test/test-column.rb
-- test/test-index-column.rb
-- test/test-patricia-trie.rb
-has_rdoc: true
 homepage: http://groonga.rubyforge.org/
 licenses: 
 - LGPLv2
@@ -184,54 +281,54 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: groonga
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for groonga that provide full text search and column store features.
 test_files: 
-- test/test-database.rb
-- test/test-array.rb
-- test/test-table-offset-and-limit.rb
+- test/groonga-test-utils.rb
 - test/run-test.rb
-- test/test-schema-type.rb
-- test/test-remote.rb
-- test/test-table-cursor.rb
-- test/test-table-select.rb
+- test/test-accessor.rb
+- test/test-array.rb
+- test/test-column.rb
+- test/test-context-select.rb
+- test/test-context.rb
+- test/test-database-dumper.rb
+- test/test-database.rb
 - test/test-encoding.rb
-- test/test-type.rb
-- test/test-table.rb
-- test/test-query.rb
-- test/test-table-select-weight.rb
-- test/test-expression-builder.rb
 - test/test-exception.rb
+- test/test-expression-builder.rb
+- test/test-expression.rb
+- test/test-fix-size-column.rb
+- test/test-gqtp.rb
+- test/test-hash.rb
+- test/test-index-column.rb
+- test/test-index-cursor.rb
+- test/test-logger.rb
+- test/test-pagination.rb
+- test/test-patricia-trie.rb
 - test/test-plugin.rb
-- test/test-schema-view.rb
 - test/test-procedure.rb
+- test/test-query.rb
+- test/test-record.rb
+- test/test-remote.rb
+- test/test-schema-create-table.rb
+- test/test-schema-dumper.rb
+- test/test-schema-type.rb
+- test/test-schema-view.rb
+- test/test-schema.rb
 - test/test-snippet.rb
-- test/groonga-test-utils.rb
+- test/test-table-cursor.rb
+- test/test-table-dumper.rb
+- test/test-table-offset-and-limit.rb
+- test/test-table-select-mecab.rb
+- test/test-table-select-normalize.rb
+- test/test-table-select-weight.rb
+- test/test-table-select.rb
+- test/test-table.rb
+- test/test-type.rb
 - test/test-variable-size-column.rb
-- test/test-database-dumper.rb
-- test/test-pagination.rb
 - test/test-variable.rb
-- test/test-version.rb
-- test/test-table-dumper.rb
 - test/test-vector-column.rb
-- test/test-schema-dumper.rb
-- test/test-hash.rb
-- test/test-logger.rb
+- test/test-version.rb
 - test/test-view.rb
-- test/test-schema.rb
-- test/test-accessor.rb
-- test/test-table-select-mecab.rb
-- test/test-table-select-normalize.rb
-- test/test-index-cursor.rb
-- test/test-fix-size-column.rb
-- test/test-schema-create-table.rb
-- test/test-context-select.rb
-- test/test-expression.rb
-- test/test-gqtp.rb
-- test/test-context.rb
-- test/test-record.rb
-- test/test-column.rb
-- test/test-index-column.rb
-- test/test-patricia-trie.rb