ec2_userdata 1.2 → 1.3

data/lib/ec2_userdata.rb

@@ -1,37 +1,38 @@
 require 'net/http'
 require 'json/pure' unless defined?(JSON)
 require 'yaml' unless defined?(YAML)
+require 'resolv' unless defined?(Resolv)
 
 module EC2
   class UserData
     def self.[](key)
-      unless defined?(@@userdata)
+      unless defined?(@userdata)
         if EC2.ec2? && !use_local_config?
           logger.info "Running on EC2. Reading user data from http://169.254.169.254/1.0/user-data" if logger
-          @@userdata = get_ec2_userdata
+          @userdata = get_ec2_userdata
         else
           logger.info "Reading user data from #{app_root}/config/ec2_userdata.yml." if logger
-          @@userdata = get_local_userdata
+          @userdata = get_local_userdata
         end
       end
 
-      @@userdata[key]
+      @userdata[key]
     end
 
     # Force use of local configuration file even when running on EC2
     def self.use_local_config!
-      @@use_local_config = true
+      @use_local_config = true
     end
-    
+
     def self.use_local_config?
-      @@use_local_config == true
+      @use_local_config == true
     end
-    
+
     private
     def self.get_ec2_userdata
       JSON.parse(Net::HTTP.get(URI.parse("http://169.254.169.254/1.0/user-data")))
     end
-    
+
     def self.get_local_userdata
       if app_root
         YAML.load_file("#{app_root}/config/ec2_userdata.yml")
@@ -39,7 +40,7 @@ module EC2
         raise "Cannot find app_root. Don't know what to do!"
       end
     end
-    
+
     def self.logger
       if defined?(Rails)
         Rails.logger
@@ -51,7 +52,7 @@ module EC2
         nil
       end
     end
-    
+
     def self.app_root
       if defined?(Rails)
         if Rails.respond_to?(:root)
@@ -72,24 +73,14 @@ module EC2
 
   # Returns true if the current instance is running on the EC2 cloud
   def self.ec2?
-    return @@running_on_ec2 if defined?(@@running_on_ec2)
-    raise("nslookup must be in the path") if cmd_exec("which nslookup").blank?
-    @@running_on_ec2 = (cmd_exec("nslookup 169.254.169.254").match(/NXDOMAIN/) || []).size < 1 
-  end
+    return @running_on_ec2 if defined?(@running_on_ec2)
 
-  private
-  def self.cmd_exec(cmd)
-    `#{cmd}`
-  end
-end
+    begin
+      @running_on_ec2 = Resolv.getname("169.254.169.254").include?(".ec2.internal")
+    rescue Resolv::ResolvError
+      @running_on_ec2 = false
+    end
 
-### Active Support ###
-class String
-  def blank?
-    self.strip.length == 0
+    @running_on_ec2
   end
 end
-
-class NilClass
-  def blank?; true; end
-end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ec2_userdata
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Carl Mercier
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-01-27 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +43,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -50,13 +52,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A simple Ruby library that reads UserData on EC2 with graceful fallback when not running on EC2