tomcap 1.0.3 → 1.1.0

data/README.txt

@@ -14,8 +14,9 @@ Capistrano tasks which allow you to quickly and easily deploy Java WAR files loc
 
 == INSTALLATION:
 
- $ gem sources -a http://gems.github.com/ (if you havn't already, which is unlikely)
- $ gem install ienders-tomcap
+No longer hosted in git gems.  From 1.0.3+ can be found in RubyGems.
+
+ $ gem install tomcap
 
 == USAGE:
 
@@ -25,6 +26,10 @@ In your deploy.rb, simply include this line at the top:
 
   require 'tomcap/recipes'
 
+NEW: If you're using Tomcat 7, instead, require recipes7 (everything else is the same aside from standard Tomcat permission changes).
+
+  require 'tomcap/recipes7'
+
 = Set your configuration parameters
 
   set :tomcat_user,         "..."

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/lib/tomcap/recipes.rb

@@ -5,7 +5,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "mkdir -p #{shared_path}/cached_java_copy"
     end
     
-    
     desc <<-DESC
       Deploy Java WAR to a running Tomcat container.
       
@@ -50,7 +49,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         wget #{war_path}/#{war_file} --user=#{mvn_repo_user} --password=#{mvn_repo_pass}
       CMD
 
-      manager_url = "#{tomcat_url}/manager"
+      manager_url = "#{tomcat_url}/#{fetch(:tomcat_manager_url, 'manager')}"
       context_path = "/#{mvn_war_artifact_id}-#{mvn_war_version}"
 
       run "curl -v -u #{tomcat_user}:#{tomcat_pass} #{manager_url}/undeploy?path=#{context_path}"

data/lib/tomcap/recipes7.rb

@@ -0,0 +1,13 @@
+require 'tomcap/recipes'
+
+Capistrano::Configuration.instance(:must_exist).load do
+  
+  namespace :deploy do
+    task :set_tomcat7_manager_url, :roles => :java do
+      set :tomcat_manager_url, 'manager/text'
+    end
+  end
+  
+  before "deploy:setup_java", "deploy:set_tomcat7_manager_url"
+  
+end

data/tomcap.gemspec

@@ -1,30 +1,29 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tomcap}
-  s.version = "1.0.3"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Enders"]
-  s.date = %q{2010-08-12}
+  s.date = %q{2010-11-29}
   s.description = %q{Capistrano tasks which allow you to quickly and easily deploy Java WAR files located in remote repositories (currently Artifactory repos) to a running Tomcat container.}
   s.email = %q{ian.enders@gmail.com}
   s.extra_rdoc_files = [
     "README.txt"
   ]
   s.files = [
-    ".gitignore",
-     "README.txt",
-     "Rakefile",
-     "VERSION",
-     "lib/tomcap/recipes.rb",
-     "tomcap.gemspec"
+    "README.txt",
+    "Rakefile",
+    "VERSION",
+    "lib/tomcap/recipes.rb",
+    "lib/tomcap/recipes7.rb",
+    "tomcap.gemspec"
   ]
   s.homepage = %q{http://github.com/ienders/tomcap}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Tomcat deployment with Capistrano}
@@ -39,3 +38,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tomcap
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ian Enders
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -04:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -28,19 +28,19 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
-- .gitignore
 - README.txt
 - Rakefile
 - VERSION
 - lib/tomcap/recipes.rb
+- lib/tomcap/recipes7.rb
 - tomcap.gemspec
 has_rdoc: true
 homepage: http://github.com/ienders/tomcap
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,3 +0,0 @@
-pkg/*
-tomcap-*.gem
-github-test.rb