engineyard-metadata 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/engineyard-metadata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{engineyard-metadata}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2010-10-08}
+  s.date = %q{2010-10-11}
   s.description = %q{Pulls metadata from EC2 and EngineYard so that your EngineYard AppCloud (Amazon EC2) instances know about each other.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [

data/lib/engineyard-metadata/chef_dna.rb

@@ -65,6 +65,11 @@ module EY
       def app_servers
         data['engineyard']['environment']['instances'].select { |i| %w{ app_master app solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
       end
+      
+      # The public hostnames of all the app slaves.
+      def app_slaves
+        data['engineyard']['environment']['instances'].select { |i| %w{ app }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      end
     
       # The public hostnames of all the db servers.
       #
@@ -73,6 +78,11 @@ module EY
         data['engineyard']['environment']['instances'].select { |i| %w{ db_master db_slave solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
       end
     
+      # The public hostnames of all the db slaves.
+      def db_slaves
+        data['engineyard']['environment']['instances'].select { |i| %w{ db_slave }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      end
+    
       # The public hostnames of all the utility servers.
       #
       # If you're on a solo app, it counts the solo as a utility.
@@ -82,16 +92,27 @@ module EY
     
       # The public hostname of the app_master.
       def app_master
-        i = data['engineyard']['environment']['instances'].detect { |i| i['role'] == 'app_master' } ||
-            data['engineyard']['environment']['instances'].detect { |i| i['role'] == 'solo' }
-        i['public_hostname']
+        if x = data['engineyard']['environment']['instances'].detect { |i| i['role'] == 'app_master' }
+          x['public_hostname']
+        else
+          solo
+        end
       end
     
       # The public hostname of the db_master,
       def db_master
-        i = data['engineyard']['environment']['instances'].detect { |i| i['role'] == 'db_master' } ||
-            data['engineyard']['environment']['instances'].detect { |i| i['role'] == 'solo' }
-        i['public_hostname']
+        if x = data['engineyard']['environment']['instances'].detect { |i| i['role'] == 'db_master' }
+          x['public_hostname']
+        else
+          solo
+        end
+      end
+      
+      # The public hostname of the solo.
+      def solo
+        if x = data['engineyard']['environment']['instances'].detect { |i| i['role'] == 'solo' }
+          x['public_hostname']
+        end
       end
       
       # The shell command for mysql, including username, password, hostname and database
@@ -103,6 +124,11 @@ module EY
       def mysqldump_command
         "#{MYSQLDUMP_BIN} -h #{database_host} -u #{database_username} -p#{database_password} #{database_name}"
       end
+      
+      # The name of the EngineYard AppCloud environment.
+      def environment_name
+        data['environment']['name']
+      end
     end
   end
 end

data/lib/engineyard-metadata/metadata.rb

@@ -21,6 +21,10 @@ module EY
       db_master
       mysql_command
       mysqldump_command
+      app_slaves
+      db_slaves
+      solo
+      environment_name
     }
     
     DELEGATED_TO_AMAZON_EC2_API.each do |name|

data/spec/metadata_spec.rb

@@ -55,7 +55,7 @@ describe EY::Metadata do
     EY::Metadata.db_servers.should == [ 'db_master.compute-1.amazonaws.com', 'db_slave_1.compute-1.amazonaws.com' ]
   end
   
-  it 'gets the utilitie hostnames' do
+  it 'gets the utilities hostnames' do
     EY::Metadata.utilities.should == [ 'util_1.compute-1.amazonaws.com' ]
   end
 
@@ -74,4 +74,20 @@ describe EY::Metadata do
   it 'gets the mysqldump command' do
     EY::Metadata.mysqldump_command.should == '/usr/bin/mysqldump -h external_db_master.compute-1.amazonaws.com -u USERS-0-USERNAME -pUSERS-0-PASSWORD APPS-0-DATABASE_NAME'
   end
+  
+  it 'gets the db slave hostnames' do
+    EY::Metadata.db_slaves.should == [ 'db_slave_1.compute-1.amazonaws.com' ]
+  end
+
+  it 'gets the app slave hostnames' do
+    EY::Metadata.app_slaves.should == [ 'app_1.compute-1.amazonaws.com' ]
+  end
+  
+  it 'gets the solo hostname' do
+    EY::Metadata.solo.should == nil
+  end
+  
+  it 'gets the environment name' do
+    EY::Metadata.environment_name.should == 'APP-NAME_production'
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-metadata
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -05:00
+date: 2010-10-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency