ucb_deployer 0.1.4 → 0.1.5

data/Rakefile

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

data/lib/ucb_deployer/jira_deployer.rb

@@ -80,10 +80,14 @@ module UcbDeployer
       "com.atlassian.seraph.auth.DefaultAuthenticator"
     end
     
-    def entityengine_xml_token()
+    def entityengine_xml_db_token()
       "field-type-name=\"hsql\""
     end
     
+    def entityengine_xml_schema_token()
+      "schema-name=\"PUBLIC\""
+    end
+    
     def seraph_config_xml_logout_url_token()
       "/secure/Logout!default.jspa"
     end
@@ -100,6 +104,10 @@ module UcbDeployer
       "field-type-name=\"postgres72\""
     end
     
+    def entityengine_schema()
+      "schema-name=\"jira_app\""
+    end
+    
     ##
     # Updates the jira web.xml file with the soulwing (CAS library)
     # authentication configuration
@@ -128,11 +136,16 @@ module UcbDeployer
       ee_xml = File.readlines(self.entityengine_xml)
       
       ee_xml = ee_xml.map do |line|
-        if m = /(#{Regexp.quote(entityengine_xml_token)})/.match(line)
+        if m = /(#{Regexp.quote(entityengine_xml_db_token)})/.match(line)
           debug(m[0])
           new_str = "#{m.pre_match}#{entityengine_db}#{m.post_match}"
           debug(new_str)
           new_str
+        elsif m = /(#{Regexp.quote(entityengine_xml_schema_token)})/.match(line)
+          debug(m[0])
+          new_str = "#{m.pre_match}#{entityengine_schema}#{m.post_match}"
+          debug(new_str)
+          new_str
         else
           line
         end

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -71,6 +71,7 @@ describe UcbDeployer::JiraDeployer do
       lines = File.readlines(@cdep.entityengine_xml)
       lines.any? { |l| l =~ /<entity-config>/ }.should be_true
       lines.any? { |l| l =~ /#{Regexp.quote(@cdep.entityengine_db)}/ }.should be_true
+      lines.any? { |l| l =~ /#{Regexp.quote(@cdep.entityengine_schema)}/ }.should be_true      
       lines.any? { |l| l =~ /<\/entity-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.1.4"
+  s.version = "0.1.5"
 
   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: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Steven Hansen