do_postgres 0.10.0-x86-mingw32 → 0.10.1-x86-mingw32

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_postgres
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: x86-mingw32
 authors: 
 - Dirkjan Bussink
@@ -9,48 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2010-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: data_objects
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "2.0"
+        version: 0.10.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
+  name: bacon
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: data_objects
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake-compiler
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: "0.7"
     version: 
 description: Implements the DataObjects API for PostgreSQL
 email: d.bussink@gmail.com
@@ -58,8 +48,10 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
+- ChangeLog.markdown
+- LICENSE
 files: 
 - lib/do_postgres/encoding.rb
 - lib/do_postgres/transaction.rb
@@ -68,7 +60,6 @@ files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
-- spec/lib/rspec_immediate_feedback_formatter.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -82,32 +73,59 @@ files:
 - 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/gem.rake
-- tasks/install.rake
-- tasks/native.rake
+- tasks/compile.rake
 - tasks/release.rake
 - tasks/retrieve.rake
 - tasks/spec.rake
-- ext/do_postgres_ext/extconf.rb
-- ext/do_postgres_ext/do_postgres_ext.c
-- ext/do_postgres_ext/error.h
-- ext/do_postgres_ext/pg_config.h
+- 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
-- HISTORY.markdown
+- ChangeLog.markdown
 - README.markdown
-- Manifest.txt
-- lib/do_postgres_ext.so
+- lib/do_postgres/1.8/do_postgres.so
+- lib/do_postgres/1.9/do_postgres.so
 has_rdoc: false
-homepage: http://github.com/datamapper/do
+homepage: 
 licenses: []
 
-post_install_message: 
-rdoc_options: []
-
+post_install_message: |+
+  
+    ======================================================================================================
+  
+      You've installed the binary version of do_postgres.
+      It was built using PostgreSQL version 8.3.9.
+      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/v8.3.9/win32/postgresql-8.3.9-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
+  
+    ======================================================================================================
+  
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -129,5 +147,24 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: DataObjects PostgreSQL Driver
-test_files: []
-
+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,12 +0,0 @@
-## 0.9.12 2009-05-17
-* Improvements
-  * Windows support
-
-## 0.9.11 2009-01-19
-* Improvements
-  * Ruby 1.9 support
-* Fixes
-  * Fix build issue on certain platforms introduces with 0.9.10
-
-## 0.9.9 2008-11-27
-* No changes since 0.9.8

data/Manifest.txt

@@ -1,34 +0,0 @@
-.gitignore
-HISTORY.markdown
-LICENSE
-Manifest.txt
-README.markdown
-Rakefile
-autobuild.rb
-buildfile
-ext-java/src/main/java/DoPostgresExtService.java
-ext-java/src/main/java/do_postgres/PostgresDriverDefinition.java
-ext/do_postgres_ext/do_postgres_ext.c
-ext/do_postgres_ext/extconf.rb
-lib/do_postgres.rb
-lib/do_postgres/transaction.rb
-lib/do_postgres/version.rb
-script/timezone_spec_runner.rb
-script/timezones.txt
-spec/command_spec.rb
-spec/connection_spec.rb
-spec/reader_spec.rb
-spec/result_spec.rb
-spec/spec.opts
-spec/spec_helper.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/string_spec.rb
-spec/typecast/time_spec.rb