fog 0.0.31 → 0.0.32

data/.document

@@ -1,5 +1,3 @@
 README.rdoc
 lib/**/*.rb
 bin/*
-features/**/*.feature
-LICENSE

data/Rakefile

@@ -7,7 +7,7 @@ require "#{current_directory}/lib/fog"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.add_dependency('excon')
+    gem.add_dependency('excon', '>=0.0.10')
     gem.add_dependency('mime-types')
     gem.add_dependency('nokogiri')
     gem.add_dependency('ruby-hmac')
@@ -102,12 +102,17 @@ 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")
+yml = <<YML
+
+:default:
+  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_username: INTENTIONALLY_LEFT_BLANK
+  :slicehost_password: INTENTIONALLY_LEFT_BLANK
+
+YML
+    print(yml)
   end
 
 end

data/VERSION

@@ -1 +1 @@
-0.0.31
+0.0.32

data/bin/fog

@@ -3,28 +3,18 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 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
-  end
-end
-
 module AWS
   class << self
-    if credentials[:aws_access_key_id] && credentials[:aws_secret_access_key]
+    if Fog.credentials[:aws_access_key_id] && Fog.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]
+        :aws_access_key_id => Fog.credentials[:aws_access_key_id],
+        :aws_secret_access_key => Fog.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]
+        :aws_access_key_id => Fog.credentials[:aws_access_key_id],
+        :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
       )
 
       def addresses
@@ -61,13 +51,21 @@ end
 
 module Rackspace
   class << self
-    if credentials[:rackspace_api_key] && credentials[:rackspace_username]
+    if Fog.credentials[:rackspace_api_key] && Fog.credentials[:rackspace_username]
 
       @@servers = Fog::Rackspace::Servers.new(
-        :rackspace_api_key => credentials[:rackspace_api_key],
-        :rackspace_username => credentials[:rackspace_username]
+        :rackspace_api_key => Fog.credentials[:rackspace_api_key],
+        :rackspace_username => Fog.credentials[:rackspace_username]
       )
 
+      def flavors
+        @@servers.flavors
+      end
+
+      def images
+        @@servers.images
+      end
+
       def servers
         @@servers.servers
       end

data/fog.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.31"
+  s.version = "0.0.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-11-16}
+  s.date = %q{2009-12-03}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -47,7 +47,6 @@ Gem::Specification.new do |s|
      "lib/fog/aws/models/s3/buckets.rb",
      "lib/fog/aws/models/s3/object.rb",
      "lib/fog/aws/models/s3/objects.rb",
-     "lib/fog/aws/models/s3/owner.rb",
      "lib/fog/aws/parsers/ec2/allocate_address.rb",
      "lib/fog/aws/parsers/ec2/attach_volume.rb",
      "lib/fog/aws/parsers/ec2/basic.rb",
@@ -137,6 +136,8 @@ Gem::Specification.new do |s|
      "lib/fog/rackspace/files.rb",
      "lib/fog/rackspace/models/servers/flavor.rb",
      "lib/fog/rackspace/models/servers/flavors.rb",
+     "lib/fog/rackspace/models/servers/image.rb",
+     "lib/fog/rackspace/models/servers/images.rb",
      "lib/fog/rackspace/models/servers/server.rb",
      "lib/fog/rackspace/models/servers/servers.rb",
      "lib/fog/rackspace/requests/files/delete_container.rb",
@@ -165,6 +166,18 @@ 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/slicehost.rb",
+     "lib/fog/slicehost/parsers/create_slice.rb",
+     "lib/fog/slicehost/parsers/get_backups.rb",
+     "lib/fog/slicehost/parsers/get_flavors.rb",
+     "lib/fog/slicehost/parsers/get_images.rb",
+     "lib/fog/slicehost/parsers/get_slices.rb",
+     "lib/fog/slicehost/requests/create_slice.rb",
+     "lib/fog/slicehost/requests/delete_slice.rb",
+     "lib/fog/slicehost/requests/get_backups.rb",
+     "lib/fog/slicehost/requests/get_flavors.rb",
+     "lib/fog/slicehost/requests/get_images.rb",
+     "lib/fog/slicehost/requests/get_slices.rb",
      "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
      "spec/aws/models/ec2/instance_spec.rb",
@@ -258,6 +271,12 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/list_servers_spec.rb",
      "spec/rackspace/requests/servers/reboot_server_spec.rb",
      "spec/rackspace/requests/servers/update_server_spec.rb",
+     "spec/slicehost/requests/create_slice_spec.rb",
+     "spec/slicehost/requests/delete_slice_spec.rb",
+     "spec/slicehost/requests/get_backups_spec.rb",
+     "spec/slicehost/requests/get_flavors_spec.rb",
+     "spec/slicehost/requests/get_images_spec.rb",
+     "spec/slicehost/requests/get_slices_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -360,6 +379,12 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/list_servers_spec.rb",
      "spec/rackspace/requests/servers/reboot_server_spec.rb",
      "spec/rackspace/requests/servers/update_server_spec.rb",
+     "spec/slicehost/requests/create_slice_spec.rb",
+     "spec/slicehost/requests/delete_slice_spec.rb",
+     "spec/slicehost/requests/get_backups_spec.rb",
+     "spec/slicehost/requests/get_flavors_spec.rb",
+     "spec/slicehost/requests/get_images_spec.rb",
+     "spec/slicehost/requests/get_slices_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -368,20 +393,21 @@ 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<excon>, [">= 0.0.10"])
       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<excon>, [">= 0.0.10"])
       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<excon>, [">= 0.0.10"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])
   end
 end
+

data/lib/fog.rb

@@ -35,6 +35,17 @@ module Fog
 
     load "fog/aws.rb"
     load "fog/rackspace.rb"
+    load "fog/slicehost.rb"
+  end
+
+  def self.credentials(path = File.expand_path('~/.fog'))
+    @credentials ||= begin
+      credentials = {}
+      File.open(path) do |file|
+        credentials = YAML.load(file.read)[:default]
+      end
+      credentials
+    end
   end
 
 end

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

@@ -9,11 +9,15 @@ module Fog
         attribute :instance_id, 'instanceId'
 
         def destroy
+          requires :public_ip
+
           connection.release_address(@public_ip)
           true
         end
 
         def instance=(new_instance)
+          requires :public_ip
+
           if new_instance
             associate(new_instance)
           else

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

@@ -24,10 +24,14 @@ module Fog
         attribute :user_data
 
         def addresses
+          requires :instance_id
+
           connection.addresses(:instance => self)
         end
 
         def destroy
+          requires :instance_id
+
           connection.terminate_instances(@instance_id)
           true
         end
@@ -41,6 +45,8 @@ module Fog
         # end
 
         def key_pair
+          requires :key_name
+
           connection.keypairs.all(@key_name).first
         end
 
@@ -64,7 +70,16 @@ module Fog
           end
         end
 
+        def reboot
+          requires :instance_id
+
+          connection.reboot_instances(@instance_id)
+          true
+        end
+
         def save
+          requires :image_id
+
           options = {}
           if @availability_zone
             options['Placement.AvailabilityZone'] = @availability_zone
@@ -96,6 +111,8 @@ module Fog
         end
 
         def volumes
+          requires :instance_id
+
           connection.volumes(:instance => self)
         end
 

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

@@ -10,11 +10,15 @@ module Fog
         attribute :material,    'keyMaterial'
 
         def destroy
+          requires :name
+
           connection.delete_key_pair(@name)
           true
         end
 
         def save
+          requires :name
+
           data = connection.create_key_pair(@name).body
           new_attributes = data.reject {|key,value| !['keyFingerprint', 'keyMaterial', 'keyName'].include?(key)}
           merge_attributes(new_attributes)

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

@@ -11,6 +11,8 @@ module Fog
         attribute :owner_id,          'ownerId'
 
         def authorize_group_and_owner(group, owner)
+          requires :group_name
+
           connection.authorize_security_group_ingress(
             'GroupName'                   => @group_name,
             'SourceSecurityGroupName'     => group,
@@ -19,6 +21,8 @@ module Fog
         end
 
         def authorize_port_range(range, options = {})
+          requires :group_name
+
           connection.authorize_security_group_ingress(
             'CidrIp'      => options[:cidr_ip] || '0.0.0.0/0',
             'FromPort'    => range.min,
@@ -29,11 +33,15 @@ module Fog
         end
 
         def destroy
+          requires :group_name
+
           connection.delete_security_group(@group_name)
           true
         end
 
         def save
+          requires :group_name
+
           data = connection.create_security_group(@group_name, @group_description).body
           true
         end

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

@@ -12,18 +12,24 @@ module Fog
         attribute :volume_id,    'volumeId'
 
         def destroy
+          requires :snapshot_id
+
           connection.delete_snapshot(@snapshot_id)
           true
         end
 
         def save
-          data = connection.create_snapshot(volume_id).body
+          requires :volume_id
+
+          data = connection.create_snapshot(@volume_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
           true
         end
 
         def volume
+          requires :snapshot_id
+
           connection.describe_volumes(@volume_id)
         end
 

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

@@ -23,11 +23,15 @@ module Fog
         end
 
         def destroy
+          requires :volume_id
+
           connection.delete_volume(@volume_id)
           true
         end
 
         def instance=(new_instance)
+          requires :volume_id
+
           if new_instance
             attach(new_instance)
           else
@@ -36,6 +40,8 @@ module Fog
         end
 
         def save
+          requires :availability_zone, :size, :snapshot_id
+
           data = connection.create_volume(@availability_zone, @size, @snapshot_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
@@ -46,7 +52,9 @@ module Fog
         end
 
         def snapshots
-          connection.snapshots(:volume_id => volume_id)
+          requires :volume_id
+
+          connection.snapshots(:volume_id => @volume_id)
         end
 
         private

data/lib/fog/aws/models/s3/bucket.rb

@@ -10,6 +10,8 @@ module Fog
         attribute :owner
 
         def destroy
+          requires :name
+
           connection.delete_bucket(@name)
           true
         rescue Excon::Errors::NotFound
@@ -17,6 +19,8 @@ module Fog
         end
 
         def location
+          requires :name
+
           data = connection.get_bucket_location(@name)
           data.body['LocationConstraint']
         end
@@ -35,16 +39,22 @@ module Fog
         end
 
         def payer
+          requires :name
+
           data = connection.get_request_payment(@name)
           data.body['Payer']
         end
 
         def payer=(new_payer)
+          requires :name
+
           connection.put_request_payment(@name, new_payer)
           @payer = new_payer
         end
 
         def save
+          requires :name
+
           options = {}
           if @location
             options['LocationConstraint'] = @location