oban 0.1.5 → 0.1.6
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/oban/oban.rb +14 -7
- data/lib/oban/version.rb +1 -1
- metadata +4 -4
data/lib/oban/oban.rb
CHANGED
@@ -143,6 +143,15 @@ class Oban
|
|
143
143
|
`git add #{self.submods}`
|
144
144
|
end
|
145
145
|
|
146
|
+
def wipe_deploy
|
147
|
+
# test to see if deploy exists.. wipe it if it does..
|
148
|
+
branches = `git branch`
|
149
|
+
|
150
|
+
if !branches.match('deploy').nil? then
|
151
|
+
`git branch -D deploy`
|
152
|
+
end
|
153
|
+
end
|
154
|
+
|
146
155
|
def deploy
|
147
156
|
|
148
157
|
real_init
|
@@ -155,12 +164,7 @@ class Oban
|
|
155
164
|
# might need to change the logic on this to do reset --hard and
|
156
165
|
# friends so we don't clobber the remote deploy branch
|
157
166
|
|
158
|
-
|
159
|
-
branches = `git branch`
|
160
|
-
|
161
|
-
if !branches.match('deploy').nil? then
|
162
|
-
`git branch -D deploy`
|
163
|
-
end
|
167
|
+
wipe_deploy
|
164
168
|
|
165
169
|
# create new branch then checkout
|
166
170
|
`git branch deploy`
|
@@ -173,8 +177,9 @@ class Oban
|
|
173
177
|
|
174
178
|
`git commit -a -m "deploying"`
|
175
179
|
|
180
|
+
# let's not track this for now
|
176
181
|
# push to deploy branch first
|
177
|
-
|
182
|
+
#`git push origin +deploy`
|
178
183
|
|
179
184
|
# btw --force should NEVER be used (except for this case) ;)
|
180
185
|
`git push --force heroku HEAD:master`
|
@@ -185,6 +190,8 @@ class Oban
|
|
185
190
|
|
186
191
|
reinit_submods
|
187
192
|
|
193
|
+
# wipe deploy again for now
|
194
|
+
wipe_deploy
|
188
195
|
end
|
189
196
|
|
190
197
|
end
|
data/lib/oban/version.rb
CHANGED
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: oban
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 23
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 1
|
9
|
-
-
|
10
|
-
version: 0.1.
|
9
|
+
- 6
|
10
|
+
version: 0.1.6
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Ian Eyberg
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-10-
|
18
|
+
date: 2010-10-14 00:00:00 -05:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|