ucb_deployer 0.1.8 → 0.1.9
Sign up to get free protection for your applications and to get access to all the features.
- data/Manifest +0 -14
- data/README.txt +2 -2
- data/Rakefile +1 -1
- data/TODO.txt +2 -0
- data/lib/ucb_deployer/confluence_deployer.rb +24 -17
- data/lib/ucb_deployer/jira_deployer.rb +10 -11
- data/spec/spec_helper.rb +6 -1
- data/spec/ucb_deployer/confluence_deployer_spec.rb +6 -4
- data/spec/ucb_deployer/jira_deployer_spec.rb +9 -8
- data/ucb_deployer.gemspec +3 -3
- metadata +4 -18
- data/resources/jdom.jar +0 -0
- data/resources/jotm-2.0.13/carol-2.0.5.jar +0 -0
- data/resources/jotm-2.0.13/commons-cli-1.0.jar +0 -0
- data/resources/jotm-2.0.13/commons-logging.jar +0 -0
- data/resources/jotm-2.0.13/connector-1_5.jar +0 -0
- data/resources/jotm-2.0.13/howl-0.1.11.jar +0 -0
- data/resources/jotm-2.0.13/jotm.jar +0 -0
- data/resources/jotm-2.0.13/jotm_iiop_stubs.jar +0 -0
- data/resources/jotm-2.0.13/jotm_jrmp_stubs.jar +0 -0
- data/resources/jotm-2.0.13/jta-spec1_0_1.jar +0 -0
- data/resources/jotm-2.0.13/jts1_0.jar +0 -0
- data/resources/jotm-2.0.13/log4j.jar +0 -0
- data/resources/jotm-2.0.13/objectweb-datasource.jar +0 -0
- data/resources/jotm-2.0.13/xapool-1.5.0.jar +0 -0
data/Manifest
CHANGED
@@ -8,21 +8,7 @@ lib/ucb_deployer/confluence_deployer.rb
|
|
8
8
|
lib/ucb_deployer/deployer.rb
|
9
9
|
lib/ucb_deployer/jira_deployer.rb
|
10
10
|
resources/confluence_cas_web.xml
|
11
|
-
resources/jdom.jar
|
12
11
|
resources/jira_cas_web.xml
|
13
|
-
resources/jotm-2.0.13/carol-2.0.5.jar
|
14
|
-
resources/jotm-2.0.13/commons-cli-1.0.jar
|
15
|
-
resources/jotm-2.0.13/commons-logging.jar
|
16
|
-
resources/jotm-2.0.13/connector-1_5.jar
|
17
|
-
resources/jotm-2.0.13/howl-0.1.11.jar
|
18
|
-
resources/jotm-2.0.13/jotm.jar
|
19
|
-
resources/jotm-2.0.13/jotm_iiop_stubs.jar
|
20
|
-
resources/jotm-2.0.13/jotm_jrmp_stubs.jar
|
21
|
-
resources/jotm-2.0.13/jta-spec1_0_1.jar
|
22
|
-
resources/jotm-2.0.13/jts1_0.jar
|
23
|
-
resources/jotm-2.0.13/log4j.jar
|
24
|
-
resources/jotm-2.0.13/objectweb-datasource.jar
|
25
|
-
resources/jotm-2.0.13/xapool-1.5.0.jar
|
26
12
|
resources/soulwing-casclient-0.5.3.jar
|
27
13
|
spec/fixtures/confluence/bad_deploy.yml
|
28
14
|
spec/fixtures/confluence/confluence-init.properties
|
data/README.txt
CHANGED
@@ -14,7 +14,7 @@ UCB Deployer is gem to automate confluence and jira deployments to Tomcat.
|
|
14
14
|
|
15
15
|
==== Tomcat Setup
|
16
16
|
We assume __Jira__ and __Confluence__ both have their own instance of tomcat (their own
|
17
|
-
$
|
17
|
+
$CATALINA_BASE). For more information on this type of setup see:
|
18
18
|
|
19
19
|
http://wikihub.berkeley.edu/x/RQAnAg
|
20
20
|
|
@@ -27,7 +27,7 @@ Where $HOME is the home directory of the user that will be doing the deployments
|
|
27
27
|
we are using a special user __app_relmgt__ for this purpose.
|
28
28
|
|
29
29
|
==== JIRA: Move Jars into common/lib
|
30
|
-
Make sure the following jars are in $
|
30
|
+
Make sure the following jars are in $CATALINA_BASE/lib
|
31
31
|
* activation-1.0.2.jar
|
32
32
|
* javamail-1.3.3.jar
|
33
33
|
* postgresql-8.3-604.jdbc3.jar
|
data/Rakefile
CHANGED
@@ -4,7 +4,7 @@ require 'echoe'
|
|
4
4
|
require 'spec/rake/spectask'
|
5
5
|
|
6
6
|
|
7
|
-
Echoe.new('ucb_deployer', '0.1.
|
7
|
+
Echoe.new('ucb_deployer', '0.1.9') do |p|
|
8
8
|
p.description = "Tool for deploying (Java/JRuby) war files to tomcat"
|
9
9
|
p.url = "http://ucbrb.rubyforge.org"
|
10
10
|
p.author = "Steven Hansen"
|
data/TODO.txt
CHANGED
@@ -10,7 +10,7 @@ module UcbDeployer
|
|
10
10
|
|
11
11
|
def export()
|
12
12
|
UcbDeployer.debug("Exporting from: #{svn_project_url}/confluence-#{version}")
|
13
|
-
pwd = Dir.getwd
|
13
|
+
pwd = Dir.getwd()
|
14
14
|
Dir.chdir("#{build_dir}")
|
15
15
|
FileUtils.rm_rf("#{build_dir}/src")
|
16
16
|
`svn export svn+ssh://#{svn_username}@#{svn_project_url}/confluence-#{version}`
|
@@ -19,21 +19,21 @@ module UcbDeployer
|
|
19
19
|
$stdout.puts("Export Completed")
|
20
20
|
end
|
21
21
|
|
22
|
-
def configure
|
23
|
-
config_web_xml
|
24
|
-
config_seraph_config_xml
|
25
|
-
config_confluence_init_properties
|
26
|
-
reshuffle_jars
|
22
|
+
def configure()
|
23
|
+
config_web_xml()
|
24
|
+
config_seraph_config_xml()
|
25
|
+
config_confluence_init_properties()
|
26
|
+
reshuffle_jars()
|
27
27
|
end
|
28
28
|
|
29
|
-
def build
|
30
|
-
pwd = Dir.getwd
|
29
|
+
def build()
|
30
|
+
pwd = Dir.getwd()
|
31
31
|
Dir.chdir("#{build_dir}/src")
|
32
32
|
`sh #{build_dir}/src/build.sh`
|
33
33
|
Dir.chdir(pwd)
|
34
34
|
end
|
35
35
|
|
36
|
-
def deploy
|
36
|
+
def deploy()
|
37
37
|
if File.exists?("#{deploy_dir}/#{war_name}")
|
38
38
|
FileUtils.rm_rf(Dir["#{deploy_dir}/#{war_name}"])
|
39
39
|
end
|
@@ -46,14 +46,14 @@ module UcbDeployer
|
|
46
46
|
FileUtils.rm("#{deploy_dir}/#{war_name}/#{war_name}.war")
|
47
47
|
end
|
48
48
|
|
49
|
-
def rollback
|
49
|
+
def rollback()
|
50
50
|
end
|
51
51
|
|
52
|
-
def svn_username
|
52
|
+
def svn_username()
|
53
53
|
@svn_username || "app_relmgt"
|
54
54
|
end
|
55
55
|
|
56
|
-
def svn_base_url
|
56
|
+
def svn_base_url()
|
57
57
|
@svn_base_url || "svn.berkeley.edu/svn/ist-svn/berkeley/projects/ist/as/webapps/confluence_archives"
|
58
58
|
end
|
59
59
|
|
@@ -134,17 +134,24 @@ module UcbDeployer
|
|
134
134
|
end
|
135
135
|
|
136
136
|
##
|
137
|
-
# Sets the confluence.home property in the file: confluence-init.properties
|
137
|
+
# Sets the confluence.home property in the file: confluence-init.properties.
|
138
138
|
#
|
139
139
|
def config_confluence_init_properties()
|
140
|
-
File.open(self.confluence_init_properties, "w")
|
140
|
+
File.open(self.confluence_init_properties, "w") do |io|
|
141
|
+
io.puts("confluence.home=#{data_dir}")
|
142
|
+
end
|
141
143
|
end
|
142
|
-
|
144
|
+
|
145
|
+
##
|
146
|
+
# Remove application jars that have been installed at the container level.
|
147
|
+
#
|
143
148
|
def reshuffle_jars()
|
144
149
|
FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
|
145
150
|
"#{build_dir}/src/confluence/WEB-INF/lib/")
|
146
|
-
# Remove the
|
147
|
-
|
151
|
+
# Remove the jars that are installed at the container level
|
152
|
+
["postgresql", "activation", "mail"].each do |jar|
|
153
|
+
FileUtils.rm_rf(Dir["#{build_dir}/src/confluence/WEB-INF/lib/#{jar}-*"])
|
154
|
+
end
|
148
155
|
end
|
149
156
|
end
|
150
157
|
end
|
@@ -10,7 +10,7 @@ module UcbDeployer
|
|
10
10
|
|
11
11
|
def export()
|
12
12
|
UcbDeployer.debug("Exporting from: #{svn_project_url}/jira-#{version}")
|
13
|
-
pwd = Dir.getwd
|
13
|
+
pwd = Dir.getwd()
|
14
14
|
Dir.chdir("#{build_dir}")
|
15
15
|
FileUtils.rm_rf("#{build_dir}/src")
|
16
16
|
`svn export svn+ssh://#{svn_username}@#{svn_project_url}/jira-#{version}`
|
@@ -20,14 +20,14 @@ module UcbDeployer
|
|
20
20
|
end
|
21
21
|
|
22
22
|
def configure()
|
23
|
-
config_web_xml
|
24
|
-
config_seraph_config_xml
|
25
|
-
config_entityengine_xml
|
26
|
-
reshuffle_jars
|
23
|
+
config_web_xml()
|
24
|
+
config_seraph_config_xml()
|
25
|
+
config_entityengine_xml()
|
26
|
+
reshuffle_jars()
|
27
27
|
end
|
28
28
|
|
29
29
|
def build()
|
30
|
-
pwd = Dir.getwd
|
30
|
+
pwd = Dir.getwd()
|
31
31
|
Dir.chdir("#{build_dir}/src")
|
32
32
|
`sh #{build_dir}/src/build.sh`
|
33
33
|
Dir.chdir(pwd)
|
@@ -184,13 +184,12 @@ module UcbDeployer
|
|
184
184
|
|
185
185
|
def reshuffle_jars()
|
186
186
|
FileUtils.mkdir_p("#{build_dir}/src/edit-webapp/WEB-INF/lib/")
|
187
|
-
FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/jotm-2.0.13/*"],
|
188
|
-
"#{build_dir}/src/edit-webapp/WEB-INF/lib/")
|
189
187
|
FileUtils.cp(Dir["#{UcbDeployer::RESOURCES_DIR}/soulwing-casclient-*"],
|
190
188
|
"#{build_dir}/src/edit-webapp/WEB-INF/lib/")
|
191
|
-
# These have been placed in $CATALINA_HOME/
|
192
|
-
|
193
|
-
|
189
|
+
# These have been placed in $CATALINA_HOME/lib
|
190
|
+
["activation", "javamail", "commons-logging", "log4j"].each do |jar|
|
191
|
+
FileUtils.rm_rf(Dir["#{build_dir}/src/webapp/WEB-INF/lib/#{jar}-*"])
|
192
|
+
end
|
194
193
|
end
|
195
194
|
|
196
195
|
end
|
data/spec/spec_helper.rb
CHANGED
@@ -18,6 +18,9 @@ Spec::Runner.configure do |config|
|
|
18
18
|
# setup confluence build dir
|
19
19
|
FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/classes")
|
20
20
|
FileUtils.mkdir_p("#{dir}/confluence/src/confluence/WEB-INF/lib")
|
21
|
+
FileUtils.touch("#{dir}/confluence/src/confluence/WEB-INF/lib/postgresql-1.3.3.jar")
|
22
|
+
FileUtils.touch("#{dir}/confluence/src/confluence/WEB-INF/lib/mail-1.3.3.jar")
|
23
|
+
FileUtils.touch("#{dir}/confluence/src/confluence/WEB-INF/lib/activation-1.3.3.jar")
|
21
24
|
|
22
25
|
FileUtils.cp("#{pwd}/fixtures/confluence/web.xml",
|
23
26
|
"#{dir}/confluence/src/confluence/WEB-INF")
|
@@ -31,7 +34,9 @@ Spec::Runner.configure do |config|
|
|
31
34
|
FileUtils.mkdir_p("#{dir}/jira/src/edit-webapp/WEB-INF/classes")
|
32
35
|
FileUtils.mkdir_p("#{dir}/jira/src/webapp/WEB-INF/lib")
|
33
36
|
FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/activation-1.0.2.jar")
|
34
|
-
FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/javamail-1.3.3.jar")
|
37
|
+
FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/javamail-1.3.3.jar")
|
38
|
+
FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/commons-logging-1.3.3.jar")
|
39
|
+
FileUtils.touch("#{dir}/jira/src/webapp/WEB-INF/lib/log4j-1.3.3.jar")
|
35
40
|
|
36
41
|
FileUtils.cp("#{pwd}/fixtures/jira/web.xml",
|
37
42
|
"#{dir}/jira/src/webapp/WEB-INF")
|
@@ -8,7 +8,7 @@ describe UcbDeployer::ConfluenceDeployer do
|
|
8
8
|
@cdep = UcbDeployer::ConfluenceDeployer.new(@deploy_file)
|
9
9
|
end
|
10
10
|
|
11
|
-
def test_build_dir
|
11
|
+
def test_build_dir()
|
12
12
|
"#{TEST_BUILD_DIR}/confluence"
|
13
13
|
end
|
14
14
|
|
@@ -76,10 +76,12 @@ describe UcbDeployer::ConfluenceDeployer do
|
|
76
76
|
|
77
77
|
describe "#reshuffle_jars" do
|
78
78
|
it "should work" do
|
79
|
-
@cdep.build_dir = test_build_dir
|
80
|
-
@cdep.reshuffle_jars
|
79
|
+
@cdep.build_dir = test_build_dir()
|
80
|
+
@cdep.reshuffle_jars()
|
81
81
|
Dir["#{@cdep.build_dir}/src/confluence/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
|
82
|
-
|
82
|
+
["postgresql", "activation", "mail"].each do |jar|
|
83
|
+
Dir["#{@cdep.build_dir}/src/confluence/WEB-INF/lib/#{jar}-*"].should be_empty
|
84
|
+
end
|
83
85
|
end
|
84
86
|
end
|
85
87
|
|
@@ -8,7 +8,7 @@ describe UcbDeployer::JiraDeployer do
|
|
8
8
|
@cdep = UcbDeployer::JiraDeployer.new(@deploy_file)
|
9
9
|
end
|
10
10
|
|
11
|
-
def test_build_dir
|
11
|
+
def test_build_dir()
|
12
12
|
"#{TEST_BUILD_DIR}/jira"
|
13
13
|
end
|
14
14
|
|
@@ -79,20 +79,21 @@ describe UcbDeployer::JiraDeployer do
|
|
79
79
|
|
80
80
|
describe "#reshuffle_jars" do
|
81
81
|
it "should work" do
|
82
|
-
@cdep.build_dir = test_build_dir
|
83
|
-
@cdep.reshuffle_jars
|
82
|
+
@cdep.build_dir = test_build_dir()
|
83
|
+
@cdep.reshuffle_jars()
|
84
84
|
Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/soulwing-casclient-*"].should_not be_empty
|
85
|
-
|
86
|
-
|
85
|
+
["activation", "javamail", "commons-logging", "log4j"].each do |lib|
|
86
|
+
Dir["#{@cdep.build_dir}/src/edit-webapp/WEB-INF/lib/#{lib}-*"].should be_empty
|
87
|
+
end
|
87
88
|
end
|
88
89
|
end
|
89
90
|
|
90
91
|
|
91
92
|
describe "#build" do
|
92
93
|
it "should work" do
|
93
|
-
@cdep.build_dir = test_build_dir
|
94
|
+
@cdep.build_dir = test_build_dir()
|
94
95
|
@cdep.should_receive("`").with("sh #{@cdep.build_dir}/src/build.sh")
|
95
|
-
@cdep.build
|
96
|
+
@cdep.build()
|
96
97
|
end
|
97
98
|
end
|
98
99
|
|
@@ -100,7 +101,7 @@ describe UcbDeployer::JiraDeployer do
|
|
100
101
|
describe "#export" do
|
101
102
|
it "should work" do
|
102
103
|
cdep = UcbDeployer::JiraDeployer.new(@deploy_file)
|
103
|
-
cdep.build_dir = test_build_dir
|
104
|
+
cdep.build_dir = test_build_dir()
|
104
105
|
cdep.version = "3.2.1_01"
|
105
106
|
arg = "svn export svn+ssh://#{cdep.svn_username}@#{cdep.svn_project_url}/jira-#{cdep.version}"
|
106
107
|
cdep.should_receive("`").with(arg).and_return(nil)
|
data/ucb_deployer.gemspec
CHANGED
@@ -2,17 +2,17 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = %q{ucb_deployer}
|
5
|
-
s.version = "0.1.
|
5
|
+
s.version = "0.1.9"
|
6
6
|
|
7
7
|
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
|
8
8
|
s.authors = ["Steven Hansen"]
|
9
|
-
s.date = %q{2010-
|
9
|
+
s.date = %q{2010-11-17}
|
10
10
|
s.default_executable = %q{ucb_deploy}
|
11
11
|
s.description = %q{Tool for deploying (Java/JRuby) war files to tomcat}
|
12
12
|
s.email = %q{runner@berkeley.edu}
|
13
13
|
s.executables = ["ucb_deploy"]
|
14
14
|
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"]
|
15
|
-
s.files = ["Manifest", "README.txt", "Rakefile", "TODO.txt", "bin/ucb_deploy", "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/
|
15
|
+
s.files = ["Manifest", "README.txt", "Rakefile", "TODO.txt", "bin/ucb_deploy", "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/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/bad_deploy.yml", "spec/fixtures/jira/deploy.yml", "spec/fixtures/jira/entityengine.xml", "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/ucb_deployer/ucb_deployer_spec.rb", "ucb_deployer.gemspec"]
|
16
16
|
s.homepage = %q{http://ucbrb.rubyforge.org}
|
17
17
|
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ucb_deployer", "--main", "README.txt"]
|
18
18
|
s.require_paths = ["lib"]
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ucb_deployer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 9
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 0.1.
|
9
|
+
- 9
|
10
|
+
version: 0.1.9
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Steven Hansen
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-
|
18
|
+
date: 2010-11-17 00:00:00 -08:00
|
19
19
|
default_executable:
|
20
20
|
dependencies: []
|
21
21
|
|
@@ -42,21 +42,7 @@ files:
|
|
42
42
|
- lib/ucb_deployer/deployer.rb
|
43
43
|
- lib/ucb_deployer/jira_deployer.rb
|
44
44
|
- resources/confluence_cas_web.xml
|
45
|
-
- resources/jdom.jar
|
46
45
|
- resources/jira_cas_web.xml
|
47
|
-
- resources/jotm-2.0.13/carol-2.0.5.jar
|
48
|
-
- resources/jotm-2.0.13/commons-cli-1.0.jar
|
49
|
-
- resources/jotm-2.0.13/commons-logging.jar
|
50
|
-
- resources/jotm-2.0.13/connector-1_5.jar
|
51
|
-
- resources/jotm-2.0.13/howl-0.1.11.jar
|
52
|
-
- resources/jotm-2.0.13/jotm.jar
|
53
|
-
- resources/jotm-2.0.13/jotm_iiop_stubs.jar
|
54
|
-
- resources/jotm-2.0.13/jotm_jrmp_stubs.jar
|
55
|
-
- resources/jotm-2.0.13/jta-spec1_0_1.jar
|
56
|
-
- resources/jotm-2.0.13/jts1_0.jar
|
57
|
-
- resources/jotm-2.0.13/log4j.jar
|
58
|
-
- resources/jotm-2.0.13/objectweb-datasource.jar
|
59
|
-
- resources/jotm-2.0.13/xapool-1.5.0.jar
|
60
46
|
- resources/soulwing-casclient-0.5.3.jar
|
61
47
|
- spec/fixtures/confluence/bad_deploy.yml
|
62
48
|
- spec/fixtures/confluence/confluence-init.properties
|
data/resources/jdom.jar
DELETED
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|