ec2_userdata 1.0 → 1.1

data/lib/ec2_userdata.rb

@@ -5,17 +5,26 @@ module EC2
   class UserData
     def self.[](key)
       if @userdata.nil?
-        if EC2.ec2?
+        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
         else
-          logger.info "Not running on EC2. Reading user data from #{app_root}/config/ec2_userdata.yml." if logger
+          logger.info "Reading user data from #{app_root}/config/ec2_userdata.yml." if logger
           @userdata = get_local_userdata
         end
       end
 
       @userdata[key]
     end
+
+    # Force use of local configuration file even when running on EC2
+    def self.use_local_config!
+      @use_local_config = true
+    end
+    
+    def self.use_local_config?
+      @use_local_config == true
+    end
     
     private
     def self.get_ec2_userdata
@@ -44,7 +53,12 @@ module EC2
     
     def self.app_root
       if defined?(Rails)
-        RAILS_ROOT
+        if Rails.respond_to?(:root)
+          Rails.root
+        else
+          RAILS_ROOT
+        end
+
       elsif defined?(Merb)
         Merb.root
       elsif defined?(APP_ROOT)
@@ -77,4 +91,4 @@ end
 
 class NilClass
   def blank?; true; end
-end
+end

data/test/unit/ec2_userdata_test.rb

@@ -9,8 +9,8 @@ APP_ROOT = "File.dirname(__FILE__) + '/../.."
 class Ec2UserDataTest < Test::Unit::TestCase
   def setup
     EC2::UserData.class_eval("@userdata = nil")
+    EC2::UserData.class_eval("@use_local_config = nil")
     EC2::module_eval("@running_on_ec2 = nil")
-
   end
   
   def test_get_on_ec2
@@ -48,14 +48,20 @@ class Ec2UserDataTest < Test::Unit::TestCase
     assert_raises(RuntimeError) { EC2.ec2? }
   end
 
+  def test_use_local_config!
+    EC2::UserData.use_local_config!
+    assert EC2::UserData.use_local_config?
+    EC2::UserData.expects(:get_local_userdata).returns({'foo'=>'bar'})
+    assert_equal 'bar', EC2::UserData['foo']
+  end
 
   ## Helpers ##
   def ec2_json_userdata
-    '{"queue_host":"lisa-queue.defensio.net","cluster":"lisa","queue_port":11300}'
+    '{"queue_host":"lisa-queue.example.net","cluster":"lisa","queue_port":11300}'
   end
   
   def local_yaml_userdata
-    "--- \nqueue_host: lisa-queue.defensio.net\nqueue_port: 11300\ncluster: lisa\n"
+    "--- \nqueue_host: lisa-queue.example.net\nqueue_port: 11300\ncluster: lisa\n"
   end
   
   def nslookup_on_ec2
@@ -65,4 +71,4 @@ class Ec2UserDataTest < Test::Unit::TestCase
   def nslookup_on_local
     "Server:		192.168.1.1\nAddress:	192.168.1.1#53\n\n** server can't find 254.169.254.169.in-addr.arpa.: NXDOMAIN\n"
   end
-end
+end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ec2_userdata
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Carl Mercier
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -38,23 +39,27 @@ rdoc_options: []
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple Ruby library that reads UserData on EC2 with graceful fallback when not running on EC2