fog 0.7.2 → 0.8.0

data/docs/{_posts/2011-01-01-dns.markdown → dns/index.markdown}

@@ -1,6 +1,6 @@
 ---
 layout: default
-title:  dns
+title:  DNS
 ---
 
 The power and flexibility of the cloud are amazing. But sometimes it can be a pain to chase your resources around and keep everything up to date. This is especially true of keeping track of addresses for DNS, but thankfully more and more API driven options are available, allowing you to automate your DNS to keep up with your hardware changes.
@@ -18,9 +18,9 @@ For this first example we will use Zerigo (see below for how to use other provid
 
     # create a connection to the service
     dns = Fog::DNS.new({
-      :provider     => 'Zerigo',
-      :zerigo_email => ZERIGO_EMAIL,
-      :zerigo_token => ZERIGO_TOKEN
+      :provider     => 'Zerigo',
+      :zerigo_email => ZERIGO_EMAIL,
+      :zerigo_token => ZERIGO_TOKEN
     }
 
 ## Getting in the Zone
@@ -28,8 +28,8 @@ For this first example we will use Zerigo (see below for how to use other provid
 The first thing you need to do to prepare for your DNS excursion is create a zone for your domain.  The zone will contain all of the more specific records that you will create later.  You will just need to specify the domain, which should be your url without the 'http' or 'www' parts, and an email address.  Then you can create the zone with your DNS connection:<!--more-->
 
     zone = @dns.zones.create(
-      :domain =&gt; 'example.com',
-      :email  =&gt; 'admin@example.com'
+      :domain => 'example.com',
+      :email  => 'admin@example.com'
     )
 
 Now that you have a zone you will need to update your registrar to let them know what DNS servers are responsible for your domain.  You can ask the zone what values to use:
@@ -41,25 +41,25 @@ Now that you have a zone you will need to update your registrar to let them know
 With your new zone in hand you can add records as needed.  First and foremost you will probably want the 'www' version of your site to point to whatever your ip might be:
 
     record = @zone.records.create(
-      :ip   =&gt; '1.2.3.4',
-      :name =&gt; 'example.com',
-      :type =&gt; 'A'
+      :ip   => '1.2.3.4',
+      :name => 'example.com',
+      :type => 'A'
     )
 
 Adding other records is similarly easy, for instance if we want 'www.example.com' to go to the same place, we can use a cname record:
 
     record = @zone.records.create(
-      :ip   =&gt; 'example.com',
-      :name =&gt; 'www',
-      :type =&gt; 'CNAME'
+      :ip   => 'example.com',
+      :name => 'www',
+      :type => 'CNAME'
     )
 
 Or, similarly you might want to have your blog elsewhere:
 
     record = @zone.records.create(
-      :ip   =&gt; '4.3.2.1',
-      :name =&gt; 'blog.example.com',
-      :type =&gt; 'A'
+      :ip   => '4.3.2.1',
+      :name => 'blog.example.com',
+      :type => 'A'
     )
 
 You can add more specifics if you need to, but reasonable defaults make it just that easy.  You can also add any other kind of DNS record you might need for mail or other purposes, you can find a nice overview of record options and types <a href="http://en.wikipedia.org/wiki/Domain_Name_System#DNS_resource_records">on Wikipedia</a>.
@@ -69,9 +69,9 @@ You can add more specifics if you need to, but reasonable defaults make it just
 If you already have an account with another service you can just as easily use this same code with different credentials. fog currently supports <a href="http://aws.amazon.com/route53/">AWS Route 53</a>, <a href="http://bluebox.net">Blue Box</a>, <a href="http://dnsimple.com">DNSimple</a>, <a href="http://www.linode.com">Linode</a>, <a href="http://www.slicehost.com">Slicehost</a> and <a href="http://www.zerigo.com/managed-dns">Zerigo</a>; so you can have your pick.  As an example you can connect to AWS instead of Zerigo:
 
     dns = Fog::DNS.new(
-      :provider               =&gt; 'AWS',
-      :aws_access_key_id      =&gt; AWS_ACCESS_KEY_ID,
-      :aws_secret_access_key  =&gt; AWS_SECRET_ACCESS_KEY
+      :provider               => 'AWS',
+      :aws_access_key_id      => AWS_ACCESS_KEY_ID,
+      :aws_secret_access_key  => AWS_SECRET_ACCESS_KEY
     )
 
 ## Go Forth and Resolve

data/docs/index.markdown

@@ -28,7 +28,7 @@ Now type 'fog' to try stuff, confident that fog will let you know what to do. He
 
 ## Go forth and conquer
 
-Play around and use the console to explore or check out the [getting started guide](http://wiki.github.com/geemus/fog/getting-started-with-fog) for more details. Once you are reading to start scripting fog, here is a quick hint on how to make connections without the command line thing to help you.
+Play around and use the console to explore or check out the [getting started guide](/about/getting_started.html) for more details. Once you are reading to start scripting fog, here is a quick hint on how to make connections without the command line thing to help you.
 
     # create a compute connection
     compute = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => ACCESS_KEY_ID, :aws_secret_access_key => SECRET_ACCESS_KEY)
@@ -60,13 +60,14 @@ Wonder how you can get a lovely fog shirt? Look no further!
 
 Enjoy, and let me know what I can do to continue improving fog!
 
+* Work through the [fog tutorial](https://github.com/downloads/geemus/learn_fog/learn_fog.tar.gz)
 * Stay up to date by following [@fog](http://twitter.com/fog) and/or [@geemus](http://twitter.com/geemus) on Twitter.
 * Get and give help on the [#ruby-fog](irc://irc.freenode.net/ruby-fog) irc channel on Freenode
 * Follow release notes and discussions on the [mailing list](http://groups.google.com/group/ruby-fog)
 * Report bugs or find tasks to help with in the [issues](http://github.com/geemus/fog/issues)
-* Learn about [contributing](http://github.com/geemus/fog/wiki/contributor-guide)
-* See where fog is used and let the world know how you use it [in the wild](http://wiki.github.com/geemus/fog/in-the-wild)
-* Check out blog posts and other mentions in the [press](http://wiki.github.com/geemus/fog/press)
+* Learn about [contributing](/about/contributing.html)
+* See where fog is used and let the world know how you use it [in the wild](/about/users.html)
+* Check out blog posts and other mentions in the [press](/about/press.html)
 
 ## Copyright
 

data/docs/{_posts/2011-01-01-storage.markdown → storage/index.markdown}

@@ -1,6 +1,6 @@
 ---
 layout: default
-title:  storage
+title:  Storage
 ---
 
 Having Ruby experience makes you hirable; but how can you stand out? You need to demonstrate your abilities. What better way than using Ruby and "the cloud" to store and serve your resume!
@@ -34,15 +34,15 @@ First, create a connection with your new account:
 
     # create a connection
     connection = Fog::Storage.new(
-      :provider                 => 'AWS',
-      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY,
-      :aws_access_key_id => YOUR_SECRET_ACCESS_KEY_ID
+      :provider                 => 'AWS',
+      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY,
+      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID
     )
 
     # First, a place to contain the glorious details
     directory = connection.directories.create(
-      :key    => "fog-demo-#{Time.now.to_i}", # globally unique name
-      :public => true
+      :key    => "fog-demo-#{Time.now.to_i}", # globally unique name
+      :public => true
     )
 
     # list directories
@@ -50,9 +50,9 @@ First, create a connection with your new account:
 
     # upload that resume
     file = directory.files.create(
-      :key    => 'resume.html',
-      :body   => File.open("/path/to/my/resume.html"),
-      :public => true
+      :key    => 'resume.html',
+      :body   => File.open("/path/to/my/resume.html"),
+      :public => true
     )
 
 If you are anything like me, you will continually tweak your resume. Pushing updates is easy:
@@ -73,12 +73,50 @@ directory = connection.directories.get("proclamations1234567890")
 
     # also, create(attributes) is just new(attributes).save, so you can also do:
     file = directory.files.new(
-      :key => 'resume.html',
-      :body => 'improvements',
-      :public => true
+      :key    => 'resume.html',
+      :body   => 'improvements',
+      :public => true
     )
     file.save
 
+## Backing up your files
+
+Now you've got a bunch of files in S3: your resume, some code samples,
+and maybe some pictures of your cat doing funny stuff. Since this is
+all of vital importance, you need to back it up.
+
+   # copy each file to local disk
+   directory.files.each do |s3_file|
+     File.open(s3_file.key, 'w') do |local_file|
+       local_file.write(s3_file.body)
+     end
+   end
+
+One caveat: it's way more efficient to do this:
+
+  # do two things per file
+  directory.files.each do |file|
+    do_one_thing(file)
+    do_another_thing(file)
+  end
+
+than it is to do this:
+
+  # do two things per file
+  directory.files.each do |file|
+    do_one_thing(file)
+  end.each do |file|
+    do_another_thing(file)
+  end
+
+The reason is that the list of files might be large. Really
+large. Eat-all-your-RAM-and-ask-for-more large. Therefore, every time
+you say `files.each`, fog makes a fresh set of API calls to Amazon to
+list the available files (Amazon's API returns a page at a time, so
+fog works a page at a time in order to keep its memory requirements sane).
+
+## Sending it out
+
 Alright, so you (eventually) become satisfied enough to send it off, what is the URL endpoint to your resume?
 
     puts file.public_url
@@ -92,9 +130,9 @@ More clouds? How much extra stuff will you have to do for these services!?! Hard
 Sign up <a href="http://gs-signup-redirect.appspot.com/">here</a> and get your credentials <a href="https://sandbox.google.com/storage/m/">here</a>.
 
     connection = Fog::Storage.new(
-      :provider =&gt; 'Google',
-      :google_storage_secret_access_key =&gt; YOUR_SECRET_ACCESS_KEY,
-      :google_storage_access_key_id =&gt; YOUR_SECRET_ACCESS_KEY_ID
+      :provider                         => 'Google',
+      :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY,
+      :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID
     )
 
 ## Rackspace CloudFiles
@@ -102,20 +140,20 @@ Sign up <a href="http://gs-signup-redirect.appspot.com/">here</a> and get your c
 Rackspace has <a href="http://www.rackspacecloud.com/cloud_hosting_products/files">Cloud Files</a> and you can sign up <a href="https://www.rackspacecloud.com/signup">here</a> and get your credentials <a href="https://manage.rackspacecloud.com/APIAccess.do">here</a>.
 
     connection = Fog::Storage.new(
-      :provider =&gt; 'Rackspace',
-      :rackspace_username =&gt; RACKSPACE_USERNAME,
-      :rackspace_api_key =&gt; RACKSPACE_API_KEY
+      :provider           => 'Rackspace',
+      :rackspace_username => RACKSPACE_USERNAME,
+      :rackspace_api_key  => RACKSPACE_API_KEY
     )
 
-Then create, save, destroy as per fog-for-AWS. The `:public =&gt; true` option when creating directories (see above) is important for Rackspace; your folder and files won't be shared to Rackspace's CDN and hence your users without it.  Similarly the `:public =&gt; true` on files is important for AWS and Google or they will be private.
+Then create, save, destroy as per fog-for-AWS. The `:public => true` option when creating directories (see above) is important for Rackspace; your folder and files won't be shared to Rackspace's CDN and hence your users without it.  Similarly the `:public =&gt; true` on files is important for AWS and Google or they will be private.
 
 ## Local Storage
 
 While you are working out the kinks you might not want to do everything live though, ditto for while you are running tests, so you have a couple options to try before you buy.  First, you can use a local provider to store things in a directory on your machine.
 
     connection = Fog::Storage.new(
-      :provider =&gt; 'Local',
-      :local_root =&gt; '~/fog'
+      :provider   => 'Local',
+      :local_root => '~/fog'
     )
 
 ## Mocking out Cloud Storage

data/fog.gemspec

@@ -1,14 +1,13 @@
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
 
   ## Leave these as is they will be modified for you by the rake gemspec task.
   ## 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.7.2'
-  s.date              = '2011-04-05'
+  s.version           = '0.8.0'
+  s.date              = '2011-05-12'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -23,17 +22,12 @@ Gem::Specification.new do |s|
   s.email    = 'geemus@gmail.com'
   s.homepage = 'http://github.com/geemus/fog'
 
-  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
-  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
-  s.require_paths = %w[lib]
-
   ## This sections is only necessary if you have C extensions.
   # s.require_paths << 'ext'
   # s.extensions = %w[ext/extconf.rb]
 
   ## If your gem includes any executables, list them here.
   s.executables = ["fog"]
-  s.default_executable = 'fog'
 
   ## Specify any RDoc options here. You'll want to add your README and
   ## LICENSE files to the extra_rdoc_files list.
@@ -43,7 +37,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.6.1')
+  s.add_dependency('excon', '~>0.6.1')
   s.add_dependency('formatador', '>=0.1.3')
   s.add_dependency('json')
   s.add_dependency('mime-types')

data/lib/fog.rb

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

data/lib/fog/aws/elb.rb

@@ -2,18 +2,37 @@ module Fog
   module AWS
     class ELB < Fog::Service
 
+      class IdentifierTaken < Fog::Errors::Error; end
+      class InvalidInstance < Fog::Errors::Error; end
+
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :region, :host, :path, :port, :scheme, :persistent
 
       request_path 'fog/aws/requests/elb'
+      request :configure_health_check
+      request :create_app_cookie_stickiness_policy
+      request :create_lb_cookie_stickiness_policy
       request :create_load_balancer
+      request :create_load_balancer_listeners
       request :delete_load_balancer
+      request :delete_load_balancer_listeners
+      request :delete_load_balancer_policy
       request :deregister_instances_from_load_balancer
       request :describe_instance_health
       request :describe_load_balancers
       request :disable_availability_zones_for_load_balancer
       request :enable_availability_zones_for_load_balancer
       request :register_instances_with_load_balancer
+      #request :set_load_balancer_listener_ssl_certificate
+      request :set_load_balancer_policies_of_listener
+
+      model_path 'fog/aws/models/elb'
+      model      :load_balancer
+      collection :load_balancers
+      model      :policy
+      collection :policies
+      model      :listener
+      collection :listeners
 
       class Mock
 
@@ -89,22 +108,37 @@ module Fog
               :path               => @path,
               :port               => @port,
               :version            => '2010-07-01'
-            }
+          }
           )
-
-          response = @connection.request({
-            :body       => body,
-            :expects    => 200,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-            :idempotent => idempotent,
-            :host       => @host,
-            :method     => 'POST',
-            :parser     => parser
-          })
+          begin
+            response = @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :idempotent => idempotent,
+              :host       => @host,
+              :method     => 'POST',
+              :parser     => parser
+            })
+          rescue Excon::Errors::HTTPStatusError => error
+            if match = error.message.match(/<Code>(.*)<\/Code>/m)
+              case match[1]
+              when 'LoadBalancerNotFound'
+                raise Fog::AWS::ELB::NotFound
+              when 'DuplicateLoadBalancerName'
+                raise Fog::AWS::ELB::IdentifierTaken
+              when 'InvalidInstance'
+                raise Fog::AWS::ELB::InvalidInstance
+              else
+                raise
+              end
+            else
+              raise
+            end
+          end
 
           response
         end
-
       end
     end
   end

data/lib/fog/aws/iam.rb

@@ -27,6 +27,7 @@ module Fog
       request :list_groups
       request :list_groups_for_user
       request :list_group_policies
+      request :list_server_certificates
       request :list_signing_certificates
       request :list_user_policies
       request :list_users

data/lib/fog/aws/models/elb/listener.rb

@@ -0,0 +1,51 @@
+require 'fog/core/model'
+module Fog
+  module AWS
+    class ELB
+      class Listener < Fog::Model
+
+        attribute :policy_names,  :aliases => 'PolicyNames'
+        attribute :instance_port, :aliases => 'InstancePort'
+        attribute :lb_port,       :aliases => 'LoadBalancerPort'
+        attribute :protocol,      :aliases => 'Protocol'
+        attribute :ssl_id,        :aliases => 'SSLCertificateId'
+
+        def save
+          requires :load_balancer, :instance_port, :lb_port, :protocol
+          connection.create_load_balancer_listeners(load_balancer.id, [to_params])
+          reload
+        end
+
+        def destroy
+          requires :load_balancer, :lb_port
+          connection.delete_load_balancer_listeners(load_balancer.id, [lb_port])
+          reload
+        end
+
+        # Return the policy associated with this load balancer
+        def policy
+          load_balancer.policies.get(policy_names.first)
+        end
+
+        def reload
+          load_balancer.reload
+        end
+
+        def load_balancer
+          collection.load_balancer
+        end
+
+        def to_params
+          {
+            'InstancePort'     => instance_port,
+            'LoadBalancerPort' => lb_port,
+            'Protocol'         => protocol,
+            'SSLCertificateId' => ssl_id
+          }
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/elb/listeners.rb

@@ -0,0 +1,32 @@
+require 'fog/aws/models/elb/listener'
+module Fog
+  module AWS
+    class ELB
+      class Listeners < Fog::Collection
+
+        model Fog::AWS::ELB::Listener
+
+        attr_accessor :data, :load_balancer
+
+        def all
+          load(munged_data)
+        end
+
+        def get(lb_port)
+          all.detect{|listener| listener.lb_port == lb_port}
+        end
+
+        private
+        # Munge an array of ListernerDescription hashes like:
+        # {'Listener' => listener, 'PolicyNames' => []}
+        # to an array of listeners withi a PolicyNames key
+        def munged_data
+          data.map {|description|
+            description['Listener'].merge('PolicyNames' => description['PolicyNames'])
+          }
+        end
+
+      end
+    end
+  end
+end