ucb_deployer 0.0.1 → 0.0.2

data/spec/spec_helper.rb

@@ -4,7 +4,8 @@ require 'spec'
 require 'pp'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-require 'confluence_deployer'
+require 'ucb_deployer'
+
 
 TEST_BUILD_DIR = File.expand_path(File.dirname(__FILE__) + "/build") unless defined?(TEST_BUILD_DIR)
   
@@ -12,19 +13,20 @@ Spec::Runner.configure do |config|
   config.before(:all) do
     dir = TEST_BUILD_DIR
     pwd = File.expand_path(File.dirname(__FILE__))
-    FileUtils.mkdir_p("#{dir}/confluence/lib")
-    FileUtils.touch("#{dir}/confluence/lib/soulwing-casclient-x.x.x.jar")
     
+    FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/classes")
     FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/lib")
-    FileUtils.touch("#{dir}/confluence/src/confluence/WEB-INF/lib/postgresql-x.x.x.jar")
     
-    FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/classes")
-    FileUtils.cp("#{pwd}/fixtures/web.xml", "#{dir}/confluence/src/confluence/WEB-INF")
-    FileUtils.cp("#{pwd}/fixtures/seraph-config.xml", "#{dir}/confluence/src/confluence/WEB-INF/classes")
-    FileUtils.cp("#{pwd}/fixtures/confluence-init.properties", "#{dir}/confluence/src/confluence/WEB-INF/classes")
+    FileUtils.cp("#{pwd}/fixtures/confluence/web.xml",
+                 "#{dir}/confluence/src/confluence/WEB-INF")
+    FileUtils.cp("#{pwd}/fixtures/confluence/seraph-config.xml",
+                 "#{dir}/confluence/src/confluence/WEB-INF/classes")
+    FileUtils.cp("#{pwd}/fixtures/confluence/confluence-init.properties",
+                 "#{dir}/confluence/src/confluence/WEB-INF/classes")
   end
   
   config.after(:all) do
-    # FileUtils.rm_rf(TEST_BUILD_DIR)
+    FileUtils.rm_rf("#{TEST_BUILD_DIR}/confluence")
+    FileUtils.rm_rf("#{TEST_BUILD_DIR}/jira")    
   end
 end

data/spec/{confluence_deployer → ucb_deployer}/confluence_deployer_spec.rb

@@ -1,30 +1,34 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe ConfluenceDeployer do
+describe UcbDeployer::ConfluenceDeployer do
+  
   before(:each) do
-    @cdeprc_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/dot_cdeprc')
-    @bad_cdeprc_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/bad_dot_cdeprc')    
-    @cdep = ConfluenceDeployer.new(@cdeprc_file)
+    @deploy_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/confluence/deploy.yml')
+    @bad_deploy_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/confluence/bad_deploy.yml')    
+    @cdep = UcbDeployer::ConfluenceDeployer.new(@deploy_file)
   end
   
+  def test_build_dir
+    "#{TEST_BUILD_DIR}/confluence"
+  end
   
   describe "#load_config" do
     it "should load configuration options" do
-      @cdep.build_dir.should == "/path/to/build_dir"
+      @cdep.build_dir.should == "/path/to/build_dir/confluence"
       @cdep.deploy_dir.should == "/path/to/deploy_dir"
       @cdep.war_name.should == "war_name"
       @cdep.svn_project_url.should == "svn.berkeley.edu/svn/ist-svn/berkeley/projects/ist/as/webapps/confluence_archives/tags"
     end
 
     it "should raise error for invalid config options" do
-      lambda { @cdep.load_config(@bad_cdeprc_file) }.should raise_error(ConfluenceDeployer::ConfigError)
+      lambda { @cdep.load_config(@bad_deploy_file) }.should raise_error(UcbDeployer::ConfigError)
     end
   end
   
   
   describe "#config_web_xml" do
     it "should configure souldwing (CAS auth) in web.xml" do
-      @cdep.build_dir = TEST_BUILD_DIR
+      @cdep.build_dir = test_build_dir
       # just checking if spec_helper did the right
       File.exists?(@cdep.web_xml).should be_true
 
@@ -42,7 +46,7 @@ describe ConfluenceDeployer do
   
   describe "#config_seraph_config_xml" do
     it "should configure the soulwing (CAS) authenticator in seraph_config.xml" do
-      @cdep.build_dir = TEST_BUILD_DIR
+      @cdep.build_dir = test_build_dir
       # just checking if spec_helper did the right
       File.exists?(@cdep.seraph_config_xml).should be_true
 
@@ -58,32 +62,32 @@ describe ConfluenceDeployer do
 
   describe "#config_confluence_init_props" do
     it "should configure confluence-init.properties" do
-      @cdep.build_dir = TEST_BUILD_DIR
+      @cdep.build_dir = test_build_dir
       # just checking if spec_helper did the right
       File.exists?(@cdep.confluence_init_properties).should be_true
 
       @cdep.config_confluence_init_properties
       File.exists?(@cdep.confluence_init_properties).should be_true
       lines = File.readlines(@cdep.confluence_init_properties)
-      lines.any? { |l| l =~ /confluence.home=#{@cdep.confluence_home_dir}/ }.should be_true
+      lines.any? { |l| l =~ /confluence.home=#{@cdep.data_dir}/ }.should be_true
     end
   end
   
   
   describe "#reshuffle_jars" do
     it "should work" do
-      @cdep.build_dir = TEST_BUILD_DIR
+      @cdep.build_dir = test_build_dir
       @cdep.reshuffle_jars
-      Dir["#{@cdep.build_dir}/confluence/src/confluence/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
-      Dir["#{@cdep.build_dir}/confluence/src/confluence/WEB-INF/lib/postgresql-*"].should be_empty      
+      Dir["#{@cdep.build_dir}/src/confluence/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
+      Dir["#{@cdep.build_dir}/src/confluence/WEB-INF/lib/postgresql-*"].should be_empty      
     end
   end
 
   
   describe "#build" do
     it "should work" do
-      @cdep.build_dir = TEST_BUILD_DIR
-      @cdep.should_receive(:exec).with("sh #{@cdep.build_dir}/confluence/src/build.sh")
+      @cdep.build_dir = test_build_dir
+      @cdep.should_receive(:exec).with("sh #{@cdep.build_dir}/src/build.sh")
       @cdep.build
     end
   end
@@ -91,8 +95,8 @@ describe ConfluenceDeployer do
 
   describe "#export" do
     it "should work" do
-      cdep = ConfluenceDeployer.new(@cdeprc_file)
-      cdep.build_dir = TEST_BUILD_DIR
+      cdep = UcbDeployer::ConfluenceDeployer.new(@deploy_file)
+      cdep.build_dir = test_build_dir
       cdep.version = "3.2.1_01"
       arg = "svn export svn+ssh://#{cdep.svn_username}@#{cdep.svn_project_url}/confluence-#{cdep.version}"
       cdep.should_receive("`").with(arg).and_return(nil)

data/ucb_deployer.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ucb_deployer}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Hansen"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2010-10-22}
   s.default_executable = %q{deployer}
   s.description = %q{Tool for deploying java applications}
   s.email = %q{runner@berkeley.edu}
   s.executables = ["deployer"]
-  s.extra_rdoc_files = ["README.txt", "lib/confluence_deployer.rb"]
-  s.files = ["README.txt", "Rakefile", "bin/deployer", "cas_web.xml", "lib/confluence_deployer.rb", "spec/build/confluence/lib/soulwing-casclient-x.x.x.jar", "spec/build/confluence/src/confluence/WEB-INF/classes/confluence-init.properties", "spec/build/confluence/src/confluence/WEB-INF/classes/seraph-config.xml", "spec/build/confluence/src/confluence/WEB-INF/lib/postgresql-x.x.x.jar", "spec/build/confluence/src/confluence/WEB-INF/lib/soulwing-casclient-x.x.x.jar", "spec/build/confluence/src/confluence/WEB-INF/web.xml", "spec/confluence_deployer/confluence_deployer_spec.rb", "spec/fixtures/bad_dot_cdeprc", "spec/fixtures/confluence-init.properties", "spec/fixtures/dot_cdeprc", "spec/fixtures/seraph-config.xml", "spec/fixtures/web.xml", "spec/spec_helper.rb", "Manifest", "ucb_deployer.gemspec"]
+  s.extra_rdoc_files = ["README.txt", "lib/ucb_deployer.rb", "lib/ucb_deployer/confluence_deployer.rb", "lib/ucb_deployer/deployer.rb", "lib/ucb_deployer/jira_deployer.rb"]
+  s.files = ["Manifest", "README.txt", "Rakefile", "TODO.txt", "bin/deployer", "lib/ucb_deployer.rb", "lib/ucb_deployer/confluence_deployer.rb", "lib/ucb_deployer/deployer.rb", "lib/ucb_deployer/jira_deployer.rb", "resources/confluence_cas_web.xml", "resources/jdom.jar", "resources/jira_cas_web.xml", "resources/soulwing-casclient-0.5.3.jar", "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/jira/web.xml", "spec/spec_helper.rb", "spec/ucb_deployer/confluence_deployer_spec.rb", "spec/ucb_deployer/jira_deployer_spec.rb", "spec/ucb_deployer/ucb_deployer_spec.rb", "ucb_deployer.gemspec"]
   s.homepage = %q{http://ucbrb.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ucb_deployer", "--main", "README.txt"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,27 +27,34 @@ extensions: []
 
 extra_rdoc_files: 
 - README.txt
-- lib/confluence_deployer.rb
+- lib/ucb_deployer.rb
+- lib/ucb_deployer/confluence_deployer.rb
+- lib/ucb_deployer/deployer.rb
+- lib/ucb_deployer/jira_deployer.rb
 files: 
+- Manifest
 - README.txt
 - Rakefile
+- TODO.txt
 - bin/deployer
-- cas_web.xml
-- lib/confluence_deployer.rb
-- spec/build/confluence/lib/soulwing-casclient-x.x.x.jar
-- spec/build/confluence/src/confluence/WEB-INF/classes/confluence-init.properties
-- spec/build/confluence/src/confluence/WEB-INF/classes/seraph-config.xml
-- spec/build/confluence/src/confluence/WEB-INF/lib/postgresql-x.x.x.jar
-- spec/build/confluence/src/confluence/WEB-INF/lib/soulwing-casclient-x.x.x.jar
-- spec/build/confluence/src/confluence/WEB-INF/web.xml
-- spec/confluence_deployer/confluence_deployer_spec.rb
-- spec/fixtures/bad_dot_cdeprc
-- spec/fixtures/confluence-init.properties
-- spec/fixtures/dot_cdeprc
-- spec/fixtures/seraph-config.xml
-- spec/fixtures/web.xml
+- lib/ucb_deployer.rb
+- lib/ucb_deployer/confluence_deployer.rb
+- lib/ucb_deployer/deployer.rb
+- lib/ucb_deployer/jira_deployer.rb
+- resources/confluence_cas_web.xml
+- resources/jdom.jar
+- resources/jira_cas_web.xml
+- resources/soulwing-casclient-0.5.3.jar
+- 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/jira/web.xml
 - spec/spec_helper.rb
-- Manifest
+- spec/ucb_deployer/confluence_deployer_spec.rb
+- spec/ucb_deployer/jira_deployer_spec.rb
+- spec/ucb_deployer/ucb_deployer_spec.rb
 - ucb_deployer.gemspec
 has_rdoc: true
 homepage: http://ucbrb.rubyforge.org

data/lib/confluence_deployer.rb

@@ -1,228 +0,0 @@
-require 'yaml'
-require 'net/http'
-require 'erb'
-
-class ConfluenceDeployer
-  class ConfigError < RuntimeError; end
-  
-  DEPLOYER_HOME = File.expand_path(File.dirname(__FILE__) + '/..') unless defined?(DEPLOYER_HOME)
-  CONFIG_OPTIONS = [
-    :build_dir,
-    :deploy_dir,
-    :war_name,
-    :cas_service_url,
-    :cas_server_url,
-    :confluence_home_dir,
-    :svn_username,                  
-    :svn_project_url,
-   ]
-  
-  attr_accessor *CONFIG_OPTIONS
-  attr_accessor :version, :debug_mode
-  
-  def initialize(config_file = "~/cdeprc")
-    FileUtils.touch(config_file) if !File.exists?(config_file)
-    load_config(config_file)
-  end
-  
-  ##
-  # Configuration options are:
-  #
-  # +build_dir+
-  # +deploy_dir+
-  # +war_name+
-  # +svn_project_url+
-  # +svn_username+
-  # +cas_service_url+
-  # +cas_server_url+
-  # +confluence_home_dir+  
-  #
-  def load_config(config_file)
-    hash = YAML.load_file(config_file)
-    hash.each do |k, v|
-      CONFIG_OPTIONS.include?(k.to_sym) ? self.send("#{k}=", v) : raise(ConfigError, "Unrecognized Option: #{k}")
-    end
-  end
-  
-  def export()
-    debug("Exporting from: #{svn_project_url}")
-    pwd = Dir.getwd
-    Dir.chdir("#{build_dir}/confluence")
-    `svn export svn+ssh://#{svn_username}@#{svn_project_url}/confluence-#{version}`
-    FileUtils.mv("confluence-#{version}", "src")
-    Dir.chdir(pwd)
-    $stdout.puts("Export Completed")
-  end
-  
-  def configure
-    config_web_xml
-    config_seraph_config_xml
-    config_confluence_init_properties
-    reshuffle_jars
-  end
-
-  def build
-    exec("sh #{build_dir}/confluence/src/build.sh")
-  end
-
-  def deploy
-    display_maintenance_file
-    FileUtils.rm_rf(Dir["#{deploy_dir}/#{war_name}*"])
-    FileUtils.mkdir("#{deploy_dir}/#{war_name}")    
-    FileUtils.cp(Dir["#{build_dir}/confluence/src/dist/*.war"], "#{deploy_dir}/#{war_name}")
-    exec("jar -xvf #{deploy_dir}/#{war_name}/#{war_name}.war")
-    FileUtils.rm("#{deploy_dir}/#{war_name}/#{war_name}.war")
-  end
-
-  def rollback
-  end
-
-  def svn_username
-    @svn_username || "app_relmgt"
-  end
-  
-  def svn_base_url
-    @svn_base_url || "svn.berkeley.edu/svn/ist-svn/berkeley/projects/ist/as/webapps/confluence_archives"
-  end
-  
-  ##
-  # Shortcut to confluence web.xml file
-  #
-  def web_xml()
-    "#{build_dir}/confluence/src/confluence/WEB-INF/web.xml"
-  end
-  
-  ##
-  # Shortcut to confluence seraph-config.xml file
-  #
-  def seraph_config_xml()
-    "#{build_dir}/confluence/src/confluence/WEB-INF/classes/seraph-config.xml"
-  end
-  
-  ##
-  # Shortcut to confluence confluence-init.properties file
-  #
-  def confluence_init_properties()
-    "#{build_dir}/confluence/src/confluence/WEB-INF/classes/confluence-init.properties"
-  end
-  
-  def web_xml_token()
-    "<!-- Uncomment the following to disable the space export long running task. -->"
-  end
-  
-  def seraph_config_xml_token()
-    "com.atlassian.confluence.user.ConfluenceAuthenticator"
-  end
-  
-  def cas_authenticator_class()
-    "org.soulwing.cas.apps.atlassian.ConfluenceCasAuthenticator"
-  end
-  
-  ##
-  # Updates the confluence web.xml file with the soulwing (CAS library)
-  # authentication configuration
-  #
-  def config_web_xml()
-    web_xml = File.readlines(self.web_xml)
-    
-    web_xml = web_xml.map do |line|
-      if line =~ /#{web_xml_token}/
-        template = File.open("#{DEPLOYER_HOME}/cas_web.xml") { |f| f.read }
-        ERB.new(template).result(self.send(:binding))
-      else
-        line
-      end
-    end
-    
-    File.open(self.web_xml, "w") do |io|
-      web_xml.each { |line| io.puts(line) }
-    end
-  end
-
-  ##
-  # Updates the confluence seraph_config.xml file with the soulwing
-  # 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_token)})/.match(line)
-        puts m[0]
-        puts "#{m.pre_match}#{cas_authenticator_class}#{m.post_match}"
-        "#{m.pre_match}#{cas_authenticator_class}#{m.post_match}"
-      else
-        line
-      end
-    end
-    
-    File.open(self.seraph_config_xml, "w") do |io|
-      seraph_xml.each { |line| io.puts(line) }
-    end
-  end
-  
-  ##
-  # Sets the confluence.home property in the file: confluence-init.properties
-  #
-  def config_confluence_init_properties()
-    File.open(self.confluence_init_properties, "w") { |io| io.puts("confluence.home=#{confluence_home_dir}") }
-  end
-
-  def reshuffle_jars()
-    FileUtils.cp(Dir["#{build_dir}/confluence/lib/soulwing-casclient-*"],
-                 "#{build_dir}/confluence/src/confluence/WEB-INF/lib")
-    FileUtils.rm_rf(Dir["#{build_dir}/confluence/src/confluence/WEB-INF/lib/postgresql-*"])
-  end
-
-  def debug(str)
-    if debug_mode
-      $stdout.puts(str)
-    end
-  end
-
-  def display_maintenance_file()
-    maint_start = Time.now.strftime("%m-%d-%Y %H:%M:%S")
-    template = ERB.new(maintenance_template)
-    File.open("/var/www/html/confluence/maintenance.html", "w") do |f|
-      f.puts template.result(binding)
-    end
-  end
-
-  def maintenance_template()
-    %q{
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-  <title>Site Maintenance<title>
-  <style type="text/css">
-  body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-  div.dialog {
-  width: 35em;
-  padding: 0 3em;
-  margin: 3em auto 0 auto;
-  border: 1px solid #ccc;
-  border-right-color: #999;
-  border-bottom-color: #999;
-  }
-  h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
-  </style>
-</head>
-
-<body>
-  <div class="dialog">
-    <h1>Site Maintenance</h1>
-    <p>
-        The site is down for maintenance as of: <strong><%= maint_start %></strong> <br/>
-        it should be available shortly.
-    </p>
-  </div>
-</body>
-</html>
-}
-  end
-  
-end

data/spec/fixtures/confluence-init.properties

@@ -1,41 +0,0 @@
-# This file allows you to set the directory for Confluence to store its configuration files.
-#
-###########################
-# Note for Windows Users  #
-###########################
-#
-# Each backslash in your path must be written as a forward slash.
-# - For example:
-# c:\confluence\data
-#
-# should be written as:
-#
-# c:/confluence/data
-
-###########################
-# Note for Unix Users     #
-###########################
-# - For example:
-# confluence.home=/var/confluence
-#
-# NOTE: If the path of your confluence.home directory contains symlinks,
-# please set confluence.home to the absolute path, otherwise problems may occur.
-# - For example:
-# confluence.home=/data/confluence/ (where /data is a symlink to -> /var/data/)
-# should be written as:
-# confluence.home=/var/data/confluence/
-
-###########################
-# Configuration Directory #
-###########################
-
-# specify your directory below (don't forget to remove the '#' in front)
-
-# confluence.home=c:/confluence/data
-
-###########################
-# Daily Backups Directory #
-###########################
-
-## Set this to true to enable setting of the daily backups directory in the admin section.
-#confluence.backup.path.set.allowed=false

data/spec/fixtures/seraph-config.xml

@@ -1,46 +0,0 @@
-<security-config>
-    <parameters>
-        <init-param>
-            <param-name>login.url</param-name>
-            <param-value>/login.action?os_destination=${originalurl}</param-value>
-        </init-param>
-        <init-param>
-            <param-name>link.login.url</param-name>
-            <param-value>/login.action</param-value>
-        </init-param>
-        <init-param>
-            <param-name>cookie.encoding</param-name>
-            <param-value>cNf</param-value>
-        </init-param>
-        <init-param>
-            <param-name>login.cookie.key</param-name>
-            <param-value>seraph.confluence</param-value>
-        </init-param>
-
-        <!--only basic authentication available-->
-        <init-param>
-            <param-name>authentication.type</param-name>
-            <param-value>os_authType</param-value>
-        </init-param>
-    </parameters>
-
-    <rolemapper class="com.atlassian.confluence.security.ConfluenceRoleMapper"/>
-    <controller class="com.atlassian.confluence.setup.seraph.ConfluenceSecurityController"/>
-    <authenticator class="com.atlassian.confluence.user.ConfluenceAuthenticator"/>
-
-    <services>
-        <service class="com.atlassian.seraph.service.PathService">
-            <init-param>
-                <param-name>config.file</param-name>
-                <param-value>seraph-paths.xml</param-value>
-            </init-param>
-        </service>
-    </services>
-
-    <elevatedsecurityguard class="com.atlassian.confluence.security.seraph.ConfluenceElevatedSecurityGuard"/>
-
-    <interceptors>
-        <interceptor name="session-invalidator" class="com.atlassian.confluence.security.seraph.SessionInvalidatingLoginInterceptor"/>        
-        <interceptor name="login-logger" class="com.atlassian.confluence.user.ConfluenceLoginInterceptor"/>
-    </interceptors>
-</security-config>