do_mysql 0.10.0-java → 0.10.1-java

data/spec/typecast/string_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/string_spec'
 
 describe 'DataObjects::Mysql with String' do
-  it_should_behave_like 'supporting String'
+  behaves_like 'supporting String'
 end

data/spec/typecast/time_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/time_spec'
 
 describe 'DataObjects::Mysql with Time' do
-  it_should_behave_like 'supporting Time'
+  behaves_like 'supporting Time'
 end

data/tasks/compile.rake

@@ -0,0 +1,65 @@
+begin
+  gem 'rake-compiler', '~>0.7'
+  require 'rake/extensiontask'
+  require 'rake/javaextensiontask'
+
+  # Hack to avoid "allocator undefined for Proc" issue when unpacking Gems:
+  # gemspec provided by Jeweler uses Rake::FileList for files, test_files and
+  # extra_rdoc_files, and procs cannot be marshalled.
+  def gemspec
+    @clean_gemspec ||= eval("#{Rake.application.jeweler.gemspec.to_ruby}") # $SAFE = 3\n
+  end
+
+  Rake::ExtensionTask.new('do_mysql', gemspec) do |ext|
+    ext.lib_dir = "lib/#{gemspec.name}"
+    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"
+
+      ext.cross_compiling do |gemspec|
+        gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
+
+  ======================================================================================================
+
+    You've installed the binary version of #{gemspec.name}.
+    It was built using MySQL version #{BINARY_VERSION}.
+    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-#{BINARY_VERSION}-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
+
+  ======================================================================================================
+
+        POST_INSTALL_MESSAGE
+      end
+
+    end
+
+  end
+
+  Rake::JavaExtensionTask.new('do_mysql', gemspec) do |ext|
+    ext.lib_dir   = "lib/#{gemspec.name}"
+    ext.ext_dir   = 'ext-java/src/main/java'
+    ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
+    ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
+    ext.java_compiling do |gem|
+      gem.add_dependency 'jdbc-mysql', '>=5.0.4'
+      gem.add_dependency 'do_jdbc',    '0.10.1'
+    end
+  end
+rescue LoadError
+  warn "To compile, install rake-compiler (gem install rake-compiler)"
+end

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,43 +1,88 @@
 --- !ruby/object:Gem::Specification 
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-email: d.bussink@gmail.com
-cert_chain: []
-
-summary: DataObjects MySQL Driver
-post_install_message: 
-extra_rdoc_files: []
-
-homepage: http://github.com/datamapper/do
-signing_key: 
 name: do_mysql
-rdoc_options: []
-
-rubyforge_project: dorb
+version: !ruby/object:Gem::Version 
+  version: 0.10.1
+platform: java
+authors: 
+- Dirkjan Bussink
 autorequire: 
-licenses: []
+bindir: bin
+cert_chain: []
 
+date: 2010-01-09 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !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.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.7"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jdbc-mysql
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 5.0.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: do_jdbc
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.10.1
+    version: 
+description: Implements the DataObjects API for MySQL
+email: d.bussink@gmail.com
 executables: []
 
-description: Implements the DataObjects API for MySQL
-specification_version: 3
-default_executable: 
+extensions: []
+
+extra_rdoc_files: 
+- README.markdown
+- ChangeLog.markdown
+- LICENSE
 files: 
-- lib/do_mysql.rb
 - lib/do_mysql/encoding.rb
 - lib/do_mysql/transaction.rb
 - lib/do_mysql/version.rb
+- lib/do_mysql.rb
 - 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/lib/rspec_immediate_feedback_formatter.rb
 - spec/typecast/array_spec.rb
 - spec/typecast/bigdecimal_spec.rb
 - spec/typecast/boolean_spec.rb
@@ -48,103 +93,70 @@ 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/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.jar
+- lib/do_mysql/do_mysql.jar
+has_rdoc: false
+homepage: 
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-extensions: []
-
-rubygems_version: 1.3.3
 requirements: []
 
-authors: 
-- Dirkjan Bussink
-date: 2009-09-19 22:00:00 +00:00
-platform: java
-test_files: []
-
-version: !ruby/object:Gem::Version 
-  version: 0.10.0
-require_paths: 
-- lib
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: addressable
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.12
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: extlib
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: data_objects
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version 
-        version: 5.0.4
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: jdbc-mysql
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: do_jdbc
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
-  type: :development
-  version_requirement: 
-  name: rspec
-bindir: bin
-has_rdoc: true
+rubyforge_project: dorb
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: DataObjects MySQL Driver
+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