do_postgres 0.10.3-java → 0.10.4-java

data/spec/typecast/time_spec.rb

@@ -1,8 +1,9 @@
 # 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::Postgres with Time' do
-  behaves_like 'supporting Time'
+  it_should_behave_like 'supporting Time'
+  it_should_behave_like 'supporting sub second Time'
 end

data/tasks/compile.rake

@@ -3,67 +3,64 @@ 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_postgres.gemspec', __FILE__))
   end
 
-  Rake::ExtensionTask.new('do_postgres', gemspec) do |ext|
+  unless JRUBY
+    Rake::ExtensionTask.new('do_postgres', gemspec) do |ext|
 
-    postgres_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'pgsql'))
+      postgres_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'pgsql'))
 
-    ext.lib_dir = "lib/#{gemspec.name}"
+      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"
+      # 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
+        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.
+      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:
+      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
+      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
+      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
+      - 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
+      POST_INSTALL_MESSAGE
+        end
       end
-
     end
-
   end
 
   Rake::JavaExtensionTask.new('do_postgres', gemspec) do |ext|
@@ -73,7 +70,7 @@ begin
     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.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_postgres
 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-postgres
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,22 +76,24 @@ dependencies:
         - 2
         version: "8.2"
   type: :runtime
+  name: jdbc-postgres
+  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 PostgreSQL
 email: d.bussink@gmail.com
@@ -103,14 +102,25 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
 - ChangeLog.markdown
 - LICENSE
+- README.markdown
 files: 
+- ChangeLog.markdown
+- LICENSE
+- README.markdown
+- Rakefile
+- ext/do_postgres/compat.h
+- ext/do_postgres/do_common.c
+- ext/do_postgres/do_common.h
+- ext/do_postgres/do_postgres.c
+- ext/do_postgres/error.h
+- ext/do_postgres/extconf.rb
+- ext/do_postgres/pg_config.h
+- lib/do_postgres.rb
 - lib/do_postgres/encoding.rb
 - lib/do_postgres/transaction.rb
 - lib/do_postgres/version.rb
-- lib/do_postgres.rb
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
@@ -136,23 +146,14 @@ files:
 - tasks/release.rake
 - tasks/retrieve.rake
 - tasks/spec.rake
-- ext/do_postgres/extconf.rb
-- ext/do_postgres/do_postgres.c
-- ext/do_postgres/compat.h
-- ext/do_postgres/error.h
-- ext/do_postgres/pg_config.h
-- LICENSE
-- Rakefile
-- ChangeLog.markdown
-- README.markdown
 - lib/do_postgres/do_postgres.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