fog 0.0.9 → 0.0.10

data/README.rdoc

@@ -1,7 +1,84 @@
 = fog
 
-Description goes here.
+fog helps you interact with cloud services. fog is a work in progress.
+
+== Features
+
+* Low level api calls
+* Model level abstractions
+* Mocks
+
+== Supports
+
+* AWS EC2 (missing security group mocking, just starting on models)
+* AWS S3
+* AWS SimpleDB (missing models)
+
+== Synopsis
+
+  require 'fog'
+
+  # turn on mocking (if desired)
+  Fog.mock!
+
+  # initialize a connection
+  s3 = Fog::AWS::S3.new(
+    :aws_access_key_id => id,
+    :aws_secret_access_key => key
+  )
+
+  # low level requests
+  s3.put_bucket('bucketname')
+  s3.put_object('bucketname', 'objectname', 'objectbody')
+
+  s3.get_bucket('bucketname')
+  s3.get_object('bucketname', 'objectname')
+
+  s3.delete_object('bucketname', 'objectname')
+  s3.delete_bucket('bucketname')
+
+  # models
+  bucket = s3.buckets.create(:name => 'bucketname')
+  bucket.objects.create(:name => 'objectname', :body => 'objectbody')
+
+  bucket = s3.buckets.get('bucketname')
+  object = bucket.objects.get('objectname')
+
+  object.destroy
+  bucket.destroy
+
+== Requirements
+
+* ruby 1.8 or 1.9
+* ruby-hmac
+* mime-types
+* nokogiri
+
+== Install
+
+  sudo gem install fog
 
 == Copyright
 
-Copyright (c) 2009 Wesley Beary. See LICENSE for details.
+(The MIT License)
+
+Copyright (c) 2009 {geemus (Wesley Beary)}[http://github.com/geemus]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/fog.gemspec

@@ -5,21 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wesley Beary"]
-  s.date = %q{2009-09-10}
+  s.date = %q{2009-09-30}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
   s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
-     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -34,8 +32,12 @@ Gem::Specification.new do |s|
      "lib/fog/aws/ec2.rb",
      "lib/fog/aws/models/ec2/address.rb",
      "lib/fog/aws/models/ec2/addresses.rb",
+     "lib/fog/aws/models/ec2/instance.rb",
+     "lib/fog/aws/models/ec2/instances.rb",
      "lib/fog/aws/models/ec2/key_pair.rb",
      "lib/fog/aws/models/ec2/key_pairs.rb",
+     "lib/fog/aws/models/ec2/security_group.rb",
+     "lib/fog/aws/models/ec2/security_groups.rb",
      "lib/fog/aws/models/ec2/snapshot.rb",
      "lib/fog/aws/models/ec2/snapshots.rb",
      "lib/fog/aws/models/ec2/volume.rb",
@@ -132,6 +134,16 @@ Gem::Specification.new do |s|
      "lib/fog/model.rb",
      "lib/fog/parser.rb",
      "lib/fog/response.rb",
+     "spec/aws/models/ec2/address_spec.rb",
+     "spec/aws/models/ec2/addresses_spec.rb",
+     "spec/aws/models/ec2/key_pair_spec.rb",
+     "spec/aws/models/ec2/key_pairs_spec.rb",
+     "spec/aws/models/ec2/security_group_spec.rb",
+     "spec/aws/models/ec2/security_groups_spec.rb",
+     "spec/aws/models/ec2/snapshot_spec.rb",
+     "spec/aws/models/ec2/snapshots_spec.rb",
+     "spec/aws/models/ec2/volume_spec.rb",
+     "spec/aws/models/ec2/volumes_spec.rb",
      "spec/aws/models/s3/bucket_spec.rb",
      "spec/aws/models/s3/buckets_spec.rb",
      "spec/aws/models/s3/object_spec.rb",
@@ -198,7 +210,17 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{fog = clouds + you}
   s.test_files = [
-    "spec/aws/models/s3/bucket_spec.rb",
+    "spec/aws/models/ec2/address_spec.rb",
+     "spec/aws/models/ec2/addresses_spec.rb",
+     "spec/aws/models/ec2/key_pair_spec.rb",
+     "spec/aws/models/ec2/key_pairs_spec.rb",
+     "spec/aws/models/ec2/security_group_spec.rb",
+     "spec/aws/models/ec2/security_groups_spec.rb",
+     "spec/aws/models/ec2/snapshot_spec.rb",
+     "spec/aws/models/ec2/snapshots_spec.rb",
+     "spec/aws/models/ec2/volume_spec.rb",
+     "spec/aws/models/ec2/volumes_spec.rb",
+     "spec/aws/models/s3/bucket_spec.rb",
      "spec/aws/models/s3/buckets_spec.rb",
      "spec/aws/models/s3/object_spec.rb",
      "spec/aws/models/s3/objects_spec.rb",

data/lib/fog.rb

@@ -1,11 +1,14 @@
+__DIR__ = File.dirname(__FILE__)
+
+$LOAD_PATH.unshift __DIR__ unless
+  $LOAD_PATH.include?(__DIR__) ||
+  $LOAD_PATH.include?(File.expand_path(__DIR__))
+
 module Fog
 
-  def self.mocking=(new_mocking)
-    old_mocking = @mocking
-    @mocking = new_mocking
-    unless old_mocking == new_mocking
-      self.reload
-    end
+  def self.mock!
+    @mocking = true
+    self.reload
   end
 
   def self.mocking?
@@ -13,7 +16,7 @@ module Fog
   end
 
   def self.reload
-    load "#{File.dirname(__FILE__)}/fog/aws.rb"
+    load "fog/aws.rb"
   end
 
 end

data/lib/fog/aws.rb

@@ -10,10 +10,9 @@ module Fog
   module AWS
 
     def self.reload
-      current_directory = File.dirname(__FILE__)
-      load "#{current_directory}/aws/ec2.rb"
-      load "#{current_directory}/aws/simpledb.rb"
-      load "#{current_directory}/aws/s3.rb"
+      load "fog/aws/ec2.rb"
+      load "fog/aws/simpledb.rb"
+      load "fog/aws/s3.rb"
     end
 
     if Fog.mocking?
@@ -29,10 +28,37 @@ module Fog
           sprintf("%0.10f", rand / 100).to_f
         end
 
+        def self.console_output
+          'This is my console. There are many like it, but this one is mine. My console is my best friend. It is my life. I must master it as I master my life. My console, without me, is useless. Without my console, I am useless.'
+        end
+
         def self.etag
           hex(32)
         end
 
+        def self.image
+          path = []
+          (rand(3) + 2).times do
+            path << letters(rand(9) + 8)
+          end
+          {
+            "imageOwnerId"  => letters(rand(5) + 4),
+            "productCodes"  => [],
+            "kernelId"      => kernel_id,
+            "ramdiskId"     => ramdisk_id,
+            "imageState"    => "available",
+            "imageId"       => image_id,
+            "architecture"  => "i386",
+            "isPublic"      => true,
+            "imageLocation" => path.join('/'),
+            "imageType"     => "machine"
+          }
+        end
+
+        def self.image_id
+          "ami-#{hex(8)}"
+        end
+
         def self.key_fingerprint
           fingerprint = []
           20.times do
@@ -75,6 +101,10 @@ module Fog
           numbers(12)
         end
 
+        def self.ramdisk_id
+          "ari-#{hex(8)}"
+        end
+
         def self.request_id
           request_id = []
           request_id << hex(8)
@@ -85,10 +115,6 @@ module Fog
           request_id.join('-')
         end
 
-        def self.ramdisk_id
-          "ari-#{hex(8)}"
-        end
-
         def self.reservation_id
           "r-#{hex(8)}"
         end
@@ -135,7 +161,7 @@ module Fog
 
         def self.base64(length)
           random_selection(
-            "ABCDEFGHIJKLMNOP QRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
             length
           )
         end

data/lib/fog/aws/ec2.rb

@@ -20,75 +20,88 @@ module Fog
       end
 
       def self.reload
-        current_directory = File.dirname(__FILE__)
-        load "#{current_directory}/../connection.rb"
-        load "#{current_directory}/../parser.rb"
-        load "#{current_directory}/../response.rb"
-
-        parsers_directory = "#{current_directory}/parsers/ec2"
-        load "#{parsers_directory}/allocate_address.rb"
-        load "#{parsers_directory}/attach_volume.rb"
-        load "#{parsers_directory}/basic.rb"
-        load "#{parsers_directory}/create_key_pair.rb"
-        load "#{parsers_directory}/create_snapshot.rb"
-        load "#{parsers_directory}/create_volume.rb"
-        load "#{parsers_directory}/describe_addresses.rb"
-        load "#{parsers_directory}/describe_availability_zones.rb"
-        load "#{parsers_directory}/describe_images.rb"
-        load "#{parsers_directory}/describe_instances.rb"
-        load "#{parsers_directory}/describe_key_pairs.rb"
-        load "#{parsers_directory}/describe_regions.rb"
-        load "#{parsers_directory}/describe_security_groups.rb"
-        load "#{parsers_directory}/describe_snapshots.rb"
-        load "#{parsers_directory}/describe_volumes.rb"
-        load "#{parsers_directory}/detach_volume.rb"
-        load "#{parsers_directory}/get_console_output.rb"
-        load "#{parsers_directory}/run_instances.rb"
-        load "#{parsers_directory}/terminate_instances.rb"
-
-        requests_directory = "#{current_directory}/requests/ec2"
-        load "#{requests_directory}/allocate_address.rb"
-        load "#{requests_directory}/associate_address.rb"
-        load "#{requests_directory}/attach_volume.rb"
-        load "#{requests_directory}/authorize_security_group_ingress.rb"
-        # TODO: require "#{requests_directory}/bundle_instance.rb"
-        # TODO: require "#{requests_directory}/cancel_bundle_task.rb"
-        # TODO: require "#{requests_directory}/confirm_product_instance.rb"
-        load "#{requests_directory}/create_key_pair.rb"
-        load "#{requests_directory}/create_security_group.rb"
-        load "#{requests_directory}/create_snapshot.rb"
-        load "#{requests_directory}/create_volume.rb"
-        load "#{requests_directory}/delete_key_pair.rb"
-        load "#{requests_directory}/delete_security_group.rb"
-        load "#{requests_directory}/delete_snapshot.rb"
-        load "#{requests_directory}/delete_volume.rb"
-        # TODO: require "#{requests_directory}/deregister_image.rb"
-        load "#{requests_directory}/describe_addresses.rb"
-        load "#{requests_directory}/describe_availability_zones.rb"
-        # TODO: require "#{requests_directory}/describe_bundle_tasks.rb"
-        # TODO: require "#{requests_directory}/describe_image_attribute.rb"
-        load "#{requests_directory}/describe_images.rb"
-        load "#{requests_directory}/describe_instances.rb"
-        load "#{requests_directory}/describe_key_pairs.rb"
-        load "#{requests_directory}/describe_regions.rb"
-        # TODO: require "#{requests_directory}/describe_reserved_instances.rb"
-        # TODO: require "#{requests_directory}/describe_reserved_instances_offerings.rb"
-        load "#{requests_directory}/describe_security_groups.rb"
-        load "#{requests_directory}/describe_snapshots.rb"
-        load "#{requests_directory}/describe_volumes.rb"
-        load "#{requests_directory}/detach_volume.rb"
-        load "#{requests_directory}/disassociate_address.rb"
-        load "#{requests_directory}/get_console_output.rb"
-        # TODO: require "#{requests_directory}/modify_image_attribute.rb"
-        # TODO: require "#{requests_directory}/monitor_instances.rb"
-        # TODO: require "#{requests_directory}/purchase_reserved_instances_offering.rb"
-        load "#{requests_directory}/reboot_instances.rb"
-        # TODO: require "#{requests_directory}/register_image.rb"
-        load "#{requests_directory}/release_address.rb"
-        load "#{requests_directory}/revoke_security_group_ingress.rb"
-        load "#{requests_directory}/run_instances.rb"
-        load "#{requests_directory}/terminate_instances.rb"
-        # TODO: require "#{requests_directory}/unmonitor_instances.rb"
+        load "fog/collection.rb"
+        load "fog/connection.rb"
+        load "fog/model.rb"
+        load "fog/parser.rb"
+        load "fog/response.rb"
+
+        load "fog/aws/models/ec2/address.rb"
+        load "fog/aws/models/ec2/addresses.rb"
+        load "fog/aws/models/ec2/key_pair.rb"
+        load "fog/aws/models/ec2/key_pairs.rb"
+        load "fog/aws/models/ec2/security_group.rb"
+        load "fog/aws/models/ec2/security_groups.rb"
+        load "fog/aws/models/ec2/snapshot.rb"
+        load "fog/aws/models/ec2/snapshots.rb"
+        load "fog/aws/models/ec2/volume.rb"
+        load "fog/aws/models/ec2/volumes.rb"
+
+        load "fog/aws/parsers/ec2/allocate_address.rb"
+        load "fog/aws/parsers/ec2/attach_volume.rb"
+        load "fog/aws/parsers/ec2/basic.rb"
+        load "fog/aws/parsers/ec2/create_key_pair.rb"
+        load "fog/aws/parsers/ec2/create_snapshot.rb"
+        load "fog/aws/parsers/ec2/create_volume.rb"
+        load "fog/aws/parsers/ec2/describe_addresses.rb"
+        load "fog/aws/parsers/ec2/describe_availability_zones.rb"
+        load "fog/aws/parsers/ec2/describe_images.rb"
+        load "fog/aws/parsers/ec2/describe_instances.rb"
+        load "fog/aws/parsers/ec2/describe_key_pairs.rb"
+        load "fog/aws/parsers/ec2/describe_regions.rb"
+        load "fog/aws/parsers/ec2/describe_security_groups.rb"
+        load "fog/aws/parsers/ec2/describe_snapshots.rb"
+        load "fog/aws/parsers/ec2/describe_volumes.rb"
+        load "fog/aws/parsers/ec2/detach_volume.rb"
+        load "fog/aws/parsers/ec2/get_console_output.rb"
+        load "fog/aws/parsers/ec2/run_instances.rb"
+        load "fog/aws/parsers/ec2/terminate_instances.rb"
+
+        load "fog/aws/requests/ec2/allocate_address.rb"
+        load "fog/aws/requests/ec2/associate_address.rb"
+        load "fog/aws/requests/ec2/attach_volume.rb"
+        load "fog/aws/requests/ec2/authorize_security_group_ingress.rb"
+        # TODO: require "fog/aws/requests/ec2/bundle_instance.rb"
+        # TODO: require "fog/aws/requests/ec2/cancel_bundle_task.rb"
+        # TODO: require "fog/aws/requests/ec2/confirm_product_instance.rb"
+        load "fog/aws/requests/ec2/create_key_pair.rb"
+        load "fog/aws/requests/ec2/create_security_group.rb"
+        load "fog/aws/requests/ec2/create_snapshot.rb"
+        load "fog/aws/requests/ec2/create_volume.rb"
+        load "fog/aws/requests/ec2/delete_key_pair.rb"
+        load "fog/aws/requests/ec2/delete_security_group.rb"
+        load "fog/aws/requests/ec2/delete_snapshot.rb"
+        load "fog/aws/requests/ec2/delete_volume.rb"
+        # TODO: require "fog/aws/requests/ec2/deregister_image.rb"
+        load "fog/aws/requests/ec2/describe_addresses.rb"
+        load "fog/aws/requests/ec2/describe_availability_zones.rb"
+        # TODO: require "fog/aws/requests/ec2/describe_bundle_tasks.rb"
+        # TODO: require "fog/aws/requests/ec2/describe_image_attribute.rb"
+        load "fog/aws/requests/ec2/describe_images.rb"
+        load "fog/aws/requests/ec2/describe_instances.rb"
+        load "fog/aws/requests/ec2/describe_key_pairs.rb"
+        load "fog/aws/requests/ec2/describe_regions.rb"
+        # TODO: require "fog/aws/requests/ec2/describe_reserved_instances.rb"
+        # TODO: require "fog/aws/requests/ec2/describe_reserved_instances_offerings.rb"
+        load "fog/aws/requests/ec2/describe_security_groups.rb"
+        load "fog/aws/requests/ec2/describe_snapshots.rb"
+        load "fog/aws/requests/ec2/describe_volumes.rb"
+        load "fog/aws/requests/ec2/detach_volume.rb"
+        load "fog/aws/requests/ec2/disassociate_address.rb"
+        load "fog/aws/requests/ec2/get_console_output.rb"
+        # TODO: require "fog/aws/requests/ec2/modify_image_attribute.rb"
+        # TODO: require "fog/aws/requests/ec2/modify_snapshot_attribute.rb"
+        # TODO: require "fog/aws/requests/ec2/monitor_instances.rb"
+        # TODO: require "fog/aws/requests/ec2/purchase_reserved_instances_offering.rb"
+        load "fog/aws/requests/ec2/reboot_instances.rb"
+        # TODO: require "fog/aws/requests/ec2/register_image.rb"
+        load "fog/aws/requests/ec2/release_address.rb"
+        # TODO: require "fog/aws/requests/ec2/reset_image_attributes.rb"
+        # TODO: require "fog/aws/requests/ec2/reset_snapshot_attributes.rb"
+        load "fog/aws/requests/ec2/revoke_security_group_ingress.rb"
+        load "fog/aws/requests/ec2/run_instances.rb"
+        load "fog/aws/requests/ec2/terminate_instances.rb"
+        # TODO: require "fog/aws/requests/ec2/unmonitor_instances.rb"
 
         if Fog.mocking?
           reset_data

data/lib/fog/aws/models/ec2/address.rb

@@ -7,17 +7,39 @@ module Fog
         attribute :instance_id, 'instanceId'
         attribute :public_ip,   'publicIp'
 
-        def delete
+        def addresses
+          @addresses
+        end
+
+        def initialize(new_attributes = {})
+          new_attributes = {
+            :instance_id => ''
+          }.merge!(new_attributes)
+          super(new_attributes)
+        end
+
+        def destroy
           connection.release_address(@public_ip)
           true
         end
 
+        def reload
+          new_attributes = addresses.get(@public_ip).attributes
+          merge_attributes(new_attributes)
+        end
+
         def save
           data = connection.allocate_address
           @public_ip = data.body['publicIp']
           true
         end
 
+        private
+
+        def addresses=(new_addresses)
+          @addresses = new_addresses
+        end
+
       end
 
     end