ucb_deployer 0.3.1 → 0.3.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'echoe'
 require 'spec/rake/spectask'
 
 
-Echoe.new('ucb_deployer', '0.3.1') do |p|
+Echoe.new('ucb_deployer', '0.3.2') do |p|
   p.description    = "Tool for deploying Confluence/JIRA war files to tomcat"
   p.url            = "http://ucbrb.rubyforge.org"
   p.author         = "Steven Hansen"

data/lib/ucb_deployer/jira_deployer.rb

@@ -3,8 +3,7 @@ module UcbDeployer
   class JiraDeployer < Deployer
     
     def initialize(config_file = "#{ENV['HOME']}/config/jira/deploy.yml")
-      info("Using config file: #{config_file}")
-      info("")
+      debug("Using config file: #{config_file}")
       
       load_config(config_file)
     end
@@ -70,7 +69,7 @@ module UcbDeployer
     end
     
     def web_xml_token()
-      "appropriate error message for any requests. Basically it locks JIRA. -->"
+      "<!--This filter is used to determine is there are any Application Errors before any pages are accessed"
     end
     
     ##

data/spec/fixtures/jira/web.xml

@@ -372,6 +372,7 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+
     <!-- THIS MUST REMAIN AS THE TOP FILTER SO THAT THE ENCODING CAN BE SET BEFORE ANYTHING ELSE TOUCHES IT -->
     <filter-mapping>
         <filter-name>encoding</filter-name>

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -36,11 +36,11 @@ describe UcbDeployer::JiraDeployer do
       @cdep.config_web_xml
       File.exists?(@cdep.web_xml).should be_true
       lines = File.readlines(@cdep.web_xml)
-      lines.any? { |l| l =~ /<\?xml version="1\.0"\?>/ }.should be_true
-      lines.any? { |l| l =~ /^<web-app / }.should be_true
-      lines.any? { |l| l =~ /#{@cdep.cas_server_url}/ }.should be_true
-      lines.any? { |l| l =~ /#{@cdep.cas_service_url}/ }.should be_true
-      lines.any? { |l| l =~ /<\/web-app>/ }.should be_true            
+      lines.grep(/<\?xml version="1\.0"\?>/).should be_true
+      lines.grep(/^<web-app /).should be_true
+      lines.grep(/#{@cdep.cas_server_url}/).should have(1).record
+      lines.grep(/#{@cdep.cas_service_url}/).should have(1).record
+      lines.grep(/<\/web-app>/).should be_true            
     end
   end
   
@@ -54,10 +54,10 @@ describe UcbDeployer::JiraDeployer do
       @cdep.config_seraph_config_xml
       File.exists?(@cdep.seraph_config_xml).should be_true
       lines = File.readlines(@cdep.seraph_config_xml)
-      lines.any? { |l| l =~ /<security-config>/ }.should be_true
-      lines.any? { |l| l =~ /#{Regexp.quote(@cdep.cas_authenticator_class)}/ }.should be_true
-      lines.any? { |l| l =~ /#{Regexp.quote(@cdep.cas_server_url)}\/logout/ }.should be_true      
-      lines.any? { |l| l =~ /<\/security-config>/ }.should be_true            
+      lines.grep(/<security-config>/).should be_true
+      lines.grep(/#{Regexp.quote(@cdep.cas_authenticator_class)}/).should have(1).record
+      lines.grep(/#{Regexp.quote(@cdep.cas_server_url)}\/logout/).should have(1).record
+      lines.grep(/<\/security-config>/).should be_true            
     end
   end
   

data/ucb_deployer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hansen"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Steven Hansen