fog 0.0.67 → 0.0.68

data/README.rdoc

@@ -1,4 +1,4 @@
-= fog
+http://geemus.com/fog.png
 
 fog helps you interact with cloud services.
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 67
+:patch: 68
 :build: 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.67"
+  s.version = "0.0.68"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-04-02}
+  s.date = %q{2010-04-08}
   s.default_executable = %q{fog}
   s.description = %q{The Ruby cloud computing library.}
   s.email = %q{geemus@gmail.com}
@@ -169,6 +169,7 @@ Gem::Specification.new do |s|
     "lib/fog/rackspace/requests/servers/delete_image.rb",
     "lib/fog/rackspace/requests/servers/delete_server.rb",
     "lib/fog/rackspace/requests/servers/get_flavor_details.rb",
+    "lib/fog/rackspace/requests/servers/get_image_details.rb",
     "lib/fog/rackspace/requests/servers/get_server_details.rb",
     "lib/fog/rackspace/requests/servers/list_addresses.rb",
     "lib/fog/rackspace/requests/servers/list_flavors.rb",
@@ -214,18 +215,27 @@ Gem::Specification.new do |s|
     "lib/fog/terremark/parsers/get_catalog_item.rb",
     "lib/fog/terremark/parsers/get_organization.rb",
     "lib/fog/terremark/parsers/get_organizations.rb",
+    "lib/fog/terremark/parsers/get_public_Ips.rb",
     "lib/fog/terremark/parsers/get_tasks_list.rb",
     "lib/fog/terremark/parsers/get_vapp_template.rb",
     "lib/fog/terremark/parsers/get_vdc.rb",
     "lib/fog/terremark/parsers/instantiate_vapp_template.rb",
+    "lib/fog/terremark/parsers/internet_service.rb",
+    "lib/fog/terremark/parsers/node_service.rb",
     "lib/fog/terremark/parsers/task.rb",
     "lib/fog/terremark/parsers/vapp.rb",
+    "lib/fog/terremark/requests/add_internet_service.rb",
+    "lib/fog/terremark/requests/add_node_service.rb",
+    "lib/fog/terremark/requests/create_internet_service.rb",
+    "lib/fog/terremark/requests/delete_internet_service.rb",
+    "lib/fog/terremark/requests/delete_node_service.rb",
     "lib/fog/terremark/requests/delete_vapp.rb",
     "lib/fog/terremark/requests/deploy_vapp.rb",
     "lib/fog/terremark/requests/get_catalog.rb",
     "lib/fog/terremark/requests/get_catalog_item.rb",
     "lib/fog/terremark/requests/get_organization.rb",
     "lib/fog/terremark/requests/get_organizations.rb",
+    "lib/fog/terremark/requests/get_public_ips.rb",
     "lib/fog/terremark/requests/get_task.rb",
     "lib/fog/terremark/requests/get_tasks_list.rb",
     "lib/fog/terremark/requests/get_vapp.rb",
@@ -342,6 +352,17 @@ Gem::Specification.new do |s|
     "spec/slicehost/models/server_spec.rb",
     "spec/slicehost/models/servers_spec.rb",
     "spec/spec_helper.rb",
+    "tests/helper.rb",
+    "tests/helper_tests.rb",
+    "tests/rackspace/helper.rb",
+    "tests/rackspace/requests/servers/create_image_tests.rb",
+    "tests/rackspace/requests/servers/create_server_tests.rb",
+    "tests/rackspace/requests/servers/delete_image_tests.rb",
+    "tests/rackspace/requests/servers/delete_server_tests.rb",
+    "tests/rackspace/requests/servers/get_flavor_details_tests.rb",
+    "tests/rackspace/requests/servers/get_image_details_tests.rb",
+    "tests/rackspace/requests/servers/get_server_details_tests.rb",
+    "tests/slicehost/helper.rb",
     "tests/slicehost/requests/create_slice_tests.rb",
     "tests/slicehost/requests/delete_slice_tests.rb",
     "tests/slicehost/requests/get_backups_tests.rb",
@@ -351,10 +372,7 @@ Gem::Specification.new do |s|
     "tests/slicehost/requests/get_images_tests.rb",
     "tests/slicehost/requests/get_slice_tests.rb",
     "tests/slicehost/requests/get_slices_tests.rb",
-    "tests/slicehost/requests/reboot_slice_tests.rb",
-    "tests/slicehost/slicehost_helper.rb",
-    "tests/test_helper.rb",
-    "tests/test_helper_tests.rb"
+    "tests/slicehost/requests/reboot_slice_tests.rb"
   ]
   s.homepage = %q{http://github.com/geemus/fog}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/fog/aws/ec2.rb

@@ -1,55 +1,56 @@
-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/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/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'
-
 module Fog
   module AWS
     module EC2
 
       def self.new(options={})
+
+        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/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/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'
+
         unless options[:aws_access_key_id]
           raise ArgumentError.new('aws_access_key_id is required to access ec2')
         end

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -62,7 +62,7 @@ module Fog
 
       class Mock
 
-        def describe_instances(instance_id = {})
+        def describe_instances(instance_id = [])
           response = Excon::Response.new
           instance_id = [*instance_id]
           if instance_id != []

data/lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -43,11 +43,11 @@ module Fog
 
           snapshot_set.each do |snapshot|
             case snapshot['status']
-            when 'creating'
-              if Time.now - volume['createTime'] > 2
+            when 'in progress', 'pending'
+              if Time.now - snapshot['startTime'] > 2
                 snapshot['progress']  = '100%'
                 snapshot['status']    = 'completed'
-              else
+              elsif Time.now - snapshot['startTime'] > 1
                 snapshot['progress']  = '50%'
                 snapshot['status']    = 'in progress'
               end

data/lib/fog/aws/requests/ec2/run_instances.rb

@@ -102,7 +102,6 @@ module Fog
 
           group_set = [ (options['GroupId'] || 'default') ]
           instances_set = []
-          owner_id = @owner_id
           reservation_id = Fog::AWS::Mock.reservation_id
 
           min_count.times do |i|
@@ -120,7 +119,7 @@ module Fog
               'keyName'             => options['KeyName'] || '',
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'ownerId'             => owner_id,
+              'ownerId'             => @owner_id,
               'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
               'privateDnsName'      => '',
               'productCodes'        => [],
@@ -135,7 +134,7 @@ module Fog
           response.body = {
             'groupSet'      => group_set,
             'instancesSet'  => instances_set,
-            'ownerId'       => owner_id,
+            'ownerId'       => @owner_id,
             'requestId'     => Fog::AWS::Mock.request_id,
             'reservationId' => reservation_id
           }

data/lib/fog/aws/s3.rb

@@ -1,25 +1,26 @@
-require 'fog/aws/models/s3/directories'
-require 'fog/aws/models/s3/directory'
-require 'fog/aws/models/s3/files'
-require 'fog/aws/models/s3/file'
-require 'fog/aws/requests/s3/copy_object'
-require 'fog/aws/requests/s3/delete_bucket'
-require 'fog/aws/requests/s3/delete_object'
-require 'fog/aws/requests/s3/get_bucket'
-require 'fog/aws/requests/s3/get_bucket_location'
-require 'fog/aws/requests/s3/get_object'
-require 'fog/aws/requests/s3/get_request_payment'
-require 'fog/aws/requests/s3/get_service'
-require 'fog/aws/requests/s3/head_object'
-require 'fog/aws/requests/s3/put_bucket'
-require 'fog/aws/requests/s3/put_object'
-require 'fog/aws/requests/s3/put_request_payment'
-
 module Fog
   module AWS
     module S3
 
       def self.new(options={})
+
+        require 'fog/aws/models/s3/directories'
+        require 'fog/aws/models/s3/directory'
+        require 'fog/aws/models/s3/files'
+        require 'fog/aws/models/s3/file'
+        require 'fog/aws/requests/s3/copy_object'
+        require 'fog/aws/requests/s3/delete_bucket'
+        require 'fog/aws/requests/s3/delete_object'
+        require 'fog/aws/requests/s3/get_bucket'
+        require 'fog/aws/requests/s3/get_bucket_location'
+        require 'fog/aws/requests/s3/get_object'
+        require 'fog/aws/requests/s3/get_request_payment'
+        require 'fog/aws/requests/s3/get_service'
+        require 'fog/aws/requests/s3/head_object'
+        require 'fog/aws/requests/s3/put_bucket'
+        require 'fog/aws/requests/s3/put_object'
+        require 'fog/aws/requests/s3/put_request_payment'
+
         if Fog.mocking?
           Fog::AWS::S3::Mock.new(options)
         else

data/lib/fog/aws/simpledb.rb

@@ -1,18 +1,19 @@
-require 'fog/aws/requests/simpledb/batch_put_attributes'
-require 'fog/aws/requests/simpledb/create_domain'
-require 'fog/aws/requests/simpledb/delete_attributes'
-require 'fog/aws/requests/simpledb/delete_domain'
-require 'fog/aws/requests/simpledb/domain_metadata'
-require 'fog/aws/requests/simpledb/get_attributes'
-require 'fog/aws/requests/simpledb/list_domains'
-require 'fog/aws/requests/simpledb/put_attributes'
-require 'fog/aws/requests/simpledb/select'
-
 module Fog
   module AWS
     module SimpleDB
 
       def self.new(options={})
+
+        require 'fog/aws/requests/simpledb/batch_put_attributes'
+        require 'fog/aws/requests/simpledb/create_domain'
+        require 'fog/aws/requests/simpledb/delete_attributes'
+        require 'fog/aws/requests/simpledb/delete_domain'
+        require 'fog/aws/requests/simpledb/domain_metadata'
+        require 'fog/aws/requests/simpledb/get_attributes'
+        require 'fog/aws/requests/simpledb/list_domains'
+        require 'fog/aws/requests/simpledb/put_attributes'
+        require 'fog/aws/requests/simpledb/select'
+
         if Fog.mocking?
           Fog::AWS::SimpleDB::Mock.new(options)
         else

data/lib/fog/bin.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'credentials')
+
 module Fog
   class << self
 
@@ -14,7 +16,9 @@ module Fog
     def flavors
       flavors = {}
       services.each do |service|
-        flavors[service] = service.flavors
+        if service.respond_to?(:flavors)
+          flavors[service] = service.flavors
+        end
       end
       flavors
     end
@@ -22,7 +26,9 @@ module Fog
     def images
       images = {}
       services.each do |service|
-        images[service] = service.images
+        if service.respond_to?(:images)
+          images[service] = service.images
+        end
       end
       images
     end
@@ -30,10 +36,12 @@ module Fog
     def servers
       servers = {}
       services.each do |service|
-        servers[service] = service.servers
+        if service.respond_to?(:servers)
+          servers[service] = service.servers
+        end
       end
       servers
     end
 
   end
-end
+end

data/lib/fog/rackspace/files.rb

@@ -1,23 +1,24 @@
-require 'fog/rackspace/models/files/directory'
-require 'fog/rackspace/models/files/directories'
-require 'fog/rackspace/models/files/file'
-require 'fog/rackspace/models/files/files'
-require 'fog/rackspace/requests/files/delete_container'
-require 'fog/rackspace/requests/files/delete_object'
-require 'fog/rackspace/requests/files/get_container'
-require 'fog/rackspace/requests/files/get_containers'
-require 'fog/rackspace/requests/files/get_object'
-require 'fog/rackspace/requests/files/head_container'
-require 'fog/rackspace/requests/files/head_containers'
-require 'fog/rackspace/requests/files/head_object'
-require 'fog/rackspace/requests/files/put_container'
-require 'fog/rackspace/requests/files/put_object'
-
 module Fog
   module Rackspace
     module Files
 
       def self.new(options={})
+
+        require 'fog/rackspace/models/files/directory'
+        require 'fog/rackspace/models/files/directories'
+        require 'fog/rackspace/models/files/file'
+        require 'fog/rackspace/models/files/files'
+        require 'fog/rackspace/requests/files/delete_container'
+        require 'fog/rackspace/requests/files/delete_object'
+        require 'fog/rackspace/requests/files/get_container'
+        require 'fog/rackspace/requests/files/get_containers'
+        require 'fog/rackspace/requests/files/get_object'
+        require 'fog/rackspace/requests/files/head_container'
+        require 'fog/rackspace/requests/files/head_containers'
+        require 'fog/rackspace/requests/files/head_object'
+        require 'fog/rackspace/requests/files/put_container'
+        require 'fog/rackspace/requests/files/put_object'
+
         if Fog.mocking?
           Fog::Rackspace::Files::Mock.new(options)
         else

data/lib/fog/rackspace/requests/servers/get_image_details.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Rackspace
+    module Servers
+      class Real
+
+        # Get details for image by id
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'id'<~Integer> - Id of the image
+        #     * 'name'<~String> - Name of the image
+        #     * 'serverId'<~Integer> - Id of server image was created from
+        #     * 'status'<~Integer> - Status of image
+        #     * 'updated'<~String> - Timestamp of last update
+        def get_image_details(image_id)
+          request(
+            :expects  => [200, 203],
+            :method   => 'GET',
+            :path     => "images/#{image_id}.json"
+          )
+        end
+
+      end
+
+      class Mock
+
+        def get_image_details(image_id)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/servers.rb

@@ -1,32 +1,34 @@
-require 'fog/rackspace/models/servers/flavor'
-require 'fog/rackspace/models/servers/flavors'
-require 'fog/rackspace/models/servers/image'
-require 'fog/rackspace/models/servers/images'
-require 'fog/rackspace/models/servers/server'
-require 'fog/rackspace/models/servers/servers'
-require 'fog/rackspace/requests/servers/create_image'
-require 'fog/rackspace/requests/servers/create_server'
-require 'fog/rackspace/requests/servers/delete_image'
-require 'fog/rackspace/requests/servers/delete_server'
-require 'fog/rackspace/requests/servers/get_flavor_details'
-require 'fog/rackspace/requests/servers/get_server_details'
-require 'fog/rackspace/requests/servers/list_addresses'
-require 'fog/rackspace/requests/servers/list_private_addresses'
-require 'fog/rackspace/requests/servers/list_public_addresses'
-require 'fog/rackspace/requests/servers/list_flavors'
-require 'fog/rackspace/requests/servers/list_flavors_detail'
-require 'fog/rackspace/requests/servers/list_images'
-require 'fog/rackspace/requests/servers/list_images_detail'
-require 'fog/rackspace/requests/servers/list_servers'
-require 'fog/rackspace/requests/servers/list_servers_detail'
-require 'fog/rackspace/requests/servers/reboot_server'
-require 'fog/rackspace/requests/servers/update_server'
-
 module Fog
   module Rackspace
     module Servers
 
       def self.new(options={})
+
+        require 'fog/rackspace/models/servers/flavor'
+        require 'fog/rackspace/models/servers/flavors'
+        require 'fog/rackspace/models/servers/image'
+        require 'fog/rackspace/models/servers/images'
+        require 'fog/rackspace/models/servers/server'
+        require 'fog/rackspace/models/servers/servers'
+        require 'fog/rackspace/requests/servers/create_image'
+        require 'fog/rackspace/requests/servers/create_server'
+        require 'fog/rackspace/requests/servers/delete_image'
+        require 'fog/rackspace/requests/servers/delete_server'
+        require 'fog/rackspace/requests/servers/get_flavor_details'
+        require 'fog/rackspace/requests/servers/get_image_details'
+        require 'fog/rackspace/requests/servers/get_server_details'
+        require 'fog/rackspace/requests/servers/list_addresses'
+        require 'fog/rackspace/requests/servers/list_private_addresses'
+        require 'fog/rackspace/requests/servers/list_public_addresses'
+        require 'fog/rackspace/requests/servers/list_flavors'
+        require 'fog/rackspace/requests/servers/list_flavors_detail'
+        require 'fog/rackspace/requests/servers/list_images'
+        require 'fog/rackspace/requests/servers/list_images_detail'
+        require 'fog/rackspace/requests/servers/list_servers'
+        require 'fog/rackspace/requests/servers/list_servers_detail'
+        require 'fog/rackspace/requests/servers/reboot_server'
+        require 'fog/rackspace/requests/servers/update_server'
+
         if Fog.mocking?
           Fog::Rackspace::Servers::Mock.new(options)
         else