ucb_deployer 0.4.5 → 1.0.0

data/{.svnignore → .gitignore}

@@ -1,8 +1,10 @@
+work.txt
+ucb_deployer.iml
 spec/build
 Manifest
 pkg
 .yardoc
 .rvmrc
 .idea
-work.txt
-ucb_deployer.iml
+ucb_deployer_git.iml
+*.log

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ucb_deployer (0.4.5)
+    ucb_deployer (1.0.0)
       rake (= 0.8.7)
 
 GEM

data/lib/ucb_deployer/jira_deployer.rb

@@ -49,7 +49,6 @@ module UcbDeployer
     end
 
 
-  protected
 
     def cas_logout_url()
       "/casLogout.action"
@@ -141,7 +140,8 @@ module UcbDeployer
     end
     
     def seraph_config_xml_auth_class_token()
-      "com.atlassian.jira.security.login.JiraOsUserAuthenticator"
+      "com.atlassian.jira.security.login.JiraSeraphAuthenticator"
+      # "com.atlassian.jira.security.login.JiraOsUserAuthenticator"
     end
     
     def seraph_config_xml_logout_url_token()
@@ -188,7 +188,11 @@ module UcbDeployer
     def jira_home_token()
       "jira.home ="
     end
-    
+
+    def jira_projectkey_token()
+      "jira.projectkey.pattern ="
+    end
+
     ##
     # Sets the jira.home property in the file: jira-application.properties.
     #
@@ -199,6 +203,11 @@ module UcbDeployer
           new_str = "#{self.jira_home_token()} #{self.data_dir()}"
           self.debug(new_str)
           new_str
+        elsif m = /(#{Regexp.quote(jira_projectkey_token)})/.match(line)
+          self.debug(m[0])
+          new_str = "#{self.jira_projectkey_token()} ([A-Z][A-Z0-9]+)"
+          self.debug(new_str)
+          new_str
         else
           line
         end
@@ -226,8 +235,8 @@ module UcbDeployer
       FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
                    "#{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["#{self.build_dir()}/src/webapp/WEB-INF/lib/#{jar}-*"])
+      ["mail", "activation", "javamail", "commons-logging", "log4j"].each do |jar_file|
+        FileUtils.rm_rf(Dir["#{self.build_dir()}/src/webapp/WEB-INF/lib/#{jar_file}-*"])
       end
     end
 

data/lib/ucb_deployer/version.rb

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

data/spec/fixtures/confluence/deploy.yml

@@ -1,7 +1,6 @@
 build_dir: /path/to/build_dir/confluence
 deploy_dir: /path/to/deploy_dir
 war_name: war_name
-svn_username: runner
-svn_project_url: svn.berkeley.edu/svn/ist-svn/berkeley/projects/ist/as/webapps/confluence_archives/tags
+svn_project_url: svn+ssh://svn@code-qa.berkeley.edu/istas/confluence_archives/tags
 cas_server_url: https://auth.berkeley.edu/cas
 cas_service_url: https://wikihub.berkeley.edu

data/spec/fixtures/jira/deploy.yml

@@ -1,8 +1,7 @@
 build_dir: /path/to/build_dir/jira
 deploy_dir: /path/to/deploy_dir
 war_name: war_name
-svn_username: runner
-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
 cas_server_url: https://auth.berkeley.edu/cas
 cas_service_url: https://wikihub.berkeley.edu
 data_dir: /path/to/data_dir

data/spec/fixtures/jira/jira-application.properties

@@ -15,7 +15,7 @@
 #
 # You can also use Unix-like paths which Java/JIRA can handle, eg c:/jira/home
 #
-jira.home =
+jira.home = 
 
 ########################################################################################################################
 #
@@ -314,7 +314,7 @@ jira.table.cols.linkedissue = issuetype, issuekey, summary, status, priority
 
 
 #-----------------------------------------------------------------------------------------------------------------------
-# Sub-Tasks
+# Subtasks
 #-----------------------------------------------------------------------------------------------------------------------
 
 # The columns to show when viewing sub-task issues in a table  (ie. the 'Sub-Tasks' section on the 'View Issue' page).
@@ -802,6 +802,9 @@ jira.search.fullcontentview.pagebreaks = true
 #jira.i18n.sql.collator.strength = IDENTICAL
 
 #-----------------------------------------------------------------------------------------------------------------------
+#
+# This property specifies whether JIRA should embed i18n key meta-data when rendering pages.
+jira.i18n.include.meta-data=true
 
 # Specified the 'wait time' for a file lock in the Lucene IssueIndexManager (in milliseconds)
 # This value should only be modified if you are seeing a jira.issue.index.DefaultIndexManager 'Giving up reindex' ERROR
@@ -844,6 +847,15 @@ jira.index.interactive.mergefactor = 4
 jira.index.interactive.maxmergedocs = 2147483647
 jira.index.interactive.maxbuffereddocs = 300
 
+#-----------------------------------------------------------------------------------------------------------------------
+# Websudo settings - Temporary Administrative Access
+#-----------------------------------------------------------------------------------------------------------------------
+
+# Is websudo disabled
+jira.websudo.is.disabled = false
+# How long will a websudo session last in minutes
+jira.websudo.timeout = 10
+
 
 ########################################################################################################################
 #

data/spec/fixtures/jira/seraph-config.xml

@@ -11,7 +11,7 @@
                 This gives SSO login pages the chance to redirect to the original page
             -->
             <param-name>login.url</param-name>
-            <param-value>/login.jsp?os_destination=${originalurl}</param-value>
+            <param-value>/login.jsp?permissionViolation=true&amp;os_destination=${originalurl}</param-value>
             <!--<param-value>http://sso.mycompany.com/login?redirectTo=${originalurl}</param-value>-->
         </init-param>
         <init-param>
@@ -67,18 +67,18 @@
         </init-param>
         <init-param>
             <param-name>invalidate.session.exclude.list</param-name>
-            <param-value>ASESSIONID</param-value>
+            <param-value>ASESSIONID,jira.websudo.timestamp</param-value>
         </init-param>
     </parameters>
 
-    <!-- CROWD:START - If enabling Crowd SSO integration uncomment the following JIRAAuthenticator and comment out the DefaultAuthenticator below -->
+    <!-- CROWD:START - If enabling Crowd SSO integration uncomment the following SSOSeraphAuthenticator and comment out the JiraSeraphAuthenticator below -->
     <!--
-    <authenticator class="com.atlassian.crowd.integration.seraph.v22.JIRAAuthenticator"/>
+    <authenticator class="com.atlassian.jira.security.login.SSOSeraphAuthenticator"/>
     -->
     <!-- CROWD:END -->
 
     <!-- CROWD:START - The authenticator below here will need to be commented out for Crowd SSO integration -->
-    <authenticator class="com.atlassian.jira.security.login.JiraOsUserAuthenticator"/>
+    <authenticator class="com.atlassian.jira.security.login.JiraSeraphAuthenticator"/>
     <!-- CROWD:END -->
 
     <!-- NB: the URL to redirect to is now specified by login.url above -->
@@ -103,7 +103,6 @@
     <elevatedsecurityguard class="com.atlassian.jira.security.login.JiraElevatedSecurityGuard"/>
     
     <interceptors>
-        <interceptor class="com.atlassian.jira.portal.PortalPageInterceptor"/>
         <interceptor class="com.atlassian.jira.user.preferences.UserPreferencesResetInterceptor"/>
     </interceptors>
 </security-config>

data/spec/ucb_deployer/confluence_deployer_spec.rb

@@ -17,7 +17,7 @@ describe UcbDeployer::ConfluenceDeployer do
       @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"
+      @cdep.svn_project_url.should == "svn+ssh://svn@code-qa.berkeley.edu/istas/confluence_archives/tags"
     end
 
     it "should raise error for invalid config options" do
@@ -113,7 +113,7 @@ describe UcbDeployer::ConfluenceDeployer do
       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}"
+      arg = "svn export #{cdep.svn_project_url}/confluence-#{cdep.version}"
       cdep.should_receive("`").with(arg).and_return(nil)
       FileUtils.should_receive("mv")
       cdep.export()

data/spec/ucb_deployer/jira_deployer_spec.rb

@@ -4,134 +4,133 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe UcbDeployer::JiraDeployer do
   before(:each) do
     @deploy_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/jira/deploy.yml')
-    @bad_deploy_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/jira/bad_deploy.yml')    
-    @cdep = UcbDeployer::JiraDeployer.new(@deploy_file)
+    @bad_deploy_file = File.expand_path(File.dirname(__FILE__) + '/../fixtures/jira/bad_deploy.yml')
+    @jdep = UcbDeployer::JiraDeployer.new(@deploy_file)
   end
-  
+
   def test_build_dir()
     "#{TEST_BUILD_DIR}/jira"
   end
-  
-  
-  describe "#load_config" do
+
+
+  describe "configure()" do
     it "should load configuration options" do
-      @cdep.build_dir.should == "/path/to/build_dir/jira"
-      @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/jira_archives/tags"
+      @jdep.build_dir.should == "/path/to/build_dir/jira"
+      @jdep.deploy_dir.should == "/path/to/deploy_dir"
+      @jdep.war_name.should == "war_name"
+      @jdep.svn_project_url.should == "svn+ssh://svn@code.berkeley.edu/istas/jira_archives/tags"
     end
 
     it "should raise error for invalid config options" do
-      lambda { @cdep.load_config(@bad_deploy_file) }.should raise_error(UcbDeployer::ConfigError)
+      lambda { @jdep.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
+      @jdep.build_dir = test_build_dir
       # just checking if spec_helper did the right
-      File.exists?(@cdep.web_xml).should be_true
+      File.exists?(@jdep.web_xml).should be_true
 
-      @cdep.config_web_xml
-      File.exists?(@cdep.web_xml).should be_true
-      lines = File.readlines(@cdep.web_xml)
+      @jdep.configure()
+      File.exists?(@jdep.web_xml).should be_true
+      lines = File.readlines(@jdep.web_xml)
       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            
+      lines.grep(/#{@jdep.cas_server_url}/).should have(1).record
+      lines.grep(/#{@jdep.cas_service_url}/).should have(1).record
+      lines.grep(/<\/web-app>/).should be_true
     end
-  end
-  
-  
-  describe "#config_seraph_config_xml" do
+
     it "should configure the soulwing (CAS) authenticator in seraph_config.xml" do
-      @cdep.build_dir = test_build_dir
+      @jdep.build_dir = test_build_dir
       # just checking if spec_helper did the right
-      File.exists?(@cdep.seraph_config_xml).should be_true
+      File.exists?(@jdep.seraph_config_xml).should be_true
 
-      @cdep.config_seraph_config_xml
-      File.exists?(@cdep.seraph_config_xml).should be_true
-      lines = File.readlines(@cdep.seraph_config_xml)
+      @jdep.configure()
+      File.exists?(@jdep.seraph_config_xml).should be_true
+      lines = File.readlines(@jdep.seraph_config_xml)
       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            
+      lines.grep(/#{Regexp.quote(@jdep.cas_authenticator_class)}/).should have(1).record
+      lines.grep(/#{Regexp.quote(@jdep.cas_server_url)}\/logout/).should have(1).record
+      lines.grep(/<\/security-config>/).should be_true
     end
-  end
-  
 
-  describe "#config_entityengine_xml" do
     it "should configure the postgres72 db option in entityengine.xml" do
-      @cdep.build_dir = test_build_dir
+      @jdep.build_dir = test_build_dir
       # just checking if spec_helper did the right
-      File.exists?(@cdep.entityengine_xml).should be_true
+      File.exists?(@jdep.entityengine_xml).should be_true
 
-      @cdep.config_entityengine_xml
-      File.exists?(@cdep.entityengine_xml).should be_true
-      lines = File.readlines(@cdep.entityengine_xml)
+      @jdep.configure()
+      File.exists?(@jdep.entityengine_xml).should be_true
+      lines = File.readlines(@jdep.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            
+      lines.any? { |l| l =~ /#{Regexp.quote(@jdep.entityengine_db)}/ }.should be_true
+      lines.any? { |l| l =~ /#{Regexp.quote(@jdep.entityengine_schema)}/ }.should be_true
+      lines.any? { |l| l =~ /<\/entity-config>/ }.should be_true
     end
-  end
-  
-  describe "#config_jira_application_properties" do
-    it "should configure jira.home in the jira-application.properties file" do
-      @cdep.build_dir = test_build_dir
-      # just checking if spec_helper did the right
-      File.exists?(@cdep.jira_application_properties).should be_true
-      
-      @cdep.config_jira_application_properties
-      File.exists?(@cdep.jira_application_properties).should be_true
-      lines = File.readlines(@cdep.jira_application_properties)
-      lines.any? { |l| l =~ /# JIRA HOME/ }.should be_true
-      lines.any? { |l| l =~ /# JIRA SECURITY SETTINGS/ }.should be_true
-      lines.any? { |l| l =~ /#{Regexp.quote(@cdep.jira_home_token + ' ' + @cdep.data_dir)}/ }.should be_true      
-      lines.any? { |l| l =~ /# NOTES FOR DEVELOPERS/ }.should be_true            
+
+    context "jira-application.properties file" do
+      it "should configure jira.home" do
+        @jdep.build_dir = test_build_dir()
+        # just checking if spec_helper did the right
+        File.exists?(@jdep.jira_application_properties).should be_true
+
+        @jdep.configure()
+        File.exists?(@jdep.jira_application_properties).should be_true
+        lines = File.readlines(@jdep.jira_application_properties)
+        lines.any? { |l| l =~ /# JIRA HOME/ }.should be_true
+        lines.any? { |l| l =~ /# JIRA SECURITY SETTINGS/ }.should be_true
+        lines.any? { |l| l =~ /#{Regexp.quote(@jdep.jira_home_token + ' ' + @jdep.data_dir)}/ }.should be_true
+        lines.any? { |l| l =~ /# NOTES FOR DEVELOPERS/ }.should be_true
+      end
+
+      it "should configure jira.projectkey.pattern" do
+        @jdep.build_dir = test_build_dir()
+        # just checking if spec_helper did the right
+        File.exists?(@jdep.jira_application_properties()).should be_true
+
+        @jdep.configure()
+        File.exists?(@jdep.jira_application_properties).should be_true
+        lines = File.readlines(@jdep.jira_application_properties)
+        lines.any? { |l| l =~ /# JIRA HOME/ }.should be_true
+        lines.any? { |l| l =~ /# JIRA SECURITY SETTINGS/ }.should be_true
+        lines.any? { |l| l =~ /#{Regexp.quote(@jdep.jira_projectkey_token() + ' ' + "([A-Z][A-Z0-9]+)")}/ }.should be_true
+        lines.any? { |l| l =~ /# NOTES FOR DEVELOPERS/ }.should be_true
+      end
     end
-  end
-  
-  describe "#config_ist_banner" do
+
     it "should place ist_banner.jpg in webapps" do
-      @cdep.build_dir = test_build_dir()
-      @cdep.config_ist_banner()
-      File.exists?("#{@cdep.build_dir}/src/webapp/images/ist_banner.jpg").should be_true
+      @jdep.build_dir = test_build_dir()
+      @jdep.configure()
+      File.exists?("#{@jdep.build_dir}/src/webapp/images/ist_banner.jpg").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/edit-webapp/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
+
+    it "should reshuffle jar files" do
+      @jdep.build_dir = test_build_dir()
+      @jdep.configure()
+      Dir["#{@jdep.build_dir}/src/edit-webapp/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
       ["activation", "javamail", "commons-logging", "log4j"].each do |lib|
-        Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/#{lib}-*"].should be_empty
+        Dir["#{@jdep.build_dir}/src/edit-webapp/WEB-INF/lib/#{lib}-*"].should be_empty
       end
     end
   end
 
-  
   describe "#build" do
-    it "should work" do
-      @cdep.build_dir = test_build_dir()
-      @cdep.should_receive("`").with("sh #{@cdep.build_dir}/src/build.sh")
-      @cdep.build()
+    it "should build the the war" do
+      @jdep.build_dir = test_build_dir()
+      @jdep.should_receive("`").with("sh #{@jdep.build_dir}/src/build.sh")
+      @jdep.build()
     end
   end
-  
 
   describe "#export" do
-    it "should work" do
-      cdep = UcbDeployer::JiraDeployer.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}/jira-#{cdep.version}"
-      cdep.should_receive("`").with(arg).and_return(nil)
+    it "should export the code from svn" do
+      jdep = UcbDeployer::JiraDeployer.new(@deploy_file)
+      jdep.build_dir = test_build_dir()
+      jdep.version = "3.2.1_01"
+      arg = "svn export #{jdep.svn_project_url}/jira-#{jdep.version}"
+      jdep.should_receive("`").with(arg).and_return(nil)
       FileUtils.should_receive("mv")
-      cdep.export()
+      jdep.export()
     end
   end
 end

data/ucb_deployer.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.md"]
   s.rubyforge_project = "ucb_deployer"  
   
-  s.files         = `svn ls -R`.split("\n")
+  s.files         = `git ls-files`.split("\n")
   s.test_files    = Dir["spec/**/**"]
   s.executables   = ["ucb_deploy"]
   s.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ucb_deployer
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 4
-  - 5
-  version: 0.4.5
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Steven Hansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -107,22 +107,22 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .svnignore
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - TODO.md
 - bin/ucb_deploy
+- lib/ucb_deployer.rb
 - lib/ucb_deployer/confluence_deployer.rb
 - lib/ucb_deployer/deployer.rb
 - lib/ucb_deployer/jira_deployer.rb
 - lib/ucb_deployer/version.rb
-- lib/ucb_deployer.rb
 - resources/confluence_cas_web.xml
 - resources/ist_banner.jpg
 - resources/jira_cas_web.xml
-- resources/soulwing-casclient-0.5.3-1.jar
+- resources/soulwing-casclient-0.6-patched.jar
 - resources/xwork.xml
 - spec/fixtures/confluence/bad_deploy.yml
 - spec/fixtures/confluence/confluence-init.properties