trinidad_jars 1.1.0 → 1.1.1

data/lib/trinidad/jars.rb

@@ -1,12 +1,10 @@
-TRINIDAD_LIBS = File.dirname(__FILE__) + "/../../trinidad-libs" unless defined?(TRINIDAD_LIBS)
-$:.unshift(TRINIDAD_LIBS) unless 
-  $:.include?(TRINIDAD_LIBS) || $:.include?(File.expand_path(TRINIDAD_LIBS))
+
+load File.expand_path('../../trinidad-libs/tomcat-core.jar', File.dirname(__FILE__))
+load File.expand_path('../../trinidad-libs/trinidad-rb.jar', File.dirname(__FILE__))
 
 module Trinidad
-  require 'tomcat-core'
-  require 'trinidad-rb'
-  TRINIDAD_JARS_VERSION = '1.1.0'
-  TOMCAT_VERSION = '7.0.30' unless defined?(Trinidad::TOMCAT_VERSION)
+  TRINIDAD_JARS_VERSION = '1.1.1'
+  TOMCAT_VERSION = '7.0.32' unless const_defined?(:TOMCAT_VERSION)
 
   module Tomcat
     include_package 'org.apache.catalina'

data/trinidad_jars.gemspec

@@ -3,7 +3,6 @@
 
 Gem::Specification.new do |s|
   s.name              = 'trinidad_jars'
-  s.rubyforge_project = 'trinidad_jars'
   
   file = File.expand_path("../lib/trinidad/jars.rb", __FILE__)
   line = File.read(file)[/^\s*TRINIDAD_JARS_VERSION\s*=\s*.*/]
@@ -16,11 +15,10 @@ Gem::Specification.new do |s|
   s.email    = 'calavera@apache.org'
   s.homepage = 'http://github.com/trinidad/trinidad'
   
-  s.require_paths = %w[lib]
+  s.require_paths = %w[lib] # due require 'trinidad/jars'
   
   s.files = `git ls-files`.split("\n").sort.
-    select { |file| file == 'trinidad_jars.gemspec' || 
-                    file == 'lib/trinidad/jars.rb'  || 
+    select { |file| file == 'trinidad_jars.gemspec' ||
+                    file == 'lib/trinidad/jars.rb'  ||
                     file =~ /^trinidad-libs\// }
-  
 end

metadata

@@ -2,7 +2,7 @@
 name: trinidad_jars
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-20 00:00:00 Z
+date: 2012-10-17 00:00:00 Z
 dependencies: []
 
 description: Bundled version of Tomcat and a slice of Java required by Trinidad.
@@ -41,17 +41,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 requirements: []
 
-rubyforge_project: trinidad_jars
-rubygems_version: 1.8.15
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Jars packaged for Trinidad