ey_cloud_awareness 0.1.11 → 0.1.12

data/Rakefile

@@ -11,7 +11,9 @@ begin
     gem.homepage = "http://github.com/seamusabshere/ey_cloud_awareness"
     gem.authors = ["Seamus Abshere"]
     # gem.rubyforge_project = "ey_cloud_awareness"
-    %w{ activesupport right_aws }.each { |name| gem.add_dependency name }
+    gem.add_dependency 'json', '>=1.2.3'
+    gem.add_dependency 'activesupport', '>=2.3.4'
+    gem.add_dependency 'right_aws', '1.10.0' # static because of my hack
     gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/ey_cloud_awareness.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ey_cloud_awareness}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-04-07}
   s.description = %q{Make your EngineYard cloud instances aware of each other.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/seamusabshere/ey_cloud_awareness}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Make your EngineYard cloud instances aware of each other.}
   s.test_files = [
     "spec/ey_cloud_awareness_spec.rb",
@@ -47,17 +47,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<right_aws>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 1.2.3"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_runtime_dependency(%q<right_aws>, ["= 1.10.0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<right_aws>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 1.2.3"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+      s.add_dependency(%q<right_aws>, ["= 1.10.0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<right_aws>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 1.2.3"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
+    s.add_dependency(%q<right_aws>, ["= 1.10.0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/lib/engine_yard_cloud_instance.rb

@@ -1,7 +1,7 @@
 class EngineYardCloudInstance
-  CURRENT_INSTANCE_ID_CACHE_PATH = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/engine_yard_cloud_instance_id" : '/etc/engine_yard_cloud_instance_id'
-  CURRENT_SECURITY_GROUPS_CACHE_PATH = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/engine_yard_cloud_security_groups" : '/etc/engine_yard_cloud_security_groups'
-  INSTANCE_DESCRIPTIONS_CACHE_PATH = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/engine_yard_cloud_instance_descriptions.yml" : '/etc/engine_yard_cloud_instance_descriptions.yml'
+  CURRENT_INSTANCE_ID_CACHE_PATH = File.expand_path '~/.ey_cloud_awareness/engine_yard_cloud_instance_id'
+  CURRENT_SECURITY_GROUPS_CACHE_PATH = File.expand_path '~/.ey_cloud_awareness/engine_yard_cloud_security_groups'
+  INSTANCE_DESCRIPTIONS_CACHE_PATH = File.expand_path '~/.ey_cloud_awareness/engine_yard_cloud_instance_descriptions.yml'
   DNA_PATH = '/etc/chef/dna.json'
   
   attr_reader :instance_id
@@ -152,23 +152,33 @@ class EngineYardCloudInstance
     
     private
     
-    # def cached_current_instance_id
-    # def cached_current_security_groups
-    %w{ current_instance_id current_security_groups }.each do |name|
-      eval %{
-        def cached_#{name}(refresh = false)
-          raise "[EY CLOUD AWARENESS GEM] Can't call #{name} if we used from_hash" if self.proxy
-          if refresh or !File.readable?(#{name.upcase}_CACHE_PATH)
-            @_cached_#{name} = open("http://169.254.169.254/latest/meta-data/#{name.gsub('current_', '').dasherize}").gets
-            begin
-              File.open(#{name.upcase}_CACHE_PATH, 'w') { |f| f.write @_cached_#{name} }
-            rescue Errno::EACCES
-              $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching #{name.humanize.downcase} because \#{#{name.upcase}_CACHE_PATH} can't be written to"
-            end
-          end
-          @_cached_#{name} ||= IO.read(#{name.upcase}_CACHE_PATH)
+    def cached_current_instance_id(refresh = false)
+      raise "[EY CLOUD AWARENESS GEM] Can't call current_instance_id if we used from_hash" if self.proxy
+      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
+          FileUtils.mkdir_p File.dirname(CURRENT_INSTANCE_ID_CACHE_PATH)
+          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 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 cached_current_security_groups(refresh = false)
+      raise "[EY CLOUD AWARENESS GEM] Can't call current_security_groups if we used from_hash" if self.proxy
+      if refresh or !File.readable?(CURRENT_SECURITY_GROUPS_CACHE_PATH)
+        @_cached_current_security_groups = open("http://169.254.169.254/latest/meta-data/security-groups").gets
+        begin
+          FileUtils.mkdir_p File.dirname(CURRENT_SECURITY_GROUPS_CACHE_PATH)
+          File.open(CURRENT_SECURITY_GROUPS_CACHE_PATH, 'w') { |f| f.write @_cached_current_security_groups }
+        rescue Errno::EACCES
+          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching current security groups because #{CURRENT_SECURITY_GROUPS_CACHE_PATH} can't be written to"
+        end
+      end
+      @_cached_current_security_groups ||= IO.read(CURRENT_SECURITY_GROUPS_CACHE_PATH)
     end
     
     def cached_instance_descriptions(refresh = false)
@@ -177,6 +187,7 @@ class EngineYardCloudInstance
         ec2 = RightAws::Ec2.new dna[:aws_secret_id], dna[:aws_secret_key]
         @_cached_instance_descriptions = ec2.describe_instances.map(&:recursive_symbolize_keys!)
         begin
+          FileUtils.mkdir_p File.dirname(INSTANCE_DESCRIPTIONS_CACHE_PATH)
           File.open(INSTANCE_DESCRIPTIONS_CACHE_PATH, 'w') { |f| f.write @_cached_instance_descriptions.to_yaml }
         rescue Errno::EACCES
           $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching instance data because #{INSTANCE_DESCRIPTIONS_CACHE_PATH} can't be written to"

data/lib/ey_cloud_awareness.rb

@@ -1,8 +1,16 @@
 require 'open-uri'
 require 'set'
-require 'active_support'
+require 'fileutils'
+require 'json'
+require 'yaml'
 require 'right_aws' # See aws-s3 compatibility hack below
-require File.expand_path(File.join(File.dirname(__FILE__), 'engine_yard_cloud_instance'))
+require 'active_support'
+begin; require 'active_support/core_ext/class/inheritable_attributes'; rescue MissingSourceFile; end
+begin; require 'active_support/inflector/inflections'; rescue MissingSourceFile; end
+begin; require 'active_support/core_ext/string/inflections'; rescue MissingSourceFile; end
+begin; require 'active_support/core_ext/hash/keys'; rescue MissingSourceFile; end
+begin; require 'active_support/core_ext/array/wrap'; rescue MissingSourceFile; end
+require 'engine_yard_cloud_instance'
 
 class Hash
   # http://pragmatig.wordpress.com/2009/04/14/recursive-symbolize_keys/

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_awareness
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -9,39 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -05:00
+date: 2010-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 4
+        version: 2.3.4
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: right_aws
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 1
+        - 10
+        - 0
+        version: 1.10.0
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Make your EngineYard cloud instances aware of each other.
 email: seamus@abshere.net
 executables: []
@@ -79,18 +110,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Make your EngineYard cloud instances aware of each other.