obbistrano 1.1.68 → 1.1.69
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/obbistrano_tasks.rb +8 -7
- data/obbistrano.gemspec +1 -1
- metadata +16 -7
data/lib/obbistrano_tasks.rb
CHANGED
@@ -160,12 +160,14 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
160
160
|
end
|
161
161
|
logger.level = 2
|
162
162
|
run "cd #{deploy_to} && git fetch"
|
163
|
-
|
164
|
-
run "cd #{deploy_to} && git checkout
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
163
|
+
if defined? "#{commit}"
|
164
|
+
run "cd #{deploy_to} && git checkout #{commit} && git submodule update --init --recursive"
|
165
|
+
else
|
166
|
+
begin
|
167
|
+
run "cd #{deploy_to} && git show-branch #{branch} && git checkout #{branch} && git reset --hard origin/#{branch} && git submodule update --init --recursive"
|
168
|
+
rescue
|
169
|
+
run "cd #{deploy_to} && git checkout -b #{branch} origin/#{branch} && git submodule update --init --recursive"
|
170
|
+
end
|
169
171
|
end
|
170
172
|
|
171
173
|
logger.info "Application has been updated on branch #{branch}"
|
@@ -251,7 +253,6 @@ Capistrano::Configuration.instance(:must_exist).load do
|
|
251
253
|
run "rm -f /etc/apache2/sites-enabled/#{user_to_config}.conf; ln -s /home/#{user_to_config}/#{deploy_to}/app/platform/apache.conf /etc/apache2/sites-enabled/#{user_to_config}.conf"
|
252
254
|
end
|
253
255
|
user_cron_tasks = capture("cat #{deploy_to}/app/platform/crontab")
|
254
|
-
logger.info "Writing Cron: #{user_cron_tasks}"
|
255
256
|
write_crontab(user_cron_tasks)
|
256
257
|
rescue
|
257
258
|
|
data/obbistrano.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = %q{obbistrano}
|
5
|
-
s.version = "1.1.
|
5
|
+
s.version = "1.1.69"
|
6
6
|
s.authors = ["Ross Riley", "One Black Bear"]
|
7
7
|
s.date = Time.now
|
8
8
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
metadata
CHANGED
@@ -1,12 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: obbistrano
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
4
|
+
hash: 153
|
5
|
+
prerelease:
|
5
6
|
segments:
|
6
7
|
- 1
|
7
8
|
- 1
|
8
|
-
-
|
9
|
-
version: 1.1.
|
9
|
+
- 69
|
10
|
+
version: 1.1.69
|
10
11
|
platform: ruby
|
11
12
|
authors:
|
12
13
|
- Ross Riley
|
@@ -15,16 +16,17 @@ autorequire:
|
|
15
16
|
bindir: bin
|
16
17
|
cert_chain: []
|
17
18
|
|
18
|
-
date: 2011-11-
|
19
|
-
default_executable:
|
19
|
+
date: 2011-11-28 00:00:00 Z
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
22
|
name: capistrano
|
23
23
|
prerelease: false
|
24
24
|
requirement: &id001 !ruby/object:Gem::Requirement
|
25
|
+
none: false
|
25
26
|
requirements:
|
26
27
|
- - ">="
|
27
28
|
- !ruby/object:Gem::Version
|
29
|
+
hash: 9
|
28
30
|
segments:
|
29
31
|
- 2
|
30
32
|
- 5
|
@@ -35,9 +37,11 @@ dependencies:
|
|
35
37
|
name: activeresource
|
36
38
|
prerelease: false
|
37
39
|
requirement: &id002 !ruby/object:Gem::Requirement
|
40
|
+
none: false
|
38
41
|
requirements:
|
39
42
|
- - ">="
|
40
43
|
- !ruby/object:Gem::Version
|
44
|
+
hash: 7
|
41
45
|
segments:
|
42
46
|
- 2
|
43
47
|
version: "2"
|
@@ -47,9 +51,11 @@ dependencies:
|
|
47
51
|
name: httparty
|
48
52
|
prerelease: false
|
49
53
|
requirement: &id003 !ruby/object:Gem::Requirement
|
54
|
+
none: false
|
50
55
|
requirements:
|
51
56
|
- - ">="
|
52
57
|
- !ruby/object:Gem::Version
|
58
|
+
hash: 9
|
53
59
|
segments:
|
54
60
|
- 0
|
55
61
|
- 4
|
@@ -73,7 +79,6 @@ files:
|
|
73
79
|
- lib/slicehost.rb
|
74
80
|
- lib/obbistrano_tasks.rb
|
75
81
|
- lib/templates/apache_vhost.erb
|
76
|
-
has_rdoc: true
|
77
82
|
homepage: http://github.com/oneblackbear/obbistrano
|
78
83
|
licenses: []
|
79
84
|
|
@@ -83,23 +88,27 @@ rdoc_options: []
|
|
83
88
|
require_paths:
|
84
89
|
- lib
|
85
90
|
required_ruby_version: !ruby/object:Gem::Requirement
|
91
|
+
none: false
|
86
92
|
requirements:
|
87
93
|
- - ">="
|
88
94
|
- !ruby/object:Gem::Version
|
95
|
+
hash: 3
|
89
96
|
segments:
|
90
97
|
- 0
|
91
98
|
version: "0"
|
92
99
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
100
|
+
none: false
|
93
101
|
requirements:
|
94
102
|
- - ">="
|
95
103
|
- !ruby/object:Gem::Version
|
104
|
+
hash: 3
|
96
105
|
segments:
|
97
106
|
- 0
|
98
107
|
version: "0"
|
99
108
|
requirements: []
|
100
109
|
|
101
110
|
rubyforge_project:
|
102
|
-
rubygems_version: 1.
|
111
|
+
rubygems_version: 1.8.11
|
103
112
|
signing_key:
|
104
113
|
specification_version: 2
|
105
114
|
summary: Adds extra namespaces to Capistrano to allow simple setup, deploys and maintenance.
|