ey_cloud_awareness 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ey_cloud_awareness.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ey_cloud_awareness}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "ey_cloud_awareness.gemspec",
-     "lib/engine_yard_cloud_chef.rb",
      "lib/engine_yard_cloud_instance.rb",
      "lib/ey_cloud_awareness.rb",
      "spec/ey_cloud_awareness_spec.rb",

data/lib/engine_yard_cloud_instance.rb

@@ -1,19 +1,29 @@
 class EngineYardCloudInstance
-  INSTANCE_DESCRIPTIONS_CACHE_PATH = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/engine_yard_instance_descriptions.yml" : '/etc/engine_yard_instance_descriptions.yml'
+  CURRENT_INSTANCE_ID_CACHE_PATH = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/engine_yard_cloud_instance_id" : '/etc/engine_yard_cloud_instance_id'
+  INSTANCE_DESCRIPTIONS_CACHE_PATH = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/engine_yard_cloud_instance_descriptions.yml" : '/etc/engine_yard_cloud_instance_descriptions.yml'
+  DNA_PATH = '/etc/chef/dna.json'
   
-  attr_accessor :instance_id
+  attr_reader :instance_id
   def initialize(instance_id)
     @instance_id = instance_id.to_sym
   end
   
+  def valid?
+    data.present?
+  end
+  
   def refresh
     self.class.refresh
   end
   
+  def data
+    self.class.data[instance_id]
+  end
+  
   def method_missing(name, *args, &block)
     name = name.to_sym
-    if me = self.class.data[instance_id] and me.has_key?(name)
-      me[name]
+    if data and data.has_key?(name)
+      data[name]
     else
       super
     end
@@ -36,12 +46,16 @@ class EngineYardCloudInstance
       data.map { |k, _| new k }
     end
     
+    def current
+      new cached_current_instance_id
+    end
+    
     def first
       new data.to_a.first.first
     end
     
     def find_by_instance_id(instance_id)
-      new instance_id.to_sym
+      new instance_id
     end
     
     def find_all_by_instance_roles(*args)
@@ -51,16 +65,16 @@ class EngineYardCloudInstance
     def refresh
       @_data = nil
       @_dna = nil
-      refresh_instance_descriptions true
+      cached_instance_descriptions true
+      cached_current_instance_id true
     end
     
     def data
       return @_data if @_data
       hash = Hash.new
       cached_instance_descriptions.each do |instance_description|
-        key = instance_description[:aws_instance_id].dup
-        hash[key] ||= Hash.new
-        current = hash[key]
+        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]
           current[:instance_role] = :db
@@ -73,24 +87,30 @@ class EngineYardCloudInstance
         end
         current[:private_dns_name] = instance_description[:private_dns_name]
         current[:dns_name] = instance_description[:dns_name]
-        current[:aws_instance_id] = instance_description[:aws_instance_id]
         current[:aws_state] = instance_description[:aws_state]
       end
       @_data = hash.recursive_symbolize_keys!
     end
     
-    private
-    
     def dna
-      @_dna ||= EngineYardCloudChef.dna
+      @_dna ||= JSON.load(IO.read(DNA_PATH)).recursive_symbolize_keys!
     end
     
-    def cached_instance_descriptions(refresh = false)
-      refresh_instance_descriptions refresh
-      @_cached_instance_descriptions ||= YAML.load(IO.read(INSTANCE_DESCRIPTIONS_CACHE_PATH))
+    private
+    
+    def cached_current_instance_id(refresh = false)
+      if refresh or !File.readable?(CURRENT_INSTANCE_ID_CACHE_PATH)
+        @_cached_current_instance_id = open("http://169.254.169.254/latest/meta-data/instance-id").gets
+        begin
+          File.open(CURRENT_INSTANCE_ID_CACHE_PATH, 'w') { |f| f.write @_cached_current_instance_id }
+        rescue Errno::EACCES
+          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching current instance id because #{CURRENT_INSTANCE_ID_CACHE_PATH} can't be written to"
+        end
+      end
+      @_cached_current_instance_id ||= IO.read(CURRENT_INSTANCE_ID_CACHE_PATH)
     end
     
-    def refresh_instance_descriptions(refresh)
+    def cached_instance_descriptions(refresh = false)
       if refresh or !File.readable?(INSTANCE_DESCRIPTIONS_CACHE_PATH)
         ec2 = RightAws::Ec2.new dna[:aws_secret_id], dna[:aws_secret_key]
         @_cached_instance_descriptions = ec2.describe_instances.map(&:recursive_symbolize_keys!)
@@ -100,6 +120,7 @@ class EngineYardCloudInstance
           $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching instance data because #{INSTANCE_DESCRIPTIONS_CACHE_PATH} can't be written to"
         end
       end
+      @_cached_instance_descriptions ||= YAML.load(IO.read(INSTANCE_DESCRIPTIONS_CACHE_PATH))
     end
   end
 end

data/lib/ey_cloud_awareness.rb

@@ -1,9 +1,7 @@
+require 'open-uri'
 require 'active_support'
 require 'right_aws'
-
-%w{ engine_yard_cloud_instance engine_yard_cloud_chef }.each do |lib|
-  require File.expand_path(File.join(File.dirname(__FILE__), lib))
-end
+require File.expand_path(File.join(File.dirname(__FILE__), 'engine_yard_cloud_instance'))
 
 # http://pragmatig.wordpress.com/2009/04/14/recursive-symbolize_keys/
 class Hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_awareness
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -59,7 +59,6 @@ files:
 - Rakefile
 - VERSION
 - ey_cloud_awareness.gemspec
-- lib/engine_yard_cloud_chef.rb
 - lib/engine_yard_cloud_instance.rb
 - lib/ey_cloud_awareness.rb
 - spec/ey_cloud_awareness_spec.rb

data/lib/engine_yard_cloud_chef.rb

@@ -1,9 +0,0 @@
-module EngineYardCloudChef
-  DNA_PATH = '/etc/chef/dna.json'
-  # Load the Chef DNA file from /etc/chef/dna.json
-  # >> JSON.load(IO.read('/etc/chef/dna.json')).keys   
-  # => ["aws_secret_key", "db_slaves", "user_ssh_key", "admin_ssh_key", "backup_interval", "instance_role", "mailserver", "utility_instances", "crons", "backup_window", "removed_applications", "alert_email", "applications", "gems_to_install", "members", "reporting_url", "aws_secret_id", "environment", "users", "master_app_server", "db_host", "packages_to_install", "haproxy"]
-  def self.dna
-    JSON.load(IO.read(DNA_PATH)).recursive_symbolize_keys!
-  end
-end