From 482fd82d83b83e5a2707f101e77dfc3e46428c45 Mon Sep 17 00:00:00 2001 From: Roger Pack Date: Wed, 13 May 2009 00:23:47 +0000 Subject: [PATCH] allow the gem to compile, also ensure it requires our version of mysql.so --- lib/mysqlplus.rb | 8 +++++--- mysqlplus.gemspec | 11 +---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lib/mysqlplus.rb b/lib/mysqlplus.rb index ba043bb..1feb9ee 100644 --- a/lib/mysqlplus.rb +++ b/lib/mysqlplus.rb @@ -1,8 +1,10 @@ -require 'mysql' # this should load the mysqlplus version of mysql.so, as we assume the user has installed mysql as a gem and have not done any previous "require 'mysql'" to have loaded the other +require File.dirname(__FILE__) + '/mysql' # load our version of mysql--note +# if someone does a require 'mysql' after a require 'mysqlplus' then their screen will be littered with warnings +# and the "old" mysql will override the "new" mysqlplus, so be careful. # -# Mysqlplus library gives you a [slightly modified] version of the Mysql class -# See http://www.kitebird.com/articles/ruby-mysql.html for details, as well as the test directory within the library +# The mysqlplus library is a [slightly updated] fork of the Mysql class, with asynchronous capability added +# See http://www.kitebird.com/articles/ruby-mysql.html for details, as well as the test directory within the gem # class Mysql diff --git a/mysqlplus.gemspec b/mysqlplus.gemspec index d1acafe..5dfb880 100755 --- a/mysqlplus.gemspec +++ b/mysqlplus.gemspec @@ -18,16 +18,7 @@ Gem::Specification.new do |s| ext/mysql.c lib/mysqlplus.rb mysqlplus.gemspec - test/c_threaded_test.rb - test/evented_test.rb - test/native_threaded_test.rb - test/test_all_hashes.rb - test/test_failure.rb - test/test_helper.rb - test/test_many_requests.rb - test/test_parsing_while_response_is_being_read.rb - test/test_threaded_sequel.rb - ] + ] + Dir.glob('test/*') s.rdoc_options = ["--main", "README"] s.extra_rdoc_files = ["README"] s.extensions << "ext/extconf.rb"