trinidad_dbpool 0.3.1 → 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/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_dbpool.rb

@@ -1,12 +1,7 @@
-
 require 'java'
-require 'rubygems'
-gem 'trinidad_jars'
 
 require 'trinidad'
-
 require 'trinidad/jars'
-
 require File.expand_path('../../trinidad-libs/tomcat-dbcp', __FILE__)
 
 require 'trinidad_dbpool/webapp_extension'

data/lib/trinidad_dbpool/webapp_extension.rb

@@ -9,21 +9,20 @@ module Trinidad
           @options.map { |opts| create_resource tomcat, app_context, opts }
         end
       end
-
+      
       private
       def create_resource tomcat, app_context, opts
-        jndi = opts.delete(:jndi)
-        url = opts.delete(:url)
+        jndi, url = opts.delete(:jndi), opts.delete(:url)
         url = protocol + url unless %r{^#{protocol}} =~ url
         opts[:url] = url
                 
         driver_name = opts.delete(:driver) || self.driver_name
-
+        
         resource = Trinidad::Tomcat::ContextResource.new
-        resource.set_auth(opts.delete(:auth)) if opts.key?(:auth)
+        resource.set_auth(opts.delete(:auth)) if opts.has_key?(:auth)
+        resource.set_description(opts.delete(:description)) if opts.has_key?(:description)
         resource.set_name(jndi)
         resource.set_type('javax.sql.DataSource')
-        resource.set_description(opts.delete(:description)) if opts.key?(:description)
 
         opts.each { |key, value| resource.set_property(key.to_s, value.to_s) }
         resource.set_property('driverClassName', driver_name)

metadata

@@ -1,75 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: trinidad_dbpool
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.4.0
 platform: ruby
-authors:
-- David Calavera
+authors: 
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: trinidad_jars
-  requirement: &2155018540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2155018540
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2155018000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.9
-  type: :development
-  prerelease: false
-  version_requirements: *2155018000
+
+date: 2012-05-31 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: trinidad_jars
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.0.2
+    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 database pools in Trinidad
 email: calavera@apache.org
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.rdoc
-files:
-- LICENSE
-- README.rdoc
-- VERSION
-- lib/trinidad_dbpool.rb
-- lib/trinidad_dbpool/webapp_extension.rb
-- trinidad-libs/tomcat-dbcp.jar
+
+extra_rdoc_files: 
+  - LICENSE
+  - README.rdoc
+files: 
+  - lib/trinidad_dbpool.rb
+  - lib/trinidad_dbpool/webapp_extension.rb
+  - trinidad-libs/tomcat-dbcp.jar
+  - History.txt
+  - LICENSE
+  - README.rdoc
+  - Rakefile
 homepage: http://github.com/trinidad/trinidad_dbpool_extension
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Addon to support database pools in Trinidad
 test_files: []
-has_rdoc: 
+

data/VERSION

@@ -1 +0,0 @@
-0.3.1