trinidad 1.4.4 → 1.4.5.B1

data/lib/trinidad/version.rb

@@ -1,3 +1,3 @@
 module Trinidad
-  VERSION = '1.4.4'
+  VERSION = '1.4.5.B1'
 end

data/lib/trinidad/web_app.rb

@@ -13,7 +13,7 @@ module Trinidad
           RailsWebApp.new(config, default_config)
     end
 
-    def initialize(config, default_config)
+    def initialize(config, default_config = Trinidad.configuration)
       @config, @default_config = config, default_config || {}
       complete_config!
       # NOTE: we should maybe @config.freeze here ?!
@@ -30,13 +30,16 @@ module Trinidad
       use_default ? default_config.key?(key) : false
     end
     
-    %w{ root_dir rackup log async_supported reload_strategy }.each do |method|
+    %w{ root_dir rackup async_supported reload_strategy host_name }.each do |method|
       class_eval "def #{method}; self[:'#{method}']; end"
     end
-    alias_method :web_app_dir, :root_dir # is getting deprecated soon
     
+    alias_method :web_app_dir, :root_dir # is getting deprecated soon
     def app_root; root_dir; end
     
+    # @deprecated use `self[:log]` instead
+    def log; self[:log]; end
+    
     def context_path
       path = self[:context_path] || self[:path]
       path ? path.to_s : path
@@ -87,7 +90,7 @@ module Trinidad
     def environment; self[:environment] || @@defaults[:environment]; end # TODO check web.xml
     
     def public_dir
-      @public_dir ||= expand_path(public_root)
+      @public_dir ||= ( public_root == '/' ? root_dir : expand_path(public_root) )
     end
     
     # by (a "Rails") convention use '[RAILS_ROOT]/tmp'
@@ -144,6 +147,7 @@ module Trinidad
       add_context_param 'jruby.compat.version', jruby_compat_version
       add_context_param 'public.root', public_root
       add_context_param 'jruby.rack.layout_class', layout_class
+      add_context_param 'jruby.rack.error', false # do not start error app on errors
       @context_params
     end
     # @deprecated replaced with {#context_params}
@@ -388,20 +392,8 @@ module Trinidad
       raise NotImplementedError.new "context_listener expected to be redefined"
     end
     
-    if Gem::Version.create(JRuby::Rack::VERSION) > Gem::Version.create('1.1.10')
-      def layout_class
-        'JRuby::Rack::FileSystemLayout' # handles Rails as well as Rack
-      end
-    else
-      def layout_class
-        # NOTE: we'll also need to do a GEM_PATH hack to avoid a bug :
-        if gem_path = ENV['GEM_PATH']
-          add_context_param 'gem.path', gem_path
-          # ENV['GEM_PATH'] will contain twice the same entry(ies) ...
-        end
-        add_context_param 'rails.root', app_root # still boots a rack app
-        'JRuby::Rack::RailsFilesystemLayout' # no plain FS layout defined !
-      end
+    def layout_class
+      'JRuby::Rack::FileSystemLayout' # handles Rails as well as Rack
     end
     
     def complete_config!
@@ -538,17 +530,20 @@ module Trinidad
     end
     
     def self.war?(config, default_config = nil)
-      config[:context_path] && config[:context_path].to_s[-4..-1] == '.war'
+      root_dir = root_dir(config, default_config)
+      return true if root_dir && root_dir.to_s[-4..-1] == '.war'
+      context_path = config[:context_path] # backwards-compatibility :
+      context_path && context_path.to_s[-4..-1] == '.war'
     end
     
     private
     
-    def self.root_dir(config, default_config)
+    def self.root_dir(config, default_config, default_dir = Dir.pwd)
       # for backwards compatibility accepts the :web_app_dir "alias"
       config[:root_dir] || config[:web_app_dir] || 
         ( default_config && 
           ( default_config[:root_dir] || default_config[:web_app_dir] ) ) ||
-            Dir.pwd
+            default_dir
     end
     
     def self.context_path(config, default_config = nil)
@@ -629,7 +624,7 @@ module Trinidad
     
   end
   
-  # Rack web application (looks for a rackup config.ru file).
+  # Rack web application (looks for a "rackup" *config.ru* file).
   class RackupWebApp < WebApp
 
     def context_params
@@ -646,7 +641,7 @@ module Trinidad
     
   end
   
-  # Rails web app specifics. Supports the same versions as jruby-rack !
+  # Rails web application specifics (supports same versions as JRuby-Rack).
   class RailsWebApp < WebApp
 
     def context_params
@@ -680,7 +675,12 @@ module Trinidad
     end
 
     def self.threadsafe_match?(file)
-      File.exist?(file) && file_line_match?(file, /^[^#]*threadsafe!/)
+      File.exist?(file) && (
+        file_line_match?(file, /^[^#]*threadsafe!/) || ( # Rails 4.0
+          file_line_match?(file, /^[^#]*config\.eager_load = true/) &&
+          file_line_match?(file, /^[^#]*config\.cache_classes = true/)
+        )
+      )
     end
     
   end
@@ -688,30 +688,64 @@ module Trinidad
   # A web application for deploying (java) .war files.
   class WarWebApp < WebApp
     
-    def context_path
-      super.gsub(/\.war$/, '')
+    def root_dir
+      @root_dir ||= ( config[:root_dir] || begin
+        path = config[:context_path]
+        path.to_s if path.to_s[-4..-1] == '.war'
+      end || default_confit[:root_dir] )
     end
-    
-    def log_dir
-      @log_dir ||= self[:log_dir] || File.join(work_dir, 'log')
+
+    def context_path
+      @path ||= begin
+        path = File.basename(super)
+        context_name = Trinidad::Tomcat::ContextName.new(path)
+        context_name.path # removes .war handles ## versioning
+      end
     end
-    
+
     def work_dir
-      @work_dir ||= File.join(root_dir.gsub(/\.war$/, ''), 'WEB-INF')
+      self[:work_dir]
     end
 
+    def log_dir
+      @log_dir ||= self[:log_dir] || begin 
+        if work_dir then work_dir
+        else
+          if root_dir[-4..-1] == '.war'
+            parent_dir = File.dirname(root_dir)
+            expanded_dir = File.join(parent_dir, context_path)
+            File.exist?(expanded_dir) ? expanded_dir : parent_dir
+          else
+            File.join(root_dir, 'log')
+          end
+        end
+      end
+    end
+    
     def monitor
-      File.expand_path(root_dir)
+      root_dir ? File.expand_path(root_dir) : nil # the .war file itself
+    end
+    
+    def class_loader
+      @class_loader ||= nil # lifecycle will setup JRuby CL
     end
 
-    def define_lifecycle
-      Trinidad::Lifecycle::WebApp::War.new(self)
+    def context_params
+      warbler? ? super : @context_params ||= {}
     end
-    
+
     def layout_class
       'JRuby::Rack::WebInfLayout'
     end
     
+    def define_lifecycle
+      Trinidad::Lifecycle::WebApp::War.new(self)
+    end
+
+    private
+
+    def warbler?; nil; end # TODO detect warbler created .war ?!
+    
   end
   
 end

data/rakelib/tomcat.rake

@@ -67,6 +67,7 @@ end
 namespace :'tomcat-core' do
 
   task :compile do
+    mkdir_p TOMCAT_CORE_TARGET_DIR unless File.exist?(TOMCAT_CORE_TARGET_DIR)
     javac "src/tomcat-core/java", TOMCAT_CORE_TARGET_DIR
   end
 

data/trinidad.gemspec

@@ -21,15 +21,13 @@ 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.1.0")
-  s.add_dependency('jruby-rack', ">= 1.1.10")
+  s.add_dependency('trinidad_jars', ">= 1.2.2")
+  s.add_dependency('jruby-rack', ">= 1.1.13")
   
-  s.add_development_dependency('rack')
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.10')
-  s.add_development_dependency('mocha')
+  s.add_development_dependency('rspec', '~> 2.12.0')
+  s.add_development_dependency('mocha', '~> 0.12.1')
   s.add_development_dependency('fakefs', '>= 0.4.0')
-  s.add_development_dependency('sinatra')
 
   s.files = `git ls-files`.split("\n").sort.
     reject { |file| file =~ /^\./ }. # .gitignore, .travis.yml

metadata

@@ -1,171 +1,176 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trinidad
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.4.4
+version: !ruby/object:Gem::Version
+  prerelease: 6
+  version: 1.4.5.B1
 platform: ruby
-authors: 
-  - David Calavera
-autorequire: 
+authors:
+- David Calavera
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-10-19 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: trinidad_jars
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.1.0
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: jruby-rack
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.1.10
-    requirement: *id002
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: rack
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id004
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.10"
-    requirement: *id005
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: mocha
-    version_requirements: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id006
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: fakefs
-    version_requirements: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.4.0
-    requirement: *id007
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: sinatra
-    version_requirements: &id008 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id008
-    prerelease: false
-    type: :development
+date: 2013-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: trinidad_jars
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jruby-rack
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.13
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.13
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    none: false
+  prerelease: false
+  type: :development
 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
+executables:
+- trinidad
 extensions: []
-
-extra_rdoc_files: 
-  - README.md
-  - LICENSE
-files: 
-  - 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/extensions.rb
-  - lib/trinidad/lifecycle/base.rb
-  - lib/trinidad/lifecycle/host.rb
-  - lib/trinidad/lifecycle/host/restart_reload.rb
-  - lib/trinidad/lifecycle/host/rolling_reload.rb
-  - lib/trinidad/lifecycle/web_app/default.rb
-  - lib/trinidad/lifecycle/web_app/shared.rb
-  - lib/trinidad/lifecycle/web_app/war.rb
-  - lib/trinidad/logging.rb
-  - lib/trinidad/server.rb
-  - lib/trinidad/version.rb
-  - lib/trinidad/web_app.rb
-  - rakelib/tomcat.rake
-  - trinidad.gemspec
+extra_rdoc_files:
+- README.md
+- LICENSE
+files:
+- 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/extensions.rb
+- lib/trinidad/helpers.rb
+- lib/trinidad/lifecycle/base.rb
+- lib/trinidad/lifecycle/host.rb
+- lib/trinidad/lifecycle/host/restart_reload.rb
+- lib/trinidad/lifecycle/host/rolling_reload.rb
+- lib/trinidad/lifecycle/web_app/default.rb
+- lib/trinidad/lifecycle/web_app/shared.rb
+- lib/trinidad/lifecycle/web_app/war.rb
+- lib/trinidad/logging.rb
+- lib/trinidad/server.rb
+- lib/trinidad/version.rb
+- lib/trinidad/web_app.rb
+- rakelib/tomcat.rake
+- trinidad.gemspec
 homepage: http://github.com/trinidad/trinidad
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-  - --charset=UTF-8
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+post_install_message:
+rdoc_options:
+- "--charset=UTF-8"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - !binary |-
+      Pg==
+    - !ruby/object:Gem::Version
+      version: 1.3.1
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Web server for Rails/Rack applications built upon JRuby::Rack and Apache Tomcat
 test_files: []
-