fog 0.8.2 → 0.9.0

data/docs/index.markdown

@@ -31,11 +31,11 @@ Now type 'fog' to try stuff, confident that fog will let you know what to do. He
 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)
+    compute = Fog::Compute.new({:provider => 'AWS', :aws_access_key_id => ACCESS_KEY_ID, :aws_secret_access_key => SECRET_ACCESS_KEY})
     # compute operations go here
 
     # create a storage connection
-    storage = Fog::Storage.new(:provider => 'AWS', :aws_access_key_id => ACCESS_KEY_ID, :aws_secret_access_key => SECRET_ACCESS_KEY)
+    storage = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => ACCESS_KEY_ID, :aws_secret_access_key => SECRET_ACCESS_KEY})
     # storage operations go here
 
 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!"
@@ -61,7 +61,7 @@ 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)
-* Read fog's [API documentation](/latest/rdoc)
+* Read fog's [API documentation](/rdoc)
 * 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)

data/docs/storage/index.markdown

@@ -33,11 +33,11 @@ First, create a connection with your new account:
     require 'fog'
 
     # create a connection
-    connection = Fog::Storage.new(
+    connection = Fog::Storage.new({
       :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(
@@ -72,11 +72,11 @@ directory = connection.directories.get("proclamations1234567890")
     file.save
 
     # also, create(attributes) is just new(attributes).save, so you can also do:
-    file = directory.files.new(
+    file = directory.files.new({
       :key    => 'resume.html',
       :body   => 'improvements',
       :public => true
-    )
+    })
     file.save
 
 ## Backing up your files
@@ -129,21 +129,21 @@ 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(
+    connection = Fog::Storage.new({
       :provider                         => 'Google',
       :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY,
       :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID
-    )
+    })
 
 ## Rackspace CloudFiles
 
 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(
+    connection = Fog::Storage.new({
       :provider           => 'Rackspace',
       :rackspace_username => RACKSPACE_USERNAME,
       :rackspace_api_key  => RACKSPACE_API_KEY
-    )
+    })
 
 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.
 
@@ -151,10 +151,10 @@ Then create, save, destroy as per fog-for-AWS. The `:public => true` option when
 
 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(
+    connection = Fog::Storage.new({
       :provider   => 'Local',
       :local_root => '~/fog'
-    )
+    })
 
 ## Mocking out Cloud Storage
 

data/examples/compute_tests.rb

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'shindo'
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
+require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
+
+Shindo.tests('compute examples', 'compute') do
+
+  # iterate over all the providers
+  Fog.providers.each do |provider|
+
+    # FIXME: implement expected shared compute stuff for these providers as well
+    next if ['Bluebox', 'Brightbox', 'Ecloud', 'GoGrid', 'Linode', 'NewServers', 'Ninefold', 'Slicehost', 'StormOnDemand', 'VirtualBox', 'Voxel'].include?(provider)
+
+    provider = eval(provider) # convert from string to object
+
+    # skip if provider does not have compute
+    next unless provider.respond_to?(:services) && provider.services.include?(:compute)
+
+    tests(provider, provider.to_s.downcase) do
+
+      # use shortcuts to instantiate connection
+      @compute = Fog::Compute.new(:provider => provider.to_s)
+
+      # create a server
+      tests('@server = @compute.servers.bootstrap').succeeds do
+        @server = @compute.servers.bootstrap
+      end
+
+      # list servers
+      tests('@servers = @compute.servers').succeeds do
+        @servers = @compute.servers
+      end
+
+      # get a server
+      tests('@compute.servers.get(@server.identity)').succeeds do
+        @compute.servers.get(@server.identity)
+      end
+
+      # ssh to a server
+      tests('@server.ssh("pwd")').succeeds do
+        @server.ssh('pwd')
+      end
+
+      # scp a file to a server
+      lorem_path = File.join([File.dirname(__FILE__), '..', 'tests', 'lorem.txt'])
+      tests("@server.scp('#{lorem_path}', 'lorem.txt')").succeeds do
+        @server.scp(lorem_path, 'lorem.txt')
+      end
+
+      # scp a directory to a server
+      Dir.mkdir('/tmp/lorem')
+      file = ::File.new('/tmp/lorem/lorem.txt', 'w')
+      file.write(File.read(lorem_path))
+      lorem_dir = File.join([File.dirname(__FILE__), '..', 'tests'])
+      tests("@server.scp('#{lorem_dir}', '/tmp/lorem', :recursive => true)").succeeds do
+        @server.scp(lorem_dir, '/tmp/lorem', :recursive => true)
+      end
+      File.delete('/tmp/lorem/lorem.txt')
+      Dir.rmdir('/tmp/lorem')
+
+      # destroy the server
+      tests('@server.destroy').succeeds do
+        @server.destroy
+      end
+
+    end
+
+  end
+
+end

data/examples/dns_tests.rb

@@ -4,7 +4,7 @@ require 'shindo'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
 
-Shindo.tests('dns tests', 'dns') do
+Shindo.tests('dns examples', 'dns') do
 
   # iterate over all the providers
   Fog.providers.each do |provider|
@@ -35,9 +35,9 @@ Shindo.tests('dns tests', 'dns') do
       #   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'
+          :value  => '1.2.3.4',
+          :name   => 'www.fogdnsexamples.com',
+          :type   => 'A'
         )
       end
 

data/examples/storage_tests.rb

@@ -4,7 +4,7 @@ require 'shindo'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
 
-Shindo.tests('storage tests', 'storage') do
+Shindo.tests('storage examples', 'storage') do
 
   # iterate over all the providers
   Fog.providers.each do |provider|

data/fog.gemspec

@@ -6,8 +6,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.8.2'
-  s.date              = '2011-05-26'
+  s.version           = '0.9.0'
+  s.date              = '2011-06-24'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -41,7 +41,8 @@ Gem::Specification.new do |s|
   s.add_dependency('formatador', '>=0.1.3')
   s.add_dependency('json')
   s.add_dependency('mime-types')
-  s.add_dependency('net-ssh', '>=2.1.3')
+  s.add_dependency('net-scp', '>=1.0.4')
+  s.add_dependency('net-ssh', '>=2.1.4')
   s.add_dependency('nokogiri', '>=1.4.4')
   s.add_dependency('ruby-hmac')
 

data/lib/fog.rb

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

data/lib/fog/aws/cloud_formation.rb

@@ -80,7 +80,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body = Fog::AWS.signed_params(
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,

data/lib/fog/aws/elb.rb

@@ -58,7 +58,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1'i, 'ap-southeast-1']
+        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'ap-northeast-1', 'ap-southeast-1']
         #
         # ==== Returns
         # * ELB object with connection to AWS.
@@ -100,7 +100,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body = Fog::AWS.signed_params(
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
@@ -108,7 +108,7 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2010-07-01'
+              :version            => '2011-04-05'
           }
           )
           begin

data/lib/fog/aws/iam.rb

@@ -93,7 +93,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body = Fog::AWS.signed_params(
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,

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

@@ -6,11 +6,12 @@ module Fog
       class LoadBalancer < Fog::Model
 
         identity  :id,                    :aliases => 'LoadBalancerName'
+        attribute :availability_zones,    :aliases => 'AvailabilityZones'
         attribute :created_at,            :aliases => 'CreatedTime'
-        attribute :health_check,          :aliases => 'HealthCheck'
         attribute :dns_name,              :aliases => 'DNSName'
-        attribute :availability_zones,    :aliases => 'AvailabilityZones'
+        attribute :health_check,          :aliases => 'HealthCheck'
         attribute :instances,             :aliases => 'Instances'
+        attribute :source_group,          :aliases => 'SourceSecurityGroup'
 
         def initialize(attributes={})
           attributes[:availability_zones] ||= %w(us-east-1a us-east-1b us-east-1c us-east-1d)

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

@@ -65,8 +65,6 @@ module Fog
           merge_attributes(data)
         end
 
-
-
       end
     end
   end

data/lib/fog/aws/models/rds/server.rb

@@ -45,7 +45,7 @@ module Fog
           state == 'available'
         end
    
-        def destroy(snapshot_identifier)
+        def destroy(snapshot_identifier=nil)
           requires :id
           connection.delete_db_instance(id, snapshot_identifier, snapshot_identifier.nil?)
           true
@@ -102,4 +102,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/parsers/elb/describe_load_balancers.rb

@@ -14,7 +14,7 @@ module Fog
           end
 
           def reset_load_balancer
-            @load_balancer = { 'ListenerDescriptions' => [], 'Instances' => [], 'AvailabilityZones' => [], 'Policies' => {'AppCookieStickinessPolicies' => [], 'LBCookieStickinessPolicies' => [] }, 'HealthCheck' => {} }
+            @load_balancer = { 'ListenerDescriptions' => [], 'Instances' => [], 'AvailabilityZones' => [], 'Policies' => {'AppCookieStickinessPolicies' => [], 'LBCookieStickinessPolicies' => [] }, 'HealthCheck' => {}, 'SourceSecurityGroup' => {} }
           end
 
           def reset_listener_description
@@ -66,7 +66,7 @@ module Fog
                 reset_load_balancer
               end
 
-            when 'LoadBalancerName', 'DNSName'
+            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName'
               @load_balancer[name] = value
             when 'CreatedTime'
               @load_balancer[name] = Time.parse(value)
@@ -95,6 +95,9 @@ module Fog
             when 'LBCookieStickinessPolicies'
               @in_lb_cookies = false
 
+            when 'OwnerAlias', 'GroupName'
+              @load_balancer['SourceSecurityGroup'][name] = value
+
             when 'Interval', 'HealthyThreshold', 'Timeout', 'UnhealthyThreshold'
               @load_balancer['HealthCheck'][name] = value.to_i
             when 'Target'

data/lib/fog/aws/rds.rb

@@ -115,7 +115,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body = Fog::AWS.signed_params(
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,

data/lib/fog/aws/requests/cloud_formation/create_stack.rb

@@ -36,7 +36,7 @@ module Fog
           end
 
           if options['NotificationARNs']
-            params.merge!(AWS.indexed_param("NotificationARNs.member", [*options['NotificationARNs']]))
+            params.merge!(Fog::AWS.indexed_param("NotificationARNs.member", [*options['NotificationARNs']]))
           end
 
           if options['Parameters']

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -23,7 +23,7 @@ module Fog
         #     * 'CreateLoadBalancerResult'<~Hash>:
         #       * 'DNSName'<~String> - DNS name for the newly created ELB
         def create_load_balancer(availability_zones, lb_name, listeners)
-          params = AWS.indexed_param('AvailabilityZones.member', [*availability_zones])
+          params = Fog::AWS.indexed_param('AvailabilityZones.member', [*availability_zones])
 
           listener_protocol = []
           listener_lb_port = []
@@ -36,10 +36,10 @@ module Fog
             listener_ssl_certificate_id.push(listener['SSLCertificateId'])
           end
 
-          params.merge!(AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.SSLCertificateId', listener_ssl_certificate_id))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.SSLCertificateId', listener_ssl_certificate_id))
 
           request({
             'Action'           => 'CreateLoadBalancer',

data/lib/fog/aws/requests/elb/create_load_balancer_listeners.rb

@@ -33,10 +33,10 @@ module Fog
             listener_ssl_certificate_id.push(listener['SSLCertificateId'])
           end
 
-          params.merge!(AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.SSLCertificateId', listener_ssl_certificate_id))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port))
+          params.merge!(Fog::AWS.indexed_param('Listeners.member.%d.SSLCertificateId', listener_ssl_certificate_id))
 
           request({
             'Action'           => 'CreateLoadBalancerListeners',

data/lib/fog/aws/requests/elb/delete_load_balancer_listeners.rb

@@ -16,7 +16,7 @@ module Fog
         #     * 'ResponseMetadata'<~Hash>:
         #       * 'RequestId'<~String> - Id of request
         def delete_load_balancer_listeners(lb_name, load_balancer_ports)
-          params = AWS.indexed_param('LoadBalancerPorts.memeber.%d', load_balancer_ports)
+          params = Fog::AWS.indexed_param('LoadBalancerPorts.memeber.%d', load_balancer_ports)
 
           request({
             'Action'           => 'DeleteLoadBalancerListeners',

data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb

@@ -20,7 +20,7 @@ module Fog
         #       * 'Instances'<~Array> - array of hashes describing instances currently enabled
         #         * 'InstanceId'<~String>
         def deregister_instances_from_load_balancer(instance_ids, lb_name)
-          params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids])
+          params = Fog::AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids])
           request({
             'Action'           => 'DeregisterInstancesFromLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/describe_instance_health.rb

@@ -23,7 +23,7 @@ module Fog
         #         * 'InstanceId'<~String>
         #         * 'ReasonCode'<~String>
         def describe_instance_health(lb_name, instance_ids = [])
-          params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids])
+          params = Fog::AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids])
           request({
             'Action'           => 'DescribeInstanceHealth',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -17,28 +17,33 @@ module Fog
         #       * 'RequestId'<~String> - Id of request
         #     * 'DescribeLoadBalancersResult'<~Hash>:
         #       * 'LoadBalancerDescriptions'<~Array>
-        #         * 'LoadBalancerName'<~String> - name of load balancer
-        #         * 'DNSName'<~String> - external DNS name of load balancer
+        #         * 'AvailabilityZones'<~Array> - list of availability zones covered by this load balancer
+        #         * 'CanonicalHostedZoneName'<~String> - name of the Route 53 hosted zone associated with the load balancer
+        #         * 'CanonicalHostedZoneNameID'<~String> - ID of the Route 53 hosted zone associated with the load balancer
         #         * 'CreatedTime'<~Time> - time load balancer was created
-        #         * 'ListenerDescriptions'<~Array>
-        #           * 'PolicyNames'<~Array> - list of policies enabled
-        #           * 'Listener'<~Hash>:
-        #             * 'InstancePort'<~Integer> - port on instance that requests are sent to
-        #             * 'Protocol'<~String> - transport protocol used for routing in [TCP, HTTP]
-        #             * 'LoadBalancerPort'<~Integer> - port that load balancer listens on for requests
+        #         * 'DNSName'<~String> - external DNS name of load balancer
         #         * 'HealthCheck'<~Hash>:
         #           * 'HealthyThreshold'<~Integer> - number of consecutive health probe successes required before moving the instance to the Healthy state
         #           * 'Timeout'<~Integer> - number of seconds after which no response means a failed health probe
         #           * 'Interval'<~Integer> - interval (in seconds) between health checks of an individual instance
         #           * 'UnhealthyThreshold'<~Integer> - number of consecutive health probe failures that move the instance to the unhealthy state
         #           * 'Target'<~String> - string describing protocol type, port and URL to check
+        #         * 'Instances'<~Array> - list of instances that the load balancer balances between
+        #         * 'ListenerDescriptions'<~Array>
+        #           * 'PolicyNames'<~Array> - list of policies enabled
+        #           * 'Listener'<~Hash>:
+        #             * 'InstancePort'<~Integer> - port on instance that requests are sent to
+        #             * 'Protocol'<~String> - transport protocol used for routing in [TCP, HTTP]
+        #             * 'LoadBalancerPort'<~Integer> - port that load balancer listens on for requests
+        #         * 'LoadBalancerName'<~String> - name of load balancer
         #         * 'Policies'<~Hash>:
         #           * 'LBCookieStickinessPolicies'<~Array> - list of Load Balancer Generated Cookie Stickiness policies for the LoadBalancer
         #           * 'AppCookieStickinessPolicies'<~Array> - list of Application Generated Cookie Stickiness policies for the LoadBalancer
-        #         * 'AvailabilityZones'<~Array> - list of availability zones covered by this load balancer
-        #         * 'Instances'<~Array> - list of instances that the load balancer balances between
+        #         * 'SourceSecurityGroup'<~Hash>:
+        #           * 'GroupName'<~String> - Name of the source security group to use with inbound security group rules
+        #           * 'OwnerAlias'<~String> - Owner of the source security group
         def describe_load_balancers(lb_name = [])
-          params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name])
+          params = Fog::AWS.indexed_param('LoadBalancerNames.member', [*lb_name])
           request({
             'Action'  => 'DescribeLoadBalancers',
             :parser   => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new