fog 0.0.41 → 0.0.42

data/README.rdoc

@@ -104,12 +104,11 @@ Now we will try again, but with Rackspace
   # delete the directory
   directory.destroy
 
-== Requirements
+== More info
 
-* ruby 1.8 or 1.9
-* ruby-hmac
-* mime-types
-* nokogiri
+* Follow {@geemus}[http://twitter.com/geemus] on Twitter.
+* See upcoming work in the {tracker}[http://www.pivotaltracker.com/projects/54635].
+* Report bugs in {issues}[http://github.com/geemus/fog/issues].
 
 == Supports
 

data/Rakefile

@@ -8,6 +8,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.add_dependency('excon', '>=0.0.18')
+    gem.add_dependency('json')
     gem.add_dependency('mime-types')
     gem.add_dependency('nokogiri')
     gem.add_dependency('ruby-hmac')

data/VERSION.yml

@@ -0,0 +1,5 @@
+--- 
+:major: 0
+:minor: 0
+:patch: 42
+:build:

data/fog.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# 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.41"
+  s.version = "0.0.42"
 
   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-25}
+  s.date = %q{2010-02-01}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
      ".gitignore",
      "README.rdoc",
      "Rakefile",
-     "VERSION",
+     "VERSION.yml",
      "benchs/fog_vs.rb",
      "benchs/params.rb",
      "benchs/parse_vs_push.rb",
@@ -251,6 +251,7 @@ Gem::Specification.new do |s|
      "spec/compact_progress_bar_formatter.rb",
      "spec/lorem.txt",
      "spec/rackspace/models/servers/server_spec.rb",
+     "spec/rackspace/models/servers/servers_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",
@@ -277,6 +278,7 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/reboot_server_spec.rb",
      "spec/rackspace/requests/servers/update_server_spec.rb",
      "spec/shared_examples/server_examples.rb",
+     "spec/shared_examples/servers_examples.rb",
      "spec/slicehost/requests/create_slice_spec.rb",
      "spec/slicehost/requests/delete_slice_spec.rb",
      "spec/slicehost/requests/get_backups_spec.rb",
@@ -393,6 +395,7 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/select_spec.rb",
      "spec/compact_progress_bar_formatter.rb",
      "spec/rackspace/models/servers/server_spec.rb",
+     "spec/rackspace/models/servers/servers_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",
@@ -419,6 +422,7 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/reboot_server_spec.rb",
      "spec/rackspace/requests/servers/update_server_spec.rb",
      "spec/shared_examples/server_examples.rb",
+     "spec/shared_examples/servers_examples.rb",
      "spec/slicehost/requests/create_slice_spec.rb",
      "spec/slicehost/requests/delete_slice_spec.rb",
      "spec/slicehost/requests/get_backups_spec.rb",
@@ -434,17 +438,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<excon>, [">= 0.0.18"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       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.18"])
+      s.add_dependency(%q<json>, [">= 0"])
       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.18"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])

data/lib/fog.rb

@@ -57,19 +57,20 @@ module Fog
       else
         nil
       end
-      unless credentials
-        print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
+      unless credentials && credentials[credential]
+        print("\n  To run as '#{credential}', add credentials like the following to ~/.fog\n")
         yml = <<-YML
 
-:#{key}:
-  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
+:#{credential}:
+  :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
+  :rackspace_api_key:     INTENTIONALLY_LEFT_BLANK
+  :rackspace_username:    INTENTIONALLY_LEFT_BLANK
+  :slicehost_password:    INTENTIONALLY_LEFT_BLANK
 
 YML
         print(yml)
+        raise(ArgumentError.new("Missing Credentials"))
       end
       credentials[credential]
     end

data/lib/fog/aws.rb

@@ -7,6 +7,14 @@ module Fog
       load "fog/aws/s3.rb"
     end
 
+    def self.indexed_param(key, values)
+      params = {}
+      [*values].each_with_index do |value, index|
+        params["#{key}.#{index}"] = value
+      end
+      params
+    end
+
     if Fog.mocking?
       srand(Time.now.to_i)
 

data/lib/fog/aws/ec2.rb

@@ -137,21 +137,12 @@ module Fog
         @host       = options[:host]      || 'ec2.amazonaws.com'
         @port       = options[:port]      || 443
         @scheme     = options[:scheme]    || 'https'
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
       end
 
       private
 
-      def indexed_params(name, params)
-        indexed, index = {}, 1
-        for param in [*params]
-          indexed["#{name}.#{index}"] = param
-          index += 1
-        end
-        indexed
-      end
-
       def request(params, parser)
+        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
         params.merge!({
           'AWSAccessKeyId' => @aws_access_key_id,
           'SignatureMethod' => 'HmacSHA256',

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

@@ -104,8 +104,8 @@ module Fog
           if @availability_zone
             options['Placement.AvailabilityZone'] = @availability_zone
           end
-          @groups.each_with_index do |group, index|
-            options["SecurityGroup.#{index}"] = group
+          unless @groups.empty?
+            options.merge!(AWS.indexed_param("SecurityGroup", @groups))
           end
           if @kernel_id
             options['KernelId'] = @kernel_id

data/lib/fog/aws/requests/ec2/describe_addresses.rb

@@ -17,7 +17,7 @@ unless Fog.mocking?
         #       * 'instanceId'<~String> - instance for ip address
         #       * 'publicIp'<~String> - ip address for instance
         def describe_addresses(public_ip = [])
-          params = indexed_params('PublicIp', public_ip)
+          params = AWS.indexed_param('PublicIp', public_ip)
           request({
             'Action' => 'DescribeAddresses'
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeAddresses.new)

data/lib/fog/aws/requests/ec2/describe_availability_zones.rb

@@ -18,7 +18,7 @@ unless Fog.mocking?
         #       * 'zoneName'<~String> - Name of zone
         #       * 'zoneState'<~String> - State of zone
         def describe_availability_zones(zone_name = [])
-          params = indexed_params('ZoneName', zone_name)
+          params = AWS.indexed_param('ZoneName', zone_name)
           request({
             'Action' => 'DescribeAvailabilityZones'
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeAvailabilityZones.new)

data/lib/fog/aws/requests/ec2/describe_images.rb

@@ -31,7 +31,7 @@ unless Fog.mocking?
         #       * 'ramdiskId'<~String> - Ramdisk id associated with image, if any
         def describe_images(options = {})
           if image_id = options.delete('ImageId')
-            options.merge!(indexed_params('ImageId', image_id))
+            options.merge!(AWS.indexed_param('ImageId', image_id))
           end
           request({
             'Action' => 'DescribeImages'

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -39,7 +39,7 @@ unless Fog.mocking?
         #           * 'ramdiskId'<~String> - Id of ramdisk used to launch instance
         #           * 'reason'<~String> - reason for most recent state transition, or blank
         def describe_instances(instance_id = [])
-          params = indexed_params('InstanceId', instance_id)
+          params = AWS.indexed_param('InstanceId', instance_id)
           request({
             'Action' => 'DescribeInstances'
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeInstances.new)

data/lib/fog/aws/requests/ec2/describe_key_pairs.rb

@@ -17,7 +17,7 @@ unless Fog.mocking?
         #       * 'keyName'<~String> - Name of key
         #       * 'keyFingerprint'<~String> - Fingerprint of key
         def describe_key_pairs(key_name = [])
-          params = indexed_params('KeyName', key_name)
+          params = AWS.indexed_param('KeyName', key_name)
           request({
             'Action' => 'DescribeKeyPairs'
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeKeyPairs.new)

data/lib/fog/aws/requests/ec2/describe_regions.rb

@@ -17,7 +17,7 @@ unless Fog.mocking?
         #       * 'regionName'<~String> - Name of region
         #       * 'regionEndpoint'<~String> - Service endpoint for region
         def describe_regions(region_name = [])
-          params = indexed_params('RegionName', region_name)
+          params = AWS.indexed_param('RegionName', region_name)
           request({
             'Action' => 'DescribeRegions'
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeRegions.new)

data/lib/fog/aws/requests/ec2/describe_security_groups.rb

@@ -27,7 +27,7 @@ unless Fog.mocking?
         #         * 'toPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #       * 'ownerId'<~String> - AWS Access Key Id of the owner of the security group
         def describe_security_groups(group_name = [])
-          params = indexed_params('GroupName', group_name)
+          params = AWS.indexed_param('GroupName', group_name)
           request({
             'Action' => 'DescribeSecurityGroups',
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeSecurityGroups.new)

data/lib/fog/aws/requests/ec2/describe_snapshots.rb

@@ -20,7 +20,7 @@ unless Fog.mocking?
         #       * 'status'<~String>: Snapshot state, in ['pending', 'completed']
         #       * 'volumeId'<~String>: Id of volume that snapshot contains
         def describe_snapshots(snapshot_id = [])
-          params = indexed_params('SnapshotId', snapshot_id)
+          params = AWS.indexed_param('SnapshotId', snapshot_id)
           request({
             'Action' => 'DescribeSnapshots'
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeSnapshots.new)

data/lib/fog/aws/requests/ec2/describe_volumes.rb

@@ -26,7 +26,7 @@ unless Fog.mocking?
         #         * 'status'<~String> - Attachment state
         #         * 'volumeId'<~String> - Reference to volume
         def describe_volumes(volume_id = [])
-          params = indexed_params('VolumeId', volume_id)
+          params = AWS.indexed_param('VolumeId', volume_id)
           request({
             'Action' => 'DescribeVolumes'
           }.merge!(params), Fog::Parsers::AWS::EC2::DescribeVolumes.new)

data/lib/fog/aws/requests/ec2/reboot_instances.rb

@@ -15,7 +15,7 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def reboot_instances(instance_id = [])
-          params = indexed_params('InstanceId', instance_id)
+          params = AWS.indexed_param('InstanceId', instance_id)
           request({
             'Action' => 'RebootInstances'
           }.merge!(params), Fog::Parsers::AWS::EC2::Basic.new)

data/lib/fog/aws/requests/ec2/terminate_instances.rb

@@ -22,7 +22,7 @@ unless Fog.mocking?
         #         * 'code'<~Integer> - current status code
         #         * 'name'<~String> - name of current state
         def terminate_instances(instance_id)
-          params = indexed_params('InstanceId', instance_id)
+          params = AWS.indexed_param('InstanceId', instance_id)
           request({
             'Action' => 'TerminateInstances'
           }.merge!(params), Fog::Parsers::AWS::EC2::TerminateInstances.new)

data/lib/fog/aws/s3.rb

@@ -69,7 +69,6 @@ module Fog
         @host       = options[:host]      || 's3.amazonaws.com'
         @port       = options[:port]      || 443
         @scheme     = options[:scheme]    || 'https'
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
       end
 
       private
@@ -96,6 +95,7 @@ module Fog
       end
 
       def request(params)
+        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
         params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
         params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
 

data/lib/fog/aws/simpledb.rb

@@ -58,7 +58,6 @@ module Fog
         @nil_string = options[:nil_string]|| 'nil'
         @port       = options[:port]      || 443
         @scheme     = options[:scheme]    || 'https'
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
       end
 
       private
@@ -82,15 +81,7 @@ module Fog
       end
 
       def encode_attribute_names(attributes)
-        encoded_attribute_names = {}
-        if attributes
-          index = 0
-          for attribute in attributes
-            encoded_attribute_names["AttributeName.#{index}"] = attribute.to_s
-            index += 1
-          end
-        end
-        encoded_attribute_names
+        AWS.indexed_param('AttributeName', attributes.map {|attribute| attributes.to_s})
       end
 
       def encode_batch_attributes(items, replace_attributes = Hash.new([]))
@@ -117,6 +108,7 @@ module Fog
       end
 
       def request(params, parser)
+        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
         params.merge!({
           'AWSAccessKeyId' => @aws_access_key_id,
           'SignatureMethod' => 'HmacSHA256',

data/lib/fog/slicehost.rb

@@ -36,10 +36,10 @@ module Fog
       @host       = options[:host]      || "api.slicehost.com"
       @port       = options[:port]      || 443
       @scheme     = options[:scheme]    || 'https'
-      @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
     end
 
     def request(params)
+      @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
       headers = {
         'Authorization' => "Basic #{Base64.encode64(@password).gsub("\n",'')}"
       }

data/spec/aws/models/ec2/servers_spec.rb

@@ -1,8 +1,11 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/servers_examples'
 
 describe 'Fog::AWS::EC2::Servers' do
 
-  subject { @server = @servers.create(:image_id => GENTOO_AMI) }
+  it_should_behave_like "Servers"
+
+  subject { @server = @servers.new(:image_id => GENTOO_AMI) }
 
   before(:each) do
     @servers = AWS[:ec2].servers
@@ -10,43 +13,9 @@ describe 'Fog::AWS::EC2::Servers' do
 
   after(:each) do
     if @server && !@server.new_record?
-      @server.destroy
-    end
-  end
-
-  describe "#all" do
-
-    it "should include persisted servers" do
-      eventually do
-        @servers.all.map {|server| server.id}.should include(subject.id)
-      end
-    end
-
-  end
-
-  describe "#get" do
-
-    it "should return a matching server if one exists" do
-      eventually do
-        get = @servers.get(subject.id)
-        subject.attributes.should == get.attributes
-      end
-    end
-
-    it "should return nil if no matching server exists" do
-      @servers.get('i-00000000').should be_nil
+      @server.wait_for { ready? }
+      @server.destroy.should be_true
     end
-
-  end
-
-  describe "#reload" do
-
-    it "should reset attributes to remote state" do
-      servers = @servers.all
-      reloaded = servers.reload
-      servers.attributes.should == reloaded.attributes
-    end
-
   end
 
 end

data/spec/rackspace/models/servers/server_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require File.dirname(__FILE__) + '/../../../shared_examples/server_examples'
 
-describe 'Fog::AWS::EC2::Server' do
+describe 'Fog::Rackspace::Servers::Server' do
 
   it_should_behave_like "Server"
 

data/spec/rackspace/models/servers/servers_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/servers_examples'
+
+describe 'Fog::Rackspace::Servers::Servers' do
+
+  it_should_behave_like "Servers"
+
+  # flavor 1 = 256, image 3 = gentoo 2008.0
+  subject { @server = @servers.new(:flavor_id => 1, :image_id => 3, :name => 'name') }
+
+  before(:each) do
+    @servers = Rackspace[:servers].servers
+  end
+
+  after(:each) do
+    if @server && !@server.new_record?
+      @server.wait_for { ready? }
+      @server.destroy.should be_true
+    end
+  end
+
+end

data/spec/shared_examples/server_examples.rb

@@ -40,3 +40,4 @@ shared_examples_for "Server" do
   end
 
 end
+

data/spec/shared_examples/servers_examples.rb

@@ -0,0 +1,37 @@
+shared_examples_for "Servers" do
+
+  describe "#all" do
+
+    it "should include persisted servers" do
+      subject.save
+      @servers.all.map {|server| server.id}.should include(subject.id)
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a matching server if one exists" do
+      subject.save
+      get = @servers.get(subject.id)
+      subject.attributes.should == get.attributes
+    end
+
+    it "should return nil if no matching server exists" do
+      @servers.get('0').should be_nil
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should reset attributes to remote state" do
+      subject.save
+      servers = @servers.all
+      reloaded = servers.reload
+      servers.attributes.should == reloaded.attributes
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -08:00
+date: 2010-02-01 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.18
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   type: :runtime
@@ -65,7 +75,7 @@ files:
 - .gitignore
 - README.rdoc
 - Rakefile
-- VERSION
+- VERSION.yml
 - benchs/fog_vs.rb
 - benchs/params.rb
 - benchs/parse_vs_push.rb
@@ -294,6 +304,7 @@ files:
 - spec/compact_progress_bar_formatter.rb
 - spec/lorem.txt
 - spec/rackspace/models/servers/server_spec.rb
+- spec/rackspace/models/servers/servers_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
@@ -320,6 +331,7 @@ files:
 - spec/rackspace/requests/servers/reboot_server_spec.rb
 - spec/rackspace/requests/servers/update_server_spec.rb
 - spec/shared_examples/server_examples.rb
+- spec/shared_examples/servers_examples.rb
 - spec/slicehost/requests/create_slice_spec.rb
 - spec/slicehost/requests/delete_slice_spec.rb
 - spec/slicehost/requests/get_backups_spec.rb
@@ -457,6 +469,7 @@ test_files:
 - spec/aws/requests/simpledb/select_spec.rb
 - spec/compact_progress_bar_formatter.rb
 - spec/rackspace/models/servers/server_spec.rb
+- spec/rackspace/models/servers/servers_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
@@ -483,6 +496,7 @@ test_files:
 - spec/rackspace/requests/servers/reboot_server_spec.rb
 - spec/rackspace/requests/servers/update_server_spec.rb
 - spec/shared_examples/server_examples.rb
+- spec/shared_examples/servers_examples.rb
 - spec/slicehost/requests/create_slice_spec.rb
 - spec/slicehost/requests/delete_slice_spec.rb
 - spec/slicehost/requests/get_backups_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.41