do_derby 0.10.0-java → 0.10.1-java

data/ChangeLog.markdown

@@ -0,0 +1,15 @@
+## 0.10.1 (unreleased, in git)
+
+* Switch to Jeweler for Gem building tasks (this change may be temporary).
+* Switch to using Bacon for running specs: This should make specs friendlier to
+  new Ruby implementations that are not yet 100% MRI-compatible, and in turn,
+  prepared the road for our own IronRuby and MacRuby support.
+* Switch to the newly added rake-compiler `JavaExtensionTask` for compiling
+  JRuby extensions, instead of our (broken) home-grown solution.
+
+## 0.10.0 2009-09-15
+
+Initial release of Derby driver (using *do_jdbc*).
+
+* Known Issues
+  * JRuby-only

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2009 Alex Coles, Ikonoklastik Productions
+Copyright (c) 2008 - 2010 Alex Coles, Ikonoklastik Productions
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -1,4 +1,80 @@
-do_derby
-========
+# do_derby
 
-A Derby driver for DataObjects
+* <http://dataobjects.info>
+
+## Description
+
+A Derby driver for DataObjects.
+
+## Features/Problems
+
+This driver implements the DataObjects API for the Derby relational database.
+This driver is currently provided only for JRuby.
+
+## Synopsis
+
+An example of usage:
+
+    @connection = DataObjects::Connection.new("derby://employees")
+    @reader = @connection.create_command('SELECT * FROM users').execute_reader
+    @reader.next!
+
+The `Connection` constructor should be passed either a DataObjects-style URL or
+JDBC-style URL:
+
+    derby://employees
+    jdbc:derby:employees;create=true
+
+## Requirements
+
+ * JRuby 1.3.1 + (1.4+ recommended)
+ * `data_objects` gem
+ * `do_jdbc` gem (shared library)
+
+## Install
+
+To install the gem:
+
+    jruby -S gem install do_derby
+
+To compile and install from source:
+
+ * Install the Java Development Kit (provided if you are on a recent version of
+   Mac OS X) from <http://java.sun.com>
+ * Install a recent version of JRuby. Ensure `jruby` is in your `PATH` and/or
+   you have configured the `JRUBY_HOME` environment variable to point to your
+   JRuby installation.
+ * Install `data_objects` and `do_jdbc` with `jruby -S rake install`.
+ * Install this driver with `jruby -S rake install`.
+
+For more information, see the Derby driver wiki page:
+<http://wiki.github.com/datamapper/do/derby>.
+
+## Developers
+
+Follow the above installation instructions. Additionally, you'll need:
+  * `bacon` gem for running specs.
+  * `YARD` gem for generating documentation.
+
+See the DataObjects wiki for more comprehensive information:
+<http://wiki.github.com/datamapper/do/jruby>.
+
+To run specs:
+
+    jruby -S rake spec
+
+To run specs without compiling extensions first:
+
+    jruby -S rake spec_no_compile
+
+To run individual specs:
+
+    jruby -S rake spec TEST=spec/connection_spec.rb
+
+(Note that the `rake` task uses a `TEST` parameter, not `SPEC`. This is because
+the `Rake::TestTask` is used for executing the Bacon specs).
+
+## License
+
+This code is licensed under an **MIT (X11) License**. Please see the
+accompanying `LICENSE` file.

data/Rakefile

@@ -1,15 +1,54 @@
+require 'pathname'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
 
-require 'pathname'
-require 'lib/do_derby/version'
+ROOT = Pathname(__FILE__).dirname.expand_path
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
+require ROOT + 'lib/do_derby/version'
 
-Dir['tasks/*.rake'].sort.each { |f| import f }
+JRUBY    = RUBY_PLATFORM =~ /java/
+IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
+WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
+SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext-java/target ])
+
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'do_derby'
+    gem.version     = DataObjects::Derby::VERSION
+    gem.summary     = 'DataObjects Derby Driver'
+    gem.description = 'Implements the DataObjects API for Derby'
+    gem.platform    = 'java'
+    gem.files       = FileList['lib/**/*.rb', 'spec/**/*.rb', 'tasks/**/*.rake',
+                               'LICENSE', 'Rakefile', '*.{markdown,rdoc,txt,yml}',
+                               'lib/*.jar']
+    gem.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE']
+    gem.test_files  = FileList['spec/**/*.rb']
+
+    gem.add_dependency 'data_objects', DataObjects::Derby::VERSION
+    gem.add_dependency 'do_jdbc',      DataObjects::Derby::VERSION
+    gem.add_dependency 'jdbc-derby',   '~>10.4.2.0'
+
+    gem.add_development_dependency 'bacon',         '~>1.1'
+    gem.add_development_dependency 'rake-compiler', '~>0.7'
+
+    gem.has_rdoc = false
+    gem.rubyforge_project = 'dorb'
+    gem.authors     = [ 'Alex Coles' ]
+    gem.email       = 'alex@alexcolesportfolio.com'
+  end
+
+  Rake::Task['build'].clear_actions if Rake::Task.task_defined?('build')
+  task :build => [ :java, :gem ]
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+end

data/lib/do_derby.rb

@@ -11,23 +11,13 @@ if RUBY_PLATFORM =~ /java/
     require 'jdbc/derby'      # the JDBC driver, packaged as a gem
   end
 
-  require 'do_derby_ext'    # the Java extension for this DO driver
+  require 'do_derby/do_derby'    # the Java extension for this DO driver
 
   # Another way of loading the JDBC Class. This seems to be more reliable
   # than Class.forName() within the data_objects.Connection Java class,
   # which is currently not working as expected.
   java_import driver
 
-  module DataObjects
-    module Derby
-      class Connection
-        def self.pool_size
-          20
-        end
-      end
-    end
-  end
-
 else
   warn "do_derby is only for use with JRuby"
 end

data/lib/do_derby/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Derby
-    VERSION = "0.10.0"
+    VERSION = '0.10.1'.freeze
   end
 end

data/spec/command_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/command_spec'
 
 describe DataObjects::Derby::Command do
-  it_should_behave_like 'a Command'
- # it_should_behave_like 'a Command with async'
+  behaves_like 'a Command'
+ # behaves_like 'a Command with async'
 end

data/spec/connection_spec.rb

@@ -5,15 +5,17 @@ require 'data_objects/spec/connection_spec'
 
 describe DataObjects::Derby::Connection do
 
-  before :all do
-    @driver = 'derby'
-    @user   = ''
+  before do
+    @driver   = 'derby'
+    @user     = ''
     @password = ''
-    @host   = ''
-    @port   = ''
+    @host     = ''
+    @port     = ''
     @database = "#{File.expand_path(File.dirname(__FILE__))}/test.db;create=true"
   end
 
-  it_should_behave_like 'a Connection'
-  #it_should_behave_like 'a Connection with authentication support'
+  behaves_like 'a Connection'
+  #behaves_like 'a Connection with authentication support'
+  behaves_like 'a Connection with JDBC URL support'
+  behaves_like 'a Connection via JDNI'
 end

data/spec/encoding_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/encoding_spec'
 
 describe DataObjects::Derby::Connection do
-#  it_should_behave_like 'a driver supporting encodings'
+#  behaves_like 'a driver supporting different encodings'
 end

data/spec/reader_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/reader_spec'
 
 describe DataObjects::Derby::Reader do
-  it_should_behave_like 'a Reader'
+  behaves_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -4,13 +4,13 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/result_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "it_should_behave_like ....."
+# concurrent execution of the "behaves_like ....."
 # needed by some databases (sqlite3)
 
 describe DataObjects::Derby::Result do
-  it_should_behave_like 'a Result'
+  behaves_like 'a Result'
 end
 
 describe DataObjects::Derby::Result do
-  it_should_behave_like 'a Result which returns inserted keys'
+  behaves_like 'a Result which returns inserted keys'
 end

data/spec/spec_helper.rb

@@ -2,47 +2,28 @@ $TESTING=true
 JRUBY = true
 
 require 'rubygems'
-
-gem 'rspec', '>1.1.12'
-require 'spec'
-
 require 'date'
 require 'ostruct'
-require 'pathname'
 require 'fileutils'
 
-dir = File.dirname(__FILE__)
-lib_path = File.expand_path("#{dir}/../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-# put data_objects from repository in the load path
-# DO NOT USE installed gem of data_objects!
-do_lib_path = File.expand_path("#{dir}/../../data_objects/lib")
-$LOAD_PATH.unshift do_lib_path unless $LOAD_PATH.include?(do_lib_path)
-
-if JRUBY
-  jdbc_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
-  $LOAD_PATH.unshift jdbc_lib_path unless $LOAD_PATH.include?(jdbc_lib_path)
-  require 'do_jdbc'
+driver_lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(driver_lib) unless $LOAD_PATH.include?(driver_lib)
+
+# Prepend data_objects/do_jdbc in the repository to the load path.
+# DO NOT USE installed gems, except when running the specs from gem.
+repo_root = File.expand_path('../../..', __FILE__)
+['data_objects', 'do_jdbc'].each do |lib|
+  lib_path = "#{repo_root}/#{lib}/lib"
+  $LOAD_PATH.unshift(lib_path) if File.directory?(lib_path) && !$LOAD_PATH.include?(lib_path)
 end
 
 require 'data_objects'
-
-DATAOBJECTS_SPEC_ROOT = Pathname(__FILE__).dirname.parent.parent + 'data_objects' + 'spec'
-Pathname.glob((DATAOBJECTS_SPEC_ROOT + 'lib/**/*.rb').to_s).each { |f| require f }
-
+require 'data_objects/spec/bacon'
 require 'do_derby'
 
-log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
-FileUtils.mkdir_p(File.dirname(log_path))
-
-DataObjects::Derby.logger = DataObjects::Logger.new(log_path, :debug)
-
+DataObjects::Derby.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
-Spec::Runner.configure do |config|
-  config.include(DataObjects::Spec::PendingHelpers)
-end
-
 CONFIG = OpenStruct.new
 # CONFIG.scheme   = 'derby'
 # CONFIG.user     = ENV['DO_DERBY_USER'] || 'derby'
@@ -52,6 +33,7 @@ CONFIG = OpenStruct.new
 # CONFIG.database = ENV['DO_DERBY_DATABASE'] || "#{File.expand_path(File.dirname(__FILE__))}/testdb"
 
 CONFIG.uri = ENV["DO_DERBY_SPEC_URI"] || "jdbc:derby:testdb;create=true"
+CONFIG.testsql = "SELECT 1 FROM SYSIBM.SYSDUMMY1"
 
 module DataObjectsSpecHelpers
 
@@ -199,3 +181,5 @@ module DataObjectsSpecHelpers
 
   end
 end
+
+include DataObjectsSpecHelpers

data/spec/typecast/array_spec.rb

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

data/spec/typecast/bigdecimal_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/bigdecimal_spec'
 
 describe 'DataObjects::Derby with BigDecimal' do
-  it_should_behave_like 'supporting BigDecimal'
-  it_should_behave_like 'supporting BigDecimal autocasting'
+  behaves_like 'supporting BigDecimal'
+  behaves_like 'supporting BigDecimal autocasting'
 end

data/spec/typecast/boolean_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/boolean_spec'
 
 describe 'DataObjects::Derby with Boolean' do
-  it_should_behave_like 'supporting Boolean'
+  behaves_like 'supporting Boolean'
   # TODO should we map smallint to boolean for derby ??
-#  it_should_behave_like 'supporting Boolean autocasting'
+#  behaves_like 'supporting Boolean autocasting'
 end

data/spec/typecast/byte_array_spec.rb

@@ -5,5 +5,5 @@ require 'data_objects/spec/typecast/byte_array_spec'
 
 describe 'DataObjects::Derby with ByteArray' do
   # We need to switch to using parameter binding for this to work with Derby
-  # it_should_behave_like 'supporting ByteArray'
+  # behaves_like 'supporting ByteArray'
 end

data/spec/typecast/class_spec.rb

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

data/spec/typecast/date_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/date_spec'
 
 describe 'DataObjects::Derby with Date' do
-  it_should_behave_like 'supporting Date'
-  it_should_behave_like 'supporting Date autocasting'
+  behaves_like 'supporting Date'
+  behaves_like 'supporting Date autocasting'
 end

data/spec/typecast/datetime_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/datetime_spec'
 
 describe 'DataObjects::Derby with DateTime' do
-  it_should_behave_like 'supporting DateTime'
-  it_should_behave_like 'supporting DateTime autocasting'
+  behaves_like 'supporting DateTime'
+  behaves_like 'supporting DateTime autocasting'
 end

data/spec/typecast/float_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/float_spec'
 
 describe 'DataObjects::Derby with Float' do
-  it_should_behave_like 'supporting Float'
-  it_should_behave_like 'supporting Float autocasting'
+  behaves_like 'supporting Float'
+  behaves_like 'supporting Float autocasting'
 end

data/spec/typecast/integer_spec.rb

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

data/spec/typecast/nil_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/nil_spec'
 
 describe 'DataObjects::Derby with Nil' do
-  it_should_behave_like 'supporting Nil'
-  it_should_behave_like 'supporting writing an Nil'
-  it_should_behave_like 'supporting Nil autocasting'
+  behaves_like 'supporting Nil'
+  behaves_like 'supporting writing an Nil'
+  behaves_like 'supporting Nil autocasting'
 end

data/spec/typecast/other_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/other_spec'
+
+describe 'DataObjects::H2 with other (unknown) type' do
+  behaves_like 'supporting other (unknown) type'
+end

data/spec/typecast/range_spec.rb

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

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::Derby 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::Derby with Time' do
-  it_should_behave_like 'supporting Time'
+  behaves_like 'supporting Time'
 end

data/tasks/compile.rake

@@ -0,0 +1,29 @@
+begin
+  gem 'rake-compiler', '~>0.7'
+  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::JavaExtensionTask.new('do_derby', gemspec) do |ext|
+    ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = 'lib/do_derby'
+    ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
+    ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
+  end
+
+  # do_derby is only available for JRuby: the normal behaviour of rake-compiler
+  # is to only chain 'compile:PLATFORM' tasks to 'compile' where PLATFORM is the
+  # platform of the current interpreter (i.e. 'compile:java' to 'compile' only
+  # if running on JRuby). However, we always want to compile for Java, even if
+  # running from MRI.
+  task 'compile:do_derby' => ['compile:do_derby:java']
+  task 'compile' => ['compile:java']
+
+rescue LoadError
+  warn "To compile, install rake-compiler (gem install rake-compiler)"
+end

data/tasks/release.rake

@@ -1,75 +1,14 @@
-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 java gem`
 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_derby-#{DataObjects::Derby::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/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,145 +1,154 @@
 --- !ruby/object:Gem::Specification 
-extensions: []
-
-homepage: http://github.com/datamapper/do
-executables: []
-
-version: !ruby/object:Gem::Version 
-  version: 0.10.0
-post_install_message: 
-date: 2009-09-16 00:00:00 Z
-files: 
-- lib/do_derby.rb
-- lib/do_derby/version.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
-- 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/range_spec.rb
-- spec/typecast/string_spec.rb
-- spec/typecast/time_spec.rb
-- tasks/gem.rake
-- tasks/install.rake
-- tasks/native.rake
-- tasks/release.rake
-- tasks/spec.rake
-- LICENSE
-- Rakefile
-- HISTORY.markdown
-- README.markdown
-- Manifest.txt
-rubygems_version: 1.3.4
-rdoc_options: []
-
-signing_key: 
-cert_chain: []
-
 name: do_derby
-has_rdoc: false
+version: !ruby/object:Gem::Version 
+  version: 0.10.1
 platform: java
-summary: DataObjects Derby Driver
-default_executable: 
+authors: 
+- Alex Coles
+autorequire: 
 bindir: bin
-licenses: []
-
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  version: 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_ruby_version: !ruby/object:Gem::Requirement 
-  version: 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-require_paths: 
-- lib
-specification_version: 3
-test_files: []
+cert_chain: []
 
+date: 2010-01-09 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: data_objects
   type: :runtime
-  name: addressable
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "2.0"
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: extlib
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+        version: 0.10.1
     version: 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.12
 - !ruby/object:Gem::Dependency 
+  name: do_jdbc
   type: :runtime
-  name: data_objects
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.10.1
+    version: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   name: jdbc-derby
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 10.4.2.0
+    version: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: do_jdbc
+  name: bacon
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: "1.1"
+    version: 
 - !ruby/object:Gem::Dependency 
+  name: rake-compiler
   type: :development
-  name: rspec
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: "0.7"
+    version: 
 description: Implements the DataObjects API for Derby
 email: alex@alexcolesportfolio.com
-authors: 
-- Alex Coles
-extra_rdoc_files: []
+executables: []
 
+extensions: []
+
+extra_rdoc_files: 
+- README.markdown
+- ChangeLog.markdown
+- LICENSE
+files: 
+- lib/do_derby/version.rb
+- lib/do_derby.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/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
+- tasks/compile.rake
+- tasks/release.rake
+- tasks/spec.rake
+- LICENSE
+- Rakefile
+- ChangeLog.markdown
+- README.markdown
+- lib/do_derby/do_derby.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: 
 requirements: []
 
 rubyforge_project: dorb
-autorequire: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: DataObjects Derby 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

data/HISTORY.markdown

@@ -1,6 +0,0 @@
-## 0.10.0 2009-10-15
-
-Initial release of Derby driver (using *do_jdbc*).
-
-* Known Issues
-  * JRuby-only

data/Manifest.txt

@@ -1,16 +0,0 @@
-HISTORY.markdown
-LICENSE
-Manifest.txt
-README.markdown
-Rakefile
-buildfile
-ext-java/src/main/java/DoDerbyExtService.java
-ext-java/src/main/java/do_derby/DerbyDriverDefinition.java
-lib/do_derby.rb
-lib/do_derby/version.rb
-lib/do_derby_ext.jar
-spec/integration/do_derby_spec.rb
-spec/integration/logging_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/unit/do_derby_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_derby.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,4 +0,0 @@
-if (tasks_dir = ROOT.parent + 'tasks').directory?
-  require tasks_dir + 'ext_helper_java'
-  setup_java_extension("#{GEM_SPEC.name}_ext", GEM_SPEC)
-end