fog 0.0.39 → 0.0.40

data/README.rdoc

@@ -2,52 +2,105 @@
 
 fog helps you interact with cloud services. fog is a work in progress.
 
-== Features
+== Install
 
-* Low level api calls
-* Model level abstractions
-* Mocks
+  sudo gem install fog
 
-== Supports
+== Getting Started
 
-* AWS EC2
-* AWS S3
-* AWS SimpleDB (no models yet)
-* Rackspace Files (no models yet, just getting started on requests)
-* Rackspace Servers (some requests, server model, just getting started)
+You can start stumbling around as soon as you install with the fog command line tool.
+After installing, just type 'fog' to get started.
+If you don't have credentials setup it will let you know what to do.
+
+Then just start playing around, fog should let you know if you are forget things.
+
+For example if you try to create a server but leave out stuff:
+
+  server = AWS.servers.create
 
-== Synopsis
+You'll get reminded that things are missing.
+
+  ArgumentError: image_id is required for this operation
+
+So just add the missing stuff and you are off to the races:
+
+  server = AWS.servers.create(:image_id => 'ami-5ee70037')
+
+But don't forget to cleanup or you'll regret it when you get the bill:
+
+  server.destroy
+
+Rinse, repeat, enjoy!
+
+== Working with Servers
+
+Lets boot up a server on EC2
 
   require 'fog'
 
-  # turn on mocking (if desired)
-  Fog.mock!
+  # initialize a connection to Amazon Elastic Compute Cloud
+  connection = Fog::AWS::EC2.new(
+    :aws_access_key_id => id,
+    :aws_secret_access_key => key
+  )
+
+  # boot a gentoo server
+  server = connection.servers.new(:image_id => 'ami-5ee70037')
+
+  # wait for it to be ready to do stuff
+  server.wait_for { ready? }
+
+  # DO STUFF
+
+  # shutdown the server
+  server.destroy
+
+Now we will try again, but with Rackspace
+
+  # initialize a connection to Rackspace Servers
+  connection = Fog::Rackspace::Servers.new(
+    :rackspace_api_key => key,
+    :rackspace_username => username
+  )
+
+  # boot a gentoo server (flavor 1 = 256, image 3 = gentoo 2008.0)
+  server = connection.servers.new(:flavor_id => 1, :image_id => 3, :name => 'my_server')
+
+  # wait for it to be ready to do stuff
+  server.wait_for { ready? }
+
+  # DO STUFF
+
+  # shutdown the server
+  server.destroy
 
-  # initialize a connection
-  s3 = Fog::AWS::S3.new(
+== Working with Directories and Files
+
+  require 'fog'
+
+  # initialize a connection to Amazon Simple Storage Solution
+  connection = 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')
+  # create a directory
+  directory = connection.directory.create(:name => 'directoryname')
 
-  s3.get_bucket('bucketname')
-  s3.get_object('bucketname', 'objectname')
+  # create a new file in your directory
+  directory.files.create(:key => 'filename', :body => 'filebody')
 
-  s3.delete_object('bucketname', 'objectname')
-  s3.delete_bucket('bucketname')
+  # connect to your directory
+  directory = connection.directories.get('filename')
 
-  # models
-  bucket = s3.buckets.create(:name => 'bucketname')
-  bucket.objects.create(:key => 'objectname', :body => 'objectbody')
+  # get your file
+  file = directory.files.get('filename')
 
-  bucket = s3.buckets.get('bucketname')
-  object = bucket.objects.get('objectname')
+  # delete the file
+  file.destroy
 
-  object.destroy
-  bucket.destroy
+  # delete the directory
+  directory.destroy
 
 == Requirements
 
@@ -56,9 +109,13 @@ fog helps you interact with cloud services. fog is a work in progress.
 * mime-types
 * nokogiri
 
-== Install
+== Supports
 
-  sudo gem install fog
+* AWS EC2
+* AWS S3
+* AWS SimpleDB (no models yet)
+* Rackspace Files (no models yet, just getting started on requests)
+* Rackspace Servers (some requests, server model, just getting started)
 
 == Copyright
 

data/Rakefile

@@ -7,7 +7,7 @@ require "#{current_directory}/lib/fog"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.add_dependency('excon', '>=0.0.14')
+    gem.add_dependency('excon', '>=0.0.18')
     gem.add_dependency('mime-types')
     gem.add_dependency('nokogiri')
     gem.add_dependency('ruby-hmac')
@@ -18,7 +18,30 @@ begin
     gem.homepage = "http://github.com/geemus/fog"
     gem.authors = ["geemus (Wesley Beary)"]
     gem.rubyforge_project = "fog"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+
+    gem.post_install_message = <<MESSAGE
+#{'=' * 50}
+
+  fog 0.0.40 has API changes you should know about.
+
+  Some changes you might care about happened in the models:
+
+    # what_it_was => what_it_is
+
+    ec2.instances => ec2.servers
+    ec2.instance  => ec2.server
+
+    s3.buckets  => s3.directories
+    s3.bucket   => s3.directory
+
+    s3.objects  => s3.files
+    s3.object   => s3.file
+
+  Sorry for the bother, but it will allow for a more consistent API as fog continues to expand.
+
+#{'=' * 50}
+MESSAGE
+
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.0.39
+0.0.40

data/bin/fog

@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
 
-module AWS
-  class << self
+module Fog
+  module Credentials
     key = (ARGV.first && :"#{ARGV.first}") || :default
     unless Fog.credentials(key)
       print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
@@ -19,46 +19,65 @@ module AWS
 
 YML
       print(yml)
-      raise ArgumentError.new("No credentials for :#{key}")
+      exit
     end
-    if Fog.credentials(key)[:aws_access_key_id] && Fog.credentials(key)[:aws_secret_access_key]
+  end
+end
 
-      @@ec2 = Fog::AWS::EC2.new(
-        :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-        :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
-      )
+module AWS
+  class << self
+    key = (ARGV.first && :"#{ARGV.first}") || :default
+    if Fog.credentials(key)[:aws_access_key_id] && Fog.credentials(key)[:aws_secret_access_key]
 
-      @@s3 = Fog::AWS::S3.new(
-        :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-        :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
-      )
+      def connections
+        @@connections ||= Hash.new do |hash, key|
+          credentials = {
+            :aws_access_key_id => Fog.credentials[:aws_access_key_id],
+            :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
+          }
+          hash[key] = case key
+          when :ec2
+            Fog::AWS::EC2.new(credentials)
+          when :s3
+            Fog::AWS::S3.new(credentials)
+          end
+        end
+      end
 
       def addresses
-        @@ec2.addresses
+        connections[:ec2].addresses
+      end
+
+      def directories
+        connections[:s3].directories
       end
 
-      def buckets
-        @@s3.buckets
+      def flavors
+        connections[:ec2].flavors
+      end
+
+      def images
+        connections[:ec2].images
       end
 
-      def instances
-        @@ec2.instances
+      def servers
+        connections[:ec2].servers
       end
 
       def key_pairs
-        @@ec2.key_pairs
+        connections[:ec2].key_pairs
       end
 
       def security_groups
-        @@ec2.security_groups
+        connections[:ec2].security_groups
       end
 
       def snapshots
-        @@ec2.snapshots
+        connections[:ec2].snapshots
       end
 
       def volumes
-        @@ec2.volumes
+        connections[:ec2].volumes
       end
 
     end
@@ -68,38 +87,33 @@ end
 module Rackspace
   class << self
     key = (ARGV.first && :"#{ARGV.first}") || :default
-    unless Fog.credentials(key)
-      print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
-      yml = <<-YML
-
-:#{key}:
-  :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)
-      raise ArgumentError.new("No credentials for :#{key}")
-    end
     if Fog.credentials(key)[:rackspace_api_key] && Fog.credentials(key)[:rackspace_username]
 
-      @@servers = Fog::Rackspace::Servers.new(
-        :rackspace_api_key => Fog.credentials[:rackspace_api_key],
-        :rackspace_username => Fog.credentials[:rackspace_username]
-      )
+      def connections
+        @@connections ||= Hash.new do |hash, key|
+          credentials = {
+            :rackspace_api_key => Fog.credentials[:rackspace_api_key],
+            :rackspace_username => Fog.credentials[:rackspace_username]
+          }
+          hash[key] = case key
+          when :files
+            Fog::Rackspace::Files.new(credentials)
+          when :servers
+            Fog::Rackspace::Servers.new(credentials)
+          end
+        end
+      end
 
       def flavors
-        @@servers.flavors
+        connections[:servers].flavors
       end
 
       def images
-        @@servers.images
+        connections[:servers].images
       end
 
       def servers
-        @@servers.servers
+        connections[:servers].servers
       end
       
     end

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.39"
+  s.version = "0.0.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-01-04}
+  s.date = %q{2010-01-14}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -33,20 +33,24 @@ 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/flavor.rb",
+     "lib/fog/aws/models/ec2/flavors.rb",
+     "lib/fog/aws/models/ec2/image.rb",
+     "lib/fog/aws/models/ec2/images.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/server.rb",
+     "lib/fog/aws/models/ec2/servers.rb",
      "lib/fog/aws/models/ec2/snapshot.rb",
      "lib/fog/aws/models/ec2/snapshots.rb",
      "lib/fog/aws/models/ec2/volume.rb",
      "lib/fog/aws/models/ec2/volumes.rb",
-     "lib/fog/aws/models/s3/bucket.rb",
-     "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/directories.rb",
+     "lib/fog/aws/models/s3/directory.rb",
+     "lib/fog/aws/models/s3/file.rb",
+     "lib/fog/aws/models/s3/files.rb",
      "lib/fog/aws/parsers/ec2/allocate_address.rb",
      "lib/fog/aws/parsers/ec2/attach_volume.rb",
      "lib/fog/aws/parsers/ec2/basic.rb",
@@ -180,20 +184,20 @@ Gem::Specification.new do |s|
      "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",
-     "spec/aws/models/ec2/instances_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/server_spec.rb",
+     "spec/aws/models/ec2/servers_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",
+     "spec/aws/models/s3/directories_spec.rb",
+     "spec/aws/models/s3/directory_spec.rb",
+     "spec/aws/models/s3/file_spec.rb",
+     "spec/aws/models/s3/files_spec.rb",
      "spec/aws/requests/ec2/allocate_address_spec.rb",
      "spec/aws/requests/ec2/associate_address_spec.rb",
      "spec/aws/requests/ec2/attach_volume_spec.rb",
@@ -245,6 +249,7 @@ 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/models/servers/server_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",
@@ -270,6 +275,7 @@ 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/shared_examples/server_examples.rb",
      "spec/slicehost/requests/create_slice_spec.rb",
      "spec/slicehost/requests/delete_slice_spec.rb",
      "spec/slicehost/requests/get_backups_spec.rb",
@@ -280,6 +286,27 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/geemus/fog}
+  s.post_install_message = %q{==================================================
+
+  fog 0.0.40 has API changes you should know about.
+
+  Some changes you might care about happened in the models:
+
+    # what_it_was => what_it_is
+
+    ec2.instances => ec2.servers
+    ec2.instance  => ec2.server
+
+    s3.buckets  => s3.directories
+    s3.bucket   => s3.directory
+
+    s3.objects  => s3.files
+    s3.object   => s3.file
+
+  Sorry for the bother, but it will allow for a more consistent API as fog continues to expand.
+
+==================================================
+}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fog}
@@ -288,20 +315,20 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
-     "spec/aws/models/ec2/instance_spec.rb",
-     "spec/aws/models/ec2/instances_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/server_spec.rb",
+     "spec/aws/models/ec2/servers_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",
+     "spec/aws/models/s3/directories_spec.rb",
+     "spec/aws/models/s3/directory_spec.rb",
+     "spec/aws/models/s3/file_spec.rb",
+     "spec/aws/models/s3/files_spec.rb",
      "spec/aws/requests/ec2/allocate_address_spec.rb",
      "spec/aws/requests/ec2/associate_address_spec.rb",
      "spec/aws/requests/ec2/attach_volume_spec.rb",
@@ -352,6 +379,7 @@ 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/models/servers/server_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",
@@ -377,6 +405,7 @@ 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/shared_examples/server_examples.rb",
      "spec/slicehost/requests/create_slice_spec.rb",
      "spec/slicehost/requests/delete_slice_spec.rb",
      "spec/slicehost/requests/get_backups_spec.rb",
@@ -391,18 +420,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.0.14"])
+      s.add_runtime_dependency(%q<excon>, [">= 0.0.18"])
       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.0.14"])
+      s.add_dependency(%q<excon>, [">= 0.0.18"])
       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.0.14"])
+    s.add_dependency(%q<excon>, [">= 0.0.18"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])