fog 0.0.14 → 0.0.15

data/Rakefile

@@ -39,12 +39,12 @@ end
 namespace :specs do
 
   task :with_mocking do
-    Fog.mocking = true
+    Fog.mock!
     Rake::Task[:spec].invoke
   end
 
   task :without_mocking do
-    Fog.mocking = true
+    Fog.mock!
     Rake::Task[:spec].invoke
   end
 
@@ -95,3 +95,18 @@ begin
 rescue LoadError
   puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
 end
+
+namespace :fog do
+
+  desc 'Provide a sample yaml file for credentials'
+  task :yml do
+    puts('Copy the following sample to ~/.fog and fill in with your credentials as needed:')
+    print("\n")
+    print(":aws_access_key_id: INTENTIONALLY_LEFT_BLANK\n")
+    print(":aws_secret_access_key: INTENTIONALLY_LEFT_BLANK\n")
+    print(":rackspace_api_key: INTENTIONALLY_LEFT_BLANK\n")
+    print(":rackspace_username: INTENTIONALLY_LEFT_BLANK\n")
+    print("\n")
+  end
+
+end

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/bin/fog

@@ -3,48 +3,77 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
 
-if ARGV[0] && File.exists?(File.expand_path(ARGV[0]))
-  @credentials = YAML.load(File.open(File.expand_path(ARGV[0])).read)
-elsif File.exists?(File.expand_path('~/.fog'))
-  @credentials = YAML.load(File.open(File.expand_path('~/.fog')).read)
+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
+  end
 end
 
-@ec2 = Fog::AWS::EC2.new(
-  :aws_access_key_id => @credentials['aws_access_key_id'],
-  :aws_secret_access_key => @credentials['aws_secret_access_key']
-)
+module AWS
+  class << self
+    if credentials[:aws_access_key_id] && credentials[:aws_secret_access_key]
 
-@s3 = Fog::AWS::S3.new(
-  :aws_access_key_id => @credentials['aws_access_key_id'],
-  :aws_secret_access_key => @credentials['aws_secret_access_key']
-)
+      @@ec2 = Fog::AWS::EC2.new(
+        :aws_access_key_id => credentials[:aws_access_key_id],
+        :aws_secret_access_key => credentials[:aws_secret_access_key]
+      )
 
-def addresses
-  @ec2.addresses
-end
+      @@s3 = Fog::AWS::S3.new(
+        :aws_access_key_id => credentials[:aws_access_key_id],
+        :aws_secret_access_key => credentials[:aws_secret_access_key]
+      )
 
-def buckets
-  @s3.buckets
-end
+      def addresses
+        @@ec2.addresses
+      end
 
-def instances
-  @ec2.instances
-end
+      def buckets
+        @@s3.buckets
+      end
 
-def key_pairs
-  @ec2.key_pairs
-end
+      def instances
+        @@ec2.instances
+      end
 
-def security_groups
-  @ec2.security_groups
-end
+      def key_pairs
+        @@ec2.key_pairs
+      end
 
-def snapshots
-  @ec2.snapshots
+      def security_groups
+        @@ec2.security_groups
+      end
+
+      def snapshots
+        @@ec2.snapshots
+      end
+
+      def volumes
+        @@ec2.volumes
+      end
+
+    end
+  end
 end
 
-def volumes
-  @ec2.volumes
+module Rackspace
+  class << self
+    if credentials[:rackspace_api_key] && credentials[:rackspace_username]
+
+      @@servers = Fog::Rackspace::Servers.new(
+        :rackspace_api_key => credentials[:rackspace_api_key],
+        :rackspace_username => credentials[:rackspace_username]
+      )
+
+      def servers
+        @@servers.servers
+      end
+      
+    end
+  end
 end
 
 ARGV.clear # Avoid passing args to IRB

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   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-09}
+  s.date = %q{2009-10-15}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -136,6 +136,20 @@ Gem::Specification.new do |s|
      "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/get_containers.rb",
+     "lib/fog/rackspace/requests/files/head_containers.rb",
+     "lib/fog/rackspace/requests/servers/create_server.rb",
+     "lib/fog/rackspace/requests/servers/delete_server.rb",
+     "lib/fog/rackspace/requests/servers/get_flavors.rb",
+     "lib/fog/rackspace/requests/servers/get_images.rb",
+     "lib/fog/rackspace/requests/servers/get_server_details.rb",
+     "lib/fog/rackspace/requests/servers/get_servers.rb",
+     "lib/fog/rackspace/requests/servers/get_servers_details.rb",
+     "lib/fog/rackspace/servers.rb",
      "lib/fog/response.rb",
      "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
@@ -205,6 +219,15 @@ 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/get_containers_spec.rb",
+     "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/servers/create_server_spec.rb",
+     "spec/rackspace/requests/servers/delete_server_spec.rb",
+     "spec/rackspace/requests/servers/get_flavors_spec.rb",
+     "spec/rackspace/requests/servers/get_images_spec.rb",
+     "spec/rackspace/requests/servers/get_server_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -282,6 +305,15 @@ 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/get_containers_spec.rb",
+     "spec/rackspace/requests/files/head_containers_spec.rb",
+     "spec/rackspace/requests/servers/create_server_spec.rb",
+     "spec/rackspace/requests/servers/delete_server_spec.rb",
+     "spec/rackspace/requests/servers/get_flavors_spec.rb",
+     "spec/rackspace/requests/servers/get_images_spec.rb",
+     "spec/rackspace/requests/servers/get_server_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_details_spec.rb",
+     "spec/rackspace/requests/servers/get_servers_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/fog.rb

@@ -17,6 +17,7 @@ module Fog
 
   def self.reload
     load "fog/aws.rb"
+    load "fog/rackspace.rb"
   end
 
 end

data/lib/fog/aws/ec2.rb

@@ -172,6 +172,7 @@ 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/addresses.rb

@@ -24,7 +24,7 @@ module Fog
           }.merge!(attributes))
           data['addressesSet'].each do |address|
             addresses << Fog::AWS::EC2::Address.new({
-              :addresses  => self,
+              :addresses  => addresses,
               :connection => connection
             }.merge!(address))
           end

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

@@ -4,7 +4,7 @@ module Fog
 
       class Volume < Fog::Model
 
-        attribute :attachment_time,   'attachmentTime'
+        attribute :attach_time,       'attachTime'
         attribute :availability_zone, 'availabilityZone'
         attribute :create_time,       'createTime'
         attribute :device

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

@@ -2,8 +2,10 @@ module Fog
   module AWS
     class EC2
 
-      def volumes
-        Fog::AWS::EC2::Volumes.new(:connection => self)
+      def volumes(attributes = {})
+        Fog::AWS::EC2::Volumes.new({
+          :connection => self
+        }.merge!(attributes))
       end
 
       class Volumes < Fog::Collection

data/lib/fog/aws/s3.rb

@@ -105,6 +105,7 @@ module Fog
         response = @connection.request({
           :block    => params[:block],
           :body     => params[:body],
+          :error_parser => Fog::Errors::Parser.new,
           :expects  => params[:expects],
           :headers  => params[:headers],
           :host     => params[:host],

data/lib/fog/collection.rb

@@ -32,7 +32,7 @@ module Fog
       for member in self
         data << "#{member.inspect},"
       end
-      data.chop!
+      data.chop! unless self.empty?
       data << "]>"
     end
 

data/lib/fog/connection.rb

@@ -36,7 +36,7 @@ unless Fog.mocking?
 
       def request(params)
         params[:path] ||= ''
-        unless params[:path][0] == '/'
+        unless params[:path][0..0] == '/'
           params[:path] = '/' + params[:path].to_s
         end
         if params[:query] && !params[:query].empty?
@@ -56,19 +56,18 @@ unless Fog.mocking?
 
         if params[:body]
           if params[:body].is_a?(String)
-            body = StringIO.new(params[:body])
+            connection.write(params[:body])
           else
-            body = params[:body]
-          end
-          while chunk = body.read(CHUNK_SIZE)
-            connection.write(chunk)
+            while chunk = params[:body].read(CHUNK_SIZE)
+              connection.write(chunk)
+            end
           end
         end
 
         response = Fog::Response.new
         response.request = params
         response.status = connection.readline[9..11].to_i
-        if params[:expects] && params[:expects] != response.status
+        if params[:expects] && ![*params[:expects]].include?(response.status)
           error = true
         end
         while true
@@ -81,9 +80,9 @@ unless Fog.mocking?
         end
 
         unless params[:method] == 'HEAD'
-          if error || params[:parser]
+          if (error && params[:error_parser]) || params[:parser]
             if error
-              parser = Fog::Errors::Parser.new
+              parser = params[:error_parser]
             elsif params[:parser]
               parser = params[:parser]
             end

data/lib/fog/rackspace.rb

@@ -0,0 +1,31 @@
+require 'rubygems'
+require 'json'
+
+module Fog
+  module Rackspace
+
+    def self.reload
+      load 'fog/rackspace/files.rb'
+      load 'fog/rackspace/servers.rb'
+    end
+
+    def self.authenticate(options)
+      connection = Fog::Connection.new("https://auth.api.rackspacecloud.com")
+      response = connection.request({
+        :expects  => 204,
+        :headers  => {
+          'X-Auth-Key'  => options[:rackspace_api_key],
+          'X-Auth-User' => options[:rackspace_username]
+        },
+        :host     => 'auth.api.rackspacecloud.com',
+        :method   => 'GET',
+        :path     => 'v1.0'
+      })
+      response.headers.reject do |key, value| 
+        !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)
+      end
+    end
+
+  end
+end
+Fog::Rackspace.reload

data/lib/fog/rackspace/files.rb

@@ -0,0 +1,62 @@
+module Fog
+  module Rackspace
+    class Files
+
+      def self.reload
+        load "fog/rackspace/requests/files/get_containers.rb"
+      end
+
+      def initialize(options={})
+        credentials = Fog::Rackspace.authenticate(options)
+        @auth_token = credentials['X-Auth-Token']
+        cdn_uri = URI.parse(credentials['X-CDN-Management-Url'])
+        @cdn_host   = cdn_uri.host
+        @cdn_path   = cdn_uri.path
+        @cdn_port   = cdn_uri.port
+        @cdn_scheme = cdn_uri.scheme
+        storage_uri = URI.parse(credentials['X-Storage-Url'])
+        @storage_host   = storage_uri.host
+        @storage_path   = storage_uri.path
+        @storage_port   = storage_uri.port
+        @storage_scheme = storage_uri.scheme
+        @connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}")
+      end
+
+      def cdn_request(params)
+        response = @connection.request({
+          :body     => params[:body],
+          :expects  => params[:expects],
+          :headers  => {
+            'X-Auth-Token' => @auth_token
+          },
+          :host     => @cdn_host,
+          :method   => params[:method],
+          :path     => "#{@cdn_path}/#{params[:path]}"
+        })
+        unless response.status == 204
+          response.body = JSON.parse(response.body)
+        end
+        response
+      end
+
+      def storage_request(params)
+        response = @connection.request({
+          :body     => params[:body],
+          :expects  => params[:expects],
+          :headers  => {
+            'X-Auth-Token' => @auth_token
+          },
+          :host     => @storage_host,
+          :method   => params[:method],
+          :path     => "#{@storage_path}/#{params[:path]}"
+        })
+        unless response.status == 204
+          response.body = JSON.parse(response.body)
+        end
+        response
+      end
+
+    end
+  end
+end
+Fog::Rackspace::Files.reload

data/lib/fog/rackspace/models/servers/server.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Rackspace
+    class Server
+
+      class Server < Fog::Model
+
+        attribute :admin_pass,  'adminPass'
+        attribute :id
+        attribute :name
+        attribute :image_id,    'imageId'
+        attribute :flavor_id,   'flavorId'
+        attribute :host_id,     'hostId'
+        attribute :status
+        attribute :personality
+        attribute :progress
+        attribute :addresses
+        attribute :metadata
+
+        def destroy
+          connection.delete_server(@id)
+          true
+        end
+
+        def reload
+          new_attributes = servers.get(@id).attributes
+          merge_attributes(new_attributes)
+        end
+
+        def save
+          options = { :metadata => @metadata, :name => @name, :personality => @personality }
+          options = options.reject {|key, value| value.nil?}
+          data = connection.create_server(@flavor_id, @image_id, options)
+          merge_attributes(data.body['server'])
+          true
+        end
+
+        def servers
+          @servers
+        end
+
+        private
+
+        def servers=(new_servers)
+          @servers = new_servers
+        end
+
+      end
+
+    end
+  end
+end