fog 0.1.8 → 0.1.9

data/Gemfile

@@ -7,7 +7,7 @@ gem 'json', ">= 0"
 gem 'mime-types', ">= 0"
 gem 'net-ssh', ">= 0"
 gem 'nokogiri', ">= 0"
-gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
-gem 'shindo', '>= 0.1.4'
+gem 'ruby-hmac', '>= 0'
+gem 'shindo', '>= 0.1.5'
 gem 'builder', '>= 0'

data/Gemfile.lock

@@ -8,7 +8,7 @@ dependencies:
     group: 
     - :default
     version: ">= 0"
-  rspec: 
+  ruby-hmac: 
     group: 
     - :default
     version: ">= 0"
@@ -16,7 +16,7 @@ dependencies:
     group: 
     - :default
     version: ">= 0"
-  ruby-hmac: 
+  rspec: 
     group: 
     - :default
     version: ">= 0"
@@ -39,7 +39,7 @@ dependencies:
   shindo: 
     group: 
     - :default
-    version: ">= 0.1.4"
+    version: ">= 0.1.5"
   nokogiri: 
     group: 
     - :default
@@ -68,8 +68,8 @@ specs:
 - ruby-hmac: 
     version: 0.4.0
 - shindo: 
-    version: 0.1.4
-hash: da3f548f91388bc9e002c42ee2a4488bc8db9991
+    version: 0.1.5
+hash: 12012795f07111bf764cef89d9ba91f521c54956
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/README.rdoc

@@ -1,6 +1,6 @@
 http://geemus.com/fog.png
 
-fog helps you interact with cloud services.
+fog is the Ruby cloud computing library.
 
 The quick and dirty, top to bottom:
 * Models provide a simplified interface, making clouds easier to work with and switch between.
@@ -25,21 +25,21 @@ Now just type 'fog' to trying stuff out, confident that fog should let you know
 == Collections
 
 Nouns like Images and Servers are collections, which form the interface to the cloud.
-Collections provide all, create, get and new methods.
-* all fetches every object of that type from the cloud.
-* create initializes a new record locally and then persists it to the cloud.
-* get fetches a single object by its identity.
-* new initializes a new record locally.
+Some of these collections are shared across multiple providers.
+The shared collections for compute resources are flavors, images and servers.
+Shared collections for storage are directory and file.
 
-Common compute nouns are flavors, images and servers.
+Some common methods for all of these collections are:
+* #all - fetch every object of that type from the provider.
+* #create  initialize a new record locally and then persists it with the provider.
+* #get - fetch a single object by its identity from the provider.
+* #new - initialize a new record locally, but do not persist it to the provider.
 
-Common storage nouns are directory and file.
-
-As an example, we'll try initializing and persisting a rackspace server:
+As an example, we'll try initializing and persisting a Rackspace Cloud server:
 
   require 'fog'
 
-  # initialize a connection to Rackspace Servers
+  # initialize a connection to Rackspace Cloud Servers
   connection = Fog::Rackspace::Servers.new(
     :rackspace_api_key => key,
     :rackspace_username => username
@@ -59,47 +59,47 @@ As an example, we'll try initializing and persisting a rackspace server:
 == Models
 
 Many of the collection methods return individual objects, which provide destroy, save and wait_for methods.
-* destroy will destroy the persisted object from the cloud
-* save will persist the object to the cloud
-* wait_for takes a block and waits for either the block to return true for the object or for a timeout (defaults to 10 minutes)
+* #destroy - will destroy the persisted object from the provider
+* #save - persist the object to the provider
+* #wait_for - takes a block and waits for either the block to return true for the object or for a timeout (defaults to 10 minutes)
 
 == Mocks
 
-Mocking provides an in memory representation of clouds as you make different requests.
-This representation allows subsequent calls to mimic the behavior of the cloud while eliminating the cost and time needed to actually run tests against various providers.
-Mocking is easy to use, just write any functions as you normally would and then in your tests ensure you call:
+Mocking provides an in memory representation of the state of cloud resources as you make requests.
+Mocked calls to mimic the behavior of each provider while eliminating the cost and time needed to actually use cloud resources.
+Enabling mocking easy to use, before you run any other commands run:
 
   Fog.mock!
 
-Make sure you call it first (before you initialize any connections) and all your calls should now run in mock mode.
-If you run into the edges of mock implementation it should let you know that they haven't been implemented yet.
+Then you can run other commands just like you always would.
+Some mocks are not implemented just yet, but fog will raise an error to let you know and contributions are always welcome!
 
 == Requests
 
 Requests allow you to dive deeper when the models just can't cut it.
-For instance, ec2 provides methods related to reserved instances that don't have any models (yet anyway).
-You can get a description of your reserved instances like this:
+For instance, ec2 provides methods related to reserved instances that don't have any models (yet).
+Here is how you can lookup your reserved instances:
 
   $ fog
   >> AWS[:ec2].describe_reserved_instances
   #<Excon::Response [...]>
 
-It will return an excon response, which has headers and body methods. Both give nice ruby hash representations of the result.
+It will return an {excon}[http://github.com/geemus/excon] response, which has #headers and #body. Both return nice hashes.
 
 == Go forth and conquer
 
-That should give you some stuff to try and places to look.
-For a more in depth walk through, check out the {getting started guide}[http://wiki.github.com/geemus/fog/getting-started-with-fog].
+Play around and use the console to explore or check out the {getting started guide}[http://wiki.github.com/geemus/fog/getting-started-with-fog] for more details.
 
 You should try out the (varying) support fog has for:
-* AWS [EC2, S3, SimpleDB]
-* Rackspace [Files, Servers]
-* Slicehost
-* Terremark vCloud Express
-* Blue Box Group [Blocks]
+* {AWS}[http://aws.amazon.com] [{EC2}[http://aws.amazon.com/ec2], {ELB}[http://aws.amazon.com/elasticloadbalancing], {S3}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
+* {Rackspace}[http://www.rackspace.com] [{Files}[http://www.rackspacecloud.com/cloud_hosting_products/files], {Servers}[http://www.rackspacecloud.com/cloud_hosting_products/servers]]
+* {Slicehost}[http://www.slicehost.com]
+* {Terremark}[http://www.terremark.com] [{vCloud Express}[http://vcloudexpress.terremark.com]]
+* {Blue Box Group}[http://www.blueboxgrp.com] [{Blocks}[http://www.blueboxgrp.com/blocks]]
 
 Enjoy, and let me know what I can do to continue improving fog!
 
+* Work for {twitter}[http://twitter.com]? I'd love to reclaim the unused {@fog}[http://twitter.com/fog] account!
 * Follow {@geemus}[http://twitter.com/geemus] on Twitter.
 * See upcoming work in the {tracker}[http://www.pivotaltracker.com/projects/54635].
 * Report bugs in {issues}[http://github.com/geemus/fog/issues].

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.1.8'
-  s.date              = '2010-06-07'
+  s.version           = '0.1.9'
+  s.date              = '2010-06-15'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -233,6 +233,8 @@ Gem::Specification.new do |s|
     lib/fog/connection.rb
     lib/fog/credentials.rb
     lib/fog/deprecation.rb
+    lib/fog/errors.rb
+    lib/fog/hmac.rb
     lib/fog/local.rb
     lib/fog/local/bin.rb
     lib/fog/local/models/directories.rb
@@ -283,6 +285,7 @@ Gem::Specification.new do |s|
     lib/fog/rackspace/requests/servers/reboot_server.rb
     lib/fog/rackspace/requests/servers/update_server.rb
     lib/fog/rackspace/servers.rb
+    lib/fog/service.rb
     lib/fog/slicehost.rb
     lib/fog/slicehost/bin.rb
     lib/fog/slicehost/models/flavor.rb
@@ -383,6 +386,8 @@ Gem::Specification.new do |s|
     lib/fog/vcloud/parsers/get_vdc.rb
     lib/fog/vcloud/parsers/get_versions.rb
     lib/fog/vcloud/parsers/login.rb
+    lib/fog/vcloud/parsers/network.rb
+    lib/fog/vcloud/requests/get_network.rb
     lib/fog/vcloud/requests/get_organization.rb
     lib/fog/vcloud/requests/get_vdc.rb
     lib/fog/vcloud/requests/get_versions.rb
@@ -391,6 +396,10 @@ Gem::Specification.new do |s|
     lib/fog/vcloud/terremark/ecloud.rb
     lib/fog/vcloud/terremark/ecloud/models/internet_service.rb
     lib/fog/vcloud/terremark/ecloud/models/internet_services.rb
+    lib/fog/vcloud/terremark/ecloud/models/ip.rb
+    lib/fog/vcloud/terremark/ecloud/models/ips.rb
+    lib/fog/vcloud/terremark/ecloud/models/network.rb
+    lib/fog/vcloud/terremark/ecloud/models/networks.rb
     lib/fog/vcloud/terremark/ecloud/models/public_ip.rb
     lib/fog/vcloud/terremark/ecloud/models/public_ips.rb
     lib/fog/vcloud/terremark/ecloud/models/vdc.rb
@@ -400,9 +409,14 @@ Gem::Specification.new do |s|
     lib/fog/vcloud/terremark/ecloud/parsers/get_public_ips.rb
     lib/fog/vcloud/terremark/ecloud/parsers/get_vdc.rb
     lib/fog/vcloud/terremark/ecloud/parsers/internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/parsers/network.rb
+    lib/fog/vcloud/terremark/ecloud/parsers/network_ips.rb
     lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb
     lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_network.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb
@@ -477,6 +491,7 @@ Gem::Specification.new do |s|
     spec/vcloud/bin_spec.rb
     spec/vcloud/models/vdc_spec.rb
     spec/vcloud/models/vdcs_spec.rb
+    spec/vcloud/requests/get_network_spec.rb
     spec/vcloud/requests/get_organization_spec.rb
     spec/vcloud/requests/get_vdc_spec.rb
     spec/vcloud/requests/get_versions_spec.rb
@@ -484,13 +499,20 @@ Gem::Specification.new do |s|
     spec/vcloud/spec_helper.rb
     spec/vcloud/terremark/ecloud/models/internet_service_spec.rb
     spec/vcloud/terremark/ecloud/models/internet_services_spec.rb
+    spec/vcloud/terremark/ecloud/models/ip_spec.rb
+    spec/vcloud/terremark/ecloud/models/ips_spec.rb
+    spec/vcloud/terremark/ecloud/models/network_spec.rb
+    spec/vcloud/terremark/ecloud/models/networks_spec.rb
     spec/vcloud/terremark/ecloud/models/public_ip_spec.rb
     spec/vcloud/terremark/ecloud/models/public_ips_spec.rb
     spec/vcloud/terremark/ecloud/models/vdc_spec.rb
     spec/vcloud/terremark/ecloud/models/vdcs_spec.rb
     spec/vcloud/terremark/ecloud/requests/add_internet_service_spec.rb
+    spec/vcloud/terremark/ecloud/requests/configure_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_network_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb

data/lib/fog.rb

@@ -4,8 +4,6 @@ require 'cgi'
 require 'digest/md5'
 require 'excon'
 require 'formatador'
-require 'hmac-sha1'
-require 'hmac-sha2'
 require 'json'
 require 'mime/types'
 require 'net/ssh'
@@ -22,22 +20,13 @@ require 'fog/attributes'
 require 'fog/collection'
 require 'fog/connection'
 require 'fog/deprecation'
+require 'fog/errors'
+require 'fog/hmac'
 require 'fog/model'
 require 'fog/parser'
+require 'fog/service'
 require 'fog/ssh'
 
-module Fog
-  module Errors
-
-    class Error < StandardError; end
-
-    class MockNotImplemented < Fog::Errors::Error; end
-
-    class NotFound < Fog::Errors::Error; end
-
-  end
-end
-
 require 'fog/aws'
 require 'fog/bluebox'
 require 'fog/local'
@@ -49,7 +38,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -33,8 +33,8 @@ module Fog
         end
       end
       string_to_sign = "POST\n#{options[:host]}\n/\n" << body.chop
-      hmac = options[:hmac].update(string_to_sign)
-      body << "Signature=#{CGI.escape(Base64.encode64(hmac.digest).chomp!).gsub(/\+/, '%20')}"
+      signed_string = options[:hmac].sign(string_to_sign)
+      body << "Signature=#{CGI.escape(Base64.encode64(signed_string).chomp!).gsub(/\+/, '%20')}"
 
       body
     end

data/lib/fog/aws/ec2.rb

@@ -1,101 +1,65 @@
 module Fog
   module AWS
     module EC2
-
-      class Error < Fog::Errors::Error; end
-      class NotFound < Fog::Errors::NotFound; end
-
-      def self.new(options={})
-
-        unless @required
-          require 'fog/aws/models/ec2/address'
-          require 'fog/aws/models/ec2/addresses'
-          require 'fog/aws/models/ec2/flavor'
-          require 'fog/aws/models/ec2/flavors'
-          require 'fog/aws/models/ec2/image'
-          require 'fog/aws/models/ec2/images'
-          require 'fog/aws/models/ec2/key_pair'
-          require 'fog/aws/models/ec2/key_pairs'
-          require 'fog/aws/models/ec2/security_group'
-          require 'fog/aws/models/ec2/security_groups'
-          require 'fog/aws/models/ec2/server'
-          require 'fog/aws/models/ec2/servers'
-          require 'fog/aws/models/ec2/snapshot'
-          require 'fog/aws/models/ec2/snapshots'
-          require 'fog/aws/models/ec2/volume'
-          require 'fog/aws/models/ec2/volumes'
-          require 'fog/aws/parsers/ec2/allocate_address'
-          require 'fog/aws/parsers/ec2/attach_volume'
-          require 'fog/aws/parsers/ec2/basic'
-          require 'fog/aws/parsers/ec2/create_key_pair'
-          require 'fog/aws/parsers/ec2/create_snapshot'
-          require 'fog/aws/parsers/ec2/create_volume'
-          require 'fog/aws/parsers/ec2/describe_addresses'
-          require 'fog/aws/parsers/ec2/describe_availability_zones'
-          require 'fog/aws/parsers/ec2/describe_images'
-          require 'fog/aws/parsers/ec2/describe_instances'
-          require 'fog/aws/parsers/ec2/describe_key_pairs'
-          require 'fog/aws/parsers/ec2/describe_regions'
-          require 'fog/aws/parsers/ec2/describe_reserved_instances'
-          require 'fog/aws/parsers/ec2/describe_security_groups'
-          require 'fog/aws/parsers/ec2/describe_snapshots'
-          require 'fog/aws/parsers/ec2/describe_volumes'
-          require 'fog/aws/parsers/ec2/detach_volume'
-          require 'fog/aws/parsers/ec2/get_console_output'
-          require 'fog/aws/parsers/ec2/run_instances'
-          require 'fog/aws/parsers/ec2/terminate_instances'
-          require 'fog/aws/requests/ec2/allocate_address'
-          require 'fog/aws/requests/ec2/associate_address'
-          require 'fog/aws/requests/ec2/attach_volume'
-          require 'fog/aws/requests/ec2/authorize_security_group_ingress'
-          require 'fog/aws/requests/ec2/create_key_pair'
-          require 'fog/aws/requests/ec2/create_security_group'
-          require 'fog/aws/requests/ec2/create_snapshot'
-          require 'fog/aws/requests/ec2/create_volume'
-          require 'fog/aws/requests/ec2/delete_key_pair'
-          require 'fog/aws/requests/ec2/delete_security_group'
-          require 'fog/aws/requests/ec2/delete_snapshot'
-          require 'fog/aws/requests/ec2/delete_volume'
-          require 'fog/aws/requests/ec2/describe_addresses'
-          require 'fog/aws/requests/ec2/describe_availability_zones'
-          require 'fog/aws/requests/ec2/describe_images'
-          require 'fog/aws/requests/ec2/describe_instances'
-          require 'fog/aws/requests/ec2/describe_reserved_instances'
-          require 'fog/aws/requests/ec2/describe_key_pairs'
-          require 'fog/aws/requests/ec2/describe_regions'
-          require 'fog/aws/requests/ec2/describe_security_groups'
-          require 'fog/aws/requests/ec2/describe_snapshots'
-          require 'fog/aws/requests/ec2/describe_volumes'
-          require 'fog/aws/requests/ec2/detach_volume'
-          require 'fog/aws/requests/ec2/disassociate_address'
-          require 'fog/aws/requests/ec2/get_console_output'
-          require 'fog/aws/requests/ec2/modify_image_attributes'
-          require 'fog/aws/requests/ec2/reboot_instances'
-          require 'fog/aws/requests/ec2/release_address'
-          require 'fog/aws/requests/ec2/revoke_security_group_ingress'
-          require 'fog/aws/requests/ec2/run_instances'
-          require 'fog/aws/requests/ec2/terminate_instances'
-          @required = true
-        end
-
-        unless options[:aws_access_key_id]
-          raise ArgumentError.new('aws_access_key_id is required to access ec2')
-        end
-        unless options[:aws_secret_access_key]
-          raise ArgumentError.new('aws_secret_access_key is required to access ec2')
-        end
-        if Fog.mocking?
-          Fog::AWS::EC2::Mock.new(options)
-        else
-          Fog::AWS::EC2::Real.new(options)
-        end
-      end
-
-      def self.reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
+      extend Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+
+      model_path 'fog/aws/models/ec2'
+      model 'address'
+      model 'addresses'
+      model 'flavor'
+      model 'flavors'
+      model 'image'
+      model 'images'
+      model 'key_pair'
+      model 'key_pairs'
+      model 'security_group'
+      model 'security_groups'
+      model 'server'
+      model 'servers'
+      model 'snapshot'
+      model 'snapshots'
+      model 'volume'
+      model 'volumes'
+
+      require 'fog/aws/parsers/ec2/basic'
+
+      request_path 'fog/aws/requests/ec2'
+      request 'allocate_address'
+      request 'associate_address'
+      request 'attach_volume'
+      request 'authorize_security_group_ingress'
+      request 'create_key_pair'
+      request 'create_security_group'
+      request 'create_snapshot'
+      request 'create_volume'
+      request 'delete_key_pair'
+      request 'delete_security_group'
+      request 'delete_snapshot'
+      request 'delete_volume'
+      request 'describe_addresses'
+      request 'describe_availability_zones'
+      request 'describe_images'
+      request 'describe_instances'
+      request 'describe_reserved_instances'
+      request 'describe_key_pairs'
+      request 'describe_regions'
+      request 'describe_security_groups'
+      request 'describe_snapshots'
+      request 'describe_volumes'
+      request 'detach_volume'
+      request 'disassociate_address'
+      request 'get_console_output'
+      request 'modify_image_attributes'
+      request 'reboot_instances'
+      request 'release_address'
+      request 'revoke_security_group_ingress'
+      request 'run_instances'
+      request 'terminate_instances'
 
       class Mock
+        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -158,6 +122,7 @@ module Fog
       end
 
       class Real
+        include Collections
 
         # Initialize connection to EC2
         #
@@ -180,7 +145,7 @@ module Fog
         def initialize(options={})
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
-          @hmac = HMAC::SHA256.new(@aws_secret_access_key)
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @host = options[:host] || case options[:region]
             when 'ap-southeast-1'
               'ec2.ap-southeast-1.amazonaws.com'
@@ -193,8 +158,8 @@ module Fog
             else
               'ec2.amazonaws.com'
             end
-          @port       = options[:port]      || 443
-          @scheme     = options[:scheme]    || 'https'
+          @port   = options[:port]      || 443
+          @scheme = options[:scheme]    || 'https'
         end
 
         private
@@ -227,14 +192,12 @@ module Fog
             })
           rescue Excon::Errors::Error => error
             if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
-              new_error = case match[1].split('.').last
+              raise case match[1].split('.').last
               when 'NotFound'
-                Fog::AWS::EC2::NotFound.new(match[2])
+                Fog::AWS::EC2::NotFound.slurp(error, match[2])
               else
-                Fog::AWS::EC2::Error.new("#{match[1]} => #{match[2]}")
+                Fog::AWS::EC2::Error.slurp(error, "#{match[1]} => #{match[2]}")
               end
-              new_error.set_backtrace(error.backtrace)
-              raise new_error
             else
               raise error
             end