engineyard-metadata 0.0.7 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/engineyard-metadata.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{engineyard-metadata}
-  s.version = "0.0.7"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "spec/metadata_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/dna.json",
+     "spec/support/dot.git.config",
      "spec/support/engine_yard_cloud_api_response.json"
   ]
   s.homepage = %q{http://github.com/seamusabshere/engineyard-metadata}

data/lib/engineyard-metadata/engine_yard_cloud_api.rb

@@ -1,4 +1,5 @@
-require 'rest' # from nap gem
+gem 'nap' # gives you rest...
+require 'rest'
 require 'active_support'
 require 'active_support/version'
 %w{
@@ -124,7 +125,7 @@ module EY
           if EY::Metadata.environment_name
             environment_hsh['name'] == EY::Metadata.environment_name
           else
-            environment_hsh['apps'].any? { |app_hsh| app_hsh['repository_uri'] == repository_uri }
+            environment_hsh['apps'].any? { |app_hsh| app_hsh['repository_uri'] == EY::Metadata.repository_uri }
           end
         end
         raise RuntimeError, "[engineyard-metadata gem] Found too many environments: #{matching_environment_hshs.map { |hsh| hsh['name'] }.join(', ')}" if matching_environment_hshs.length > 1

data/lib/engineyard-metadata/insider.rb

@@ -21,6 +21,11 @@ module EY
         end
       end
       
+      def clear
+        @chef_dna = nil
+        @amazon_ec2_api = nil
+      end
+      
       # An adapter that reads from the EngineYard AppCloud /etc/chef/dna.json file.
       def chef_dna
         @chef_dna ||= ChefDna.new

data/lib/engineyard-metadata/metadata.rb

@@ -41,11 +41,13 @@ module EY
     autoload :AmazonEc2Api, 'engineyard-metadata/amazon_ec2_api'
     autoload :EngineYardCloudApi, 'engineyard-metadata/engine_yard_cloud_api'
     
-    # this is a pretty sloppy way of detecting whether we're on ec2
-    if File.exist? '/etc/chef/dna.json'
-      extend Insider
-    else
-      extend Outsider
+    def self.reload
+      if File.directory? '/var/log/engineyard'
+        extend Insider
+      else
+        extend Outsider
+      end
     end
+    reload
   end
 end

data/lib/engineyard-metadata/outsider.rb

@@ -34,14 +34,14 @@ module EY
         @repository_uri = nil
         @environment_name = nil
         @ey_cloud_token = nil
-        @data = nil
+        @engine_yard_cloud_api = nil
       end
       
       def environment_name=(str)
         # clear this out in case it was inferred
         @repository_uri = nil
         # clear this out in case we're looking up a new environment
-        @data = nil
+        @engine_yard_cloud_api = nil
         @environment_name = str
       end
       
@@ -62,7 +62,7 @@ module EY
         # clear this out in case it was inferred
         @repository_uri = nil
         # clear this out in case we're looking up a new environment
-        @data = nil
+        @engine_yard_cloud_api = nil
         @ey_cloud_token = str
       end
 
@@ -88,10 +88,12 @@ module EY
         elsif ENV['EY_REPOSITORY_URI']
           ENV['EY_REPOSITORY_URI']
         elsif File.exist? git_config_path
-          `git config --get remote.origin.url`.strip
-        else
-          raise RuntimeError, "[engineyard-metadata gem] You need to be inside a app's git repo or set ENV['EY_REPOSITORY_URI']"
+          git_config = File.read git_config_path
+          git_config =~ /^\[remote.*?\burl = (.*?)\n/m
+          $1
         end
+        raise RuntimeError, "[engineyard-metadata gem] Please set EY::Metadata.environment_name= or set ENV['EY_ENVIRONMENT_NAME']" unless @repository_uri.to_s.strip.length > 0
+        @repository_uri
       end
 
       # An adapter that reads from the public EngineYard Cloud API (https://cloud.engineyard.com)

data/spec/metadata_spec.rb

@@ -1,213 +1,203 @@
 require 'spec_helper'
 
-shared_examples_for "all execution environments" do
-  it 'gets the database username' do
+shared_examples_for "it does in all execution environments" do
+  it 'get the database username' do
     EY::Metadata.database_username.should == 'FAKE_SSH_USERNAME'
   end
 
-  it 'gets the database name' do
+  it 'get the database name' do
     EY::Metadata.database_name.should == 'FAKE_APP_NAME'
   end
 
-  it 'gets the database host' do
+  it 'get the database host' do
     EY::Metadata.database_host.should == 'FAKE_DB_MASTER_PUBLIC_HOSTNAME'
   end
 
-  it 'gets the ssh username' do
+  it 'get the ssh username' do
     EY::Metadata.ssh_username.should == 'FAKE_SSH_USERNAME'
   end
   
-  it 'gets the app server hostnames' do
+  it 'get the app server hostnames' do
     EY::Metadata.app_servers.should == [ 'app_1.compute-1.amazonaws.com' , 'app_master.compute-1.amazonaws.com' ]
   end
 
-  it 'gets the db server hostnames' do
+  it 'get the db server hostnames' do
     EY::Metadata.db_servers.should == [ 'FAKE_DB_MASTER_PUBLIC_HOSTNAME', 'db_slave_1.compute-1.amazonaws.com' ]
   end
 
-  it 'gets the utilities hostnames' do
+  it 'get the utilities hostnames' do
     EY::Metadata.utilities.should == [ 'FAKE_UTIL_1_PUBLIC_HOSTNAME' ]
   end
 
-  it 'gets the app master hostname' do
+  it 'get the app master hostname' do
     EY::Metadata.app_master.should == 'app_master.compute-1.amazonaws.com'
   end
 
-  it 'gets the db master hostname' do
+  it 'get the db master hostname' do
     EY::Metadata.db_master.should == 'FAKE_DB_MASTER_PUBLIC_HOSTNAME'
   end
 
-  it 'gets the db slave hostnames' do
+  it 'get the db slave hostnames' do
     EY::Metadata.db_slaves.should == [ 'db_slave_1.compute-1.amazonaws.com' ]
   end
 
-  it 'gets the app slave hostnames' do
+  it 'get the app slave hostnames' do
     EY::Metadata.app_slaves.should == [ 'app_1.compute-1.amazonaws.com' ]
   end
 
-  it 'gets the solo hostname' do
+  it 'get the solo hostname' do
     EY::Metadata.solo.should == nil
   end
 
-  it 'gets the environment name' do
+  it 'get the environment name' do
     EY::Metadata.environment_name.should == 'FAKE_ENVIRONMENT_NAME'
   end
   
-  it 'gets the stack name' do
+  it 'get the stack name' do
     EY::Metadata.stack_name.should == 'FAKE_STACK_NAME'
   end
   
-  it 'gets the repository URI' do
+  it 'get the repository URI' do
     EY::Metadata.repository_uri.should == 'FAKE_REPOSITORY_URI'
   end
 end
 
-shared_examples_for "execution outside the cloud" do
-  it 'cannot get the present instance ID' do
+shared_examples_for "it's executing outside the cloud" do
+  it 'not get the present instance ID' do
     lambda {
       EY::Metadata.present_instance_id
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
 
-  it 'cannot get the present instance role (as a string)' do
+  it 'not get the present instance role (as a string)' do
     lambda {
       EY::Metadata.present_instance_role
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'cannot get the present public hostname' do
+  it 'not get the present public hostname' do
     lambda {
       EY::Metadata.present_public_hostname
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'cannot get the present security group' do
+  it 'not get the present security group' do
     lambda {
       EY::Metadata.present_security_group
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
 
-  it 'cannot get the database password' do
+  it 'not get the database password' do
     lambda {
       EY::Metadata.database_password
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
 
-  it 'cannot get the ssh password' do
+  it 'not get the ssh password' do
     lambda {
       EY::Metadata.ssh_password
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'cannot get the mysql command' do
+  it 'not get the mysql command' do
     lambda {
       EY::Metadata.mysql_command
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'cannot get the mysqldump command' do
+  it 'not get the mysqldump command' do
     lambda {
       EY::Metadata.mysqldump_command
     }.should raise_error(EY::Metadata::CannotGetFromHere)
   end
   
-  it 'gets the raw EngineYard Cloud API data' do
+  it 'get the raw EngineYard Cloud API data' do
     EY::Metadata.engine_yard_cloud_api.data.should be_a(Hash)
   end
 end
 
+shared_examples_for "it's executing inside the cloud" do
+  it 'get the present instance ID' do
+    EY::Metadata.present_instance_id.should == PRESENT_INSTANCE_ID
+  end
+
+  it 'get the present instance role (as a string)' do
+    EY::Metadata.present_instance_role.should == 'app_master'
+  end
+
+  it 'get the present public hostname' do
+    EY::Metadata.present_public_hostname.should == PRESENT_PUBLIC_HOSTNAME
+  end
+
+  it 'get the present security group' do
+    EY::Metadata.present_security_group.should == PRESENT_SECURITY_GROUP
+  end
+  
+  it 'get the database password' do
+    EY::Metadata.database_password.should == 'USERS-0-PASSWORD'
+  end
+  
+  it 'get the ssh password' do
+    EY::Metadata.ssh_password.should == 'SSH-PASSWORD'
+  end
+  
+  it 'get the mysql command' do
+    EY::Metadata.mysql_command.should =~ %r{mysql -h FAKE_DB_MASTER_PUBLIC_HOSTNAME -u FAKE_SSH_USERNAME -pUSERS-0-PASSWORD FAKE_APP_NAME}
+  end
+
+  it 'get the mysqldump command' do
+    EY::Metadata.mysqldump_command.should =~ %r{mysqldump -h FAKE_DB_MASTER_PUBLIC_HOSTNAME -u FAKE_SSH_USERNAME -pUSERS-0-PASSWORD FAKE_APP_NAME}
+  end
+end
+
 describe 'EY::Metadata' do
+  after do
+    stop_pretending
+  end
+  
+  describe "being executed on an EngineYard AppCloud (i.e. Amazon EC2) instance" do
+    before do
+      pretend_we_are_on_an_engineyard_appcloud_ec2_instance
+      EY::Metadata.reload
+    end
+    it_should_behave_like "it does in all execution environments"
+    it_should_behave_like "it's executing inside the cloud"
+  end
+
   describe "being executed from a developer/administrator's local machine" do
     before do
       pretend_we_are_on_a_developer_machine
-      load File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'engineyard-metadata', 'metadata.rb'))
+      EY::Metadata.reload
       EY::Metadata.clear
       ENV.delete 'EY_CLOUD_TOKEN'
       ENV.delete 'EY_ENVIRONMENT_NAME'
     end
-    
-    after do
-      stop_pretending
-    end
-    
     describe "controlled with environment variables" do
       before do
         ENV['EY_CLOUD_TOKEN'] = FAKE_CLOUD_TOKEN + 'aaa'
         ENV['EY_ENVIRONMENT_NAME'] = FAKE_ENVIRONMENT_NAME
         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"
+      it_should_behave_like "it does in all execution environments"
+      it_should_behave_like "it's executing outside the cloud"
     end
-    
     describe "controlled with attr writers" do
       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"
+      it_should_behave_like "it does in all execution environments"
+      it_should_behave_like "it's executing 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"
-    end
-  end
-  
-  describe "being executed on an EngineYard AppCloud (i.e. Amazon EC2) instance" do
-    before do
-      pretend_we_are_on_an_engineyard_appcloud_ec2_instance
-      load File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'engineyard-metadata', 'metadata.rb'))
-    end
-    
-    after do
-      stop_pretending
-    end
-    
-    it_should_behave_like "all execution environments"
-    
-    it 'has a FakeFS dna.json' do
-      File.exist?('/etc/chef/dna.json').should == true
-    end
-    
-    it 'gets the present instance ID' do
-      EY::Metadata.present_instance_id.should == PRESENT_INSTANCE_ID
-    end
-
-    it 'gets the present instance role (as a string)' do
-      EY::Metadata.present_instance_role.should == 'app_master'
-    end
-
-    it 'gets the present public hostname' do
-      EY::Metadata.present_public_hostname.should == PRESENT_PUBLIC_HOSTNAME
-    end
-
-    it 'gets the present security group' do
-      EY::Metadata.present_security_group.should == PRESENT_SECURITY_GROUP
-    end
-    
-    it 'gets the database password' do
-      EY::Metadata.database_password.should == 'USERS-0-PASSWORD'
-    end
-    
-    it 'gets the ssh password' do
-      EY::Metadata.ssh_password.should == 'SSH-PASSWORD'
-    end
-    
-    it 'gets the mysql command' do
-      EY::Metadata.mysql_command.should =~ %r{mysql -h FAKE_DB_MASTER_PUBLIC_HOSTNAME -u FAKE_SSH_USERNAME -pUSERS-0-PASSWORD FAKE_APP_NAME}
-    end
-
-    it 'gets the mysqldump command' do
-      EY::Metadata.mysqldump_command.should =~ %r{mysqldump -h FAKE_DB_MASTER_PUBLIC_HOSTNAME -u FAKE_SSH_USERNAME -pUSERS-0-PASSWORD FAKE_APP_NAME}
+      it_should_behave_like "it does in all execution environments"
+      it_should_behave_like "it's executing outside the cloud"
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 require 'rubygems'
 require 'rspec'
-# require 'ruby-debug'
-# assumes active-support 3
 require 'active_support/json/encoding'
 require 'fakeweb'
 require 'fakefs/safe'
@@ -18,10 +16,15 @@ def pretend_we_are_on_a_developer_machine
                         "https://cloud.engineyard.com/api/v2/environments",
                         :status => ["200", "OK"],
                         :body => File.read(File.join(File.dirname(__FILE__), 'support', 'engine_yard_cloud_api_response.json'))
-  # FakeFS.activate!
+  dot_git_config = File.read File.join(File.dirname(__FILE__), 'support', 'dot.git.config')
+  FakeFS.activate!
+  git_config_path = File.join Dir.pwd, '.git', 'config'
+  FileUtils.mkdir_p File.dirname(git_config_path)
+  File.open(git_config_path, 'w') do |f|
+    f.write dot_git_config
+  end
 end
 
-
 def pretend_we_are_on_an_engineyard_appcloud_ec2_instance
   FakeWeb.allow_net_connect = false
   # fake call to amazon ec2 api to get present security group
@@ -40,6 +43,7 @@ def pretend_we_are_on_an_engineyard_appcloud_ec2_instance
   dna_json = File.read File.join(File.dirname(__FILE__), 'support', 'dna.json')
   # ... then turn on the fakefs
   FakeFS.activate!
+  FileUtils.mkdir_p '/var/log/engineyard'
   FileUtils.mkdir_p '/etc/chef'
   File.open '/etc/chef/dna.json', 'w' do |f|
     f.write dna_json
@@ -47,7 +51,10 @@ def pretend_we_are_on_an_engineyard_appcloud_ec2_instance
 end
 
 def stop_pretending
+  # http://lukeredpath.co.uk/blog/using-fakefs-with-cucumber-features.html
+  FakeFS::FileSystem.clear
   FakeFS.deactivate!
   FakeWeb.clean_registry
-  FakeWeb.allow_net_connect = true
 end
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'engineyard-metadata'))

data/spec/support/dot.git.config

@@ -0,0 +1,18 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+[remote "origin"]
+	fetch = +refs/heads/*:refs/remotes/origin/*
+	url = FAKE_REPOSITORY_URI
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+[branch "leap"]
+	remote = origin
+	merge = refs/heads/leap
+[branch "cm1_r192"]
+	remote = origin
+	merge = refs/heads/cm1_r192

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-metadata
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 7
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -118,6 +118,7 @@ files:
 - spec/metadata_spec.rb
 - spec/spec_helper.rb
 - spec/support/dna.json
+- spec/support/dot.git.config
 - spec/support/engine_yard_cloud_api_response.json
 has_rdoc: true
 homepage: http://github.com/seamusabshere/engineyard-metadata