conan 0.4.6 → 0.4.7

data/lib/conan/cloud/aws/provision.rb

@@ -30,14 +30,11 @@ module AWS
       stages.each do | st|
         server_config[st] = {}
         servers.each do |server|
-          if server.tags["stage"] == st
+          if server.tags["stage"] == st && !server.tags["roles"].nil?
             config = {}
-            unless server.tags["roles"].nil?
-              config["roles"] = server.tags["roles"].split(", ")
-              config["roles"] = server.tags["roles"].split(":") unless config["roles"].length > 1 
-            end
+            config["roles"] = server.tags["roles"].split /,\s*|:/ || []
             config["alias"] = server.tags["name"]
-            if filter_role.nil? || config["roles"].include?(filter_role) 
+            if filter_role.nil? || config["roles"].include?(filter_role)
               server_config[st][server.dns_name] = config
             end
           end 

data/lib/conan/cloud/aws/utils.rb

@@ -65,7 +65,8 @@ module AWS
     end
 
     def default_image_id(region, flavor_id, root_device_type)
-      arch = ["m1.small", "t1.micro", "c1.medium"].include?(flavor_id) ? "32-bit" : "64-bit"
+      #now default to 64 bit architecture as all flavors support 64 bit
+      arch = "64-bit"
 
       defaults = JSON.parse(File.read(File.expand_path(File.join(File.dirname(__FILE__), 'default_amis.json'))))
       

data/lib/conan/deployment.rb

@@ -40,6 +40,11 @@ module Conan
 
       def add_role(*roles)
         roles = Hash.new{ |h,k| h[k] = [] }
+
+        #init this manually otherwise we can run into problems where no server has the app role and 
+        #the above initialiser can't run while iterating over it
+        roles[:app] = []
+
         server_config.each do |s, c|
           c["roles"].each do |r|
             roles[r.to_sym] << s

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,74 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: conan
-version: !ruby/object:Gem::Version
-  version: 0.4.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 7
+  version: 0.4.7
 platform: ruby
-authors:
+authors: 
 - Paul Battley
 - Stuart Eccles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-25 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.12.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: capistrano
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 12
+        - 0
         version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: fog
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Set up a project to enable the provision of infrastructure through AWS
-  and the configuration of servers using Chef via Capistrano.
-email:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+description: Set up a project to enable the provision of infrastructure through AWS and the configuration of servers using Chef via Capistrano.
+email: 
 - stuart@madebymany.co.uk
-executables:
+executables: 
 - conan
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - bin/conan
 - lib/conan/capistrano.rb
 - lib/conan/cloud/aws/autoscale.rb
@@ -107,28 +106,35 @@ files:
 - lib/conan/template/deploy/chef/solo.rb
 - lib/conan/version.rb
 - README.md
+has_rdoc: true
 homepage: http://github.com/madebymany/conan
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Conan The Deployer
 test_files: []
+