capistrano-tomcat 0.0.2 → 0.0.3

data/HISTORY.txt

@@ -1,3 +1,8 @@
+v0.0.3
+======
+ * Allows a deployment to add additional environment variables to the
+   Tomcat runtime
+
 v0.0.2
 ======
  * Deploys to a machine with RedHat Enterprise Linux and the `tomcat6` package.

data/lib/capistrano/tomcat/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Tomcat
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/capistrano/tomcat.rb

@@ -10,6 +10,7 @@ configuration.load do
   _cset(:tomcat_https_port) { tomcat_base_port + 443 } #8443
   _cset :keystore_password, nil
   _cset :catalina_home, '/usr/share/tomcat6'
+  _cset(:tomcat_runtime_env, {})
 
   namespace :deploy do
     task :update_code, :roles => :app do
@@ -39,11 +40,12 @@ configuration.load do
     def run_tomcat_command cmd
       log = File.join(shared_path, "log", "deploy.log")
       tmpdir = File.join(current_path, "temp")
-      run "/usr/sbin/tomcat6 #{cmd} #{log}", :env => {
+      base_env = {
         "CATALINA_HOME" => catalina_home,
         "CATALINA_BASE" => current_path,
         "CATALINA_TMPDIR" => tmpdir
       }
+      run "/usr/sbin/tomcat6 #{cmd} #{log}", :env => base_env.merge(tomcat_runtime_env)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-tomcat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000 Z
+date: 2011-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70220131883800 !ruby/object:Gem::Requirement
+  requirement: &70196232739240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220131883800
+  version_requirements: *70196232739240
 description: ! "Apache Tomcat, a Java servlet container, runs WARs\n\n    These deployment
   recipes help to run a Tomcat instance with your\n    own WAR files from Capistrano.\n
   \ "