engineyard-metadata 0.0.6 → 0.0.7

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.add_dependency 'nap', '>=0.4'
     gem.add_development_dependency "fakeweb"
     gem.add_development_dependency "fakefs"
-    gem.add_development_dependency "rspec", "~>1"
+    gem.add_development_dependency "rspec", "~>2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/engineyard-metadata.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{engineyard-metadata}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
@@ -55,20 +55,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nap>, [">= 0.4"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
       s.add_development_dependency(%q<fakefs>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<nap>, [">= 0.4"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
       s.add_dependency(%q<fakefs>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 1"])
+      s.add_dependency(%q<rspec>, ["~> 2"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<nap>, [">= 0.4"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
     s.add_dependency(%q<fakefs>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 1"])
+    s.add_dependency(%q<rspec>, ["~> 2"])
   end
 end
 

data/lib/engineyard-metadata/engine_yard_cloud_api.rb

@@ -113,7 +113,7 @@ module EY
       end
       
       def data_loaded?
-        @data.is_a? Hash
+        defined?(@data) and @data.is_a? Hash
       end
       
       def data

data/lib/engineyard-metadata/metadata.rb

@@ -29,7 +29,7 @@ module EY
       environment_name
       stack_name
       repository_uri
-    }
+    } unless defined?(KEYS)
     
     # This gets raised when you can't get a particular piece of metadata from the execution environment you're in.
     class CannotGetFromHere < RuntimeError

data/lib/engineyard-metadata/outsider.rb

@@ -54,6 +54,8 @@ module EY
         elsif ENV['EY_ENVIRONMENT_NAME']
           ENV['EY_ENVIRONMENT_NAME']
         end
+        raise RuntimeError, "[engineyard-metadata gem] You need to run this from the application repo, set EY::Metadata.environment_name= or set ENV['EY_ENVIRONMENT_NAME']" unless @environment_name.to_s.strip.length > 0
+        @environment_name
       end
       
       def ey_cloud_token=(str)
@@ -70,10 +72,10 @@ module EY
         @ey_cloud_token = if ENV['EY_CLOUD_TOKEN']
           ENV['EY_CLOUD_TOKEN']
         elsif File.exist? eyrc_path
-          YAML.load(File.read(eyrc_path))['ey_cloud_token']
-        else
-          raise RuntimeError, "[engineyard-metadata gem] You need to download #{eyrc_path} or set ENV['EY_CLOUD_TOKEN']"
+          YAML.load(File.read(eyrc_path))['api_token']
         end
+        raise RuntimeError, "[engineyard-metadata gem] You need to have #{eyrc_path}, set EY::Metadata.ey_cloud_token= or set ENV['EY_CLOUD_TOKEN']" unless @ey_cloud_token.to_s.strip.length > 0
+        @ey_cloud_token
       end
       
       # The URL that EngineYard has on file for your application.

data/spec/metadata_spec.rb

@@ -118,31 +118,44 @@ end
 
 describe 'EY::Metadata' do
   describe "being executed from a developer/administrator's local machine" do
-    before(:all) do
+    before do
       pretend_we_are_on_a_developer_machine
-      # forcibly reload metadata.rb, so that it can extend itself based on its execution environment
       load File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'engineyard-metadata', 'metadata.rb'))
+      EY::Metadata.clear
+      ENV.delete 'EY_CLOUD_TOKEN'
+      ENV.delete 'EY_ENVIRONMENT_NAME'
     end
-
-    after(:all) do
+    
+    after do
       stop_pretending
     end
     
     describe "controlled with environment variables" do
-      before(:all) do
-        EY::Metadata.clear
-        ENV['EY_CLOUD_TOKEN'] = FAKE_CLOUD_TOKEN
+      before do
+        ENV['EY_CLOUD_TOKEN'] = FAKE_CLOUD_TOKEN + 'aaa'
         ENV['EY_ENVIRONMENT_NAME'] = FAKE_ENVIRONMENT_NAME
-      end      
+        EY::Metadata.ey_cloud_token.should == FAKE_CLOUD_TOKEN + 'aaa' # sanity check
+      end
       it_should_behave_like "all execution environments"
       it_should_behave_like "execution outside the cloud"
     end
     
     describe "controlled with attr writers" do
-      before(:all) do
-        EY::Metadata.clear
-        EY::Metadata.ey_cloud_token = FAKE_CLOUD_TOKEN
+      before do
+        EY::Metadata.ey_cloud_token = FAKE_CLOUD_TOKEN + 'bbb'
+        EY::Metadata.environment_name = FAKE_ENVIRONMENT_NAME
+        EY::Metadata.ey_cloud_token.should == FAKE_CLOUD_TOKEN + 'bbb' # sanity check
+      end
+      it_should_behave_like "all execution environments"
+      it_should_behave_like "execution outside the cloud"
+    end
+    
+    describe "depending on .eyrc" do
+      before do
+        FakeFS.activate!
+        File.open(EY::Metadata.eyrc_path, 'w') { |f| f.write({'api_token' => FAKE_CLOUD_TOKEN + 'ccc'}.to_yaml) }
         EY::Metadata.environment_name = FAKE_ENVIRONMENT_NAME
+        EY::Metadata.ey_cloud_token.should == FAKE_CLOUD_TOKEN + 'ccc' # sanity check
       end
       it_should_behave_like "all execution environments"
       it_should_behave_like "execution outside the cloud"
@@ -150,13 +163,12 @@ describe 'EY::Metadata' do
   end
   
   describe "being executed on an EngineYard AppCloud (i.e. Amazon EC2) instance" do
-    before(:all) do
+    before do
       pretend_we_are_on_an_engineyard_appcloud_ec2_instance
-        # forcibly reload metadata.rb, so that it can extend itself based on its execution environment
       load File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'engineyard-metadata', 'metadata.rb'))
     end
     
-    after(:all) do
+    after do
       stop_pretending
     end
     

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'spec'
+require 'rspec'
 # require 'ruby-debug'
 # assumes active-support 3
 require 'active_support/json/encoding'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-metadata
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -85,10 +85,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
-        - 1
-        version: "1"
+        - 2
+        version: "2"
   type: :development
   version_requirements: *id005
 description: Pulls metadata from EC2 and EngineYard so that your EngineYard AppCloud (Amazon EC2) instances know about each other.