do_mysql 0.2.0 → 0.2.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "do_mysql"
 NAME = "do_mysql"
-VERSION = "0.2.0"
+VERSION = "0.2.1"
 AUTHOR = "Yehuda Katz"
 EMAIL = "wycats@gmail.com"
 HOMEPAGE = "http://dataobjects.devjavu.com"
@@ -23,6 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('data_objects')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
+  s.extensions = ["ext/extconf.rb"]
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,ext}/**/*")
 end
 
@@ -31,29 +32,5 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :install => [:package] do
-  STDERR.puts
-  STDERR.puts "* Installing native extensions"
-  old_stdout, old_stderr = STDOUT.dup, STDERR.dup
-
-  STDOUT.reopen("/dev/null")
-  STDERR.reopen("/dev/null")  
-
-  prefix = "sudo bash -c \""
-  # The Heimidal hack
-  if `uname -sr` =~ /^Darwin 9/
-    sh %{sudo ln -s /usr/local/mysql/lib /usr/local/mysql/lib/mysql} rescue nil
-    sh %{sudo ln -s /usr/local/mysql/bin/mysql_config /usr/local/mysql/bin/mysql_config5} rescue nil
-    prefix = %{sudo bash -c "ARCHFLAGS='-arch i386'}
-  end
-  
-  sh %{#{prefix} ruby ext/extconf.rb"}
-  sh %{#{prefix} make clean"}
-  sh %{#{prefix} make"}
-  sh %{#{prefix} sudo make install"}
-  sh %{#{prefix} sudo gem install pkg/#{NAME}-#{VERSION}"}
-
-  STDOUT.reopen(old_stdout)
-  STDERR.reopen(old_stderr)
-  
-  puts "* Successfully installed native extensions"
+  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
 end

data/TODO

@@ -1,5 +0,0 @@
-TODO:
-Fix LICENSE with your name
-Fix Rakefile with your name and contact info
-Add your code to lib/do_sqlite3.rb
-Add your Merb rake tasks to lib/do_sqlite3/merbtasks.rb

data/ext/extconf.rb

@@ -1,6 +1,13 @@
 require 'mkmf'
 require 'open3'
 
+# Heimidal hack
+ENV["ARCHFLAGS"] = '-arch i386'
+if `uname -sr` =~ /^Darwin 9/
+  `sudo ln -s /usr/local/mysql/lib /usr/local/mysql/lib/mysql` rescue nil
+  `sudo ln -s /usr/local/mysql/bin/mysql_config /usr/local/mysql/bin/mysql_config5` rescue nil
+end
+
 def config_value(type)
   ENV["MYSQL_#{type.upcase}"] || mysql_config(type)
 end
@@ -12,6 +19,15 @@ def mysql_config(type)
   unless serr.read.empty?
     sin, sout, serr = Open3.popen3("mysql_config --#{type}")
   end
+
+  # If mysql_config is not in your path
+  unless serr.read.empty?
+    sin, sout, serr = Open3.popen3("/usr/local/mysql/bin/mysql_config --#{type}")
+  end
+  
+  unless serr.read.empty?
+    sin, sout, serr = Open3.popen3("/usr/local/mysql/bin/mysql_config5 --#{type}")
+  end  
   
   unless serr.read.empty?
     raise "mysql_config not found"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-11-11 00:00:00 -08:00
+  version: 0.2.1
+date: 2007-11-12 00:00:00 -08:00
 summary: A DataObject.rb driver for mysql
 require_paths: 
 - lib
@@ -47,8 +47,8 @@ extra_rdoc_files:
 - TODO
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/extconf.rb
 requirements: []
 
 dependencies: