engineyard-metadata 0.2.3 → 0.2.4

data/README.rdoc

@@ -8,7 +8,6 @@ To define a simple interface to useful metadata (passwords, IP addresses, etc.)
 
 == Examples
 
-* Get a dynamically updated list of all running app servers so that you can pool memcached over all of them. (<tt>EY.metadata.app_servers</tt>)
 * Get the current database password so that you can write a script that connects to it. (<tt>EY.metadata.database_password</tt>)
 
 Here's the current method list:
@@ -41,6 +40,15 @@ Here's the current method list:
 	EY.metadata.stack_name
 	EY.metadata.utilities
 
+== public_hostname, amazon_id, etc.
+
+Thanks to Nick Marden, you can do things like:
+
+    ?> EY.metadata.app_servers('amazon_id')
+    >> [ 'i-ff17d493', 'i-c217d423' ]
+
+By default, you get the public hostname.
+
 == Use
 
 See the rdoc at {the engineyard-metadata rdoc}[http://rubydoc.info/gems/engineyard-metadata].
@@ -49,6 +57,16 @@ See the rdoc at {the engineyard-metadata rdoc}[http://rubydoc.info/gems/engineya
 
 When you're executing the gem from your instances, you don't have to configure anything. Just require the gem.
 
+If you see
+
+    Errno::EACCES: Permission denied - /etc/chef/dna.json
+
+then I suggest adding something like this to `deploy/before_bundle.rb`
+
+    sudo 'chmod a+r /etc/chef/dna.json'
+
+or find some other way to make the file readable.
+
 === When you're executing this gem from OUTSIDE the cloud
 
 You must...

data/lib/engineyard-metadata/amazon_ec2_api.rb

@@ -1,4 +1,4 @@
-require 'eat'
+require 'open-uri'
 
 module EY
   class Metadata
@@ -6,12 +6,12 @@ module EY
     class AmazonEc2Api
       # The present instance's Amazon Ec2 instance id.
       def present_instance_id
-        @present_instance_id ||= eat 'http://169.254.169.254/latest/meta-data/instance-id'
+        @present_instance_id ||= open('http://169.254.169.254/latest/meta-data/instance-id').read
       end
 
       # The present instance's Amazon Ec2 security group.
       def present_security_group
-        @present_security_group ||= eat 'http://169.254.169.254/latest/meta-data/security-groups'
+        @present_security_group ||= open('http://169.254.169.254/latest/meta-data/security-groups').read
       end
     end
   end

data/lib/engineyard-metadata/chef_dna.rb

@@ -5,7 +5,6 @@ require 'active_support/version'
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
-require 'eat'
 
 module EY
   class Metadata
@@ -16,7 +15,7 @@ module EY
       include SshAliasHelper
 
       def dna # :nodoc:
-        @dna ||= ActiveSupport::JSON.decode eat(PATH)
+        @dna ||= ActiveSupport::JSON.decode File.read(PATH)
       end
       
       def application # :nodoc:
@@ -70,63 +69,63 @@ module EY
         dna['engineyard']['environment']['ssh_password']
       end
   
-      # The public hostnames of all the app servers.
+      # An identifying attribute of each app server. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as an app server.
-      def app_servers
-        dna['engineyard']['environment']['instances'].select { |i| %w{ app_master app solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      def app_servers(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        dna['engineyard']['environment']['instances'].select { |i| %w{ app_master app solo }.include? i['role'] }.map { |i| i[normalize_identifier(identifier)] }.sort
       end
-    
-      # The public hostnames of all the app slaves.
-      def app_slaves
-        dna['engineyard']['environment']['instances'].select { |i| %w{ app }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+   
+      # An identifying attribute of each app slave. Defaults to public_hostname. 
+      def app_slaves(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        dna['engineyard']['environment']['instances'].select { |i| %w{ app }.include? i['role'] }.map { |i| i[normalize_identifier(identifier)] }.sort
       end
-  
-      # The public hostnames of all the db servers.
+
+      # An identifying attribute of each DB server. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as a db server.
-      def db_servers
-        dna['engineyard']['environment']['instances'].select { |i| %w{ db_master db_slave solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      def db_servers(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        dna['engineyard']['environment']['instances'].select { |i| %w{ db_master db_slave solo }.include? i['role'] }.map { |i| i[normalize_identifier(identifier)] }.sort
       end
   
-      # The public hostnames of all the db slaves.
-      def db_slaves
-        dna['engineyard']['environment']['instances'].select { |i| %w{ db_slave }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      # An identifying attribute of each DB slave. Defaults to public_hostname.
+      def db_slaves(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        dna['engineyard']['environment']['instances'].select { |i| %w{ db_slave }.include? i['role'] }.map { |i| i[normalize_identifier(identifier)] }.sort
       end
   
-      # The public hostnames of all the utility servers.
+      # An identifying attribute of each utility server. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as a utility.
-      def utilities
-        dna['engineyard']['environment']['instances'].select { |i| %w{ util solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      def utilities(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        dna['engineyard']['environment']['instances'].select { |i| %w{ util solo }.include? i['role'] }.map { |i| i[normalize_identifier(identifier)] }.sort
       end
   
-      # The public hostname of the app_master.
+      # An identifying attribute of the app_master. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as the app_master.
-      def app_master
+      def app_master(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
         if x = dna['engineyard']['environment']['instances'].detect { |i| i['role'] == 'app_master' }
-          x['public_hostname']
+          x[normalize_identifier(identifier)]
         else
-          solo
+          solo(identifier)
         end
       end
   
-      # The public hostname of the db_master.
+      # An identifying attribute of the db_master. Defaults to public_hostname.
       #
-      # If you're on a solo app, it counts the solo as the app_master.
-      def db_master
+      # If you're on a solo app, it counts the solo as the db_master.
+      def db_master(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
         if x = dna['engineyard']['environment']['instances'].detect { |i| i['role'] == 'db_master' }
-          x['public_hostname']
+          x[normalize_identifier(identifier)]
         else
-          solo
+          solo(identifier)
         end
       end
     
-      # The public hostname of the solo.
-      def solo
+      # An identifying attribute of the solo. Defaults to public_hostname.
+      def solo(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
         if x = dna['engineyard']['environment']['instances'].detect { |i| i['role'] == 'solo' }
-          x['public_hostname']
+          x[normalize_identifier(identifier)]
         end
       end
 
@@ -149,6 +148,10 @@ module EY
       def stack_name
         dna['engineyard']['environment']['stack_name']
       end
+
+      def normalize_identifier(identifier)
+        (identifier == 'amazon_id') ? 'id' : identifier
+      end
     end
   end
 end

data/lib/engineyard-metadata/engine_yard_cloud_api.rb

@@ -46,63 +46,63 @@ module EY
         db_master
       end
 
-      # The public hostname of the db_master.
+      # An identifying attribute of the db_master. Defaults to public_hostname.
       #
-      # If you're on a solo app, it counts the solo as the app_master.
-      def db_master
+      # If you're on a solo app, it counts the solo as the db_master.
+      def db_master(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
         if x = environment['instances'].detect { |i| i['role'] == 'db_master' }
-          x['public_hostname']
+          x[identifier]
         else
-          solo
+          solo(identifier)
         end
       end
       
-      # The public hostnames of all the app servers.
+      # An identifying attribute of each app server. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as an app server.
-      def app_servers
-        environment['instances'].select { |i| %w{ app_master app solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      def app_servers(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        environment['instances'].select { |i| %w{ app_master app solo }.include? i['role'] }.map { |i| i[identifier] }.sort
       end
       
-      # The public hostnames of all the db servers.
+      # An identifying attribute of each DB server. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as a db server.
-      def db_servers
-        environment['instances'].select { |i| %w{ db_master db_slave solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      def db_servers(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        environment['instances'].select { |i| %w{ db_master db_slave solo }.include? i['role'] }.map { |i| i[identifier] }.sort
       end
       
-      # The public hostnames of all the utility servers.
+      # An identifying attribute of each utility server. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as a utility.
-      def utilities
-        environment['instances'].select { |i| %w{ util solo }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      def utilities(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        environment['instances'].select { |i| %w{ util solo }.include? i['role'] }.map { |i| i[identifier] }.sort
       end
       
-      # The public hostnames of all the app slaves.
-      def app_slaves
-        environment['instances'].select { |i| %w{ app }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      # An identifying attribute of each app slave. Defaults to public_hostname. 
+      def app_slaves(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        environment['instances'].select { |i| %w{ app }.include? i['role'] }.map { |i| i[identifier] }.sort
       end
   
-      # The public hostnames of all the db slaves.
-      def db_slaves
-        environment['instances'].select { |i| %w{ db_slave }.include? i['role'] }.map { |i| i['public_hostname'] }.sort
+      # An identifying attribute of each DB slave. Defaults to public_hostname.
+      def db_slaves(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
+        environment['instances'].select { |i| %w{ db_slave }.include? i['role'] }.map { |i| i[identifier] }.sort
       end
       
-      # The public hostname of the app_master.
+      # An identifying attribute of the app_master. Defaults to public_hostname.
       #
       # If you're on a solo app, it counts the solo as the app_master.
-      def app_master
+      def app_master(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
         if x = environment['instances'].detect { |i| i['role'] == 'app_master' }
-          x['public_hostname']
+          x[identifier]
         else
-          solo
+          solo(identifier)
         end
       end
 
-      # The public hostname of the solo.
-      def solo
+      # An identifying attribute of the solo. Defaults to public_hostname.
+      def solo(identifier = EY::Metadata::DEFAULT_IDENTIFIER)
         if x = environment['instances'].detect { |i| i['role'] == 'solo' }
-          x['public_hostname']
+          x[identifier]
         end
       end
       

data/lib/engineyard-metadata/insider.rb

@@ -36,14 +36,14 @@ module EY
       DELEGATED_TO_CHEF_DNA = METHODS - instance_methods.map { |m| m.to_s } - DELEGATED_TO_AMAZON_EC2_API
 
       DELEGATED_TO_AMAZON_EC2_API.each do |name|
-        define_method name do
-          amazon_ec2_api.send name
+        define_method name do |*args|
+          amazon_ec2_api.send name, *args
         end
       end
 
       DELEGATED_TO_CHEF_DNA.each do |name|
-        define_method name do
-          chef_dna.send name
+        define_method name do |*args|
+          chef_dna.send name, *args
         end
       end
     end

data/lib/engineyard-metadata/metadata.rb

@@ -16,6 +16,9 @@ module EY
     class CannotGetFromHere < RuntimeError
     end
 
+    # The default instance identifier for selector methods
+    DEFAULT_IDENTIFIER = 'public_hostname'
+
     attr_writer :app_name
     
     METHODS = %w{

data/lib/engineyard-metadata/outsider.rb

@@ -80,8 +80,8 @@ module EY
       end
   
       GETTABLE.each do |name|
-        define_method name do
-          engine_yard_cloud_api.send name
+        define_method name do |*args|
+          engine_yard_cloud_api.send name, *args
         end
       end
     end

data/lib/engineyard-metadata/version.rb

@@ -1,5 +1,5 @@
 module EY
   class Metadata
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/spec/metadata_spec.rb

@@ -21,14 +21,27 @@ shared_examples_for "it does in all execution environments" do
     EY.metadata.app_servers.should == ["ec2-174-129-212-130.compute-1.amazonaws.com"]
   end
 
+  it 'by getting the app server IDs' do
+    EY.metadata.app_servers('amazon_id').should == ['i-ff17d493']
+  end
+
   it 'by getting the db server hostnames' do
     EY.metadata.db_servers.should == ["ec2-67-202-19-255.compute-1.amazonaws.com"]
   end
 
+  it 'by getting the db server instance IDs' do
+    EY.metadata.db_servers('amazon_id').should == ['i-f917d495']
+  end
+
+
   it 'by getting the utilities hostnames' do
     EY.metadata.utilities.should == []
   end
 
+  it 'by getting the utilities IDs' do
+    EY.metadata.utilities('amazon_id').should == []
+  end
+
   it 'by getting the app master hostname' do
     EY.metadata.app_master.should == 'ec2-174-129-212-130.compute-1.amazonaws.com'
   end
@@ -37,14 +50,26 @@ shared_examples_for "it does in all execution environments" do
     EY.metadata.db_master.should == 'ec2-67-202-19-255.compute-1.amazonaws.com'
   end
 
+  it 'by getting the db master instance ID' do
+    EY.metadata.db_master('amazon_id').should == 'i-f917d495'
+  end
+
   it 'by getting the db slave hostnames' do
     EY.metadata.db_slaves.should == []
   end
 
+  it 'by getting the db slave instance IDs' do
+    EY.metadata.db_slaves('amazon_id').should == []
+  end
+
   it 'by getting the app slave hostnames' do
     EY.metadata.app_slaves.should == []
   end
 
+  it 'by getting the app slave hostnames' do
+    EY.metadata.app_slaves('amazon_id').should == []
+  end
+
   it 'by getting the solo hostname' do
     EY.metadata.solo.should == nil
   end
@@ -216,6 +241,7 @@ describe 'EY.metadata' do
     end
     describe "depending on .eyrc" do
       before do
+        FileUtils.mkdir_p File.dirname(EY.metadata.eyrc_path)
         File.open(EY.metadata.eyrc_path, 'w') { |f| f.write({'api_token' => FAKE_CLOUD_TOKEN + 'ccc'}.to_yaml) }
         EY.metadata.environment_name = 'cm1_production_blue'
         EY.metadata.ey_cloud_token.should == FAKE_CLOUD_TOKEN + 'ccc' # sanity check

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'rspec'
 require 'active_support/json/encoding'
 require 'fakeweb'
 require 'fakefs/safe'
-require 'eat' # otherwise it's loaded when fakefs is already active
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'engineyard-metadata'

metadata

@@ -1,122 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-metadata
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.2.4
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-31 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153302620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 3
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nap
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153302620
+- !ruby/object:Gem::Dependency
+  name: nap
+  requirement: &2153289780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: eat
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153289780
+- !ruby/object:Gem::Dependency
+  name: eat
+  requirement: &2153287620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 0
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153287620
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2153286600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153286600
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &2153285120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153285120
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153283100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id006
-description: Pulls metadata from EC2 and EngineYard so that your EngineYard AppCloud (Amazon EC2) instances know about each other.
-email: 
+  prerelease: false
+  version_requirements: *2153283100
+description: Pulls metadata from EC2 and EngineYard so that your EngineYard AppCloud
+  (Amazon EC2) instances know about each other.
+email:
 - seamus@abshere.net
-executables: 
+executables:
 - ey_ssh_aliases
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -139,43 +108,34 @@ files:
 - spec/support/dna.json
 - spec/support/dot.git.config
 - spec/support/engine_yard_cloud_api_response.json
-has_rdoc: true
 homepage: https://github.com/seamusabshere/engineyard-metadata
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: engineyard-metadata
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Make your EngineYard AppCloud (Amazon EC2) instances aware of each other.
-test_files: 
+test_files:
 - spec/metadata_spec.rb
 - spec/spec_helper.rb
 - spec/support/dna.json
 - spec/support/dot.git.config
 - spec/support/engine_yard_cloud_api_response.json
+has_rdoc: