do_sqlite3 0.10.3-java → 0.10.4-java

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
+require 'rspec'
 require 'date'
 require 'ostruct'
 require 'fileutils'
@@ -19,19 +20,18 @@ repo_root = File.expand_path('../../..', __FILE__)
 end
 
 require 'data_objects'
-require 'data_objects/spec/bacon'
+require 'data_objects/spec/setup'
+require 'data_objects/spec/lib/pending_helpers'
 require 'do_sqlite3'
 
-DataObjects::Sqlite3.logger = DataObjects::Logger.new(STDOUT, :off)
-at_exit { DataObjects.logger.flush }
 
-CONFIG = OpenStruct.new
-CONFIG.scheme   = 'sqlite3'
-CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
-
-CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}:#{CONFIG.database}"
-CONFIG.jdbc_driver = 'org.sqlite.JDBC'
-CONFIG.jdbc_uri = CONFIG.uri.sub(/sqlite3/,"jdbc:sqlite")
+CONFIG              = OpenStruct.new
+CONFIG.scheme       = 'sqlite3'
+CONFIG.database     = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
+CONFIG.uri          = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}:#{CONFIG.database}"
+CONFIG.driver       = 'sqlite3'
+CONFIG.jdbc_driver  = DataObjects::Sqlite3.const_get('JDBC_DRIVER') rescue nil
+CONFIG.jdbc_uri     = CONFIG.uri.sub(/sqlite3/,"jdbc:sqlite")
 
 module DataObjectsSpecHelpers
 
@@ -140,4 +140,7 @@ module DataObjectsSpecHelpers
 
 end
 
-include DataObjectsSpecHelpers
+RSpec.configure do |config|
+  config.include(DataObjectsSpecHelpers)
+  config.include(DataObjects::Spec::PendingHelpers)
+end

data/spec/typecast/array_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/array_spec'
+require 'data_objects/spec/shared/typecast/array_spec'
 
 describe 'DataObjects::Sqlite3 with Array' do
-  behaves_like 'supporting Array'
+  it_should_behave_like 'supporting Array'
 end

data/spec/typecast/bigdecimal_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/bigdecimal_spec'
+require 'data_objects/spec/shared/typecast/bigdecimal_spec'
 
 # Sqlite3 doesn't support decimals natively, so autocasting is not available:
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with BigDecimal' do
-  behaves_like 'supporting BigDecimal'
+  it_should_behave_like 'supporting BigDecimal'
 end

data/spec/typecast/boolean_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/boolean_spec'
+require 'data_objects/spec/shared/typecast/boolean_spec'
 
 # Sqlite3 doesn't support booleans natively, so autocasting is not available:
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with Boolean' do
-  behaves_like 'supporting Boolean'
+  it_should_behave_like 'supporting Boolean'
 end

data/spec/typecast/byte_array_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/byte_array_spec'
+require 'data_objects/spec/shared/typecast/byte_array_spec'
 
 describe 'DataObjects::Sqlite3 with ByteArray' do
-  behaves_like 'supporting ByteArray'
+  it_should_behave_like 'supporting ByteArray'
 end

data/spec/typecast/class_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/class_spec'
+require 'data_objects/spec/shared/typecast/class_spec'
 
 describe 'DataObjects::Sqlite3 with Class' do
-  behaves_like 'supporting Class'
+  it_should_behave_like 'supporting Class'
 end

data/spec/typecast/date_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/date_spec'
+require 'data_objects/spec/shared/typecast/date_spec'
 
 # Sqlite3 doesn't support dates natively, so autocasting is not available:
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with Date' do
-  behaves_like 'supporting Date'
+  it_should_behave_like 'supporting Date'
 end

data/spec/typecast/datetime_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/datetime_spec'
+require 'data_objects/spec/shared/typecast/datetime_spec'
 
 # Sqlite3 doesn't support datetimes natively, so autocasting is not available:
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with DateTime' do
-  behaves_like 'supporting DateTime'
+  it_should_behave_like 'supporting DateTime'
 end

data/spec/typecast/float_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/float_spec'
+require 'data_objects/spec/shared/typecast/float_spec'
 
 describe 'DataObjects::Sqlite3 with Float' do
-  behaves_like 'supporting Float'
+  it_should_behave_like 'supporting Float'
 end
 
 describe 'DataObjects::Sqlite3 with Float' do
-  behaves_like 'supporting Float autocasting'
+  it_should_behave_like 'supporting Float autocasting'
 end

data/spec/typecast/integer_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/integer_spec'
+require 'data_objects/spec/shared/typecast/integer_spec'
 
 describe 'DataObjects::Sqlite3 with Integer' do
-  behaves_like 'supporting Integer'
+  it_should_behave_like 'supporting Integer'
 end

data/spec/typecast/nil_spec.rb

@@ -1,20 +1,20 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/nil_spec'
+require 'data_objects/spec/shared/typecast/nil_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "behaves_like ....." calls
+# concurrent execution of the "it_should_behave_like ....." calls
 # which would lock the database
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  behaves_like 'supporting Nil'
+  it_should_behave_like 'supporting Nil'
 end
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  behaves_like 'supporting writing an Nil'
+  it_should_behave_like 'supporting writing an Nil'
 end
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  behaves_like 'supporting Nil autocasting'
+  it_should_behave_like 'supporting Nil autocasting'
 end

data/spec/typecast/other_spec.rb

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

data/spec/typecast/range_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/range_spec'
+require 'data_objects/spec/shared/typecast/range_spec'
 
 describe 'DataObjects::Sqlite3 with Range' do
-  behaves_like 'supporting Range'
+  it_should_behave_like 'supporting Range'
 end

data/spec/typecast/string_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/string_spec'
+require 'data_objects/spec/shared/typecast/string_spec'
 
 describe 'DataObjects::Sqlite3 with String' do
-  behaves_like 'supporting String'
+  it_should_behave_like 'supporting String'
 end

data/spec/typecast/time_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/time_spec'
+require 'data_objects/spec/shared/typecast/time_spec'
 
 describe 'DataObjects::Sqlite3 with Time' do
-  behaves_like 'supporting Time'
+  it_should_behave_like 'supporting Time'
 end

data/tasks/compile.rake

@@ -3,50 +3,49 @@ begin
   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
+    @clean_gemspec ||= Gem::Specification::load(File.expand_path('../../do_sqlite3.gemspec', __FILE__))
   end
 
-  Rake::ExtensionTask.new('do_sqlite3', gemspec) do |ext|
+  unless JRUBY
+    Rake::ExtensionTask.new('do_sqlite3', gemspec) do |ext|
 
-    sqlite3_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'sqlite3'))
+      sqlite3_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'sqlite3'))
 
-    ext.lib_dir = "lib/#{gemspec.name}"
+      ext.lib_dir = "lib/#{gemspec.name}"
 
-    ext.cross_compile = true
-    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
-    ext.cross_config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
+      ext.cross_compile = true
+      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+      ext.cross_config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
 
-    ext.cross_compiling do |gemspec|
-      gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
+      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 Sqlite3 version #{BINARY_VERSION}.
-  It's recommended to use the exact same version to avoid potential issues.
+    You've installed the binary version of #{gemspec.name}.
+    It was built using Sqlite3 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:
+    At the time of building this gem, the necessary DLL files where available
+    in the following download:
 
-  http://www.sqlite.org/sqlitedll-#{BINARY_VERSION}.zip
+    http://www.sqlite.org/sqlitedll-#{BINARY_VERSION}.zip
 
-  You can put the sqlite3.dll available in this package in your Ruby bin
-  directory, for example C:\\Ruby\\bin
+    You can put the sqlite3.dll available in this package in your Ruby bin
+    directory, for example C:\\Ruby\\bin
 
-=============================================================================
+  =============================================================================
 
-      POST_INSTALL_MESSAGE
-    end
+        POST_INSTALL_MESSAGE
+      end
 
-    # automatically add build options to avoid need of manual input
-    if RUBY_PLATFORM =~ /mswin|mingw/ then
-      ext.config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
-    end
+      # automatically add build options to avoid need of manual input
+      if RUBY_PLATFORM =~ /mswin|mingw/ then
+        ext.config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
+      end
 
+    end
   end
 
   Rake::JavaExtensionTask.new('do_sqlite3', gemspec) do |ext|
@@ -56,7 +55,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-sqlite3', '>=3.5.8'
-      gem.add_dependency 'do_jdbc',      '0.10.3'
+      gem.add_dependency 'do_jdbc',      '0.10.4'
     end
   end
 rescue LoadError

data/tasks/spec.rake

@@ -1,23 +1,12 @@
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 
-spec_defaults = lambda do |spec|
-  spec.libs   << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.verbose = true
+RSpec::Core::RakeTask.new(:spec => [:clean, :compile]) do |spec|
+  spec.pattern      = './spec/**/*_spec.rb'
+  spec.skip_bundler = true
 end
 
-Rake::TestTask.new(:spec => [ :clean, :compile ], &spec_defaults)
-Rake::TestTask.new(:spec_no_compile, &spec_defaults)
-
-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
+RSpec::Core::RakeTask.new(:rcov => [:clean, :compile]) do |rcov|
+  rcov.pattern    = "./spec/**/*_spec.rb"
+  rcov.rcov       = true
+  rcov.rcov_opts  = File.read('spec/rcov.opts').split(/\s+/)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: java
 authors: 
 - Dirkjan Bussink
@@ -15,59 +15,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 +01:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: data_objects
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
+        - 4
+        version: 0.10.4
   type: :runtime
+  name: data_objects
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
-        - 1
-        - 1
-        version: "1.1"
+        - 2
+        - 5
+        version: "2.5"
   type: :development
+  name: rspec
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 0
         - 7
-        - 0
-        version: 0.7.0
+        version: "0.7"
   type: :development
+  name: rake-compiler
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jdbc-sqlite3
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,22 +77,24 @@ dependencies:
         - 8
         version: 3.5.8
   type: :runtime
+  name: jdbc-sqlite3
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: do_jdbc
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
+        - 4
+        version: 0.10.4
   type: :runtime
+  name: do_jdbc
+  prerelease: false
   version_requirements: *id005
 description: Implements the DataObjects API for Sqlite3
 email: d.bussink@gmail.com
@@ -104,13 +103,25 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
 - ChangeLog.markdown
 - LICENSE
+- README.markdown
 files: 
+- ChangeLog.markdown
+- LICENSE
+- README.markdown
+- Rakefile
+- ext/do_sqlite3/compat.h
+- ext/do_sqlite3/do_common.c
+- ext/do_sqlite3/do_common.h
+- ext/do_sqlite3/do_sqlite3.c
+- ext/do_sqlite3/do_sqlite3.h
+- ext/do_sqlite3/do_sqlite3_extension.c
+- ext/do_sqlite3/error.h
+- ext/do_sqlite3/extconf.rb
+- lib/do_sqlite3.rb
 - lib/do_sqlite3/transaction.rb
 - lib/do_sqlite3/version.rb
-- lib/do_sqlite3.rb
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
@@ -136,24 +147,14 @@ files:
 - tasks/release.rake
 - tasks/retrieve.rake
 - tasks/spec.rake
-- ext/do_sqlite3/extconf.rb
-- ext/do_sqlite3/do_sqlite3.c
-- ext/do_sqlite3/do_sqlite3_extension.c
-- ext/do_sqlite3/compat.h
-- ext/do_sqlite3/do_sqlite3.h
-- ext/do_sqlite3/error.h
-- LICENSE
-- Rakefile
-- ChangeLog.markdown
-- README.markdown
 - lib/do_sqlite3/do_sqlite3.jar
-has_rdoc: false
+has_rdoc: true
 homepage: 
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement