do_sqlite3 0.10.0-x86-mswin32-60 → 0.10.1-x86-mswin32-60

data/ext/{do_sqlite3_ext → do_sqlite3}/extconf.rb

@@ -3,8 +3,8 @@ ENV["RC_ARCHS"] = "" if RUBY_PLATFORM =~ /darwin/
 # Loads mkmf which is used to make makefiles for Ruby extensions
 require 'mkmf'
 
-# Give it a name
-extension_name = 'do_sqlite3_ext'
+# Allow for custom compiler to be specified.
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 # Use some default search paths
 dir_config("sqlite3", ["/usr/local", "/opt/local", "/usr"])
@@ -22,5 +22,5 @@ if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )
   have_func("sqlite3_prepare_v2")
   have_func("sqlite3_open_v2")
 
-  create_makefile(extension_name)
+  create_makefile('do_sqlite3/do_sqlite3')
 end

data/lib/do_sqlite3.rb

@@ -18,22 +18,30 @@ if RUBY_PLATFORM =~ /java/
   java_import driver
 end
 
-require 'do_sqlite3_ext'
+begin
+  require 'do_sqlite3/do_sqlite3'
+rescue LoadError
+  if RUBY_PLATFORM =~ /mingw|mswin/ then
+    RUBY_VERSION =~ /(\d+.\d+)/
+    require "do_sqlite3/#{$1}/do_sqlite3"
+  else
+    raise
+  end
+end
+
 require 'do_sqlite3/version'
-require 'do_sqlite3/transaction'
+require 'do_sqlite3/transaction' if RUBY_PLATFORM !~ /java/
 
 if RUBY_PLATFORM =~ /java/
 
-  module DataObjects
-    module Sqlite3
-      class Connection
-        def self.pool_size
-          # sqlite3 can have only one write access at a time, with this
-          # concurrent write access will result in "Database locked" errors
-          1
-        end
-      end
+  DataObjects::Sqlite3::Connection.class_eval do
+
+    def self.pool_size
+      # sqlite3 can have only one write access at a time, with this
+      # concurrent write access will result in "Database locked" errors
+      1
     end
+
   end
 
 end

data/lib/do_sqlite3/version.rb

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

data/spec/command_spec.rb

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

data/spec/connection_spec.rb

@@ -5,14 +5,16 @@ require 'data_objects/spec/connection_spec'
 
 describe DataObjects::Sqlite3::Connection do
 
-  before :all do
-    @driver = CONFIG.scheme
-    @user   = CONFIG.user
+  before do
+    @driver   = CONFIG.scheme
+    @user     = CONFIG.user
     @password = CONFIG.pass
-    @host   = CONFIG.host
-    @port   = CONFIG.port
+    @host     = CONFIG.host
+    @port     = CONFIG.port
     @database = CONFIG.database
   end
 
-  it_should_behave_like 'a Connection'
+  behaves_like 'a Connection'
+  behaves_like 'a Connection via JDNI' if JRUBY
+  # FIXME: behaves_like 'a Connection with JDBC URL support' if JRUBY
 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::Sqlite3::Reader do
-  it_should_behave_like 'a Reader'
+  behaves_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -4,16 +4,16 @@ 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 ....." calls
+# concurrent execution of the "behaves_like ....." calls
 # which would lock the database
 
 # TODO
 # the locked database created a deadlock which is worth exploring since
 # such situation could appear in the wild too
 describe DataObjects::Sqlite3::Result do
-  it_should_behave_like 'a Result'
+  behaves_like 'a Result'
 end
 
 describe DataObjects::Sqlite3::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,51 +2,36 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
-
-gem 'rspec', '>1.1.12'
-require 'spec'
-
 require 'date'
 require 'ostruct'
-require 'pathname'
 require 'fileutils'
+require 'win32console' if RUBY_PLATFORM =~ /mingw|mswin/
+
+driver_lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(driver_lib) unless $LOAD_PATH.include?(driver_lib)
 
-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'
+# 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' if JRUBY)).compact.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_sqlite3'
 
-log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
-FileUtils.mkdir_p(File.dirname(log_path))
-
-DataObjects::Sqlite3.logger = DataObjects::Logger.new(log_path, :debug)
-
+DataObjects::Sqlite3.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   = 'sqlite3'
-CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || "#{File.expand_path(File.dirname(__FILE__))}/test.db"
+CONFIG.database = ENV['DO_SQLITE3_DATABASE'] || ":memory:"
 
-CONFIG.uri = ENV["DO_SQLITE3_SPEC_URI"] || "#{CONFIG.scheme}://#{CONFIG.database}"
+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")
 
 module DataObjectsSpecHelpers
 
@@ -111,7 +96,7 @@ module DataObjectsSpecHelpers
 
     1.upto(16) do |n|
       conn.create_command(<<-EOF).execute_non_query
-        insert into widgets(code, name, shelf_location, description, image_data, ad_description, ad_image, whitepaper_text, cad_drawing, super_number, weight) VALUES ('W#{n.to_s.rjust(7,"0")}', 'Widget #{n}', 'A14', 'This is a description', 'IMAGE DATA', 'Buy this product now!', 'AD IMAGE DATA', 'String', 'CAD DRAWING', 1234, 13.4);
+        insert into widgets(code, name, shelf_location, description, image_data, ad_description, ad_image, whitepaper_text, cad_drawing, super_number, weight) VALUES ('W#{n.to_s.rjust(7,"0")}', 'Widget #{n}', 'A14', 'This is a description', 'IMAGE DATA', 'Buy this product now!', 'AD IMAGE DATA', 'String', X'434144200120002044524157494e47', 1234, 13.4);
       EOF
     end
 
@@ -151,3 +136,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::Sqlite3 with Array' do
-  it_should_behave_like 'supporting Array'
+  behaves_like 'supporting Array'
 end

data/spec/typecast/bigdecimal_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/bigdecimal_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with BigDecimal' do
-  it_should_behave_like 'supporting BigDecimal'
+  behaves_like 'supporting BigDecimal'
 end

data/spec/typecast/boolean_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/boolean_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with Boolean' do
-  it_should_behave_like 'supporting Boolean'
+  behaves_like 'supporting Boolean'
 end

data/spec/typecast/byte_array_spec.rb

@@ -4,6 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/byte_array_spec'
 
 describe 'DataObjects::Sqlite3 with ByteArray' do
-  # We need to switch to using parameter binding for this to work with Sqlite3
-  # 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::Sqlite3 with Class' do
-  it_should_behave_like 'supporting Class'
+  behaves_like 'supporting Class'
 end

data/spec/typecast/date_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/date_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with Date' do
-  it_should_behave_like 'supporting Date'
+  behaves_like 'supporting Date'
 end

data/spec/typecast/datetime_spec.rb

@@ -7,5 +7,5 @@ require 'data_objects/spec/typecast/datetime_spec'
 # http://www.sqlite.org/datatype3.html
 
 describe 'DataObjects::Sqlite3 with DateTime' do
-  it_should_behave_like 'supporting DateTime'
+  behaves_like 'supporting DateTime'
 end

data/spec/typecast/float_spec.rb

@@ -4,9 +4,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/float_spec'
 
 describe 'DataObjects::Sqlite3 with Float' do
-  it_should_behave_like 'supporting Float'
+  behaves_like 'supporting Float'
 end
 
 describe 'DataObjects::Sqlite3 with Float' do
-  it_should_behave_like 'supporting Float autocasting'
+  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::Sqlite3 with Integer' do
-  it_should_behave_like 'supporting Integer'
+  behaves_like 'supporting Integer'
 end

data/spec/typecast/nil_spec.rb

@@ -4,17 +4,17 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/nil_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "it_should_behave_like ....." calls
+# concurrent execution of the "behaves_like ....." calls
 # which would lock the database
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  it_should_behave_like 'supporting Nil'
+  behaves_like 'supporting Nil'
 end
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  it_should_behave_like 'supporting writing an Nil'
+  behaves_like 'supporting writing an Nil'
 end
 
 describe 'DataObjects::Sqlite3 with Nil' do
-  it_should_behave_like 'supporting Nil autocasting'
+  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::Sqlite3 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::Sqlite3 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::Sqlite3 with Time' do
-  it_should_behave_like 'supporting Time'
+  behaves_like 'supporting Time'
 end

data/tasks/compile.rake

@@ -0,0 +1,64 @@
+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_sqlite3', gemspec) do |ext|
+
+    sqlite3_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'sqlite3'))
+
+    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_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.
+
+  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
+
+  You can put the sqlite3.dll available in this package in your Ruby bin
+  directory, for example C:\\Ruby\\bin
+
+=============================================================================
+
+      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
+
+  end
+
+  Rake::JavaExtensionTask.new('do_sqlite3', gemspec) do |ext|
+    ext.ext_dir   = 'ext-java/src/main/java'
+    ext.lib_dir   = "lib/#{gemspec.name}"
+    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-sqlite3', '>=3.5.8'
+      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_sqlite3-#{DataObjects::Sqlite3::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