octopusci 0.0.5 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/octopusci-tentacles +8 -0
- data/lib/octopusci/job.rb +4 -1
- data/lib/octopusci/server.rb +0 -8
- data/lib/octopusci/version.rb +1 -1
- metadata +34 -32
data/bin/octopusci-tentacles
CHANGED
@@ -5,4 +5,12 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
|
|
5
5
|
require 'rubygems'
|
6
6
|
require 'octopusci'
|
7
7
|
|
8
|
+
# The StageLocker.load() method is called here not only to set things into
|
9
|
+
# valid initial state. But, also in the case that octopusci-tentacles was
|
10
|
+
# killed it nukes the potentially screwed up state the redis data is in and
|
11
|
+
# initializes it the proper state based on the config.
|
12
|
+
if Octopusci::CONFIG.has_key?('stages')
|
13
|
+
Octopusci::StageLocker.load(Octopusci::CONFIG['stages'])
|
14
|
+
end
|
15
|
+
|
8
16
|
Octopusci::WorkerLauncher.launch
|
data/lib/octopusci/job.rb
CHANGED
@@ -6,7 +6,10 @@ module Octopusci
|
|
6
6
|
|
7
7
|
def self.perform(project_name, branch_name, job_id, job_conf)
|
8
8
|
ActiveRecord::Base.verify_active_connections!
|
9
|
-
|
9
|
+
|
10
|
+
# Note: There is no logic for handling stage coming back as nil because
|
11
|
+
# it should never happen because there are the same number of resque
|
12
|
+
# workers as there are stages at all times.
|
10
13
|
if Octopusci::CONFIG.has_key?('stages')
|
11
14
|
# Get the next available stage from redis which locks it by removing it
|
12
15
|
# from the list of available
|
data/lib/octopusci/server.rb
CHANGED
@@ -11,14 +11,6 @@ module Octopusci
|
|
11
11
|
set :public, "#{dir}/server/public"
|
12
12
|
set :static, true
|
13
13
|
|
14
|
-
def initialize
|
15
|
-
if Octopusci::CONFIG.has_key?('stages')
|
16
|
-
Octopusci::StageLocker.load(Octopusci::CONFIG['stages'])
|
17
|
-
end
|
18
|
-
|
19
|
-
super
|
20
|
-
end
|
21
|
-
|
22
14
|
before do
|
23
15
|
ActiveRecord::Base.verify_active_connections!
|
24
16
|
end
|
data/lib/octopusci/version.rb
CHANGED
metadata
CHANGED
@@ -1,19 +1,20 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: octopusci
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.6
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Andrew De Ponte
|
9
|
+
- Aldo Sarmiento
|
9
10
|
autorequire:
|
10
11
|
bindir: bin
|
11
12
|
cert_chain: []
|
12
|
-
date: 2011-09-
|
13
|
+
date: 2011-09-23 00:00:00.000000000Z
|
13
14
|
dependencies:
|
14
15
|
- !ruby/object:Gem::Dependency
|
15
16
|
name: sinatra
|
16
|
-
requirement: &
|
17
|
+
requirement: &70236289300900 !ruby/object:Gem::Requirement
|
17
18
|
none: false
|
18
19
|
requirements:
|
19
20
|
- - ! '>='
|
@@ -21,10 +22,10 @@ dependencies:
|
|
21
22
|
version: '0'
|
22
23
|
type: :runtime
|
23
24
|
prerelease: false
|
24
|
-
version_requirements: *
|
25
|
+
version_requirements: *70236289300900
|
25
26
|
- !ruby/object:Gem::Dependency
|
26
27
|
name: json
|
27
|
-
requirement: &
|
28
|
+
requirement: &70236289297760 !ruby/object:Gem::Requirement
|
28
29
|
none: false
|
29
30
|
requirements:
|
30
31
|
- - ! '>='
|
@@ -32,10 +33,10 @@ dependencies:
|
|
32
33
|
version: '0'
|
33
34
|
type: :runtime
|
34
35
|
prerelease: false
|
35
|
-
version_requirements: *
|
36
|
+
version_requirements: *70236289297760
|
36
37
|
- !ruby/object:Gem::Dependency
|
37
38
|
name: resque
|
38
|
-
requirement: &
|
39
|
+
requirement: &70236289295540 !ruby/object:Gem::Requirement
|
39
40
|
none: false
|
40
41
|
requirements:
|
41
42
|
- - ! '>='
|
@@ -43,10 +44,10 @@ dependencies:
|
|
43
44
|
version: '0'
|
44
45
|
type: :runtime
|
45
46
|
prerelease: false
|
46
|
-
version_requirements: *
|
47
|
+
version_requirements: *70236289295540
|
47
48
|
- !ruby/object:Gem::Dependency
|
48
49
|
name: actionmailer
|
49
|
-
requirement: &
|
50
|
+
requirement: &70236289294600 !ruby/object:Gem::Requirement
|
50
51
|
none: false
|
51
52
|
requirements:
|
52
53
|
- - ! '>='
|
@@ -54,10 +55,10 @@ dependencies:
|
|
54
55
|
version: '0'
|
55
56
|
type: :runtime
|
56
57
|
prerelease: false
|
57
|
-
version_requirements: *
|
58
|
+
version_requirements: *70236289294600
|
58
59
|
- !ruby/object:Gem::Dependency
|
59
60
|
name: activerecord
|
60
|
-
requirement: &
|
61
|
+
requirement: &70236289293520 !ruby/object:Gem::Requirement
|
61
62
|
none: false
|
62
63
|
requirements:
|
63
64
|
- - ! '>='
|
@@ -65,10 +66,10 @@ dependencies:
|
|
65
66
|
version: '0'
|
66
67
|
type: :runtime
|
67
68
|
prerelease: false
|
68
|
-
version_requirements: *
|
69
|
+
version_requirements: *70236289293520
|
69
70
|
- !ruby/object:Gem::Dependency
|
70
71
|
name: mysql
|
71
|
-
requirement: &
|
72
|
+
requirement: &70236289292240 !ruby/object:Gem::Requirement
|
72
73
|
none: false
|
73
74
|
requirements:
|
74
75
|
- - ! '>='
|
@@ -76,10 +77,10 @@ dependencies:
|
|
76
77
|
version: '0'
|
77
78
|
type: :runtime
|
78
79
|
prerelease: false
|
79
|
-
version_requirements: *
|
80
|
+
version_requirements: *70236289292240
|
80
81
|
- !ruby/object:Gem::Dependency
|
81
82
|
name: multi_json
|
82
|
-
requirement: &
|
83
|
+
requirement: &70236289291100 !ruby/object:Gem::Requirement
|
83
84
|
none: false
|
84
85
|
requirements:
|
85
86
|
- - ! '>='
|
@@ -87,10 +88,10 @@ dependencies:
|
|
87
88
|
version: '0'
|
88
89
|
type: :runtime
|
89
90
|
prerelease: false
|
90
|
-
version_requirements: *
|
91
|
+
version_requirements: *70236289291100
|
91
92
|
- !ruby/object:Gem::Dependency
|
92
93
|
name: time-ago-in-words
|
93
|
-
requirement: &
|
94
|
+
requirement: &70236289277620 !ruby/object:Gem::Requirement
|
94
95
|
none: false
|
95
96
|
requirements:
|
96
97
|
- - ! '>='
|
@@ -98,10 +99,10 @@ dependencies:
|
|
98
99
|
version: '0'
|
99
100
|
type: :runtime
|
100
101
|
prerelease: false
|
101
|
-
version_requirements: *
|
102
|
+
version_requirements: *70236289277620
|
102
103
|
- !ruby/object:Gem::Dependency
|
103
104
|
name: rake
|
104
|
-
requirement: &
|
105
|
+
requirement: &70236289276660 !ruby/object:Gem::Requirement
|
105
106
|
none: false
|
106
107
|
requirements:
|
107
108
|
- - ! '>='
|
@@ -109,10 +110,10 @@ dependencies:
|
|
109
110
|
version: '0'
|
110
111
|
type: :development
|
111
112
|
prerelease: false
|
112
|
-
version_requirements: *
|
113
|
+
version_requirements: *70236289276660
|
113
114
|
- !ruby/object:Gem::Dependency
|
114
115
|
name: rspec
|
115
|
-
requirement: &
|
116
|
+
requirement: &70236289275320 !ruby/object:Gem::Requirement
|
116
117
|
none: false
|
117
118
|
requirements:
|
118
119
|
- - ! '>='
|
@@ -120,10 +121,10 @@ dependencies:
|
|
120
121
|
version: '0'
|
121
122
|
type: :development
|
122
123
|
prerelease: false
|
123
|
-
version_requirements: *
|
124
|
+
version_requirements: *70236289275320
|
124
125
|
- !ruby/object:Gem::Dependency
|
125
126
|
name: rack-test
|
126
|
-
requirement: &
|
127
|
+
requirement: &70236289272920 !ruby/object:Gem::Requirement
|
127
128
|
none: false
|
128
129
|
requirements:
|
129
130
|
- - ! '>='
|
@@ -131,10 +132,10 @@ dependencies:
|
|
131
132
|
version: '0'
|
132
133
|
type: :development
|
133
134
|
prerelease: false
|
134
|
-
version_requirements: *
|
135
|
+
version_requirements: *70236289272920
|
135
136
|
- !ruby/object:Gem::Dependency
|
136
137
|
name: guard
|
137
|
-
requirement: &
|
138
|
+
requirement: &70236289271120 !ruby/object:Gem::Requirement
|
138
139
|
none: false
|
139
140
|
requirements:
|
140
141
|
- - ! '>='
|
@@ -142,10 +143,10 @@ dependencies:
|
|
142
143
|
version: '0'
|
143
144
|
type: :development
|
144
145
|
prerelease: false
|
145
|
-
version_requirements: *
|
146
|
+
version_requirements: *70236289271120
|
146
147
|
- !ruby/object:Gem::Dependency
|
147
148
|
name: rb-fsevent
|
148
|
-
requirement: &
|
149
|
+
requirement: &70236289269000 !ruby/object:Gem::Requirement
|
149
150
|
none: false
|
150
151
|
requirements:
|
151
152
|
- - ! '>='
|
@@ -153,10 +154,10 @@ dependencies:
|
|
153
154
|
version: '0'
|
154
155
|
type: :development
|
155
156
|
prerelease: false
|
156
|
-
version_requirements: *
|
157
|
+
version_requirements: *70236289269000
|
157
158
|
- !ruby/object:Gem::Dependency
|
158
159
|
name: growl
|
159
|
-
requirement: &
|
160
|
+
requirement: &70236289267280 !ruby/object:Gem::Requirement
|
160
161
|
none: false
|
161
162
|
requirements:
|
162
163
|
- - ! '>='
|
@@ -164,10 +165,10 @@ dependencies:
|
|
164
165
|
version: '0'
|
165
166
|
type: :development
|
166
167
|
prerelease: false
|
167
|
-
version_requirements: *
|
168
|
+
version_requirements: *70236289267280
|
168
169
|
- !ruby/object:Gem::Dependency
|
169
170
|
name: guard-rspec
|
170
|
-
requirement: &
|
171
|
+
requirement: &70236289266180 !ruby/object:Gem::Requirement
|
171
172
|
none: false
|
172
173
|
requirements:
|
173
174
|
- - ! '>='
|
@@ -175,10 +176,11 @@ dependencies:
|
|
175
176
|
version: '0'
|
176
177
|
type: :development
|
177
178
|
prerelease: false
|
178
|
-
version_requirements: *
|
179
|
+
version_requirements: *70236289266180
|
179
180
|
description: A multi-branch Continous Integration server that integrates with GitHub
|
180
181
|
email:
|
181
182
|
- cyphactor@gmail.com
|
183
|
+
- sarmiena@gmail.com
|
182
184
|
executables:
|
183
185
|
- octopusci-tentacles
|
184
186
|
- octopusci-skel
|