ec2-metadata 0.2.1 → 0.2.2

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.2-head@ec2-metadata

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/ec2-metadata.gemspec

@@ -1,79 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ec2-metadata}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takeshi AKIMA"]
-  s.date = %q{2010-04-09}
+  s.date = %q{2011-03-03}
   s.default_executable = %q{ec2-metadata}
   s.description = %q{ec2-metadata provides to access metadata, and you can use in outside of ec2 like in ec2}
   s.email = %q{akm2000@gmail.com}
   s.executables = ["ec2-metadata"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/ec2-metadata",
-     "ec2-metadata.gemspec",
-     "lib/ec2_metadata.rb",
-     "lib/ec2_metadata/base.rb",
-     "lib/ec2_metadata/command.rb",
-     "lib/ec2_metadata/dummy.rb",
-     "lib/ec2_metadata/dummy.yml",
-     "lib/ec2_metadata/http_client.rb",
-     "lib/ec2_metadata/revision.rb",
-     "lib/ec2_metadata/root.rb",
-     "lib/hash_key_orderable.rb",
-     "spec/ec2_metadata/base_spec.rb",
-     "spec/ec2_metadata/command_spec.rb",
-     "spec/ec2_metadata/dummy_spec.rb",
-     "spec/ec2_metadata/http_client_spec.rb",
-     "spec/ec2_metadata/revision_spec.rb",
-     "spec/ec2_metadata/root_spec.rb",
-     "spec/ec2_metadata_spec.rb",
-     "spec/hash_key_orderable_spec.rb",
-     "spec/introduction_spec.rb",
-     "spec/rcov.opts",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/to_hash_spec.rb"
+    ".rvmrc",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/ec2-metadata",
+    "ec2-metadata.gemspec",
+    "lib/ec2_metadata.rb",
+    "lib/ec2_metadata/base.rb",
+    "lib/ec2_metadata/command.rb",
+    "lib/ec2_metadata/dummy.rb",
+    "lib/ec2_metadata/dummy.yml",
+    "lib/ec2_metadata/http_client.rb",
+    "lib/ec2_metadata/revision.rb",
+    "lib/ec2_metadata/root.rb",
+    "lib/hash_key_orderable.rb",
+    "spec/ec2_metadata/base_spec.rb",
+    "spec/ec2_metadata/command_spec.rb",
+    "spec/ec2_metadata/dummy_spec.rb",
+    "spec/ec2_metadata/http_client_spec.rb",
+    "spec/ec2_metadata/revision_spec.rb",
+    "spec/ec2_metadata/root_spec.rb",
+    "spec/ec2_metadata_spec.rb",
+    "spec/hash_key_orderable_spec.rb",
+    "spec/introduction_spec.rb",
+    "spec/rcov.opts",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/to_hash_spec.rb"
   ]
   s.homepage = %q{http://github.com/akm/ec2-metadata}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ec2-metadata provides to access metadata}
   s.test_files = [
     "spec/ec2_metadata/base_spec.rb",
-     "spec/ec2_metadata/command_spec.rb",
-     "spec/ec2_metadata/dummy_spec.rb",
-     "spec/ec2_metadata/http_client_spec.rb",
-     "spec/ec2_metadata/revision_spec.rb",
-     "spec/ec2_metadata/root_spec.rb",
-     "spec/ec2_metadata_spec.rb",
-     "spec/hash_key_orderable_spec.rb",
-     "spec/introduction_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/to_hash_spec.rb"
+    "spec/ec2_metadata/command_spec.rb",
+    "spec/ec2_metadata/dummy_spec.rb",
+    "spec/ec2_metadata/http_client_spec.rb",
+    "spec/ec2_metadata/revision_spec.rb",
+    "spec/ec2_metadata/root_spec.rb",
+    "spec/ec2_metadata_spec.rb",
+    "spec/hash_key_orderable_spec.rb",
+    "spec/introduction_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/to_hash_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/ec2_metadata/base.rb

@@ -45,6 +45,7 @@ module Ec2Metadata
               new_child(child_key) :
               Ec2Metadata.get("#{path}#{child_key}")
           else
+            raise NotFoundError, "#{path}#{child_key} not found as default key" if @getting_default_child
             raise NotFoundError, "#{path}#{child_key} not found" unless default_child
             result = default_child.get(child_key)
           end
@@ -80,8 +81,16 @@ module Ec2Metadata
     alias_method :[], :get
 
     def default_child
+      return @default_child if @default_child
       logging("default_child") do
-        @default_child ||= get(default_child_key) if default_child_key
+        if default_child_key
+          @getting_default_child = true
+          begin
+            @default_child = get(default_child_key) 
+          ensure
+            @getting_default_child = false
+          end
+        end
       end
     end
 

data/lib/ec2_metadata/dummy.rb

@@ -21,7 +21,7 @@ module Ec2Metadata
       end
 
       def search_and_load_yaml
-        paths = Dir.glob(yaml_paths.map{|path| File.expand_path(path)})
+        paths = Dir.glob(yaml_paths.map{|path| File.expand_path(path) rescue nil}.compact)
         load_yaml(paths.first) unless paths.empty?
       end
 
@@ -32,7 +32,7 @@ module Ec2Metadata
         Ec2Metadata.from_hash(YAML.load(text))
         @loaded_yaml_path = path
       end
-      
+
       def loaded_yaml_path
         @loaded_yaml_path
       end

data/spec/ec2_metadata/base_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
 
 describe Ec2Metadata::Base do
@@ -59,8 +60,18 @@ describe Ec2Metadata::Base do
 
       end
     end
+  end
 
-
+  describe :default_child do
+    it "stack level too deep" do
+      Ec2Metadata.should_receive(:get).with("/latest/").once.and_return(DATA_TYPES.join("\n"))
+      # 0.2.1で発生しうる、SystemStackError: stack level too deep を無理に発生させている
+      latest = Ec2Metadata["latest"]
+      latest.instance_variable_set(:@default_child_key, 'unexist-meta-data')
+      lambda{
+        latest["instance_id"].should == nil
+      }.should raise_error(Ec2Metadata::NotFoundError)
+    end
   end
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Takeshi AKIMA
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +09:00
+date: 2011-03-03 00:00:00 +09:00
 default_executable: ec2-metadata
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -42,7 +43,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .rvmrc
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -76,11 +77,12 @@ homepage: http://github.com/akm/ec2-metadata
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -88,6 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -97,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ec2-metadata provides to access metadata

data/.gitignore

@@ -1,22 +0,0 @@
-
-
-
-
-
-## EMACS
-## MAC OS
-## PROJECT::GENERAL
-## PROJECT::SPECIFIC
-## TEXTMATE
-## VIM
-*.swp
-*.tmproj
-*~
-.DS_Store
-.\#*
-/ec2-metadata-0.1.0.gem
-\#*
-coverage
-pkg
-rdoc
-tmtags