activerecord-jdbch2-adapter 0.9.2 → 1.1.0

data/README.txt

@@ -1,5 +1,7 @@
-This is an ActiveRecord driver for H2 using JDBC running under JRuby. Please see
+= activerecord-jdbch2-adapter
 
-http://jruby-extras.rubyforge.org/activerecord-jdbc-adapter/
+* http://jruby-extras.rubyforge.org/activerecord-jdbc-adapter/
 
-for more information.
+== DESCRIPTION:
+
+This is an ActiveRecord driver for H2 using JDBC running under JRuby.

data/Rakefile

@@ -6,13 +6,15 @@ task :manifest do
 end
 Rake::Task['manifest'].invoke
 
-require File.dirname(__FILE__) + "/../../lib/jdbc_adapter/version"
+require File.dirname(__FILE__) + "/../../lib/arjdbc/version"
 $LOAD_PATH << File.dirname(__FILE__) + "/../../drivers/h2/lib"
 require "jdbc/h2"
 
 begin
   require 'hoe'
-  Hoe.new("activerecord-jdbch2-adapter", JdbcAdapter::Version::VERSION) do |p|
+  Hoe.plugin :gemcutter
+  hoe = Hoe.spec("activerecord-jdbch2-adapter") do |p|
+    p.version = ArJdbc::Version::VERSION
     p.rubyforge_name = "jruby-extras"
     p.url = "http://jruby-extras.rubyforge.org/ActiveRecord-JDBC"
     p.author = "Nick Sieger, Ola Bini and JRuby contributors"
@@ -20,10 +22,18 @@ begin
     p.summary = "H2 JDBC adapter for JRuby on Rails."
     p.changes = "Updated to H2 version #{Jdbc::H2::VERSION}."
     p.description = "Install this gem to use H2 with JRuby on Rails."
+    driver = 'jdbc-h2'
+    version = Jdbc::H2::VERSION
+    compat_version = "~> #{version.split(/\./)[0..1].join('.')}.0"
+    puts "#{p.name}: current #{driver} version #{version}, compat #{compat_version}"
     p.extra_deps += [
-      ['activerecord-jdbc-adapter', "= #{JdbcAdapter::Version::VERSION}"],
-      ['jdbc-h2', ">= #{Jdbc::H2::VERSION}"]]
-  end.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
+      ['activerecord-jdbc-adapter', "= #{ArJdbc::Version::VERSION}"],
+      [driver, compat_version]]
+  end
+  task :gemspec do
+    File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
+  end
+  task :package => :gemspec
 rescue LoadError
   puts "You really need Hoe installed to be able to package this gem"
 rescue => e

data/lib/active_record/connection_adapters/jdbch2_adapter.rb

@@ -1,30 +1 @@
-tried_gem = false
-begin
-  require "jdbc_adapter"
-rescue LoadError
-  raise if tried_gem
-  require 'rubygems'
-  gem "activerecord-jdbc-adapter"
-  tried_gem = true
-  retry
-end
-tried_gem = false
-begin
-  require "jdbc/h2"
-rescue LoadError
-  raise if tried_gem
-  require 'rubygems'
-  gem "jdbc-h2"
-  tried_gem = true
-  retry
-end
-
-require 'active_record/connection_adapters/jdbc_adapter'
-
-module ActiveRecord
-  class Base
-    class << self
-      alias_method :jdbch2_connection, :h2_connection
-    end
-  end
-end
+require 'arjdbc/h2'

metadata

@@ -1,37 +1,82 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-jdbch2-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  prerelease: false
+  segments: 
+    - 1
+    - 1
+    - 0
+  version: 1.1.0
 platform: ruby
 authors: 
-- Nick Sieger, Ola Bini and JRuby contributors
+  - Nick Sieger, Ola Bini and JRuby contributors
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -05:00
+date: 2010-12-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord-jdbc-adapter
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: jdbc-h2
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.107
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: activerecord-jdbc-adapter
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 1
+              - 0
+            version: 1.1.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: jdbc-h2
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 1
+              - 0
+            version: 1.1.0
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rubyforge
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+              - 4
+            version: 2.0.4
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: hoe
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 6
+              - 2
+            version: 2.6.2
+    type: :development
+    version_requirements: *id004
 description: Install this gem to use H2 with JRuby on Rails.
 email: nick@nicksieger.com, ola.bini@gmail.com
 executables: []
@@ -39,41 +84,45 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- Manifest.txt
-- README.txt
-- LICENSE.txt
+  - Manifest.txt
+  - README.txt
+  - LICENSE.txt
 files: 
-- Manifest.txt
-- Rakefile
-- README.txt
-- LICENSE.txt
-- lib/active_record/connection_adapters/jdbch2_adapter.rb
+  - Manifest.txt
+  - Rakefile
+  - README.txt
+  - LICENSE.txt
+  - lib/active_record/connection_adapters/jdbch2_adapter.rb
 has_rdoc: true
 homepage: http://jruby-extras.rubyforge.org/ActiveRecord-JDBC
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+  - --main
+  - README.txt
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: H2 JDBC adapter for JRuby on Rails.