ucb_deployer 0.4.4 → 0.4.5

data/.svnignore

@@ -3,3 +3,6 @@ Manifest
 pkg
 .yardoc
 .rvmrc
+.idea
+work.txt
+ucb_deployer.iml

data/Gemfile

@@ -2,4 +2,4 @@ source :rubygems
 
 gemspec
 
-gem "bundler", "1.0.21"
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ucb_deployer (0.4.0)
+    ucb_deployer (0.4.5)
       rake (= 0.8.7)
 
 GEM
@@ -25,7 +25,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 1.0.21)
   diff-lcs (>= 1.1.2)
   rcov (>= 0.9.9)
   rspec (= 1.3.0)

data/README.md

@@ -9,8 +9,11 @@ Overview
 
 Deployments done with UCB Deployer will follow the following structure.
 
-The user performing the deployment will manually stop tomcat and then 
-excecute the ucb_deploy command:
+The user performing the deployment should manually stop tomcat 
+
+   sudo service tomcat6-jira stop
+
+and then excecute the ucb_deploy command:
 
     ucb_deploy APP=<jira|confluence> VERSION=<version>
 
@@ -22,11 +25,14 @@ The *ucb_deploy* command will then do the following:
 4. Build the application which results in a war file.
 5. Deploy the war file to tomcat.
 
-The user doing the deployment will then have to manually start tomcat and 
-confirm success.  Once they have confirmed things are ok, they can then
-remove the maintenance file via the command:
+The user doing the deployment will then have to manually start tomcat 
+
+    sudo service tomcat6-jira start
 
-    ucb_deploy remove_maintenance_file APP=<jira|confluence>
+and confirm tomcat started.  Once they have confirmed things are ok, 
+they can then remove the maintenance file via the command:
+
+    ucb_deploy enable_web APP=<jira|confluence>
 
 Woot!
 
@@ -69,23 +75,19 @@ General Configuration
 The following directories and file need to be setup in the **app_relmgt** user's home 
 directory:
 
-    $HOME/config/
-            +
-            |-- jira/
-                   +
-                   |-- deploy.yml
-            |-- confluence/
-                   +
-                   |-- deploy.yml
-
-    $HOME/build/
-            +
-            |-- jira/
-                   +
-                   |-- deploy.yml
-            |-- confluence/
-                   +
-                   |-- deploy.yml
+    $HOME/.ucb_deployer/config/
+                           +
+                           |-- jira/
+                                 +
+                                 |-- deploy.yml
+                           |-- confluence/
+                                    +
+                                    |-- deploy.yml
+
+    $HOME/.ucb_deployer/build/
+                         +
+                         |-- jira/
+                         |-- confluence/
 
 
 #### Configuration Options ####
@@ -96,7 +98,6 @@ directory:
 * **cas_server_url**       : *url of CAS Server*
 * **cas_service_url**      : *url to redirect to after CAS auth succeeds*
 * **data_dir**             : *directory to be used by confluecne or jira for storing local data*
-* **svn_username**         : *username to be used to connect to svn*       
 * **svn_project_url**      : *location of confluence/jira release in svn*
 * **maintenance_file_dir** : *location where maintenance file should be written to*
 
@@ -105,14 +106,13 @@ directory:
 Assuming we had the above directories setup in ($HOME=/home/app_relmgt), the
 deploy.yml file for jira would look like so:
 
-    build_dir: /home/app_relmgt/build
+    build_dir: /home/app_relmgt/.ucb_deployer/build
     deploy_dir: /home/app_jira/tomcat6/webapps
     war_name: ROOT
     cas_server_url: http://cas-server.berkeley.edu
     cas_service_url: https://wikihub.berkeley.edu
     data_dir: /home/app_jira/app_data
-    svn_username: app_relmgt
-    svn_project_url: svn.berkeley.edu/svn/ist-svn/berkeley/projects/ist/as/webapps/jira_archives/tags
+    svn_project_url: svn+ssh://svn@code.berkeley.edu/istas/jira_archives/tags
     maintenance_file_dir: /var/www/html/jira/
     
 

data/lib/ucb_deployer/deployer.rb

@@ -19,7 +19,6 @@ module UcbDeployer
       :svn_project_url,
     ]
     
-    
     attr_accessor *CONFIG_OPTIONS
     attr_accessor :version, :debug_mode
     

data/lib/ucb_deployer/jira_deployer.rb

@@ -2,66 +2,64 @@
 module UcbDeployer
   class JiraDeployer < Deployer
     
-    def initialize(config_file = "#{ENV['HOME']}/config/jira/deploy.yml")
-      debug("Using config file: #{config_file}")
-      
-      load_config(config_file)
+    def initialize(config_file = "#{ENV['HOME']}/.ucb_deployer/config/jira/deploy.yml")
+      self.debug("Using config file: #{config_file}")
+      self.load_config(config_file)
     end
     
     def export()
-      info("Exporting from: #{svn_project_url}/jira-#{version}")
+      self.info("Exporting from: #{self.svn_project_url()}/jira-#{self.version()}")
       
-      Dir.chdir("#{build_dir}") do
-        FileUtils.rm_rf("#{build_dir}/src")
-        `svn export #{svn_project_url}/jira-#{version}`
-        FileUtils.mv("jira-#{version}", "src")
+      Dir.chdir("#{self.build_dir()}") do
+        FileUtils.rm_rf("#{self.build_dir()}/src")
+        `svn export #{self.svn_project_url()}/jira-#{self.version()}`
+        FileUtils.mv("jira-#{self.version()}", "src")
       end
     end
     
     def configure()
-      info("Configuring application.")
-      config_web_xml()
-      config_seraph_config_xml()
-      config_entityengine_xml()
-      config_jira_application_properties()
-      config_ist_banner()      
-      reshuffle_jars()
+      self.info("Configuring application.")
+      self.config_web_xml()
+      self.config_seraph_config_xml()
+      self.config_entityengine_xml()
+      self.config_jira_application_properties()
+      self.config_ist_banner()
+      self.reshuffle_jars()
     end
 
     def build()
-      info("Building application.")
-      
-      Dir.chdir("#{build_dir}/src") do
-        `sh #{build_dir}/src/build.sh`
-      end
+      self.info("Building application.")
+      Dir.chdir("#{self.build_dir()}/src") { `sh #{self.build_dir()}/src/build.sh` }
     end
 
     def deploy()
-      info("Deploying application.")
+      self.info("Deploying application.")
       
-      if File.exists?("#{deploy_dir}/#{war_name}")
-        FileUtils.rm_rf(Dir["#{deploy_dir}/#{war_name}"])
+      if File.exists?("#{self.deploy_dir()}/#{self.war_name()}")
+        FileUtils.rm_rf(Dir["#{self.deploy_dir()}/#{self.war_name()}"])
       end
 
-      FileUtils.mkdir("#{deploy_dir}/#{war_name}")
-      `mv #{build_dir}/src/dist-tomcat/atlassian-jira-*.war #{deploy_dir}/#{war_name}/#{war_name}.war`
-      `cd #{deploy_dir}/#{war_name}/ && jar -xvf #{war_name}.war`
-      `rm #{deploy_dir}/#{war_name}/#{war_name}.war`
+      FileUtils.mkdir("#{self.deploy_dir()}/#{self.war_name()}")
+      `mv #{self.build_dir()}/src/dist-tomcat/atlassian-jira-*.war #{self.deploy_dir()}/#{self.war_name()}/#{self.war_name()}.war`
+      `cd #{self.deploy_dir()}/#{self.war_name()}/ && jar -xvf #{self.war_name()}.war`
+      `rm #{self.deploy_dir()}/#{self.war_name()}/#{self.war_name()}.war`
     end
 
     def rollback()
     end
 
+
+  protected
+
     def cas_logout_url()
       "/casLogout.action"
     end
-    
-    
+
     ##
     # Shortcut to jira web.xml file
     #
     def web_xml()
-      "#{build_dir}/src/webapp/WEB-INF/web.xml"
+      "#{self.build_dir()}/src/webapp/WEB-INF/web.xml"
     end
     
     def web_xml_token()
@@ -73,18 +71,16 @@ module UcbDeployer
     # authentication configuration
     #
     def config_web_xml()
-      web_xml = File.readlines(self.web_xml)
-      
-      web_xml = web_xml.map do |line|
+      web_xml = File.readlines(self.web_xml()).map do |line|
         if line =~ /#{web_xml_token}/
-          template = File.open("#{DEPLOYER_HOME}/resources/jira_cas_web.xml") { |f| f.read }
+          template = File.open("#{DEPLOYER_HOME}/resources/jira_cas_web.xml") { |f| f.read() }
           line + ERB.new(template).result(self.send(:binding))
         else
           line
         end
       end
       
-      File.open(self.web_xml, "w") do |io|
+      File.open(self.web_xml(), "w") do |io|
         web_xml.each { |line| io.puts(line) }
       end      
     end
@@ -93,7 +89,7 @@ module UcbDeployer
     # Shortcut to jira entityengine.xml file
     #
     def entityengine_xml()
-      "#{build_dir}/src/edit-webapp/WEB-INF/classes/entityengine.xml"
+      "#{self.build_dir()}/src/edit-webapp/WEB-INF/classes/entityengine.xml"
     end
     
     def entityengine_xml_db_token()
@@ -116,25 +112,23 @@ module UcbDeployer
     # 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_db_token)})/.match(line)
-          debug(m[0])
+      ee_xml = File.readlines(self.entityengine_xml()).map do |line|
+        if m = /(#{Regexp.quote(self.entityengine_xml_db_token())})/.match(line)
+          self.debug(m[0])
           new_str = "#{m.pre_match}#{entityengine_db}#{m.post_match}"
-          debug(new_str)
+          self.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)
+        elsif m = /(#{Regexp.quote(self.entityengine_xml_schema_token())})/.match(line)
+          self.debug(m[0])
+          new_str = "#{m.pre_match}#{self.entityengine_schema()}#{m.post_match}"
+          self.debug(new_str)
           new_str
         else
           line
         end
       end
       
-      File.open(self.entityengine_xml, "w") do |io|
+      File.open(self.entityengine_xml(), "w") do |io|
         ee_xml.each { |line| io.puts(line) }
       end
     end
@@ -143,7 +137,7 @@ module UcbDeployer
     # Shortcut to jira seraph-config.xml file
     #
     def seraph_config_xml()
-      "#{build_dir}/src/webapp/WEB-INF/classes/seraph-config.xml"
+      "#{self.build_dir()}/src/webapp/WEB-INF/classes/seraph-config.xml"
     end
     
     def seraph_config_xml_auth_class_token()
@@ -163,25 +157,23 @@ module UcbDeployer
     # authenticator.
     #
     def config_seraph_config_xml()
-      seraph_xml = File.readlines(self.seraph_config_xml)
-      
-      seraph_xml = seraph_xml.map do |line|
-        if m = /(#{Regexp.quote(seraph_config_xml_auth_class_token)})/.match(line)
-          debug(m[0])
-          new_str = "#{m.pre_match}#{cas_authenticator_class}#{m.post_match}"
-          debug(new_str)
+      seraph_xml = File.readlines(self.seraph_config_xml()).map do |line|
+        if m = /(#{Regexp.quote(self.seraph_config_xml_auth_class_token())})/.match(line)
+          self.debug(m[0])
+          new_str = "#{m.pre_match}#{self.cas_authenticator_class()}#{m.post_match}"
+          self.debug(new_str)
           new_str
-        elsif m = /(#{Regexp.quote(seraph_config_xml_logout_url_token)})/.match(line)
-          debug(m[0])
-          new_str = "#{m.pre_match}#{cas_server_url}/logout#{m.post_match}"
-          debug(new_str)
+        elsif m = /(#{Regexp.quote(self.seraph_config_xml_logout_url_token())})/.match(line)
+          self.debug(m[0])
+          new_str = "#{m.pre_match}#{self.cas_server_url()}/logout#{m.post_match}"
+          self.debug(new_str)
           new_str
         else
           line
         end
       end
       
-      File.open(self.seraph_config_xml, "w") do |io|
+      File.open(self.seraph_config_xml(), "w") do |io|
         seraph_xml.each { |line| io.puts(line) }
       end
     end
@@ -190,7 +182,7 @@ module UcbDeployer
     # Shortcut to jira-application.properties file
     #
     def jira_application_properties()
-      "#{build_dir}/src/edit-webapp/WEB-INF/classes/jira-application.properties"
+      "#{self.build_dir()}/src/edit-webapp/WEB-INF/classes/jira-application.properties"
     end
     
     def jira_home_token()
@@ -201,18 +193,18 @@ module UcbDeployer
     # Sets the jira.home property in the file: jira-application.properties.
     #
     def config_jira_application_properties()
-      jira_props = File.readlines(self.jira_application_properties).map do |line|
+      jira_props = File.readlines(self.jira_application_properties()).map do |line|
         if m = /(#{Regexp.quote(jira_home_token)})/.match(line)
-          debug(m[0])
-          new_str = "#{jira_home_token} #{data_dir}"
-          debug(new_str)
+          self.debug(m[0])
+          new_str = "#{self.jira_home_token()} #{self.data_dir()}"
+          self.debug(new_str)
           new_str
         else
           line
         end
       end
       
-      File.open(self.jira_application_properties, "w") do |io|
+      File.open(self.jira_application_properties(), "w") do |io|
         jira_props.each { |line| io.puts(line) }
       end
     end
@@ -222,7 +214,7 @@ module UcbDeployer
     #
     def config_ist_banner()
       FileUtils.cp("#{UcbDeployer::RESOURCES_DIR}/ist_banner.jpg",
-                   "#{build_dir}/src/webapp/images/")      
+                   "#{self.build_dir()}/src/webapp/images/")
     end
     
     ##
@@ -230,12 +222,12 @@ module UcbDeployer
     # level to avoid conflicts.
     #
     def reshuffle_jars()
-      FileUtils.mkdir_p("#{build_dir}/src/edit-webapp/WEB-INF/lib/")
+      FileUtils.mkdir_p("#{self.build_dir()}/src/edit-webapp/WEB-INF/lib/")
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
-                   "#{build_dir}/src/edit-webapp/WEB-INF/lib/")
+                   "#{self.build_dir()}/src/edit-webapp/WEB-INF/lib/")
       # These have been placed in $CATALINA_HOME/lib
       ["mail", "activation", "javamail", "commons-logging", "log4j"].each do |jar|
-        FileUtils.rm_rf(Dir["#{build_dir}/src/webapp/WEB-INF/lib/#{jar}-*"])
+        FileUtils.rm_rf(Dir["#{self.build_dir()}/src/webapp/WEB-INF/lib/#{jar}-*"])
       end
     end
 

data/lib/ucb_deployer/version.rb

@@ -1,3 +1,3 @@
 module UcbDeployer
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -175,18 +175,18 @@ signing_key:
 specification_version: 3
 summary: Tool for deploying Confluence and JIRA war files to tomcat
 test_files: 
+- spec/fixtures/confluence/web.xml
 - spec/fixtures/confluence/bad_deploy.yml
-- spec/fixtures/confluence/confluence-init.properties
 - spec/fixtures/confluence/deploy.yml
 - spec/fixtures/confluence/seraph-config.xml
-- spec/fixtures/confluence/web.xml
+- spec/fixtures/confluence/confluence-init.properties
+- spec/fixtures/jira/web.xml
 - spec/fixtures/jira/bad_deploy.yml
 - spec/fixtures/jira/deploy.yml
-- spec/fixtures/jira/entityengine.xml
 - spec/fixtures/jira/jira-application.properties
 - spec/fixtures/jira/seraph-config.xml
-- spec/fixtures/jira/web.xml
-- spec/spec_helper.rb
-- spec/ucb_deployer/confluence_deployer_spec.rb
-- spec/ucb_deployer/jira_deployer_spec.rb
+- spec/fixtures/jira/entityengine.xml
 - spec/ucb_deployer/ucb_deployer_spec.rb
+- spec/ucb_deployer/jira_deployer_spec.rb
+- spec/ucb_deployer/confluence_deployer_spec.rb
+- spec/spec_helper.rb