do_postgres 0.10.0-x86-mswin32-60 → 0.10.1-x86-mswin32-60

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::Postgres::Reader do
-  it_should_behave_like 'a Reader'
+  behaves_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -4,24 +4,24 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/result_spec'
 
 describe DataObjects::Postgres::Result do
-  it_should_behave_like 'a Result'
+  behaves_like 'a Result'
 
-  before :all do
+  after do
     setup_test_environment
   end
 
   describe 'without using RETURNING' do
 
-    before :each do
+    before do
       @connection = DataObjects::Connection.new(CONFIG.uri)
       @result    = @connection.create_command("INSERT INTO users (name) VALUES (?)").execute_non_query("monkey")
     end
 
-    after :each do
+    after do
       @connection.close
     end
 
-    it { @result.should respond_to(:affected_rows) }
+    it 'should respond to #affected_rows' do @result.should.respond_to(:affected_rows) end
 
     describe 'affected_rows' do
 
@@ -31,19 +31,18 @@ describe DataObjects::Postgres::Result do
 
     end
 
-    it { @result.should respond_to(:insert_id) }
+    it 'should respond to #insert_id' do @result.should.respond_to(:insert_id) end
 
     describe 'insert_id' do
 
       it 'should return nil' do
-        @result.insert_id.should be_nil
+        @result.insert_id.should.be.nil
       end
 
       it 'should be retrievable through curr_val' do
-        # This is actually the 4th record inserted
         reader = @connection.create_command("SELECT currval('users_id_seq')").execute_reader
         reader.next!
-        reader.values.first.should == 4
+        reader.values.first.should == 2
       end
 
     end
@@ -52,16 +51,16 @@ describe DataObjects::Postgres::Result do
 
   describe 'when using RETURNING' do
 
-    before :each do
+    before do
       @connection = DataObjects::Connection.new(CONFIG.uri)
       @result    = @connection.create_command("INSERT INTO users (name) VALUES (?) RETURNING id").execute_non_query("monkey")
     end
 
-    after :each do
+    after do
       @connection.close
     end
 
-    it { @result.should respond_to(:affected_rows) }
+    it 'should respond to #affected_rows' do @result.should.respond_to(:affected_rows) end
 
     describe 'affected_rows' do
 
@@ -71,7 +70,7 @@ describe DataObjects::Postgres::Result do
 
     end
 
-    it { @result.should respond_to(:insert_id) }
+    it 'should respond to #insert_id' do @result.should.respond_to(:insert_id) end
 
     describe 'insert_id' do
 

data/spec/spec_helper.rb

@@ -2,55 +2,44 @@ $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_postgres'
 
-log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
-FileUtils.mkdir_p(File.dirname(log_path))
-
-DataObjects::Postgres.logger = DataObjects::Logger.new(log_path, :debug)
-
+DataObjects::Postgres.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
-Spec::Runner.configure do |config|
-  config.include(DataObjects::Spec::PendingHelpers)
+CONFIG = OpenStruct.new
+CONFIG.scheme    = 'postgres'
+CONFIG.user      = ENV['DO_POSTGRES_USER'] || 'postgres'
+CONFIG.pass      = ENV['DO_POSTGRES_PASS'] || ''
+CONFIG.user_info = unless CONFIG.pass.empty?
+  "#{CONFIG.user}:#{CONFIG.pass}@"
+else
+  "#{CONFIG.user}@"
 end
+CONFIG.host      = ENV['DO_POSTGRES_HOST'] || 'localhost'
+CONFIG.port      = ENV['DO_POSTGRES_PORT'] || '5432'
+CONFIG.database  = ENV['DO_POSTGRES_DATABASE'] || '/do_test'
 
-CONFIG = OpenStruct.new
-CONFIG.scheme   = 'postgres'
-CONFIG.user     = ENV['DO_POSTGRES_USER'] || 'postgres'
-CONFIG.pass     = ENV['DO_POSTGRES_PASS'] || ''
-CONFIG.host     = ENV['DO_POSTGRES_HOST'] || 'localhost'
-CONFIG.port     = ENV['DO_POSTGRES_PORT'] || '5432'
-CONFIG.database = ENV['DO_POSTGRES_DATABASE'] || '/do_test'
-
-CONFIG.uri = ENV["DO_POSTGRES_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.uri = ENV["DO_POSTGRES_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.jdbc_uri = CONFIG.uri.sub(/postgres/,"jdbc:postgresql")
 CONFIG.sleep = "SELECT pg_sleep(1)"
 
 module DataObjectsSpecHelpers
@@ -156,3 +145,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::Postgres 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::Postgres 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,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/boolean_spec'
 
 describe 'DataObjects::Postgres with Boolean' do
-  it_should_behave_like 'supporting Boolean'
-  it_should_behave_like 'supporting Boolean autocasting'
+  behaves_like 'supporting Boolean'
+  behaves_like 'supporting Boolean autocasting'
 end

data/spec/typecast/byte_array_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/byte_array_spec'
 
 describe 'DataObjects::Postgres with ByteArray' do
-  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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres with Time' do
-  it_should_behave_like 'supporting Time'
+  behaves_like 'supporting Time'
 end

data/tasks/compile.rake

@@ -0,0 +1,81 @@
+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_postgres', gemspec) do |ext|
+
+    postgres_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'pgsql'))
+
+    ext.lib_dir = "lib/#{gemspec.name}"
+
+    # automatically add build options to avoid need of manual input
+    if RUBY_PLATFORM =~ /mswin|mingw/ then
+      ext.config_options << "--with-pgsql-server-include=#{postgres_lib}/include/server"
+      ext.config_options << "--with-pgsql-client-include=#{postgres_lib}/include"
+      ext.config_options << "--with-pgsql-win32-include=#{postgres_lib}/include/server/port/win32"
+      ext.config_options << "--with-pgsql-client-lib=#{postgres_lib}/lib"
+    else
+      ext.cross_compile = true
+      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+      ext.cross_config_options << "--with-pgsql-server-include=#{postgres_lib}/include/server"
+      ext.cross_config_options << "--with-pgsql-client-include=#{postgres_lib}/include"
+      ext.cross_config_options << "--with-pgsql-win32-include=#{postgres_lib}/include/server/port/win32"
+      ext.cross_config_options << "--with-pgsql-client-lib=#{postgres_lib}/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 PostgreSQL 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://wwwmaster.postgresql.org/redir/107/h/binary/v#{BINARY_VERSION}/win32/postgresql-#{BINARY_VERSION}-1-binaries-no-installer.zip
+
+    You can put the following files available in this package in your Ruby bin
+    directory, for example C:\\Ruby\\bin
+
+    - lib\\libpq.dll
+    - bin\\ssleay32.dll
+    - bin\\libeay32.dll
+    - bin\\libintl-8.dll
+    - bin\\libiconv-2.dll
+    - bin\\krb5_32.dll
+    - bin\\comerr32.dll
+    - bin\\k5sprt32.dll
+    - bin\\gssapi32.dll
+
+  ======================================================================================================
+
+    POST_INSTALL_MESSAGE
+      end
+
+    end
+
+  end
+
+  Rake::JavaExtensionTask.new('do_postgres', 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-postgres', '>=8.2'
+      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_postgres-#{DataObjects::Postgres::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'
 
@@ -29,14 +29,10 @@ begin
   end
 
   def copy(from, to)
-    if WINDOWS
-      from.gsub!(/\//, '\\')
-      to.gsub!(/\//, '\\')
-    end
-    sh "#{WINDOWS ? 'copy' : 'cp'} #{from} #{to}"
+    FileUtils.cp(from, to)
   end
 
-  version = '8.3.7'
+  version = BINARY_VERSION
   file "vendor/postgresql-#{version}-1-binaries-no-installer.zip" => ['vendor'] do |t|
     url = "http://wwwmaster.postgresql.org/redir/107/h/binary/v#{version}/win32/#{File.basename(t.name)}"
     when_writing "downloading #{t.name}" do
@@ -52,8 +48,8 @@ begin
       cd "vendor" do
         sh "unzip #{full_file} pgsql/bin/** pgsql/include/** pgsql/lib/**"
       end
-      copy "ext/do_postgres_ext/pg_config.h", "vendor/pgsql/include/pg_config.h"
-      copy "ext/do_postgres_ext/pg_config.h", "vendor/pgsql/include/server/pg_config.h"
+      copy "ext/do_postgres/pg_config.h", "vendor/pgsql/include/pg_config.h"
+      copy "ext/do_postgres/pg_config.h", "vendor/pgsql/include/server/pg_config.h"
 
       # update file timestamp to avoid Rake perform this extraction again.
       touch t.name

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