ucb_deployer 0.1.0 → 0.1.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'echoe'
 require 'spec/rake/spectask'
 
-Echoe.new('ucb_deployer', '0.1.0') do |p|
+Echoe.new('ucb_deployer', '0.1.1') 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

@@ -22,6 +22,7 @@ module UcbDeployer
     def configure()
       config_web_xml
       config_seraph_config_xml
+      config_entityengine_xml      
       reshuffle_jars
     end
 
@@ -40,7 +41,7 @@ module UcbDeployer
       end
 
       FileUtils.mkdir("#{deploy_dir}/#{war_name}")
-      FileUtils.mv("#{build_dir}/src/dist/jira-#{version}.war",
+      FileUtils.mv("#{build_dir}/src/dist-tomcat/atlassian-jira-#{version}.war",
                    "#{deploy_dir}/#{war_name}/#{war_name}.war")
 
       `cd #{deploy_dir}/#{war_name}/ && jar -xvf #{war_name}.war`
@@ -54,14 +55,21 @@ module UcbDeployer
     # Shortcut to jira web.xml file
     #
     def web_xml()
-      "#{build_dir}/src/jira/WEB-INF/web.xml"
+      "#{build_dir}/src/webapp/WEB-INF/web.xml"
+    end
+    
+    ##
+    # Shortcut to jira entityengine.xml file
+    #
+    def entityengine_xml()
+      "#{build_dir}/src/edit-webapp/WEB-INF/classes/entityengine.xml"
     end
     
     ##
     # Shortcut to jira seraph-config.xml file
     #
     def seraph_config_xml()
-      "#{build_dir}/src/jira/WEB-INF/classes/seraph-config.xml"
+      "#{build_dir}/src/webapp/WEB-INF/classes/seraph-config.xml"
     end
     
     def web_xml_token()
@@ -72,6 +80,10 @@ module UcbDeployer
       "com.atlassian.seraph.auth.DefaultAuthenticator"
     end
     
+    def entityengine_xml_token()
+      "field-type-name=\"hsql\""
+    end
+    
     def seraph_config_xml_logout_url_token()
       "/secure/Logout!default.jspa"
     end
@@ -83,6 +95,10 @@ module UcbDeployer
     def cas_logout_url()
       "/casLogout.action"
     end
+
+    def entityengine_db()
+      "postgres72"
+    end
     
     ##
     # Updates the jira web.xml file with the soulwing (CAS library)
@@ -104,7 +120,29 @@ module UcbDeployer
         web_xml.each { |line| io.puts(line) }
       end      
     end
-
+    
+    ##
+    # Updates the jira entityengine.xml file with the correct database configs
+    #
+    def config_entityengine_xml()
+      ee_xml = File.readlines(self.entityengine_xml)
+      
+      ee_xml = ee_xml.map do |line|
+        if m = /(#{Regexp.quote(entityengine_xml_token)})/.match(line)
+          debug(m[0])
+          new_str = "#{m.pre_match}#{entityengine_db}#{m.post_match}"
+          debug(new_str)
+          new_str
+        else
+          line
+        end
+      end
+      
+      File.open(self.entityengine_xml, "w") do |io|
+        ee_xml.each { |line| io.puts(line) }
+      end
+    end
+    
     ##
     # Updates the jira seraph_config.xml file with the soulwing
     # authenticator.
@@ -134,10 +172,11 @@ module UcbDeployer
     end
     
     def reshuffle_jars()
+      FileUtils.mkdir_p("#{build_dir}/src/edit-webapp/WEB-INF/lib/")
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/lib/jotm-2.0.13/lib/*"],
-                   "#{build_dir}/src/jira/WEB-INF/lib/")
+                   "#{build_dir}/src/edit-webapp/WEB-INF/lib/")
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
-                   "#{build_dir}/src/jira/WEB-INF/lib/")
+                   "#{build_dir}/src/edit-webapp/WEB-INF/lib/")
     end
 
   end

data/spec/spec_helper.rb

@@ -27,13 +27,16 @@ Spec::Runner.configure do |config|
                  "#{dir}/confluence/src/confluence/WEB-INF/classes")
 
     # setup jira build dir
-    FileUtils.mkdir_p("#{dir}/jira/src/jira/WEB-INF/classes")
-    FileUtils.mkdir_p("#{dir}/jira/src/jira/WEB-INF/lib")
+    FileUtils.mkdir_p("#{dir}/jira/src/webapp/WEB-INF/classes")
+    FileUtils.mkdir_p("#{dir}/jira/src/edit-webapp/WEB-INF/classes")    
+    FileUtils.mkdir_p("#{dir}/jira/src/webapp/WEB-INF/lib")
     
     FileUtils.cp("#{pwd}/fixtures/jira/web.xml",
-                 "#{dir}/jira/src/jira/WEB-INF")
+                 "#{dir}/jira/src/webapp/WEB-INF")
     FileUtils.cp("#{pwd}/fixtures/jira/seraph-config.xml",
-                 "#{dir}/jira/src/jira/WEB-INF/classes")
+                 "#{dir}/jira/src/webapp/WEB-INF/classes")
+    FileUtils.cp("#{pwd}/fixtures/jira/entityengine.xml",
+                 "#{dir}/jira/src/edit-webapp/WEB-INF/classes")    
   end
   
   config.after(:all) do

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -59,14 +59,30 @@ describe UcbDeployer::JiraDeployer do
     end
   end
   
+
+  describe "#config_entityengine_xml" do
+    it "should configure the postgres72 db option in entityengine.xml" do
+      @cdep.build_dir = test_build_dir
+      # just checking if spec_helper did the right
+      File.exists?(@cdep.entityengine_xml).should be_true
+
+      @cdep.config_entityengine_xml
+      File.exists?(@cdep.entityengine_xml).should be_true
+      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 =~ /<\/entity-config>/ }.should be_true            
+    end
+  end
+  
   
   describe "#reshuffle_jars" do
     it "should work" do
       @cdep.build_dir = test_build_dir
       @cdep.reshuffle_jars
-      Dir["#{@cdep.build_dir}/src/jira/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
-      Dir["#{@cdep.build_dir}/src/jira/WEB-INF/lib/jotm*"].should_not be_empty
-      Dir["#{@cdep.build_dir}/src/jira/WEB-INF/lib/carol*"].should_not be_empty      
+      Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
+      Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/jotm*"].should_not be_empty
+      Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/carol*"].should_not be_empty      
     end
   end
 

data/ucb_deployer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Steven Hansen