engineyard-metadata 0.2.2 → 0.2.3

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in engineyard-metadata.gemspec
+gemspec

data/README.rdoc

@@ -98,6 +98,140 @@ You can put the output of <tt>ey_ssh_aliases</tt> into <tt>~/.ssh/config</tt>:
 
 This is the second generation of http://rubygems.org/gems/ey_cloud_awareness.
 
+== Sample test output
+
+    engineyard-metadata (master) $ rake
+    
+    EY.metadata
+      being executed on an EngineYard AppCloud (i.e. Amazon EC2) instance
+        it should behave like it does in all execution environments
+          by getting the database username
+          by getting the database name
+          by getting the database host
+          by getting the ssh username
+          by getting the app server hostnames
+          by getting the db server hostnames
+          by getting the utilities hostnames
+          by getting the app master hostname
+          by getting the db master hostname
+          by getting the db slave hostnames
+          by getting the app slave hostnames
+          by getting the solo hostname
+          by getting the environment name
+          by getting the stack name
+          by getting the repository URI
+          by getting the app name
+          by getting the current path
+          by getting the shared path
+          by getting helpful ssh aliases
+        it should behave like it's executing inside the cloud
+          by refusing to get the list of all environment names
+          by getting the present instance ID
+          by getting the present instance role (as a string)
+          by getting the present public hostname
+          by getting the present security group
+          by getting the database password
+          by getting the ssh password
+          by getting the mysql command
+          by getting the mysqldump command
+      being executed from a developer/administrator's local machine
+        controlled with environment variables
+          it should behave like it does in all execution environments
+            by getting the database username
+            by getting the database name
+            by getting the database host
+            by getting the ssh username
+            by getting the app server hostnames
+            by getting the db server hostnames
+            by getting the utilities hostnames
+            by getting the app master hostname
+            by getting the db master hostname
+            by getting the db slave hostnames
+            by getting the app slave hostnames
+            by getting the solo hostname
+            by getting the environment name
+            by getting the stack name
+            by getting the repository URI
+            by getting the app name
+            by getting the current path
+            by getting the shared path
+            by getting helpful ssh aliases
+          it should behave like it's executing outside the cloud
+            by getting the list of all environment names
+            by refusing to get the present instance ID
+            by refusing to get the present instance role (as a string)
+            by refusing to get the present public hostname
+            by refusing to get the present security group
+            by refusing to get the database password
+            by refusing to get the ssh password
+            by refusing to get the mysql command
+            by refusing to get the mysqldump command
+        controlled with attr writers
+          it should behave like it does in all execution environments
+            by getting the database username
+            by getting the database name
+            by getting the database host
+            by getting the ssh username
+            by getting the app server hostnames
+            by getting the db server hostnames
+            by getting the utilities hostnames
+            by getting the app master hostname
+            by getting the db master hostname
+            by getting the db slave hostnames
+            by getting the app slave hostnames
+            by getting the solo hostname
+            by getting the environment name
+            by getting the stack name
+            by getting the repository URI
+            by getting the app name
+            by getting the current path
+            by getting the shared path
+            by getting helpful ssh aliases
+          it should behave like it's executing outside the cloud
+            by getting the list of all environment names
+            by refusing to get the present instance ID
+            by refusing to get the present instance role (as a string)
+            by refusing to get the present public hostname
+            by refusing to get the present security group
+            by refusing to get the database password
+            by refusing to get the ssh password
+            by refusing to get the mysql command
+            by refusing to get the mysqldump command
+        depending on .eyrc
+          it should behave like it does in all execution environments
+            by getting the database username
+            by getting the database name
+            by getting the database host
+            by getting the ssh username
+            by getting the app server hostnames
+            by getting the db server hostnames
+            by getting the utilities hostnames
+            by getting the app master hostname
+            by getting the db master hostname
+            by getting the db slave hostnames
+            by getting the app slave hostnames
+            by getting the solo hostname
+            by getting the environment name
+            by getting the stack name
+            by getting the repository URI
+            by getting the app name
+            by getting the current path
+            by getting the shared path
+            by getting helpful ssh aliases
+          it should behave like it's executing outside the cloud
+            by getting the list of all environment names
+            by refusing to get the present instance ID
+            by refusing to get the present instance role (as a string)
+            by refusing to get the present public hostname
+            by refusing to get the present security group
+            by refusing to get the database password
+            by refusing to get the ssh password
+            by refusing to get the mysql command
+            by refusing to get the mysqldump command
+
+    Finished in 0.95816 seconds
+    112 examples, 0 failures
+
 == Copyright
 
 Copyright (c) 2010 Seamus Abshere. See LICENSE for details.

data/Rakefile

@@ -1,52 +1,7 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "engineyard-metadata"
-    gem.summary = %Q{Make your EngineYard AppCloud (Amazon EC2) instances aware of each other.}
-    gem.description = %Q{Pulls metadata from EC2 and EngineYard so that your EngineYard AppCloud (Amazon EC2) instances know about each other.}
-    gem.email = "seamus@abshere.net"
-    gem.homepage = "http://github.com/seamusabshere/engineyard-metadata"
-    gem.authors = ["Seamus Abshere"]
-    gem.add_dependency 'activesupport', '>=2.3.4'
-    gem.add_dependency 'nap', '>=0.4'
-    gem.add_dependency 'eat', '>=0.0.5'
-    gem.add_development_dependency "fakeweb"
-    gem.add_development_dependency "fakefs"
-    gem.add_development_dependency "rspec", "~>2"
-    gem.executables = ['ey_ssh_aliases']
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-task :test => :check_dependencies
-
-task :default => :test
+require 'rake'
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -57,3 +12,13 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'rspec/core/rake_task'
+
+# thanks bundler
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(-fs --color)
+  # t.ruby_opts  = %w(-w)
+end
+
+task :default => :spec

data/engineyard-metadata.gemspec

@@ -1,82 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "engineyard-metadata/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{engineyard-metadata}
-  s.version = "0.2.2"
+  s.name        = "engineyard-metadata"
+  s.version     = EY::Metadata::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Seamus Abshere"]
+  s.email       = ["seamus@abshere.net"]
+  s.homepage    = "https://github.com/seamusabshere/engineyard-metadata"
+  s.summary     = %Q{Make your EngineYard AppCloud (Amazon EC2) instances aware of each other.}
+  s.description = %Q{Pulls metadata from EC2 and EngineYard so that your EngineYard AppCloud (Amazon EC2) instances know about each other.}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Seamus Abshere"]
-  s.date = %q{2011-02-01}
-  s.default_executable = %q{ey_ssh_aliases}
-  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.executables = ["ey_ssh_aliases"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/ey_ssh_aliases",
-     "engineyard-metadata.gemspec",
-     "lib/engineyard-metadata.rb",
-     "lib/engineyard-metadata/amazon_ec2_api.rb",
-     "lib/engineyard-metadata/chef_dna.rb",
-     "lib/engineyard-metadata/engine_yard_cloud_api.rb",
-     "lib/engineyard-metadata/insider.rb",
-     "lib/engineyard-metadata/metadata.rb",
-     "lib/engineyard-metadata/outsider.rb",
-     "lib/engineyard-metadata/ssh_alias_helper.rb",
-     "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"
-  ]
-  s.homepage = %q{http://github.com/seamusabshere/engineyard-metadata}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Make your EngineYard AppCloud (Amazon EC2) instances aware of each other.}
-  s.test_files = [
-    "spec/metadata_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "engineyard-metadata"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<nap>, [">= 0.4"])
-      s.add_runtime_dependency(%q<eat>, [">= 0.0.5"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<fakefs>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<nap>, [">= 0.4"])
-      s.add_dependency(%q<eat>, [">= 0.0.5"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<fakefs>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<nap>, [">= 0.4"])
-    s.add_dependency(%q<eat>, [">= 0.0.5"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<fakefs>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,fengineyard-metadataures}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency 'activesupport', '>=2.3.4'
+  s.add_dependency 'nap', '>=0.4'
+  s.add_dependency 'eat', '>=0.0.5'
+  s.add_development_dependency "fakeweb"
+  s.add_development_dependency "fakefs"
+  s.add_development_dependency "rspec", "~>2"
 end
-

data/lib/engineyard-metadata.rb

@@ -1,6 +1,16 @@
+require 'engineyard-metadata/version'
+require 'engineyard-metadata/metadata'
+
 module EY
-  autoload :Metadata, 'engineyard-metadata/metadata'
   def self.metadata
-    Metadata.instance
+    @metadata ||= if ::File.directory?('/var/log/engineyard')
+      Metadata::Insider.new
+    else
+      Metadata::Outsider.new
+    end
+  end
+  
+  def self.reload_metadata
+    @metadata = nil
   end
 end

data/lib/engineyard-metadata/insider.rb

@@ -1,26 +1,7 @@
 module EY
   class Metadata
     # This gets pulled in when you're running directly on a cloud instance.
-    module Insider
-      DELEGATED_TO_AMAZON_EC2_API = %w{
-        present_instance_id
-        present_security_group
-      }
-    
-      DELEGATED_TO_CHEF_DNA = METHODS - DELEGATED_TO_AMAZON_EC2_API
-
-      DELEGATED_TO_AMAZON_EC2_API.each do |name|
-        define_method name do
-          amazon_ec2_api.send name
-        end
-      end
-
-      DELEGATED_TO_CHEF_DNA.each do |name|
-        define_method name do
-          chef_dna.send name
-        end
-      end
-            
+    class Insider < Metadata
       # You can't get the list of environment names while you're on the instances themselves.
       def environment_names
         raise CannotGetFromHere
@@ -46,6 +27,25 @@ module EY
         raise RuntimeError, "[engineyard-metadata gem] Please set EY.metadata.app_name= or set ENV['EY_APP_NAME']" unless @app_name.to_s.strip.length > 0
         @app_name
       end
+      
+      DELEGATED_TO_AMAZON_EC2_API = %w{
+        present_instance_id
+        present_security_group
+      }
+
+      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
+        end
+      end
+
+      DELEGATED_TO_CHEF_DNA.each do |name|
+        define_method name do
+          chef_dna.send name
+        end
+      end
     end
   end
 end

data/lib/engineyard-metadata/metadata.rb

@@ -1,5 +1,3 @@
-require 'singleton'
-
 module EY
   # All methods are defined on this module. For example, you're supposed to say
   #
@@ -7,8 +5,17 @@ module EY
   #
   # instead of trying to call it from a particular adapter.
   class Metadata
-    include Singleton
-    
+    autoload :Insider, 'engineyard-metadata/insider'
+    autoload :Outsider, 'engineyard-metadata/outsider'
+    autoload :SshAliasHelper, 'engineyard-metadata/ssh_alias_helper'
+    autoload :ChefDna, 'engineyard-metadata/chef_dna'
+    autoload :AmazonEc2Api, 'engineyard-metadata/amazon_ec2_api'
+    autoload :EngineYardCloudApi, 'engineyard-metadata/engine_yard_cloud_api'
+
+    # This gets raised when you can't get a particular piece of metadata from the execution environment you're in.
+    class CannotGetFromHere < RuntimeError
+    end
+
     attr_writer :app_name
     
     METHODS = %w{
@@ -51,27 +58,5 @@ module EY
     def shared_path
       "/data/#{app_name}/shared"
     end
-    
-    # This gets raised when you can't get a particular piece of metadata from the execution environment you're in.
-    class CannotGetFromHere < RuntimeError
-    end
-    
-    autoload :SshAliasHelper, 'engineyard-metadata/ssh_alias_helper'
-
-    autoload :Insider, 'engineyard-metadata/insider'
-    autoload :Outsider, 'engineyard-metadata/outsider'
-    autoload :ChefDna, 'engineyard-metadata/chef_dna'
-    autoload :AmazonEc2Api, 'engineyard-metadata/amazon_ec2_api'
-    autoload :EngineYardCloudApi, 'engineyard-metadata/engine_yard_cloud_api'
-    
-    def reload
-      if File.directory? '/var/log/engineyard'
-        Metadata.send :include, Insider
-      else
-        Metadata.send :include, Outsider
-      end
-    end
   end
 end
-
-EY.metadata.reload

data/lib/engineyard-metadata/outsider.rb

@@ -4,23 +4,7 @@ require 'yaml'
 module EY
   class Metadata
     # This gets pulled in when you're running from your developer machine (i.e., not on a cloud instance).
-    module Outsider
-      UNGETTABLE = METHODS.grep(/present/) + METHODS.grep(/password/) + METHODS.grep(/mysql/)
-      
-      GETTABLE = METHODS - UNGETTABLE - %w{ environment_name }
-      
-      UNGETTABLE.each do |name|
-        define_method name do
-          raise CannotGetFromHere
-        end
-      end
-      
-      GETTABLE.each do |name|
-        define_method name do
-          engine_yard_cloud_api.send name
-        end
-      end
-      
+    class Outsider < Metadata
       def eyrc_path
         File.join File.expand_path("~#{Etc.getpwuid.name}"), '.eyrc'
       end
@@ -84,6 +68,22 @@ module EY
       def engine_yard_cloud_api
         @engine_yard_cloud_api ||= EngineYardCloudApi.new ey_cloud_token
       end
+      
+      UNGETTABLE = METHODS.grep(/present/) + METHODS.grep(/password/) + METHODS.grep(/mysql/)
+  
+      GETTABLE = METHODS - instance_methods.map { |m| m.to_s } - UNGETTABLE
+  
+      UNGETTABLE.each do |name|
+        define_method name do
+          raise CannotGetFromHere
+        end
+      end
+  
+      GETTABLE.each do |name|
+        define_method name do
+          engine_yard_cloud_api.send name
+        end
+      end
     end
   end
 end

data/lib/engineyard-metadata/ssh_alias_helper.rb

@@ -11,7 +11,7 @@ module EY
       def ssh_aliases
         counter = Hash.new 0
         %w{ app_master db_master db_slaves app_slaves utilities }.map do |role_group|
-          send(role_group).map do |public_hostname|
+          [send(role_group)].flatten.map do |public_hostname|
             ssh_alias counter, role_group, public_hostname
           end
         end.flatten.join("\n")

data/lib/engineyard-metadata/version.rb

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

data/spec/metadata_spec.rb

@@ -1,131 +1,131 @@
 require 'spec_helper'
 
 shared_examples_for "it does in all execution environments" do
-  it 'get the database username' do
+  it 'by getting the database username' do
     EY.metadata.database_username.should == 'deploy'
   end
 
-  it 'get the database name' do
+  it 'by getting the database name' do
     EY.metadata.database_name.should == 'cm1_certified_blue'
   end
 
-  it 'get the database host' do
+  it 'by getting the database host' do
     EY.metadata.database_host.should == 'ec2-67-202-19-255.compute-1.amazonaws.com'
   end
 
-  it 'get the ssh username' do
+  it 'by getting the ssh username' do
     EY.metadata.ssh_username.should == 'deploy'
   end
   
-  it 'get the app server hostnames' do
+  it 'by getting the app server hostnames' do
     EY.metadata.app_servers.should == ["ec2-174-129-212-130.compute-1.amazonaws.com"]
   end
 
-  it 'get the db server hostnames' do
+  it 'by getting the db server hostnames' do
     EY.metadata.db_servers.should == ["ec2-67-202-19-255.compute-1.amazonaws.com"]
   end
 
-  it 'get the utilities hostnames' do
+  it 'by getting the utilities hostnames' do
     EY.metadata.utilities.should == []
   end
 
-  it 'get the app master hostname' do
+  it 'by getting the app master hostname' do
     EY.metadata.app_master.should == 'ec2-174-129-212-130.compute-1.amazonaws.com'
   end
 
-  it 'get the db master hostname' do
+  it 'by getting the db master hostname' do
     EY.metadata.db_master.should == 'ec2-67-202-19-255.compute-1.amazonaws.com'
   end
 
-  it 'get the db slave hostnames' do
+  it 'by getting the db slave hostnames' do
     EY.metadata.db_slaves.should == []
   end
 
-  it 'get the app slave hostnames' do
+  it 'by getting the app slave hostnames' do
     EY.metadata.app_slaves.should == []
   end
 
-  it 'get the solo hostname' do
+  it 'by getting the solo hostname' do
     EY.metadata.solo.should == nil
   end
 
-  it 'get the environment name' do
+  it 'by getting the environment name' do
     EY.metadata.environment_name.should == 'cm1_production_blue'
   end
   
-  it 'get the stack name' do
+  it 'by getting the stack name' do
     EY.metadata.stack_name.should == 'nginx_unicorn'
   end
   
-  it 'get the repository URI' do
+  it 'by getting the repository URI' do
     EY.metadata.repository_uri.should == 'git@github.com:brighterplanet/cm1.git'
   end
   
-  it 'gets the app name' do
+  it 'by getting the app name' do
     EY.metadata.app_name.should == 'cm1_certified_blue'
   end
   
-  it 'gets the current path' do
+  it 'by getting the current path' do
     EY.metadata.current_path.should == '/data/cm1_certified_blue/current'
   end
   
-  it 'gets the shared path' do
+  it 'by getting the shared path' do
     EY.metadata.shared_path.should == '/data/cm1_certified_blue/shared'
   end
   
-  it 'gets helpful ssh aliases' do
+  it 'by getting helpful ssh aliases' do
     EY.metadata.ssh_aliases.should =~ /Host cm1_production_blue-app_master\n  Hostname ec2-174-129-212-130.compute-1.amazonaws.com/
   end
 end
 
 shared_examples_for "it's executing outside the cloud" do
-  it 'gets the list of all environment names' do
+  it 'by getting the list of all environment names' do
     EY.metadata.environment_names.should == ["app1_production", "wlpf1_production", "data1_production", "cm1_production_red", "cm1_production_blue"]
   end
 
-  it 'not get the present instance ID' do
+  it 'by refusing to get the present instance ID' do
     lambda {
       EY.metadata.present_instance_id
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
 
-  it 'not get the present instance role (as a string)' do
+  it 'by refusing to get the present instance role (as a string)' do
     lambda {
       EY.metadata.present_instance_role
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'not get the present public hostname' do
+  it 'by refusing to get the present public hostname' do
     lambda {
       EY.metadata.present_public_hostname
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'not get the present security group' do
+  it 'by refusing to get the present security group' do
     lambda {
       EY.metadata.present_security_group
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
 
-  it 'not get the database password' do
+  it 'by refusing to get the database password' do
     lambda {
       EY.metadata.database_password
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
 
-  it 'not get the ssh password' do
+  it 'by refusing to get the ssh password' do
     lambda {
       EY.metadata.ssh_password
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'not get the mysql command' do
+  it 'by refusing to get the mysql command' do
     lambda {
       EY.metadata.mysql_command
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'not get the mysqldump command' do
+  it 'by refusing to get the mysqldump command' do
     lambda {
       EY.metadata.mysqldump_command
     }.should raise_error(EY::Metadata::CannotGetFromHere)
@@ -133,41 +133,41 @@ shared_examples_for "it's executing outside the cloud" do
 end
 
 shared_examples_for "it's executing inside the cloud" do
-  it 'not get the list of all environment names' do
+  it 'by refusing to get the list of all environment names' do
     lambda {
       EY.metadata.environment_names
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'get the present instance ID' do
+  it 'by getting the present instance ID' do
     EY.metadata.present_instance_id.should == FAKE_INSTANCE_ID
   end
 
-  it 'get the present instance role (as a string)' do
+  it 'by getting the present instance role (as a string)' do
     EY.metadata.present_instance_role.should == 'app_master'
   end
 
-  it 'get the present public hostname' do
+  it 'by getting the present public hostname' do
     EY.metadata.present_public_hostname.should == 'ec2-174-129-212-130.compute-1.amazonaws.com'
   end
 
-  it 'get the present security group' do
+  it 'by getting the present security group' do
     EY.metadata.present_security_group.should == FAKE_SECURITY_GROUP
   end
   
-  it 'get the database password' do
+  it 'by getting the database password' do
     EY.metadata.database_password.should == 'USERS-0-PASSWORD'
   end
   
-  it 'get the ssh password' do
+  it 'by getting the ssh password' do
     EY.metadata.ssh_password.should == 'USERS-0-PASSWORD'
   end
   
-  it 'get the mysql command' do
+  it 'by getting the mysql command' do
     EY.metadata.mysql_command.should =~ %r{mysql -h ec2-67-202-19-255.compute-1.amazonaws.com -u deploy -pUSERS-0-PASSWORD cm1_certified_blue}
   end
 
-  it 'get the mysqldump command' do
+  it 'by getting the mysqldump command' do
     EY.metadata.mysqldump_command.should =~ %r{mysqldump -h ec2-67-202-19-255.compute-1.amazonaws.com -u deploy -pUSERS-0-PASSWORD cm1_certified_blue}
   end
 end
@@ -180,7 +180,7 @@ describe 'EY.metadata' do
   describe "being executed on an EngineYard AppCloud (i.e. Amazon EC2) instance" do
     before do
       pretend_we_are_on_an_engineyard_appcloud_ec2_instance
-      EY.metadata.reload
+      EY.reload_metadata
       EY.metadata.app_name = 'cm1_certified_blue'
     end
     it_should_behave_like "it does in all execution environments"
@@ -190,10 +190,7 @@ describe 'EY.metadata' do
   describe "being executed from a developer/administrator's local machine" do
     before do
       pretend_we_are_on_a_developer_machine
-      EY.metadata.reload
-      EY.metadata.instance_variables.each do |ivar_name|
-        EY.metadata.instance_variable_set ivar_name, nil
-      end
+      EY.reload_metadata
       ENV.delete 'EY_CLOUD_TOKEN'
       ENV.delete 'EY_ENVIRONMENT_NAME'
       ENV.delete 'EY_APP_NAME'
@@ -201,9 +198,6 @@ describe 'EY.metadata' do
     end
     describe "controlled with environment variables" do
       before do
-        EY.metadata.instance_variables.each do |ivar_name|
-          EY.metadata.instance_variable_set ivar_name, nil
-        end
         ENV['EY_CLOUD_TOKEN'] = FAKE_CLOUD_TOKEN + 'aaa'
         ENV['EY_APP_NAME'] = 'cm1_certified_blue'
         EY.metadata.ey_cloud_token.should == FAKE_CLOUD_TOKEN + 'aaa' # sanity check

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup
 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'
 
 FAKE_SECURITY_GROUP = 'ey-cm1_production_blue-1294775925-1371-55979'
 FAKE_INSTANCE_ID = 'i-ff17d493'
@@ -55,5 +60,3 @@ def stop_pretending
   FakeFS.deactivate!
   FakeWeb.clean_registry
 end
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'engineyard-metadata'))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-metadata
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -06:00
-default_executable: ey_ssh_aliases
+date: 2011-03-31 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -108,21 +108,21 @@ dependencies:
   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: seamus@abshere.net
+email: 
+- seamus@abshere.net
 executables: 
 - ey_ssh_aliases
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/ey_ssh_aliases
 - engineyard-metadata.gemspec
 - lib/engineyard-metadata.rb
@@ -133,18 +133,19 @@ files:
 - lib/engineyard-metadata/metadata.rb
 - lib/engineyard-metadata/outsider.rb
 - lib/engineyard-metadata/ssh_alias_helper.rb
+- lib/engineyard-metadata/version.rb
 - 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: true
-homepage: http://github.com/seamusabshere/engineyard-metadata
+homepage: https://github.com/seamusabshere/engineyard-metadata
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -167,11 +168,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: engineyard-metadata
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Make your EngineYard AppCloud (Amazon EC2) instances aware of each other.
 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

data/VERSION

@@ -1 +0,0 @@
-0.2.2