trinidad 1.4.1 → 1.4.3

data/rakelib/tomcat.rake

@@ -2,8 +2,8 @@ require 'open-uri'
 require 'tmpdir'
 
 namespace :tomcat do
+  include TrinidadRakeHelpers
   
-  TOMCAT_CORE_JAR = File.expand_path('../../trinidad-libs/tomcat-core.jar', __FILE__)
   TOMCAT_MAVEN_REPO = 'http://repo2.maven.org/maven2/org/apache/tomcat'
 
   tomcat = "#{TOMCAT_MAVEN_REPO}/embed/tomcat-embed-core/%s/tomcat-embed-core-%s.jar"
@@ -36,9 +36,9 @@ namespace :tomcat do
     FileUtils.rm_r temp_dir
   end
   
-  TARGET_DIR = File.expand_path('../../target', __FILE__)
+  TOMCAT_CORE_TARGET_DIR = File.expand_path('../../target/tomcat-core', __FILE__)
   
-  desc "Updates Tomcat to a given version e.g. `rake tomcat:update[7.0.26]`"
+  desc "Updates Tomcat to a given version e.g. `rake tomcat:update[7.0.30]`"
   task :update, :version do |_, args|
     Rake::Task['tomcat:fetch'].invoke(version = args[:version])
     Rake::Task['tomcat:patch'].invoke
@@ -49,27 +49,38 @@ namespace :tomcat do
     file.gsub!(/TOMCAT_VERSION = '(.+)'/, "TOMCAT_VERSION = '#{version}'")
     File.open(path, 'w') { |io| io.write(file) }
     
-    puts "DONE - Tomcat's version has been updated succesfully, please build Trinidad again."
+    puts "DONE - Tomcat's version has been updated to #{version} succesfully !\n"
+    puts "`export trinidad_jars=true && bundle install` to use the local trinidad_jars gem with bundler"
+  end
+  
+  task :patch do
+    Rake::Task['tomcat-core:jar'].invoke
   end
 
-  task :compile do
-    FileUtils.mkdir TARGET_DIR unless File.exists?(TARGET_DIR)
-    sh 'javac -Xlint:deprecation -Xlint:unchecked -g -source 1.6 -target 1.6 ' + 
-       "-classpath #{TOMCAT_CORE_JAR} -d #{TARGET_DIR} " + 
-       Dir["src/java/**/*.java"].join(" ")
+  task :clear do
+    rm TOMCAT_CORE_JAR if File.exist?(TOMCAT_CORE_JAR)
   end
+  task :clean => :clear
   
-  task :patch => :compile do
-    Dir.chdir(TARGET_DIR) do
-      entries = Dir.entries(TARGET_DIR) - [ '.', '..']
-      puts "updating #{TOMCAT_CORE_JAR}"
-      %x{jar -uvf #{TOMCAT_CORE_JAR} #{entries.join(' ')}}
-    end
+end
+
+namespace :'tomcat-core' do
+
+  task :compile do
+    javac "src/tomcat-core/java", TOMCAT_CORE_TARGET_DIR
   end
 
-  task :clean do
-    rm_r TARGET_DIR if File.exist?(TARGET_DIR)
+  task :jar => :compile do
+    unless File.exist?(TOMCAT_CORE_JAR)
+      fail "missing #{TOMCAT_CORE_JAR} run tomcat:update first"
+    end
+    jar TOMCAT_CORE_TARGET_DIR, TOMCAT_CORE_JAR
+  end
+  
+  task :clear do
+    rm_r TOMCAT_CORE_TARGET_DIR if File.exist?(TOMCAT_CORE_TARGET_DIR)
     rm TOMCAT_CORE_JAR if File.exist?(TOMCAT_CORE_JAR)
   end
+  task :clean => :clear
   
-end
+end

data/trinidad.gemspec

@@ -3,12 +3,12 @@ $:.push File.expand_path("../lib", __FILE__)
 require 'trinidad/version'
 
 Gem::Specification.new do |s|
-  s.name              = 'trinidad'
-  s.rubyforge_project = 'trinidad'
+  s.name = 'trinidad'
   s.version = Trinidad::VERSION
   
-  s.summary     = "Simple library to run rails applications into an embedded Tomcat"
-  s.description = "Trinidad allows you to run a rails or rackup applications within an embedded Apache Tomcat container"
+  s.summary = "Web server for Rails/Rack applications built upon JRuby::Rack and Apache Tomcat"
+  s.description = "Trinidad allows you to run Rails or Rack applications within " + 
+    "an embedded Apache Tomcat container. Serves your requests with the elegance of a cat !"
   
   s.authors  = ["David Calavera"]
   s.email    = 'calavera@apache.org'
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
   
-  s.add_dependency('trinidad_jars', ">= 1.0.5")
-  s.add_dependency('jruby-rack', ">= 1.1.7")
+  s.add_dependency('trinidad_jars', ">= 1.1.0")
+  s.add_dependency('jruby-rack', ">= 1.1.10")
   
   s.add_development_dependency('rack')
   s.add_development_dependency('rake')
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n").sort.
     reject { |file| file =~ /^\./ }. # .gitignore, .travis.yml
     reject { |file| file =~ /^spec\// }. # spec/**/*.spec
-    reject { |file| file =~ /^src\// }. # src/* patched into tomcat-core.jar
+    reject { |file| file =~ /^src\// }. # src/* compiled into the jars
     # reject trinidad_jars.gemspec files :
     reject { |file| file == 'trinidad_jars.gemspec' || 
                     file == 'lib/trinidad/jars.rb'  || 

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 Z
+date: 2012-09-20 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.5
+            version: 1.1.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.1.7
+            version: 1.1.10
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ dependencies:
             version: "0"
     type: :development
     version_requirements: *id008
-description: Trinidad allows you to run a rails or rackup applications within an embedded Apache Tomcat container
+description: Trinidad allows you to run Rails or Rack applications within an embedded Apache Tomcat container. Serves your requests with the elegance of a cat !
 email: calavera@apache.org
 executables: 
   - trinidad
@@ -133,8 +133,6 @@ files:
   - lib/trinidad/version.rb
   - lib/trinidad/web_app.rb
   - rakelib/tomcat.rake
-  - rakelib/trinidad.rake
-  - rakelib/trinidad_jars.rake
   - trinidad.gemspec
 homepage: http://github.com/trinidad/trinidad
 licenses: []
@@ -158,10 +156,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
         version: "0"
 requirements: []
 
-rubyforge_project: trinidad
+rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Simple library to run rails applications into an embedded Tomcat
+summary: Web server for Rails/Rack applications built upon JRuby::Rack and Apache Tomcat
 test_files: []
 

data/rakelib/trinidad.rake

@@ -1,26 +0,0 @@
-namespace :trinidad do
-  
-  def trinidad_version
-    version("lib/trinidad/version.rb", 'VERSION')
-  end
-
-  def trinidad_gem_file
-    "trinidad-#{trinidad_version}.gem"
-  end
-
-  desc "Build trinidad gem"
-  task :build do
-    build('trinidad.gemspec', trinidad_gem_file)
-  end
-
-  desc "Install trinidad gem"
-  task :install => :build do
-    sh "gem install pkg/#{trinidad_gem_file}"
-  end
-  
-  desc "Release trinidad gem"
-  task :release => :build do
-    release('trinidad', trinidad_gem_file, trinidad_version)
-  end
-  
-end

data/rakelib/trinidad_jars.rake

@@ -1,26 +0,0 @@
-namespace :trinidad_jars do
-  
-  def trinidad_jars_version
-    version("lib/trinidad/jars.rb", 'TRINIDAD_JARS_VERSION')
-  end
-
-  def trinidad_jars_gem_file
-    "trinidad_jars-#{trinidad_jars_version}.gem"
-  end
-
-  desc "Build trinidad_jars gem"
-  task :build do
-    build('trinidad_jars.gemspec', trinidad_jars_gem_file)
-  end
-
-  desc "Install trinidad_jars gem"
-  task :install => :build do
-    sh "gem install pkg/#{trinidad_jars_gem_file}"
-  end
-  
-  desc "Release trinidad_jars gem"
-  task :release => :build do
-    release('trinidad_jars', trinidad_jars_gem_file, trinidad_jars_version)
-  end
-  
-end