trinidad_hotdeploy_extension 0.3.1 → 0.4.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.4.0 (2010-11-04)
+
+* Warbler support
+
 == 0.3.1 (2010-10-06)
 
 * Load the extension from the command line

data/README

@@ -9,7 +9,7 @@ Extension to allow Trinidad to redeploy an application each time a file, for ins
 
 # INSTALL
 
-    $ jruby -S gem install trinidad_hotdeploy_extensions
+    $ jruby -S gem install trinidad_hotdeploy_extension
 
 # CONFIGURE
 

data/lib/trinidad_hotdeploy_extension.rb

@@ -3,19 +3,26 @@ module Trinidad
     require File.expand_path('../../trinidad-libs/trinidad-hotdeploy-extension.jar', __FILE__)
 
     module Hotdeploy
-      VERSION = '0.3.1'
+      VERSION = '0.4.0'
     end
 
     class HotdeployWebAppExtension < WebAppExtension
       def configure(tomcat, app_context)
-        @options[:monitor] ||= File.join(app_context.doc_base, 'tmp/restart.txt')
-        monitor = File.expand_path(@options[:monitor])
+        monitor_file = File.expand_path(monitor(app_context))
         delay = @options[:delay] || 1000
 
-        listener = org.jruby.trinidad.HotDeployLifecycleListener.new(app_context, monitor, delay)
+        listener = org.jruby.trinidad.HotDeployLifecycleListener.new(app_context, monitor_file, delay)
         app_context.addLifecycleListener(listener)
         listener
       end
+
+      def monitor(app_context)
+        @options[:monitor] ||= begin
+          doc_base = app_context.doc_base
+          doc_base = File.join(doc_base, 'tmp/restart.txt') if !(doc_base =~ /\.war$/)
+          doc_base
+        end
+      end
     end
 
     class HotdeployOptionsExtension < OptionsExtension

data/spec/trinidad_hotdeploy_extension_spec.rb

@@ -43,6 +43,12 @@ describe Trinidad::Extensions::HotdeployWebAppExtension do
     listener = ext.configure(@tomcat, @context)
     listener.delay.should == 30000
   end
+
+  it "uses the doc_base path if the context it's a war file" do
+    @context.doc_base = 'foo.war'
+    listener = subject.configure(@tomcat, @context)
+    listener.monitor.should =~ /foo\.war$/
+  end
 end
 
 describe Trinidad::Extensions::HotdeployOptionsExtension do

data/trinidad_hotdeploy_extension.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_hotdeploy_extension'
-  s.version           = '0.3.1'
-  s.date              = '2010-10-06'
+  s.version           = '0.4.0'
+  s.date              = '2010-11-04'
   s.rubyforge_project = 'trinidad_hotdeploy_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('trinidad', '>=0.9.1')
+  s.add_dependency('trinidad', '>=1.0.0')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

metadata

@@ -3,61 +3,58 @@ name: trinidad_hotdeploy_extension
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+    - 0
+    - 4
+    - 0
+  version: 0.4.0
 platform: ruby
 authors: 
-- David Calavera
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +02:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: trinidad
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
-  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 
-        segments: 
-        - 0
-        version: "0"
-  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 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: trinidad
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 0
+              - 0
+            version: 1.0.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id003
 description: Perform hot deploys on Trinidad ala Passenger
 email: calavera@apache.org
 executables: []
@@ -65,49 +62,47 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
-- LICENSE
+  - README
+  - LICENSE
 files: 
-- History.txt
-- LICENSE
-- README
-- Rakefile
-- lib/trinidad_hotdeploy_extension.rb
-- rakelib/build.rake
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/trinidad_hotdeploy_extension_spec.rb
-- trinidad_hotdeploy_extension.gemspec
-- trinidad-libs/trinidad-hotdeploy-extension.jar
+  - History.txt
+  - LICENSE
+  - README
+  - Rakefile
+  - lib/trinidad_hotdeploy_extension.rb
+  - rakelib/build.rake
+  - spec/spec.opts
+  - spec/spec_helper.rb
+  - spec/trinidad_hotdeploy_extension_spec.rb
+  - trinidad_hotdeploy_extension.gemspec
+  - trinidad-libs/trinidad-hotdeploy-extension.jar
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad_hotdeploy_extension
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: trinidad_hotdeploy_extension
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Hot deployer for Trinidad