engineyard-serverside 1.5.9 → 1.5.10
Sign up to get free protection for your applications and to get access to all the features.
@@ -403,8 +403,8 @@ WRAP
|
|
403
403
|
if File.directory?(c.bundled_gems_path)
|
404
404
|
rebundle = false
|
405
405
|
|
406
|
-
rebundle = true if File.exist?(c.ruby_version_file)
|
407
|
-
rebundle = true if File.exist?(c.system_version_file)
|
406
|
+
rebundle = true if !File.exist?(c.ruby_version_file) || File.read(c.ruby_version_file) != ruby_version
|
407
|
+
rebundle = true if !File.exist?(c.system_version_file) || File.read(c.system_version_file) != system_version
|
408
408
|
|
409
409
|
if rebundle
|
410
410
|
info "~> Ruby version change detected, cleaning bundled gems"
|
@@ -25,8 +25,8 @@ module EY
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def syntax_error(file)
|
28
|
-
|
29
|
-
|
28
|
+
output = `ruby -c #{file} 2>&1`
|
29
|
+
output unless output =~ /Syntax OK/
|
30
30
|
end
|
31
31
|
|
32
32
|
class CallbackContext
|
@@ -7,7 +7,7 @@ module EY
|
|
7
7
|
rails_version = bundled_rails_version
|
8
8
|
roles :app_master, :app, :solo do
|
9
9
|
keep_existing_assets
|
10
|
-
cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile"
|
10
|
+
cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile || true"
|
11
11
|
if rails_version
|
12
12
|
info "~> Precompiling assets for rails v#{rails_version}"
|
13
13
|
else
|
@@ -20,7 +20,13 @@ module EY
|
|
20
20
|
def app_needs_assets?
|
21
21
|
app_rb_path = File.join(c.release_path, 'config', 'application.rb')
|
22
22
|
return unless File.readable?(app_rb_path) # Not a Rails app in the first place.
|
23
|
-
|
23
|
+
|
24
|
+
if File.directory?(File.join(c.release_path, 'app', 'assets'))
|
25
|
+
info "~> app/assets/ found. Attempting Rails asset pre-compilation."
|
26
|
+
else
|
27
|
+
return false
|
28
|
+
end
|
29
|
+
|
24
30
|
if app_builds_own_assets?
|
25
31
|
info "~> public/assets already exists, skipping pre-compilation."
|
26
32
|
return
|
data/spec/deploy_hook_spec.rb
CHANGED
@@ -194,7 +194,7 @@ describe "the deploy-hook API" do
|
|
194
194
|
it "returns a brief problem description for hook files containing valid Ruby syntax" do
|
195
195
|
hook_path = File.expand_path('../fixtures/invalid_hook.rb', __FILE__)
|
196
196
|
desc = "spec/fixtures/invalid_hook.rb:1: syntax error, unexpected '^'"
|
197
|
-
match =
|
197
|
+
match = /#{Regexp.escape desc}/
|
198
198
|
@hook.syntax_error(hook_path).should =~ match
|
199
199
|
end
|
200
200
|
end
|
metadata
CHANGED
@@ -1,13 +1,8 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: engineyard-serverside
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash: 17
|
5
4
|
prerelease:
|
6
|
-
|
7
|
-
- 1
|
8
|
-
- 5
|
9
|
-
- 9
|
10
|
-
version: 1.5.9
|
5
|
+
version: 1.5.10
|
11
6
|
platform: ruby
|
12
7
|
authors:
|
13
8
|
- EY Cloud Team
|
@@ -15,39 +10,31 @@ autorequire:
|
|
15
10
|
bindir: bin
|
16
11
|
cert_chain: []
|
17
12
|
|
18
|
-
date: 2011-
|
13
|
+
date: 2011-11-01 00:00:00 -07:00
|
19
14
|
default_executable: engineyard-serverside
|
20
15
|
dependencies:
|
21
16
|
- !ruby/object:Gem::Dependency
|
22
|
-
prerelease: false
|
23
|
-
type: :development
|
24
17
|
name: rspec
|
25
|
-
|
18
|
+
requirement: &id001 !ruby/object:Gem::Requirement
|
26
19
|
none: false
|
27
20
|
requirements:
|
28
21
|
- - "="
|
29
22
|
- !ruby/object:Gem::Version
|
30
|
-
hash: 31
|
31
|
-
segments:
|
32
|
-
- 1
|
33
|
-
- 3
|
34
|
-
- 2
|
35
23
|
version: 1.3.2
|
36
|
-
requirement: *id001
|
37
|
-
- !ruby/object:Gem::Dependency
|
38
|
-
prerelease: false
|
39
24
|
type: :development
|
25
|
+
prerelease: false
|
26
|
+
version_requirements: *id001
|
27
|
+
- !ruby/object:Gem::Dependency
|
40
28
|
name: rake
|
41
|
-
|
29
|
+
requirement: &id002 !ruby/object:Gem::Requirement
|
42
30
|
none: false
|
43
31
|
requirements:
|
44
32
|
- - ">="
|
45
33
|
- !ruby/object:Gem::Version
|
46
|
-
hash: 3
|
47
|
-
segments:
|
48
|
-
- 0
|
49
34
|
version: "0"
|
50
|
-
|
35
|
+
type: :development
|
36
|
+
prerelease: false
|
37
|
+
version_requirements: *id002
|
51
38
|
description:
|
52
39
|
email: cloud@engineyard.com
|
53
40
|
executables:
|
@@ -307,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
307
294
|
requirements:
|
308
295
|
- - ">="
|
309
296
|
- !ruby/object:Gem::Version
|
310
|
-
hash:
|
297
|
+
hash: 1487870425695455343
|
311
298
|
segments:
|
312
299
|
- 0
|
313
300
|
version: "0"
|
@@ -316,14 +303,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
316
303
|
requirements:
|
317
304
|
- - ">="
|
318
305
|
- !ruby/object:Gem::Version
|
319
|
-
hash:
|
306
|
+
hash: 1487870425695455343
|
320
307
|
segments:
|
321
308
|
- 0
|
322
309
|
version: "0"
|
323
310
|
requirements: []
|
324
311
|
|
325
312
|
rubyforge_project:
|
326
|
-
rubygems_version: 1.
|
313
|
+
rubygems_version: 1.6.2
|
327
314
|
signing_key:
|
328
315
|
specification_version: 3
|
329
316
|
summary: A gem that deploys ruby applications on EY Cloud instances
|