trinidad_mysql_dbpool_extension 0.1.0 → 0.4.0

data/History.txt

@@ -0,0 +1,22 @@
+== 0.3.0 (2011-07-01)
+
+* Oracle connection pool extension
+* Mssql connection pool extension
+* Postgresql syntax error fix
+* Add support for multiple pools per db extension
+
+== 0.2.0 (2010-07-29)
+
+* Update trinidad_dbpool_extension common gem to support Tomcat 7 
+
+== 0.1.1 (2010-05-05)
+
+* Update trinidad_dbpool_extension common gem
+* Remove adding jndi context and resource to the global tomcat context
+
+== 0.1.0 (2010-04-04)
+
+* First release
+* General connection pool extension
+* Mysql connection pool extension
+* Postgresql connection pool extension

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 David Calavera
+Copyright (c) 2009-2012 David Calavera
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -7,6 +7,8 @@ container.
 
 * MySql (trinidad_mysql_dbpool_extension)
 * PostgreSQL (trinidad_postgresql_dbpool_extension)
+* Mssql (trinidad_mssql_dbpool_extension)
+* Oracle (trinidad_oracle_dbpool_extension)
 
 == Usage
 
@@ -37,7 +39,7 @@ http://commons.apache.org/dbcp/configuration.html
   production:
     adapter: jdbc
     jndi: java:/comp/env/jdbc/TestDB
-    driver: com.mysql.jdbc.Driver
+    driver: com.mysql.jdbc.Driver     # jdbc driver is mandatory
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -0,0 +1,68 @@
+require 'rubygems'
+require 'rake'
+
+def build(gem)
+  mkdir_p 'pkg'
+  sh "gem build #{gem}.gemspec"
+  mv Dir["#{gem}*.gem"].last, 'pkg'
+end
+
+def release(gem, version = nil)
+  unless `git branch` =~ /^\* master$/
+    raise "must be on master to release !"
+  end
+  
+  if version
+    unless gem_file = Dir.glob("pkg/#{gem}-#{version}.gem").first
+      raise "#{gem}-#{version}.gem not build !"
+    end
+  else
+    unless gem_file = Dir.glob("pkg/#{gem}*").sort.last
+      raise "#{gem}*.gem not build !"
+    end
+    unless match = gem_file.match(/.*?\-(\d\.\d\.\d)\.gem/)
+      raise "version number not matched from: #{gem_file}"
+    end
+    version = match[1]
+  end
+  
+  sh "git tag #{gem}-#{version}"
+  sh "git push origin master --tags"
+  sh "gem push #{gem_file}"
+end
+
+all_gems = %W{ dbpool mysql_dbpool_extension postgresql_dbpool_extension mssql_dbpool_extension oracle_dbpool_extension }
+all_gems.map! { |gem| "trinidad_#{gem}" }
+all_gems.each do |gem_name|
+  namespace gem_name do
+    desc "Build the #{gem_name} gem"
+    task :build do
+      build(gem_name)
+    end
+    desc "Release the #{gem_name} gem"
+    task :release => :build do
+      release(gem_name)
+    end
+  end
+end
+
+{
+  :build => 'Build all connection pool gems', 
+  :release => 'Release all connection pool gems'
+}.each do |t, d|
+  desc d
+  task t => all_gems.map { |name| "#{name}:#{t}" } # e.g. mysql_dbpool:build
+end
+
+desc "Clear out all built .gem files"
+task :clear do
+  FileUtils.rm Dir["*.gem"]
+  FileUtils.rm_r Dir["pkg/*"] if File.exist?("pkg")
+end
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ['--color', "--format documentation"]
+end
+
+task :default => :spec

data/lib/trinidad_mysql_dbpool_extension.rb

@@ -1,3 +1,3 @@
 require 'trinidad_dbpool'
-require File.expand_path('../../trinidad-libs/mysql-connector-java-5.1.12-bin', __FILE__)
+require File.expand_path('../../trinidad-libs/mysql-connector-java-5.1.20-bin', __FILE__)
 require 'trinidad_mysql_dbpool_extension/mysql_webapp_extension'

metadata

@@ -1,106 +1,93 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad_mysql_dbpool_extension
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
-- David Calavera
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +02:00
-default_executable: 
+date: 2012-05-31 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: trinidad_dbpool
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-description: Addon to support MySql database pools in Trinidad
+  - !ruby/object:Gem::Dependency 
+    name: trinidad_dbpool
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.4.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "2.10"
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0.10"
+    type: :development
+    version_requirements: *id003
+description: Addon to support MySQL database pools in Trinidad
 email: calavera@apache.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+  - LICENSE
+  - README.rdoc
 files: 
-- LICENSE
-- README.rdoc
-- VERSION
-- lib/trinidad_mysql_dbpool_extension.rb
-- lib/trinidad_mysql_dbpool_extension/mysql_webapp_extension.rb
-- trinidad-libs/mysql-connector-java-5.1.12-bin.jar
-has_rdoc: true
-homepage: http://github.com/calavera/trinidad-dbpool
+  - lib/trinidad_mysql_dbpool_extension.rb
+  - lib/trinidad_mysql_dbpool_extension/mysql_webapp_extension.rb
+  - trinidad-libs/mysql-connector-java-5.1.20-bin.jar
+  - History.txt
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+homepage: http://github.com/trinidad/trinidad_dbpool_extension
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Addon to support MySql database pools in Trinidad
-test_files: 
-- spec/spec_helper.rb
-- spec/trinidad_mysql_dbpool_extension_spec.rb
+summary: Addon to support MySQL database pools in Trinidad
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.1.0

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'trinidad-libs'))
-
-require 'trinidad_mysql_dbpool_extension'
-require 'spec'
-
-Spec::Runner.configure do |config| 
-  config.mock_with :mocha
-end

data/spec/trinidad_mysql_dbpool_extension_spec.rb

@@ -1,48 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Trinidad::Extensions::MysqlDbpoolWebAppExtension do
-  before(:each) do
-    @options = {
-      :url => 'jdbc:mysql://localhost:3306/test',
-      :jndi => 'jdbc/TestDB',
-      :maxIdle => 300
-    }
-    @extension = Trinidad::Extensions::MysqlDbpoolWebAppExtension.new(@options)
-    @context = Trinidad::Tomcat::StandardContext.new
-
-    @tomcat = mock
-    resource_context = mock
-    naming = mock
-
-    naming.stubs(:addResource)
-    resource_context.stubs(:naming_resources).returns(naming)
-    resource_context.stubs(:naming_resources=)
-    @tomcat.stubs(:addContext).returns(resource_context)
-  end
-
-  it "sets the mysql driver name as a resource property" do
-    resource = configure_extension
-    resource.getProperty('driverClassName').should == 'com.mysql.jdbc.Driver'
-  end
-
-  it "adds the resource to the tomcat standard context" do
-    configure_extension
-    @context.naming_resources.find_resource('jdbc/TestDB').should_not be_nil
-  end
-
-  it "adds properties to the resource" do
-    resource = configure_extension
-    resource.getProperty('maxIdle').should == '300'
-  end
-
-  it "adds the protocol if the url doesn't include it" do
-    @options[:url] = "localhost:3306/test_protocol"
-    extension = Trinidad::Extensions::MysqlDbpoolWebAppExtension.new(@options)
-    resource = extension.configure(@tomcat, @context)
-    resource.get_property('url').should == "jdbc:mysql://localhost:3306/test_protocol"
-  end
-
-  def configure_extension
-    @extension.configure(@tomcat, @context)
-  end
-end