conan 0.4.2 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -54,10 +54,10 @@ module Conan
54
54
  load_script(context, "deployment/git")
55
55
 
56
56
  load_script(context, "cloud/tasks")
57
-
58
- #need to change to only compile for rails 3.1
57
+
59
58
  begin
60
- rails_v = `bundle exec rails -v`.chomp.split(' ').last
59
+ rails_v = context.variables[:rails_version]
60
+ rails_v = `bundle exec rails -v`.chomp.split(' ').last unless rails_v
61
61
  if Gem::Version.new(rails_v) > Gem::Version.new('3.1.0')
62
62
  load_script(context, "deployment/assets")
63
63
  end
data/lib/conan/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Conan
2
- VERSION = "0.4.2"
2
+ VERSION = "0.4.3"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conan
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.4.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-02-28 00:00:00.000000000Z
13
+ date: 2012-02-29 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: json
17
- requirement: &70360746833680 !ruby/object:Gem::Requirement
17
+ requirement: &70333738810960 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 1.6.1
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70360746833680
25
+ version_requirements: *70333738810960
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: capistrano
28
- requirement: &70360746833020 !ruby/object:Gem::Requirement
28
+ requirement: &70333738810280 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *70360746833020
36
+ version_requirements: *70333738810280
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: fog
39
- requirement: &70360746832000 !ruby/object:Gem::Requirement
39
+ requirement: &70333738803340 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
44
44
  version: '0'
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *70360746832000
47
+ version_requirements: *70333738803340
48
48
  description: Set up a project to enable the provision of infrastructure through AWS
49
49
  and the configuration of servers using Chef via Capistrano.
50
50
  email: