ey_cloud_awareness 0.2.0 → 0.2.1

data/README.rdoc

@@ -2,7 +2,7 @@
 
 This gem makes it a little easier to live on the EngineYard cloud:
 
-* allow your instances to get information about the app_master, db_master, utility workers, etc. in its EngineYard environment
+* allow your instances to get information (metadata) about the app_master, db_master, utility workers, etc. in its EngineYard environment
 * automatically map cap tasks to all your instances
 * automatically update your ssh aliases
 
@@ -24,10 +24,20 @@ to your before_restart.rb hook.
 
 Running this command only works from EngineYard AppCloud Amazon EC2 instances.
 
+  seamus-absheres-macbook:~ $ ssh my_app_staging-app_master
+  Last login: Wed Sep 22 10:33:56 2010 from 9.9.9.9
+  deploy@ip-10-202-197-254 ~ $ sudo gem install ey_cloud_awareness --no-rdoc --no-ri
+  Successfully installed string_replacer-0.0.1
+  Successfully installed ey_cloud_awareness-0.2.0
+  2 gems installed
+  deploy@ip-10-202-197-254 ~ $ sudo chmod a+r /etc/chef/dna.json
+  deploy@ip-10-202-197-254 ~ $ ey_cloud_awareness
+  {"apps":[{"name":"my_app","ebuilds":[{"name":"dev-libs/oniguruma"}],"repository_name":"git@github.com:seamusabshere/my_app.git","database_name":"my_app", [...]
+
 * SSH into one of your EngineYard AppCloud Amazon EC2 instances.
-* Run <tt>sudo gem install ey_cloud_awareness --no-rdoc --no-ri</tt> to make sure the gem binary is installed somewhere in your path.
-* Run <tt>sudo chmod a+r /etc/chef/dna.json</tt> to make sure everybody can read the EngineYard DNA information.
-* Run <tt>ey_cloud_awareness</tt> and you should get back a JSON-encoded hash of instance, environment, app, and other metadata.
+* Running <tt>sudo gem install ey_cloud_awareness --no-rdoc --no-ri</tt> makes sure the gem binary is installed somewhere in your path.
+* Running <tt>sudo chmod a+r /etc/chef/dna.json</tt> makes sure everybody can read the EngineYard DNA information.
+* Running <tt>ey_cloud_awareness</tt>, you should get back a JSON-encoded hash of instance, environment, app, and other metadata.
 
 It returns a cleaned-up combination of Amazon EC2 and EngineYard metadata.
 

data/Rakefile

@@ -18,9 +18,9 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
+  # Jeweler::RubyforgeTasks.new do |rubyforge|
+  #   rubyforge.doc_task = "rdoc"
+  # end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/ey_cloud_awareness.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ey_cloud_awareness}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2010-09-22}
+  s.date = %q{2010-09-23}
   s.default_executable = %q{ey_cloud_awareness}
   s.description = %q{Pull metadata from EC2 and EngineYard so that your EngineYard Cloud instances know about each other.}
   s.email = %q{seamus@abshere.net}

data/lib/ey_cloud_awareness/engine_yard_cloud_instance.rb

@@ -167,8 +167,9 @@ class EngineYardCloudInstance
     def mixed_instances
       ec2_instances.inject(Hash.new) do |memo, ec2_instance|
         instance_id = ec2_instance['instance_id']
-        mixed_instance = dna_instances.detect { |dna_instance| dna_instance['id'] == instance_id }.merge ec2_instance
-        memo[instance_id] = mixed_instance
+        if dna_instance = dna_instances.detect { |i| i['id'] == instance_id }
+          memo[instance_id] = dna_instance.merge ec2_instance
+        end
         memo
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_awareness
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -05:00
+date: 2010-09-23 00:00:00 -05:00
 default_executable: ey_cloud_awareness
 dependencies: 
 - !ruby/object:Gem::Dependency