ey_aws 0.9 → 0.9.1

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/*
+Gemfile.lock

data/Gemfile

@@ -1,10 +1,3 @@
 source :rubygems
 
-gem 'aws-sdk'
-gem 'rest-client'
-gem 'rake'
-
-group :test do
-  gem 'rspec'
-  gem 'webmock'
-end
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 James Martelletti
+Copyright (c) 2012 Hooroo
 
 MIT License
 

data/README.md

@@ -128,3 +128,18 @@ Or from your application
 ## Testing
 
     bundle exec rake spec
+
+## Alternatives
+
+An alternative to this gem is the [engineyard-metadata](https://github.com/seamusabshere/engineyard-metadata)
+gem which also provides similar functionality, engineyard-metadata also supports
+returning local data from the chef dna.json file when executed from an EC2 instance.
+
+## Known Issues
+
+Y U SO SLOW? It couldn't hurt to help speed this library up, it will generally take about 60 seconds
+for a reasonably sized environment. This may be able to be helped by memoising the additional AWS calls.
+
+## Copyright
+
+Copyright (c) 2012 Hooroo. See LICENSE for details.

data/ey_aws.gemspec

@@ -6,13 +6,17 @@ Gem::Specification.new do |gem|
  gem.authors     = [ "James Martelletti" ]
  gem.email       = [ "james@hooroo.com" ]
 
- gem.summary     = "EngineYard & AWS environment/host information"
- gem.description = "Retrieve your EngineYard & AWS environment/host info via APIs"
+ gem.summary     = "Engine Yard and AWS environment/host information"
+ gem.description = "Retrieve environment and host information from your Engine Yard account, providing detailed information for each EC2 instance."
  gem.homepage    = "http://github.com/hooroo/ey_aws"
 
- gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+ gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
  gem.files       = `git ls-files`.split("\n")
  gem.test_files  = `git ls-files -- spec/*`.split("\n")
 
- gem.add_development_dependency "rspec", "~>2.7"
+ gem.add_dependency             'aws-sdk',     '~>1.6'
+ gem.add_dependency             'rest-client', '~>1.6'
+ gem.add_development_dependency 'rake',        '~>0.9'
+ gem.add_development_dependency 'rspec',       '~>2.11'
+ gem.add_development_dependency 'webmock',     '~>1.8'
 end

data/lib/ey_aws/version.rb

@@ -1,3 +1,3 @@
-module EYAWS
-  VERSION = '0.9'
+class EYAWS < Hash
+  VERSION = '0.9.1'
 end

data/lib/ey_aws.rb

@@ -1,4 +1,3 @@
-#require 'rest'
 require 'rest_client'
 require 'json'
 require 'aws-sdk'
@@ -6,8 +5,8 @@ require 'aws-sdk'
 class EYAWS < Hash
   attr_reader :environments
 
-  URL               = 'https://cloud.engineyard.com/api/v2/environments'
-  AWS_ATTRIBUTES    = [
+  EY_URL         = 'https://cloud.engineyard.com/api/v2/environments'
+  AWS_ATTRIBUTES = [
     :ami_launch_index,:architecture, :client_token, :dns_name, :hypervisor,
     :id, :image_id, :instance_type, :ip_address, :kernel_id,
     :key_name, :launch_time, :monitoring, :owner_id, :platform,
@@ -30,7 +29,7 @@ class EYAWS < Hash
     raise "No EY_CLOUD_TOKEN supplied"    if ey_cloud_token.nil?
 
     # Get EY environment info
-    @data = JSON.parse(RestClient.get(URL, 'X-EY-Cloud-Token' => ey_cloud_token).body, :symbolize_names => true)
+    @data = JSON.parse(RestClient.get(EY_URL, 'X-EY-Cloud-Token' => ey_cloud_token).body, :symbolize_names => true)
 
     # Figure out the region each EY host lives in
     @data[:environments].each do |e|
@@ -57,12 +56,17 @@ class EYAWS < Hash
   end
 
   private
+  def map_attributes(attributes, data)
+    mapped_attributes = {}
+    attributes.each do |attr|
+      mapped_attributes[attr] = data.send(attr.to_s) if data.respond_to?(attr.to_s)
+    end
+    mapped_attributes
+  end
+
   def add_aws_info(inst)
     # Grab all our aws attributes
-    aws_attributes = {}
-    AWS_ATTRIBUTES.each do |attr|
-      aws_attributes[attr] = inst.send(attr.to_s)
-    end
+    aws_attributes = map_attributes(AWS_ATTRIBUTES, inst)
 
     # Find the instance to attach this stuff to
     instance = @data[:environments].map { |e|
@@ -72,17 +76,10 @@ class EYAWS < Hash
     # Now grab all the block attributes
     block_devices = []
     inst.block_device_mappings.each do |mnt, device|
-      block_device = {}
-      AWS_DEVICE_ATTRIBUTES.map do |dattr|
-        block_device[dattr] = device.send(dattr.to_s)
-      end
+      block_device = map_attributes(AWS_DEVICE_ATTRIBUTES, device)
 
       # And the volume...
-      volume = {}
-      AWS_VOLUME_ATTRIBUTES.map do |vattr|
-        volume[vattr] = device.volume.send(vattr.to_s)
-      end
-      block_device[:volume] = volume
+      block_device[:volume] = map_attributes(AWS_VOLUME_ATTRIBUTES, device.volume)
 
       block_devices << block_device
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey_aws
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,20 +9,65 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: &70348638160080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70348638160080
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70348638159080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70348638159080
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70348638142040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: *70348638142040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70268252775260 !ruby/object:Gem::Requirement
+  requirement: &70348638140840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: *70348638140840
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70348638139320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *70268252775260
-description: Retrieve your EngineYard & AWS environment/host info via APIs
+  version_requirements: *70348638139320
+description: Retrieve environment and host information from your Engine Yard account,
+  providing detailed information for each EC2 instance.
 email:
 - james@hooroo.com
 executables:
@@ -30,8 +75,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -55,19 +100,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1802294364488782302
+      hash: -3250632359038003336
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3250632359038003336
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: EngineYard & AWS environment/host information
+summary: Engine Yard and AWS environment/host information
 test_files:
 - spec/ey_aws_spec.rb
 - spec/support/cloud_engineyard_com.json

data/Gemfile.lock

@@ -1,44 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.2)
-    aws-sdk (1.3.4)
-      httparty (~> 0.7)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    httparty (0.8.1)
-      multi_json
-      multi_xml
-    json (1.6.5)
-    mime-types (1.19)
-    multi_json (1.1.0)
-    multi_xml (0.4.1)
-    nokogiri (1.5.0)
-    rake (0.9.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    uuidtools (2.1.2)
-    webmock (1.8.11)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aws-sdk
-  rake
-  rest-client
-  rspec
-  webmock