conan 0.4.2 → 0.4.3

data/lib/conan/deployment.rb

@@ -54,10 +54,10 @@ module Conan
         load_script(context, "deployment/git") 
 
         load_script(context, "cloud/tasks")
-
-        #need to change to only compile for rails 3.1
+        
         begin
-          rails_v = `bundle exec rails -v`.chomp.split(' ').last
+          rails_v = context.variables[:rails_version]
+          rails_v = `bundle exec rails -v`.chomp.split(' ').last unless rails_v
           if Gem::Version.new(rails_v) > Gem::Version.new('3.1.0')
             load_script(context, "deployment/assets")
           end

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000Z
+date: 2012-02-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70360746833680 !ruby/object:Gem::Requirement
+  requirement: &70333738810960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70360746833680
+  version_requirements: *70333738810960
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70360746833020 !ruby/object:Gem::Requirement
+  requirement: &70333738810280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70360746833020
+  version_requirements: *70333738810280
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70360746832000 !ruby/object:Gem::Requirement
+  requirement: &70333738803340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70360746832000
+  version_requirements: *70333738803340
 description: Set up a project to enable the provision of infrastructure through AWS
   and the configuration of servers using Chef via Capistrano.
 email: