do_mysql 0.10.0-x86-mingw32 → 0.10.1-x86-mingw32

data/tasks/release.rake

@@ -1,75 +1,16 @@
-begin
-  gem 'rubyforge', '~> 1.0.1'
-  require 'rubyforge'
-rescue Exception
-  nil
+desc 'Builds all gems (native, binaries for JRuby and Windows)'
+task :build_all do
+  `rake clean`
+  `rake build`
+  `rake java gem`
+  `rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1`
 end
 
-if defined?(RubyForge) then
-  if defined?(GEM_SPEC) then
-    desc 'Package and upload to RubyForge'
-    task :release do |t|
-      ver = ENV['VERSION'] or fail "Must supply VERSION (rake release VERSION=x.y.z)."
-
-      # compare versions to avoid mistakes
-      unless ver == GEM_SPEC.version.to_s then
-        fail "Version mismatch (supplied and specification versions differ)."
-      end
-
-      # no rubyforge project? no release for you!
-      if GEM_SPEC.rubyforge_project == 'TODO' or GEM_SPEC.rubyforge_project.nil? then
-        fail "Must define rubyforge_project in your gem specification."
-      end
-
-      # instantiate a RubyForge object
-      rf = RubyForge.new
-
-      # read project info and overview
-      notes = begin
-                r = File.read("README.markdown")
-                r.split(/^(.*\n\-+)/)[1..4].join.strip
-              rescue
-                warn "Missing README.markdown"
-                ''
-              end
-
-      # read changes
-      changes = begin
-                  h = File.read("HISTORY.markdown")
-                  h.split(/^(##+ .*)/)[1..2].join.strip
-                rescue
-                  warn "Missing HISTORY.markdown"
-                  ''
-                end
-
-      # build the configuration for the release
-      config = Hash.new
-      config["release_notes"] = notes
-      config["release_changes"] = changes
-      config["preformatted"] = true
-
-      # prepare configuration
-      rf.configure config
-
-      files = FileList["pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version}*.*"].to_a
-      fail "No files found for the release." if files.empty?
-
-      puts "Logging in RubyForge..."
-      rf.login
-
-      puts "Files to upload:"
-      files.each do |f|
-        puts "  * #{f}"
-      end
-
-      puts "Releasing #{GEM_SPEC.name} version #{GEM_SPEC.version}..."
-      rf.add_release GEM_SPEC.rubyforge_project, GEM_SPEC.name, GEM_SPEC.version, *files
-      puts "Done."
-    end
-    #Rake::Task['release'].prerequisites.unshift('clean', 'cross', 'native')
-  else
-    warn "no GEM_SPEC is found or defined. 'release' task cannot work without it."
+desc 'Release all gems (native, binaries for JRuby and Windows)'
+task :release_all => :build_all do
+  Dir["pkg/do_mysql-#{DataObjects::Mysql::VERSION}*.gem"].each do |gem_path|
+    command = "gem push #{gem_path}"
+    puts "Executing #{command.inspect}:"
+    sh command
   end
-else
-  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
 end

data/tasks/retrieve.rake

@@ -1,5 +1,5 @@
 begin
-  gem('rake-compiler')
+  gem 'rake-compiler', '~>0.7'
   require 'rake/clean'
   require 'rake/extensioncompiler'
 

data/tasks/spec.rake

@@ -1,19 +1,23 @@
-# Specs
-require 'spec/rake/spectask'
+require 'rake/testtask'
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec => [ :clean, :compile ]) do |t|
-  t.spec_opts << '--options' << ROOT + 'spec/spec.opts'
-  t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
-  t.libs << 'lib'
+spec_defaults = lambda do |spec|
+  spec.libs   << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.verbose = true
+end
+
+Rake::TestTask.new(:spec => [ :clean, :compile ], &spec_defaults)
+Rake::TestTask.new(:spec_no_compile, &spec_defaults)
 
-  begin
-    # RCov is run by default, except on the JRuby platform
-    t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |spec|
+    spec.libs   << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort 'RCov is not available. In order to run rcov, you must: gem install rcov'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_mysql
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: x86-mingw32
 authors: 
 - Dirkjan Bussink
@@ -9,48 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2010-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: data_objects
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 0.10.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
+  name: bacon
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: data_objects
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake-compiler
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: "0.7"
     version: 
 description: Implements the DataObjects API for MySQL
 email: d.bussink@gmail.com
@@ -58,8 +48,10 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
+- ChangeLog.markdown
+- LICENSE
 files: 
 - lib/do_mysql/encoding.rb
 - lib/do_mysql/transaction.rb
@@ -68,7 +60,6 @@ files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
-- spec/lib/rspec_immediate_feedback_formatter.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -82,32 +73,49 @@ files:
 - spec/typecast/float_spec.rb
 - spec/typecast/integer_spec.rb
 - spec/typecast/nil_spec.rb
+- spec/typecast/other_spec.rb
 - spec/typecast/range_spec.rb
 - spec/typecast/string_spec.rb
 - spec/typecast/time_spec.rb
-- tasks/gem.rake
-- tasks/install.rake
-- tasks/native.rake
+- tasks/compile.rake
 - tasks/release.rake
 - tasks/retrieve.rake
 - tasks/spec.rake
 - tasks/ssl.rake
-- ext/do_mysql_ext/extconf.rb
-- ext/do_mysql_ext/do_mysql_ext.c
-- ext/do_mysql_ext/error.h
+- ext/do_mysql/extconf.rb
+- ext/do_mysql/do_mysql.c
+- ext/do_mysql/compat.h
+- ext/do_mysql/error.h
 - LICENSE
 - Rakefile
-- HISTORY.markdown
+- ChangeLog.markdown
 - README.markdown
-- Manifest.txt
-- lib/do_mysql_ext.so
+- lib/do_mysql/1.8/do_mysql.so
+- lib/do_mysql/1.9/do_mysql.so
 has_rdoc: false
-homepage: http://github.com/datamapper/do
+homepage: 
 licenses: []
 
-post_install_message: 
-rdoc_options: []
-
+post_install_message: |+
+  
+    ======================================================================================================
+  
+      You've installed the binary version of do_mysql.
+      It was built using MySQL version 5.0.89.
+      It's recommended to use the exact same version to avoid potential issues.
+  
+      At the time of building this gem, the necessary DLL files where available
+      in the following download:
+  
+      http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-5.0.89-win32.zip/from/pick
+  
+      You can put the lib\opt\libmysql.dll available in this package in your Ruby bin
+      directory, for example C:\Ruby\bin
+  
+    ======================================================================================================
+  
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -129,5 +137,24 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: DataObjects MySQL Driver
-test_files: []
-
+test_files: 
+- spec/command_spec.rb
+- spec/connection_spec.rb
+- spec/encoding_spec.rb
+- spec/reader_spec.rb
+- spec/result_spec.rb
+- spec/spec_helper.rb
+- spec/typecast/array_spec.rb
+- spec/typecast/bigdecimal_spec.rb
+- spec/typecast/boolean_spec.rb
+- spec/typecast/byte_array_spec.rb
+- spec/typecast/class_spec.rb
+- spec/typecast/date_spec.rb
+- spec/typecast/datetime_spec.rb
+- spec/typecast/float_spec.rb
+- spec/typecast/integer_spec.rb
+- spec/typecast/nil_spec.rb
+- spec/typecast/other_spec.rb
+- spec/typecast/range_spec.rb
+- spec/typecast/string_spec.rb
+- spec/typecast/time_spec.rb

data/HISTORY.markdown

@@ -1,17 +0,0 @@
-## 0.10.0 2009-10-15
-* Improvements
-  * JRuby Support (using *do_jdbc*)
-
-## 0.9.12 2009-05-17
-* Improvements
-  * Windows support
-
-## 0.9.11 2009-01-19
-* Improvements
-  * Ruby 1.9 support
-* Fixes
-  * Reconnecting now works properly
-
-## 0.9.9 2008-11-27
-* Improvements
-  * Added initial support for Ruby 1.9 [John Harrison]

data/Manifest.txt

@@ -1,32 +0,0 @@
-.gitignore
-HISTORY.markdown
-LICENSE
-Manifest.txt
-README.markdown
-Rakefile
-buildfile
-ext-java/src/main/java/DoMysqlExtService.java
-ext-java/src/main/java/do_mysql/MySqlDriverDefinition.java
-ext/.gitignore
-ext/do_mysql_ext/do_mysql_ext.c
-ext/do_mysql_ext/extconf.rb
-lib/do_mysql.rb
-lib/do_mysql/transaction.rb
-lib/do_mysql/version.rb
-spec/command_spec.rb
-spec/connection_spec.rb
-spec/reader_spec.rb
-spec/result_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/typecast/bigdecimal_spec.rb
-spec/typecast/boolean_spec.rb
-spec/typecast/byte_array_spec.rb
-spec/typecast/class_spec.rb
-spec/typecast/date_spec.rb
-spec/typecast/datetime_spec.rb
-spec/typecast/float_spec.rb
-spec/typecast/integer_spec.rb
-spec/typecast/nil_spec.rb
-spec/typecast/string_spec.rb
-spec/typecast/time_spec.rb

data/spec/lib/rspec_immediate_feedback_formatter.rb

@@ -1,3 +0,0 @@
-# encoding: utf-8
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'data_objects', 'spec', 'lib', 'rspec_immediate_feedback_formatter'))

data/tasks/gem.rake

@@ -1,8 +0,0 @@
-require 'rubygems/package_task'
-
-GEM_SPEC = eval(File.read('do_mysql.gemspec'))
-
-gem_package = Gem::PackageTask.new(GEM_SPEC) do |pkg|
-  pkg.need_tar = false
-  pkg.need_zip = false
-end

data/tasks/install.rake

@@ -1,15 +0,0 @@
-def sudo_gem(cmd)
-  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
-end
-
-# Installation
-
-desc "Install #{GEM_SPEC.name} #{GEM_SPEC.version}"
-task :install => [ :package ] do
-  sudo_gem "install pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version} --no-update-sources"
-end
-
-desc "Uninstall #{GEM_SPEC.name} #{GEM_SPEC.version}"
-task :uninstall => [ :clean ] do
-  sudo_gem "uninstall #{GEM_SPEC.name} -v#{GEM_SPEC.version} -I -x"
-end

data/tasks/native.rake

@@ -1,31 +0,0 @@
-begin
-  gem('rake-compiler')
-  require 'rake/extensiontask'
-
-  Rake::ExtensionTask.new('do_mysql_ext', GEM_SPEC) do |ext|
-
-    mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-#{BINARY_VERSION}-win32"))
-
-    # automatically add build options to avoid need of manual input
-    if RUBY_PLATFORM =~ /mswin|mingw/ then
-      ext.config_options << "--with-mysql-include=#{mysql_lib}/include"
-      ext.config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
-    else
-      ext.cross_compile = true
-      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
-      ext.cross_config_options << "--with-mysql-include=#{mysql_lib}/include"
-      ext.cross_config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
-    end
-
-  end
-rescue LoadError
-  warn "To cross-compile, install rake-compiler (gem install rake-compiler)"
-
-  if (tasks_dir = ROOT.parent + 'tasks').directory?
-    require tasks_dir + 'ext_helper'
-    require tasks_dir + 'ext_helper_java'
-
-    setup_c_extension("#{GEM_SPEC.name}_ext", GEM_SPEC)
-    setup_java_extension("#{GEM_SPEC.name}_ext", GEM_SPEC)
-  end
-end