ey_cloud_awareness 0.1.9 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.11

data/ey_cloud_awareness.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ey_cloud_awareness}
-  s.version = "0.1.9"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2010-02-11}
   s.description = %q{Make your EngineYard cloud instances aware of each other.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [

data/lib/engine_yard_cloud_instance.rb

@@ -57,19 +57,19 @@ class EngineYardCloudInstance
     end
     
     def app_master
-      find_all_by_instance_roles(:app_master).first
+      find_all_by_instance_roles(:app_master).first || find_all_by_instance_roles(:solo).first
     end
     
     def db_master
-      find_all_by_instance_roles(:db_master).first
+      find_all_by_instance_roles(:db_master).first || find_all_by_instance_roles(:solo).first
     end
     
     def app
-      find_all_by_instance_roles :app, :app_master
+      find_all_by_instance_roles :app, :app_master, :solo
     end
     
     def db
-      find_all_by_instance_roles :db_master, :db_slave
+      find_all_by_instance_roles :db_master, :db_slave, :solo
     end
     
     def utility
@@ -118,7 +118,9 @@ class EngineYardCloudInstance
         hash[instance_description[:aws_instance_id]] ||= Hash.new
         current = hash[instance_description[:aws_instance_id]]
         # using current as a pointer
-        if dna[:db_host] == instance_description[:dns_name] or dna[:db_host] == instance_description[:private_dns_name]
+        if dna[:instance_role] == 'solo'
+          current[:instance_role] = 'solo'
+        elsif dna[:db_host] == instance_description[:dns_name] or dna[:db_host] == instance_description[:private_dns_name]
           current[:instance_role] = 'db_master'
         elsif Array.wrap(dna[:db_slaves]).include? instance_description[:private_dns_name]
           current[:instance_role] = 'db_slave'

data/lib/tasks/capistrano_tasks.rb

@@ -75,7 +75,8 @@ end
 namespace :eyc do
   task :ssh, :roles => :app_master do
     replacement = []
-    eyc_proxy.with_roles.each_with_index do |instance, index|
+    counter = 0
+    eyc_proxy.with_roles.each do |instance|
       case instance.instance_role
       when 'db_master'
         explanation = ''
@@ -83,9 +84,13 @@ namespace :eyc do
       when 'app_master'
         explanation = ''
         shorthand = 'app_master'
+      when 'solo'
+        explanation = ''
+        shorthand = 'solo'
       else
-        explanation = " (#{index})"
-        shorthand = "#{instance.instance_role}#{index}"
+        explanation = " (#{counter})"
+        shorthand = "#{instance.instance_role}#{counter}"
+        counter += 1
       end
       replacement << %{
   # #{instance.instance_role}#{explanation}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_awareness
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -05:00
+date: 2010-02-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency