fog 0.0.29 → 0.0.30

data/Rakefile

@@ -7,6 +7,7 @@ require "#{current_directory}/lib/fog"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
+    gem.add_dependency('excon')
     gem.add_dependency('mime-types')
     gem.add_dependency('nokogiri')
     gem.add_dependency('ruby-hmac')

data/VERSION

@@ -1 +1 @@
-0.0.29
+0.0.30

data/bin/fog

@@ -5,11 +5,7 @@ require 'yaml'
 
 def credentials
   @credentials ||= begin
-    if ARGV[0] && File.exists?(File.expand_path(ARGV[0]))
-      YAML.load(File.open(File.expand_path(ARGV[0])).read)
-    elsif File.exists?(File.expand_path('~/.fog'))
-      YAML.load(File.open(File.expand_path('~/.fog')).read)
-    end
+    YAML.load(File.open(File.expand_path('~/.fog')).read)
   end
 end
 
@@ -76,9 +72,20 @@ module Rackspace
   end
 end
 
-ARGV.clear # Avoid passing args to IRB
-IRB.setup(nil)
-@irb = IRB::Irb.new(nil)
-IRB.conf[:MAIN_CONTEXT] = @irb.context
-@irb.context.workspace = IRB::WorkSpace.new(binding)
-catch(:IRB_EXIT) { @irb.eval_input }
+if ARGV[0]
+  result = eval(ARGV[0])
+  result = case result
+  when Fog::Collection
+    result.map {|model| model.attributes.reject {|key, value| key == :owner}}
+  when Fog::Model
+    result.attributes
+  end
+  print(Marshal.dump(result))
+else
+  ARGV.clear # Avoid passing args to IRB
+  IRB.setup(nil)
+  @irb = IRB::Irb.new(nil)
+  IRB.conf[:MAIN_CONTEXT] = @irb.context
+  @irb.context.workspace = IRB::WorkSpace.new(binding)
+  catch(:IRB_EXIT) { @irb.eval_input }
+end

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.29"
+  s.version = "0.0.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-10-23}
+  s.date = %q{2009-11-14}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -24,10 +24,8 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "benchs/fog_vs.rb",
-     "benchs/headers_split_vs_match.rb",
      "benchs/params.rb",
      "benchs/parse_vs_push.rb",
-     "benchs/stripping.rb",
      "bin/fog",
      "fog.gemspec",
      "lib/fog.rb",
@@ -133,29 +131,37 @@ Gem::Specification.new do |s|
      "lib/fog/aws/simpledb.rb",
      "lib/fog/collection.rb",
      "lib/fog/connection.rb",
-     "lib/fog/errors.rb",
      "lib/fog/model.rb",
      "lib/fog/parser.rb",
      "lib/fog/rackspace.rb",
      "lib/fog/rackspace/files.rb",
      "lib/fog/rackspace/models/servers/server.rb",
      "lib/fog/rackspace/models/servers/servers.rb",
+     "lib/fog/rackspace/requests/files/delete_container.rb",
+     "lib/fog/rackspace/requests/files/delete_object.rb",
+     "lib/fog/rackspace/requests/files/get_container.rb",
      "lib/fog/rackspace/requests/files/get_containers.rb",
+     "lib/fog/rackspace/requests/files/head_container.rb",
      "lib/fog/rackspace/requests/files/head_containers.rb",
+     "lib/fog/rackspace/requests/files/put_container.rb",
+     "lib/fog/rackspace/requests/files/put_object.rb",
      "lib/fog/rackspace/requests/servers/create_image.rb",
      "lib/fog/rackspace/requests/servers/create_server.rb",
      "lib/fog/rackspace/requests/servers/delete_image.rb",
      "lib/fog/rackspace/requests/servers/delete_server.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",
+     "lib/fog/rackspace/requests/servers/list_flavors_detail.rb",
      "lib/fog/rackspace/requests/servers/list_images.rb",
      "lib/fog/rackspace/requests/servers/list_images_detail.rb",
+     "lib/fog/rackspace/requests/servers/list_private_addresses.rb",
+     "lib/fog/rackspace/requests/servers/list_public_addresses.rb",
      "lib/fog/rackspace/requests/servers/list_servers.rb",
      "lib/fog/rackspace/requests/servers/list_servers_detail.rb",
      "lib/fog/rackspace/requests/servers/reboot_server.rb",
      "lib/fog/rackspace/requests/servers/update_server.rb",
      "lib/fog/rackspace/servers.rb",
-     "lib/fog/response.rb",
      "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
      "spec/aws/models/ec2/instance_spec.rb",
@@ -224,20 +230,30 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/put_attributes_spec.rb",
      "spec/aws/requests/simpledb/select_spec.rb",
      "spec/lorem.txt",
+     "spec/rackspace/requests/files/delete_container_spec.rb",
+     "spec/rackspace/requests/files/delete_object_spec.rb",
+     "spec/rackspace/requests/files/get_container_spec.rb",
      "spec/rackspace/requests/files/get_containers_spec.rb",
+     "spec/rackspace/requests/files/head_container_spec.rb",
      "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/files/put_container_spec.rb",
+     "spec/rackspace/requests/files/put_object_spec.rb",
      "spec/rackspace/requests/servers/create_image_spec.rb",
      "spec/rackspace/requests/servers/create_server_spec.rb",
-     "spec/rackspace/requests/servers/delete_image.rb",
+     "spec/rackspace/requests/servers/delete_image_spec.rb",
      "spec/rackspace/requests/servers/delete_server_spec.rb",
      "spec/rackspace/requests/servers/get_server_details_spec.rb",
+     "spec/rackspace/requests/servers/list_addresses_spec.rb",
+     "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",
      "spec/rackspace/requests/servers/list_flavors_spec.rb",
-     "spec/rackspace/requests/servers/list_images_detail.rb",
+     "spec/rackspace/requests/servers/list_images_detail_spec.rb",
      "spec/rackspace/requests/servers/list_images_spec.rb",
+     "spec/rackspace/requests/servers/list_private_addresses_spec.rb",
+     "spec/rackspace/requests/servers/list_public_addresses_spec.rb",
      "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
      "spec/rackspace/requests/servers/list_servers_spec.rb",
-     "spec/rackspace/requests/servers/reboot_server.rb",
-     "spec/rackspace/requests/servers/update_server.rb",
+     "spec/rackspace/requests/servers/reboot_server_spec.rb",
+     "spec/rackspace/requests/servers/update_server_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -315,20 +331,30 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/list_domains_spec.rb",
      "spec/aws/requests/simpledb/put_attributes_spec.rb",
      "spec/aws/requests/simpledb/select_spec.rb",
+     "spec/rackspace/requests/files/delete_container_spec.rb",
+     "spec/rackspace/requests/files/delete_object_spec.rb",
+     "spec/rackspace/requests/files/get_container_spec.rb",
      "spec/rackspace/requests/files/get_containers_spec.rb",
+     "spec/rackspace/requests/files/head_container_spec.rb",
      "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/files/put_container_spec.rb",
+     "spec/rackspace/requests/files/put_object_spec.rb",
      "spec/rackspace/requests/servers/create_image_spec.rb",
      "spec/rackspace/requests/servers/create_server_spec.rb",
-     "spec/rackspace/requests/servers/delete_image.rb",
+     "spec/rackspace/requests/servers/delete_image_spec.rb",
      "spec/rackspace/requests/servers/delete_server_spec.rb",
      "spec/rackspace/requests/servers/get_server_details_spec.rb",
+     "spec/rackspace/requests/servers/list_addresses_spec.rb",
+     "spec/rackspace/requests/servers/list_flavors_detail_spec.rb",
      "spec/rackspace/requests/servers/list_flavors_spec.rb",
-     "spec/rackspace/requests/servers/list_images_detail.rb",
+     "spec/rackspace/requests/servers/list_images_detail_spec.rb",
      "spec/rackspace/requests/servers/list_images_spec.rb",
+     "spec/rackspace/requests/servers/list_private_addresses_spec.rb",
+     "spec/rackspace/requests/servers/list_public_addresses_spec.rb",
      "spec/rackspace/requests/servers/list_servers_detail_spec.rb",
      "spec/rackspace/requests/servers/list_servers_spec.rb",
-     "spec/rackspace/requests/servers/reboot_server.rb",
-     "spec/rackspace/requests/servers/update_server.rb",
+     "spec/rackspace/requests/servers/reboot_server_spec.rb",
+     "spec/rackspace/requests/servers/update_server_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -337,15 +363,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<excon>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
     else
+      s.add_dependency(%q<excon>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<ruby-hmac>, [">= 0"])
     end
   else
+    s.add_dependency(%q<excon>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])

data/lib/fog.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'rubygems'
 require 'base64'
 require 'cgi'
 require 'digest/md5'
@@ -7,6 +6,8 @@ require 'hmac-sha1'
 require 'hmac-sha2'
 require 'json'
 require 'mime/types'
+require 'nokogiri'
+require 'time'
 
 __DIR__ = File.dirname(__FILE__)
 
@@ -26,6 +27,11 @@ module Fog
   end
 
   def self.reload
+    load "fog/collection.rb"
+    load "fog/connection.rb"
+    load "fog/model.rb"
+    load "fog/parser.rb"
+
     load "fog/aws.rb"
     load "fog/rackspace.rb"
   end

data/lib/fog/aws/ec2.rb

@@ -20,12 +20,6 @@ module Fog
       end
 
       def self.reload
-        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/instance.rb"
@@ -172,7 +166,6 @@ module Fog
         response = @connection.request({
           :body     => body,
           :expects  => 200,
-          :error_parser => Fog::Errors::Parser.new,
           :headers  => { 'Content-Type' => 'application/x-www-form-urlencoded' },
           :host     => @host,
           :method   => 'POST',

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

@@ -4,19 +4,9 @@ module Fog
 
       class Address < Fog::Model
 
-        attribute :instance_id, 'instanceId'
-        attribute :public_ip,   'publicIp'
-
-        def addresses
-          @addresses
-        end
+        identity  :public_ip,   'publicIp'
 
-        def initialize(new_attributes = {})
-          new_attributes = {
-            :instance_id => ''
-          }.merge!(new_attributes)
-          super(new_attributes)
-        end
+        attribute :instance_id, 'instanceId'
 
         def destroy
           connection.release_address(@public_ip)
@@ -24,18 +14,10 @@ module Fog
         end
 
         def instance=(new_instance)
-          if !@public_ip
-            @instance = new_instance
-          elsif new_instance
-            @instance = nil
-            @instance_id = new_instance.instance_id
-            connection.associate_address(@instance_id, @public_ip)
-          end
-        end
-
-        def reload
-          if new_address = addresses.get(@public_ip)
-            merge_attributes(new_address.attributes)
+          if new_instance
+            associate(new_instance)
+          else
+            disassociate
           end
         end
 
@@ -50,8 +32,22 @@ module Fog
 
         private
 
-        def addresses=(new_addresses)
-          @addresses = new_addresses
+        def associate(new_instance)
+          if new_record?
+            @instance = new_instance
+          else
+            @instance = nil
+            @instance_id = new_instance.instance_id
+            connection.associate_address(@instance_id, @public_ip)
+          end
+        end
+
+        def disassociate
+          @instance = nil
+          @instance_id = nil
+          unless new_record?
+            connection.disassociate_address(@public_ip)
+          end
         end
 
       end

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

@@ -13,22 +13,21 @@ module Fog
         attribute :public_ip
         attribute :instance
 
+        model Fog::AWS::EC2::Address
+
         def initialize(attributes)
           @public_ip ||= []
           super
         end
 
-        def all(public_ip = [])
+        def all(public_ip = @public_ip)
           data = connection.describe_addresses(public_ip).body
           addresses = Fog::AWS::EC2::Addresses.new({
             :connection => connection,
             :public_ip  => public_ip
           }.merge!(attributes))
           data['addressesSet'].each do |address|
-            addresses << Fog::AWS::EC2::Address.new({
-              :addresses  => addresses,
-              :connection => connection
-            }.merge!(address))
+            addresses << new(address.reject {|key, value| value.nil? || value.empty? })
           end
           if instance
             addresses = addresses.select {|address| address.instance_id == instance.id}
@@ -36,30 +35,16 @@ module Fog
           addresses
         end
 
-        def create
-          address = new
-          address.save
-          address
-        end
-
         def get(public_ip)
           if public_ip
             all(public_ip).first
           end
-        rescue Fog::Errors::BadRequest
+        rescue Excon::Errors::BadRequest
           nil
         end
 
-        def new
-          Fog::AWS::EC2::Address.new(
-            :addresses  => self,
-            :connection => connection,
-            :instance   => instance
-          )
-        end
-
-        def reload
-          all(public_ip)
+        def new(attributes = {})
+          super({ :instance => instance }.merge!(attributes))
         end
 
       end

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

@@ -4,12 +4,13 @@ module Fog
 
       class Instance < Fog::Model
 
+        identity  :instance_id,       'instanceId'
+
         attribute :ami_launch_index,  'amiLaunchIndex'
         attribute :availability_zone, 'availabilityZone'
         attribute :dns_name,          'dnsName'
         attribute :group_id,          'groupId'
         attribute :image_id,          'imageId'
-        attribute :instance_id,       'instanceId'
         attribute :instance_state,    'instanceState'
         attribute :instance_type,     'instanceType'
         attribute :kernel_id,         'kernelId'
@@ -47,10 +48,6 @@ module Fog
           @key_name = new_keypair.name
         end
 
-        def instances
-          @instances
-        end
-
         def monitoring=(new_monitoring)
           if new_monitoring.is_a?(Hash)
             @monitoring = new_monitoring['state']
@@ -67,12 +64,6 @@ module Fog
           end
         end
 
-        def reload
-          if new_instance = instances.get(@instance_id)
-            merge_attributes(new_instance.attributes)
-          end
-        end
-
         def save
           options = {}
           if @availability_zone
@@ -118,10 +109,6 @@ module Fog
           end
         end
 
-        def instances=(new_instances)
-          @instances = new_instances
-        end
-
       end
 
     end

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

@@ -10,12 +10,14 @@ module Fog
 
         attribute :instance_id
 
+        model Fog::AWS::EC2::Instance
+
         def initialize(attributes)
           @instance_id ||= []
           super
         end
 
-        def all(instance_id = [])
+        def all(instance_id = @instance_id)
           data = connection.describe_instances(instance_id).body
           instances = Fog::AWS::EC2::Instances.new({
             :connection   => connection,
@@ -24,41 +26,22 @@ module Fog
           data['reservationSet'].each do |reservation|
             reservation['instancesSet'].each do |instance|
               instances << Fog::AWS::EC2::Instance.new({
-                :connection => connection,
-                :instances  => self
+                :collection => instances,
+                :connection => connection
               }.merge!(instance))
             end
           end
           instances
         end
 
-        def create(attributes = {})
-          instance = new(attributes)
-          instance.save
-          instance
-        end
-
         def get(instance_id)
           if instance_id
             all(instance_id).first
           end
-        rescue Fog::Errors::BadRequest
+        rescue Excon::Errors::BadRequest
           nil
         end
 
-        def new(attributes = {})
-          Fog::AWS::EC2::Instance.new(
-            attributes.merge!(
-              :connection => connection,
-              :instances  => self
-            )
-          )
-        end
-
-        def reload
-          all(instance_id)
-        end
-
       end
 
     end