fog 0.3.34 → 0.4.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fog (0.3.34)
+    fog (0.4.0)
       builder
-      excon (>= 0.3.6)
+      excon (>= 0.3.7)
       formatador (>= 0.0.16)
       json
       mime-types
@@ -15,7 +15,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    excon (0.3.6)
+    excon (0.3.7)
     formatador (0.0.16)
     gestalt (0.0.11)
       formatador (>= 0.0.12)
@@ -26,7 +26,7 @@ GEM
     rake (0.8.7)
     rspec (1.3.1)
     ruby-hmac (0.4.0)
-    shindo (0.1.10)
+    shindo (0.1.12)
       formatador (>= 0.0.16)
       gestalt (>= 0.0.11)
 
@@ -35,7 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  excon (>= 0.3.6)
+  excon (>= 0.3.7)
   fog!
   formatador (>= 0.0.16)
   json
@@ -45,4 +45,4 @@ DEPENDENCIES
   rake
   rspec (= 1.3.1)
   ruby-hmac
-  shindo (= 0.1.10)
+  shindo (= 0.1.12)

data/README.rdoc

@@ -27,9 +27,13 @@ A high level interface to each cloud is provided through collections, such as `i
 You can see a list of available collections by calling `collections` on the connection object. You can try it out using the `fog` command:
 
   >> AWS.collections
-  [:addresses, :directories, :files, :flavors, :images, :key_pairs, :security_groups, :servers, :snapshots, :volumes]
+  [:addresses, :directories, ..., :volumes, :zones]
 
-Some collections are available across multiple providers. For example, compute providers have +flavors+, +images+ and +servers+, and storage providers have +directory+ and +file+.
+Some collections are available across multiple providers:
+
+* compute providers have +flavors+, +images+ and +servers+
+* dns providers have +zones+ and +records+
+* storage providers have +directories+ and +files+
 
 Collections share basic CRUD type operations, such as:
 * +all+ - fetch every object of that type from the provider.
@@ -99,21 +103,28 @@ Play around and use the console to explore or check out the {getting started gui
 
 geemus says: "That should give you everything you need to get started, but let me know if there is anything I can do to help!"
 
+== Providers
+
 You should try out the (varying) support fog has for:
 * {AWS}[http://aws.amazon.com] [{Compute}[http://aws.amazon.com/ec2], {ELB}[http://aws.amazon.com/elasticloadbalancing], {Storage}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
-* {Blue Box Group}[http://www.blueboxgrp.com] [{Compute}[http://www.blueboxgrp.com/blocks]]
-* {Brightbox}[http://www.brightbox.co.uk] [{Compute}[http://beta.brightbox.com/]]
+* <b><em>{Blue Box Group}[http://www.blueboxgrp.com]</em></b> [{Compute}[http://www.blueboxgrp.com/blocks]]
+* <b><em>{Brightbox}[http://www.brightbox.co.uk]</em></b> [{Compute}[http://beta.brightbox.com/]]
 * {Google}[http://www.google.com] [{Storage}[http://code.google.com/apis/storage]]
+* {Linode}[http://www.linode.com] [{DNS}[http://www.linode.com]]
 * Local [Storage]
 * {Rackspace}[http://www.rackspace.com] [{Compute}[http://www.rackspacecloud.com/cloud_hosting_products/servers], {Storage}[http://www.rackspacecloud.com/cloud_hosting_products/files]]
 * {Slicehost}[http://www.slicehost.com] [{Compute}[http://www.slicehost.com], {DNS}[http://www.slicehost.com]]
 * {Terremark}[http://www.terremark.com] [{vCloud Express}[http://vcloudexpress.terremark.com]]
+* {Zerigo}[http://www.zerigo.com] [{DNS}[http://www.zerigo.com/managed-dns]]
 
 There are also the basics of these providers (that could use your love):
-* {GoGrid}[http://www.gogrid.com] [{Compute}[http://www.gogrid.com]]
-* {Linode}[http://www.linode.com] [{Compute}[http://www.linode.com], {DNS}[http://www.linode.com]]
+* <b><em>{GoGrid}[http://www.gogrid.com]</b></em> [{Compute}[http://www.gogrid.com]]
+* {Linode}[http://www.linode.com] [{Compute}[http://www.linode.com]]
 * {New Servers}[http://www.newservers.com] [{Compute}[http://www.newservers.com]]
-* {Zerigo}[http://www.zerigo.com] [{DNS}[http://www.zerigo.com/managed-dns]]
+
+Special thanks to providers listed in <b><em>bold italics</em></b> for donating resources for fog tests!
+
+== Additional Resources
 
 Enjoy, and let me know what I can do to continue improving fog!
 
@@ -131,6 +142,14 @@ http://www.engineyard.com/images/logo.png
 
 All new work on fog is sponsored by {Engine Yard}[http://engineyard.com]
 
+== T-Shirts
+
+Wonder how you can get a shirt? Look no further!
+
+* Blue shirts go to people who have contributed indirectly, where contribution is a judgement call on geemus's part (but he is a pretty nice guy).
+* Grey shirts and a follow from @fog go to people who have made it on to the {contributors list}[https://github.com/geemus/fog/contributors] by submitting code.
+* Black shirts go to people who have made it on to the {collaborators list}[https://github.com/api/v2/json/repos/show/geemus/fog/collaborators] by coercing geemus into adding them (geemus is currently the only member of this list).
+
 == Copyright
 
 (The MIT License)

data/Rakefile

@@ -45,7 +45,13 @@ end
 
 task :default => :test
 
-task :test do
+task :examples do
+  sh("export FOG_MOCK=false && bundle exec shindont examples")
+  # some don't provide mocks so we'll leave this out for now
+  # sh("export FOG_MOCK=true  && bundle exec shindont examples")
+end
+
+task :test => :examples do
   sh("export FOG_MOCK=true  && bundle exec spec spec") &&
   sh("export FOG_MOCK=true  && bundle exec shindont tests") &&
   sh("export FOG_MOCK=false && bundle exec spec spec") &&

data/examples/dns_tests.rb

@@ -0,0 +1,76 @@
+require 'rubygems'
+require 'shindo'
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
+require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
+
+Shindo.tests('dns tests', 'dns') do
+
+  # iterate over all the providers
+  Fog.providers.each do |provider|
+
+    # skip if provider does not have storage
+    next unless provider.respond_to?(:services) && provider.services.include?(:dns)
+
+    tests(provider, provider.to_s.downcase) do
+
+      # use shortcuts to instantiate connection
+      @dns = Fog::DNS.new(:provider => provider.to_s)
+
+      # create a zone
+      #   domain should be the hostname
+      #   email is only required for linode, but included for consistency
+      tests('@zone = @dns.zones.create').succeeds do
+        @zone = @dns.zones.create(
+          :domain => 'fogdnsexamples.com',
+          :email => 'tests@fogdnsexamples.com'
+        )
+      end
+
+      # create a record in the zone
+      #   ip is the address to route to
+      #   name is the name for the record
+      #   type is the type of record to create
+      tests('@record = @zone.records.create').succeeds do
+        @record = @zone.records.create(
+          :ip => '1.2.3.4',
+          :name => 'www.fogdnsexamples.com',
+          :type => 'A'
+        )
+      end
+
+      # list zones
+      tests('@zones = @dns.zones').succeeds do
+        @zones = @dns.zones
+      end
+
+      # get a zone
+      tests('@dns.zones.get(@zone.identity)').succeeds do
+        @dns.zones.get(@zone.identity)
+      end
+
+      # list records
+      tests('@records = @zone.records').succeeds do
+        @records = @zone.records
+      end
+
+      # get a record
+      tests('@zone.records.get(@record.identity)').succeeds do
+        @zone.records.get(@record.identity)
+      end
+
+      # destroy the record
+      tests('@record.destroy').succeeds do
+        @record.destroy
+      end
+
+      # destroy the zone
+      tests('@zone.destroy').succeeds do
+        @zone.destroy
+      end
+
+    end
+
+  end
+
+end

data/examples/{storage.rb → storage_tests.rb}

@@ -9,8 +9,8 @@ Shindo.tests('storage tests', 'storage') do
   # iterate over all the providers
   Fog.providers.each do |provider|
 
-    # return immediately if provider does not have storage
-    break unless provider.services.include?(:storage)
+    # skip if provider does not have storage
+    next unless provider.respond_to?(:services) && provider.services.include?(:storage)
 
     tests(provider, provider.to_s.downcase) do
 
@@ -25,13 +25,23 @@ Shindo.tests('storage tests', 'storage') do
           # create a directory
           #   key should be a unique string
           #   public should be a boolean
-          tests('@directory = @directories.create').succeeds do
+          tests('@directory = @storage.directories.create').succeeds do
             @directory = @storage.directories.create(
               :key    => "fogstoragedirectory#{Time.now.to_i}",
               :public => publicity
             )
           end
 
+          # list directories
+          tests('@directories = @storage.directories').succeeds do
+            @directories = @storage.directories
+          end
+
+          # get a directory
+          tests('@storage.directories.get(@directory.identity)').succeeds do
+            @storage.directories.get(@directory.identity)
+          end
+
           # create a file in the directory
           #   key can be any string
           #   body can be a string or a file as File.open(path)
@@ -49,19 +59,9 @@ Shindo.tests('storage tests', 'storage') do
             @files = @directory.files
           end
 
-          # fetch the latest files data
-          tests('@files.reload').succeeds do
-            @files.reload
-          end
-
           # get a file
-          tests('@directory.files.get(@file.key)').succeeds do
-            @directory.files.get(@file.key)
-          end
-
-          # fetch the latest file data
-          tests('@file.reload').succeeds do
-            @file.reload
+          tests('@directory.files.get(@file.identity)').succeeds do
+            @directory.files.get(@file.identity)
           end
 
           # test the publicity of files

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.3.34'
-  s.date              = '2010-12-23'
+  s.version           = '0.4.0'
+  s.date              = '2011-01-05'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '>=0.3.6')
+  s.add_dependency('excon', '>=0.3.7')
   s.add_dependency('formatador', '>=0.0.16')
   s.add_dependency('json')
   s.add_dependency('mime-types')
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '1.3.1')
-  s.add_development_dependency('shindo', '0.1.10')
+  s.add_development_dependency('shindo', '0.1.12')
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.34'
+    VERSION = '0.4.0'
   end
 
 end

data/lib/fog/aws.rb

@@ -68,7 +68,7 @@ module Fog
     class Mock
 
       def self.availability_zone
-        "us-east-1" << random_selection('abcd', 1)
+        "us-east-1" << Fog::Mock.random_selection('abcd', 1)
       end
 
       def self.box_usage
@@ -84,16 +84,16 @@ module Fog
       end
 
       def self.etag
-        hex(32)
+        Fog::Mock.random_hex(32)
       end
 
       def self.image
         path = []
         (rand(3) + 2).times do
-          path << letters(rand(9) + 8)
+          path << Fog::Mock.random_letters(rand(9) + 8)
         end
         {
-          "imageOwnerId"   => letters(rand(5) + 4),
+          "imageOwnerId"   => Fog::Mock.random_letters(rand(5) + 4),
           "blockDeviceMapping" => [],
           "productCodes"   => [],
           "kernelId"       => kernel_id,
@@ -110,106 +110,71 @@ module Fog
       end
 
       def self.image_id
-        "ami-#{hex(8)}"
+        "ami-#{Fog::Mock.random_hex(8)}"
       end
 
       def self.key_fingerprint
         fingerprint = []
         20.times do
-          fingerprint << hex(2)
+          fingerprint << Fog::Mock.random_hex(2)
         end
         fingerprint.join(':')
       end
 
       def self.instance_id
-        "i-#{hex(8)}"
+        "i-#{Fog::Mock.random_hex(8)}"
       end
 
       def self.ip_address
         ip = []
         4.times do
-          ip << numbers(rand(3) + 1).to_i.to_s # remove leading 0
+          ip << Fog::Mock.random_numbers(rand(3) + 1).to_i.to_s # remove leading 0
         end
         ip.join('.')
       end
 
       def self.kernel_id
-        "aki-#{hex(8)}"
+        "aki-#{Fog::Mock.random_hex(8)}"
       end
 
       def self.key_material
         key_material = ['-----BEGIN RSA PRIVATE KEY-----']
         20.times do
-          key_material << base64(76)
+          key_material << Fog::Mock.random_base64(76)
         end
-        key_material << base64(67) + '='
+        key_material << Fog::Mock.random_base64(67) + '='
         key_material << '-----END RSA PRIVATE KEY-----'
         key_material.join("\n")
       end
 
       def self.owner_id
-        numbers(12)
+        Fog::Mock.random_numbers(12)
       end
 
       def self.ramdisk_id
-        "ari-#{hex(8)}"
+        "ari-#{Fog::Mock.random_hex(8)}"
       end
 
       def self.request_id
         request_id = []
-        request_id << hex(8)
+        request_id << Fog::Mock.random_hex(8)
         3.times do
-          request_id << hex(4)
+          request_id << Fog::Mock.random_hex(4)
         end
-        request_id << hex(12)
+        request_id << Fog::Mock.random_hex(12)
         request_id.join('-')
       end
 
       def self.reservation_id
-        "r-#{hex(8)}"
+        "r-#{Fog::Mock.random_hex(8)}"
       end
 
       def self.snapshot_id
-        "snap-#{hex(8)}"
+        "snap-#{Fog::Mock.random_hex(8)}"
       end
 
       def self.volume_id
-        "vol-#{hex(8)}"
-      end
-
-      private
-      
-      def self.random_selection(characters, length)
-        selection = ''
-        length.times do
-          position = rand(characters.length)
-          selection << characters[position..position]
-        end
-        selection
-      end
-
-      def self.letters(length)
-        random_selection(
-          'abcdefghijklmnopqrstuvwxyz',
-          length
-        )
-      end
-
-      def self.numbers(length)
-        max = ('9' * length).to_i
-        rand(max).to_s
-      end
-
-      def self.hex(length)
-        max = ('f' * length).to_i(16)
-        rand(max).to_s(16).rjust(length, '0')
-      end
-
-      def self.base64(length)
-        random_selection(
-          "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
-          length
-        )
+        "vol-#{Fog::Mock.random_hex(8)}"
       end
 
     end

data/lib/fog/aws/dns.rb

@@ -5,7 +5,11 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
 
-      # model_path 'fog/aws/models/dns'
+      model_path 'fog/aws/models/dns'
+      model       :record
+      collection  :records
+      model       :zone
+      collection  :zones
 
       request_path 'fog/aws/requests/dns'
       request :create_hosted_zone