trinidad 1.3.4 → 1.3.5

data/Gemfile

@@ -0,0 +1,3 @@
+source :gemcutter
+
+gemspec :name => "trinidad"

data/History.txt

@@ -1,3 +1,11 @@
+== Trinidad 1.3.5 (2012-04-04)
+
+* Correctly detect :rackup from main config for web apps (#66)
+* Rearrange trinidad.gemspec to be (always) usable with Bundler's :git paths.
+* Use out/err streams from the Ruby runtime for logging instead of the default console log handler.
+* Make sure tomcat exits on initialization failure.
+* Yield from block passed to Trinidad's Rack::Handler
+
 == Trinidad 1.3.4 (2012-02-20)
 
 * Do not explicitely load rack/handler/trinidad.rb, it solves load issues with trinidad_init_services.

data/Rakefile

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'rake'
+
+def version(file, constant)
+ line = File.read(file)[/^\s*#{constant}\s*=\s*.*/]
+ line.match(/.*#{constant}\s*=\s*['"](.*)['"]/)[1]
+end
+
+def build(gemspec_file, gem_file)
+  mkdir_p 'pkg'
+  sh "gem build #{gemspec_file}"
+  mv gem_file, 'pkg'
+end
+
+def release(name, gem_file, version)
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{name} #{version}'"
+  sh "git tag v#{name}-#{version}"
+  sh "git push origin master"
+  sh "git push --tags"
+  sh "gem push pkg/#{gem_file}"
+end
+
+{
+  :build => 'Build all Trinidad gems',
+  :install => 'Install all Trinidad gems',
+  :release => 'Release all Trinidad gems'
+}.each do |task, desc|
+  desc desc
+  task task => ["trinidad_jars:#{task}", "trinidad:#{task}"]
+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/rack/handler/trinidad.rb

@@ -13,11 +13,12 @@ module Rack
         opts = parse_options(options)
 
         servlet = create_servlet(app)
-
         opts[:servlet] = {:instance => servlet, :name => 'RackServlet'}
 
-        ::Trinidad::CommandLineParser.new.load_configuration(opts)
-        ::Trinidad::Server.new.start
+        ::Trinidad::CommandLineParser.load(opts)
+        server = ::Trinidad::Server.new
+        yield server if block_given?
+        server.start
       end
 
       def self.valid_options
@@ -40,6 +41,7 @@ module Rack
         threads = (opts[:threads] || '1:1').split(':')
         opts[:port] ||= 3000
         opts[:address] ||= opts[:host] || 'localhost'
+        # NOTE: this is currently not supported by embedded Dispatcher and has no effect :
         opts[:jruby_min_runtimes], opts[:jruby_max_runtimes] = threads[0].to_i, threads[1].to_i
         opts
       end

data/lib/trinidad.rb

@@ -2,6 +2,7 @@ require 'java'
 
 require 'jruby-rack'
 
+require 'trinidad/version'
 require 'trinidad/core_ext'
 require 'trinidad/extensions'
 require 'trinidad/configuration'
@@ -18,7 +19,3 @@ require 'trinidad/web_app'
 require 'trinidad/rails_web_app'
 require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
-
-module Trinidad
-  VERSION = '1.3.4'
-end

data/lib/trinidad/command_line_parser.rb

@@ -8,6 +8,10 @@ module Trinidad
       CommandLineParser.new.parse!(argv)
     end
 
+    def self.load(options = {})
+      CommandLineParser.new.load!(options)
+    end
+    
     def initialize
       @default_options = {}
     end
@@ -20,10 +24,10 @@ module Trinidad
         exit(1)
       end
 
-      load_configuration(default_options)
+      load!(default_options)
     end
 
-    def load_configuration(options)
+    def load!(options)
       base_dir = options[:web_app_dir] || Dir.pwd
       config = options.delete(:config) || Dir.glob(File.join(base_dir, 'config', 'trinidad.{yml,rb}')).first
       if config and config = File.expand_path(config, base_dir)
@@ -42,6 +46,7 @@ module Trinidad
 
       options
     end
+    alias_method :load_configuration, :load!
 
     def yaml_configuration?(config)
       config && File.exist?(config) && config =~ /\.yml$/

data/lib/trinidad/configuration.rb

@@ -9,11 +9,6 @@ module Trinidad
     self.configuration
   end
 
-  # test only purposes
-  def self.cleanup
-    self.configuration = nil
-  end
-
   class Configuration
     attr_accessor :port, :address, :environment, :context_path, :libs_dir, :classes_dir,
                  :default_web_xml, :log, :jruby_min_runtimes, :jruby_max_runtimes,

data/lib/trinidad/lifecycle/lifecycle_listener_base.rb

@@ -49,7 +49,14 @@ module Trinidad
 
         jlogging = java.util.logging
 
-        log_handler = jlogging.FileHandler.new(log_path, true)
+        file_handler = jlogging.FileHandler.new(log_path, true)
+
+        out_handler  = jlogging.ConsoleHandler.new
+        out_handler.set_output_stream JRuby.runtime.out
+
+        err_handler  = jlogging.ConsoleHandler.new
+        err_handler.set_output_stream JRuby.runtime.err
+
         logger = jlogging.Logger.get_logger("")
 
         log_level = @webapp.log
@@ -60,7 +67,12 @@ module Trinidad
 
         level = jlogging.Level.parse(log_level)
 
-        logger.add_handler(log_handler)
+        console_handler = logger.handlers.first
+        logger.remove_handler(console_handler)
+
+        logger.add_handler(file_handler)
+        logger.add_handler(out_handler)
+        logger.add_handler(err_handler)
 
         logger.handlers.each do |handler|
           handler.level = level

data/lib/trinidad/server.rb

@@ -11,11 +11,13 @@ module Trinidad
     end
 
     def load_config(config)
-      @config = config
-      add_default_web_app!(config)
+      add_default_web_app! config
+      @config = config.freeze
     end
 
     def load_tomcat_server
+      load_default_system_properties
+
       @tomcat = Trinidad::Tomcat::Tomcat.new
       @tomcat.base_dir = Dir.pwd
       @tomcat.hostname = @config[:address] || 'localhost'
@@ -39,9 +41,8 @@ module Trinidad
 
         set_default_host
       elsif @config[:web_apps]
-        # create the hosts when they are specified for each app into
-        # web_apps. We must create them before creating the
-        # applications.
+        # create the hosts when they are specified for each app into web_apps. 
+        # We must create them before creating the applications.
         @config[:web_apps].each do |name, app_config|
           if host_names = app_config.delete(:hosts)
             dir = app_config[:web_app_dir] || Dir.pwd
@@ -60,7 +61,7 @@ module Trinidad
       apps = []
       apps << create_from_web_apps
       apps << create_from_apps_base
-
+      
       apps.flatten.compact
     end
 
@@ -218,6 +219,10 @@ module Trinidad
       @tomcat.destroy
     end
 
+    def load_default_system_properties
+      java.lang.System.set_property("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE", 'true')
+    end
+
     private
 
     def create_host(apps_base, names)

data/lib/trinidad/version.rb

@@ -0,0 +1,3 @@
+module Trinidad
+  VERSION = '1.3.5'
+end

data/lib/trinidad/web_app.rb

@@ -61,18 +61,18 @@ module Trinidad
       )
     end
 
-    def public_root
-      @app_config[:public]  || @config[:public] || 'public'
-    end
-
-    %w{context_path web_app_dir libs_dir classes_dir default_web_xml
-        jruby_min_runtimes jruby_max_runtimes rackup log}.each do |method_name|
+    %w{ context_path web_app_dir libs_dir classes_dir default_web_xml
+        jruby_min_runtimes jruby_max_runtimes rackup log }.each do |method_name|
       define_method method_name do
         sym = method_name.to_sym
         @app_config[sym] || @config[sym]
       end
     end
 
+    def public_root; @app_config[:public]  || @config[:public] || 'public'; end
+    def environment; @app_config[:environment] || @config[:environment] || 'development'; end
+    def work_dir; @app_config[:work_dir] || @config[:work_dir] || web_app_dir; end
+    
     def extensions
       @extensions ||= begin
         extensions = @config[:extensions] || {}
@@ -82,8 +82,6 @@ module Trinidad
     end
 
     def war?; WebApp.war?(app_config); end    
-    def work_dir; @app_config[:work_dir] || @config[:work_dir] || web_app_dir; end
-    def environment; @app_config[:environment] || @config[:environment] || 'development'; end
 
     def solo?
       !self.is_a?(WarWebApp) && @app_config[:solo]
@@ -147,12 +145,14 @@ module Trinidad
         app_config[:jruby_min_runtimes] = 1
         app_config[:jruby_max_runtimes] = 1
       end
-
+      
+      rackup = config[:rackup] || 'config.ru'
+      app_config[:web_app_dir] ||= config[:web_app_dir] || Dir.pwd
       # Check for rackup (but still use config/environment.rb for Rails 3)
-      if !app_config[:rackup] && !config[:rackup] &&
-          File.exists?("#{app_config[:web_app_dir]}/config.ru") &&
-          !File.exists?("#{app_config[:web_app_dir]}/config/environment.rb")
-        app_config[:rackup] = 'config.ru'
+      if !app_config[:rackup] &&
+          File.exists?(File.join(app_config[:web_app_dir], rackup)) &&
+          !File.exists?(File.join(app_config[:web_app_dir], 'config/environment.rb'))
+        app_config[:rackup] = rackup
       end
     end
 

data/rakelib/tomcat.rake

@@ -0,0 +1,44 @@
+require 'open-uri'
+require 'tmpdir'
+
+namespace :tomcat do
+  
+  TOMCAT_CORE_PATH = 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"
+  tomcat_jasper = "#{TOMCAT_MAVEN_REPO}/embed/tomcat-embed-jasper/%s/tomcat-embed-jasper-%s.jar"
+  tomcat_logging = "#{TOMCAT_MAVEN_REPO}/embed/tomcat-embed-logging-log4j/%s/tomcat-embed-logging-log4j-%s.jar"
+
+  dependencies = [tomcat, tomcat_jasper, tomcat_logging]
+  
+  desc "Updates Tomcat to a given version"
+  task :update, :version do |task, args|
+    tomcat_version = [args[:version]] * 2
+
+    Dir.chdir(Dir.tmpdir) do
+      dependencies.each do |dependency|
+        dependency_path = dependency % tomcat_version
+        dependency_name = dependency_path.split('/').last
+
+        # dowload dependencies
+        puts "downloading #{dependency_path}"
+        file = open(dependency_path)
+        %x{jar -xf #{file.path}}
+      end
+
+      # build the jar again
+      puts "building the tomcat's core jar"
+      %x{jar -cvf #{TOMCAT_CORE_PATH} META-INF javax org}
+    end
+
+    puts "updating tomcat's version number to #{tomcat_version.first}"
+    path = File.expand_path('../../lib/trinidad/jars.rb', __FILE__)
+    file = File.read(path)
+    file.gsub!(/TOMCAT_VERSION = '(.+)'/, "TOMCAT_VERSION = '#{tomcat_version.first}'")
+    File.open(path, 'w') { |io| io.write(file) }
+
+    puts "DONE - Tomcat's version has been updated succesfully, please build Trinidad again."
+  end
+  
+end

data/rakelib/trinidad.rake

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,26 @@
+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

data/trinidad.gemspec

@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'trinidad/version'
+
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = '1.3.5'
+  
+  s.name              = 'trinidad'
+  s.rubyforge_project = '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.authors  = ["David Calavera"]
+  s.email    = 'calavera@apache.org'
+  s.homepage = 'http://github.com/trinidad/trinidad'
+  
+  s.require_paths = %w[lib]
+  s.executables = ["trinidad"]
+  s.default_executable = 'trinidad'
+  
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = %w[README.md LICENSE]
+  
+  s.add_dependency('trinidad_jars', ">= 1.0.2")
+  s.add_dependency('jruby-rack', ">= 1.1.5")
+  
+  s.add_development_dependency('rack')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec', '~> 2.7')
+  s.add_development_dependency('mocha')
+  s.add_development_dependency('fakefs', '>= 0.4.0')
+
+  s.files = `git ls-files`.split("\n").sort.
+    reject { |file| file =~ /^\./ }. # .gitignore, .travis.yml
+    # TODO backward compatibility - include no spec files ?!
+    reject { |file| file =~ /^spec\// }.
+    # reject trinidad_jars.gemspec files :
+    reject { |file| file == 'trinidad_jars.gemspec' || 
+                    file == 'lib/trinidad/jars.rb'  || 
+                    file =~ /^trinidad-libs\// }
+  
+  s.test_files = s.files.select { |path| path =~ /^spec\/.*_spec\.rb/ }
+  
+end

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
   - David Calavera
@@ -10,74 +10,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-20 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.1
-    requirement: *id001
-    prerelease: false
+            version: 1.0.2
     type: :runtime
+    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: jruby-rack
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 1.1.1
-    requirement: *id002
-    prerelease: false
+            version: 1.1.5
     type: :runtime
+    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: rack
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id003
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rake
     prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
     type: :development
+    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: rspec
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.7"
-    requirement: *id004
-    prerelease: false
     type: :development
+    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: mocha
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id005
-    prerelease: false
     type: :development
+    version_requirements: *id006
   - !ruby/object:Gem::Dependency 
     name: fakefs
-    version_requirements: &id006 !ruby/object:Gem::Requirement 
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: 0.4.0
-    requirement: *id006
-    prerelease: false
     type: :development
+    version_requirements: *id007
 description: Trinidad allows you to run a rails or rackup applications within an embedded Apache Tomcat container
 email: calavera@apache.org
 executables: 
@@ -88,28 +99,35 @@ extra_rdoc_files:
   - README.md
   - LICENSE
 files: 
-  - bin/trinidad
-  - lib/trinidad.rb
+  - Gemfile
   - History.txt
   - LICENSE
   - README.md
+  - Rakefile
+  - bin/trinidad
   - lib/rack/handler/trinidad.rb
+  - lib/trinidad.rb
   - lib/trinidad/command_line_parser.rb
   - lib/trinidad/configuration.rb
   - lib/trinidad/core_ext.rb
   - lib/trinidad/extensions.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_base.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_default.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_host.rb
+  - lib/trinidad/lifecycle/lifecycle_listener_war.rb
+  - lib/trinidad/lifecycle/takeover.rb
   - lib/trinidad/log_formatter.rb
   - lib/trinidad/rackup_web_app.rb
   - lib/trinidad/rails_web_app.rb
   - lib/trinidad/server.rb
+  - lib/trinidad/version.rb
   - lib/trinidad/war_web_app.rb
   - lib/trinidad/web_app.rb
-  - lib/trinidad/lifecycle/lifecycle_listener_base.rb
-  - lib/trinidad/lifecycle/lifecycle_listener_default.rb
-  - lib/trinidad/lifecycle/lifecycle_listener_host.rb
-  - lib/trinidad/lifecycle/lifecycle_listener_war.rb
-  - lib/trinidad/lifecycle/takeover.rb
-homepage: http://github.com/calavera/trinidad
+  - rakelib/tomcat.rake
+  - rakelib/trinidad.rake
+  - rakelib/trinidad_jars.rake
+  - trinidad.gemspec
+homepage: http://github.com/trinidad/trinidad
 licenses: []
 
 post_install_message: 
@@ -122,9 +140,6 @@ 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