fog 0.0.83 → 0.0.84

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.0.83'
-  s.date              = '2010-04-27'
+  s.version           = '0.0.84'
+  s.date              = '2010-04-28'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -31,7 +31,7 @@ require 'fog/terremark'
 
 module Fog
 
-  VERSION = '0.0.83'
+  VERSION = '0.0.84'
 
   module Mock
     @delay = 1

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

@@ -38,7 +38,7 @@ module Fog
         end
 
         def get(flavor_id)
-          all.detect {|flavor| flavor.id = flavor_id}
+          all.detect {|flavor| flavor.id == flavor_id}
         end
 
       end

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

@@ -60,7 +60,7 @@ module Fog
 
         def new(attributes = {})
           if volume
-            super({ :volume_id => volume.id }.merge!(attributes))
+            super({ 'volumeId' => volume.id }.merge!(attributes))
           else
             super
           end

data/lib/fog/terremark/ecloud.rb

@@ -43,6 +43,11 @@ module Fog
      class Mock
        include Fog::Terremark::Shared::Mock
        include Fog::Terremark::Shared::Parser
+
+       def initialize(option = {})
+         super
+         @data = self.class.data[:terremark_ecloud_username]
+       end
      end
 
     end

data/lib/fog/terremark/requests/shared/get_organizations.rb

@@ -30,7 +30,16 @@ module Fog
       module Mock
 
         def get_organizations
-          raise MockNotImplemented.new("Contributions welcome!")
+          response = Excon::Response.new
+          org_list = @data[:organizations].map do |organization|
+            { "name" => organization[:info][:name],
+              "href" => "https://services.enterprisecloud.terremark.com/api/v0.8a-ext2.0/org/#{organization[:info][:id]}",
+              "type" => "application/vnd.vmware.vcloud.org+xml"
+            }
+          end
+          response.body = { "OrgList" => org_list }
+          response.headers = Fog::Terremark::Shared::Mock.headers(response.body, "application/vnd.vmware.vcloud.orgList+xml")
+          response
         end
 
       end

data/lib/fog/terremark/shared.rb

@@ -51,21 +51,42 @@ module Fog
       end
 
       module Mock
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {}
-          end
-        end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
+        DATA = {
+          :organizations =>
+          [
+            {
+              :info => {
+                :name => "Boom Inc.",
+                :id => "1"
+              }
+            }
+          ]
+        }
+
+        def self.headers(body, content_type)
+          {"X-Powered-By"=>"ASP.NET",
+           "Date"=> Time.now.to_s,
+           "Content-Type"=> content_type,
+           "Content-Length"=> body.to_s.length,
+           "Server"=>"Microsoft-IIS/7.0",
+           "Set-Cookie"=>"vcloud-token=ecb37bfc-56f0-421d-97e5-bf2gdf789457; path=/",
+           "Cache-Control"=>"private"}
         end
 
         def initialize(options={})
-          @terremark_username = options[:terremark_username]
-          @data = self.class.data[@terremark_username]
+          self.class.instance_eval '
+            def self.data
+              @data ||= Hash.new do |hash, key|
+                hash[key] = Fog::Terremark::Shared::Mock::DATA
+              end
+            end'
+          self.class.instance_eval '
+            def self.reset_data(keys=data.keys)
+              for key in [*keys]
+                data.delete(key)
+              end
+            end'
         end
       end
 

data/lib/fog/terremark/vcloud.rb

@@ -89,6 +89,11 @@ module Fog
      class Mock
        include Fog::Terremark::Shared::Mock
        include Fog::Terremark::Shared::Parser
+
+       def initialize(option = {})
+         super
+         @data = self.class.data[:terremark_vcloud_username]
+       end
      end
 
     end

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

@@ -35,7 +35,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
     it "should return true if the snapshot is deleted" do
       volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
-      snapshot.wait_for { status == "completed" }
+      snapshot.wait_for { ready? }
       snapshot.destroy.should be_true
       volume.destroy
     end
@@ -69,6 +69,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
 
     before(:each) do
       @volume   = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      @volume.wait_for { ready? }
       @snapshot = @volume.snapshots.new
     end
 
@@ -77,10 +78,9 @@ describe 'Fog::AWS::EC2::Snapshots' do
     end
 
     it "should return true when it succeeds" do
-      eventually do
-        @snapshot.save.should be_true
-        @snapshot.destroy
-      end
+      @snapshot.save.should be_true
+      @snapshot.wait_for { ready? }
+      @snapshot.destroy
     end
 
     it "should not exist in snapshots before save" do
@@ -90,6 +90,7 @@ describe 'Fog::AWS::EC2::Snapshots' do
     it "should exist in snapshots after save" do
       @snapshot.save
       AWS[:ec2].snapshots.get(@snapshot.id).should_not be_nil
+      @snapshot.wait_for { ready? }
       @snapshot.destroy
     end
 

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

@@ -19,8 +19,11 @@ describe 'Fog::AWS::EC2::Snapshots' do
     it "should limit snapshots by volume if present" do
       @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       @other_volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
-      eventually { @snapshot = @volume.snapshots.create }
+      @volume.wait_for { ready?}
+      @snapshot = @volume.snapshots.create
       @other_volume.snapshots.all.map {|snapshot| snapshot.id}.should_not include(@snapshot.id)
+
+      @snapshot.wait_for { ready? }
       @snapshot.destroy
       @other_volume.destroy
       @volume.destroy
@@ -32,10 +35,12 @@ describe 'Fog::AWS::EC2::Snapshots' do
 
     before(:each) do
       @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      @volume.wait_for { ready? }
       @snapshot = @volume.snapshots.create
     end
 
     after(:each) do
+      @snapshot.wait_for { ready? }
       @snapshot.destroy
       @volume.destroy
     end
@@ -55,8 +60,9 @@ describe 'Fog::AWS::EC2::Snapshots' do
     it "should return a Fog::AWS::EC2::Snapshot if a matching snapshot exists" do
       volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
       snapshot = volume.snapshots.create
+      snapshot.wait_for { ready? }
       get = AWS[:ec2].snapshots.get(snapshot.id)
-      snapshot.attributes.reject {|key, value| [:progress, :status].include?(key)}.should == get.attributes.reject {|key, value| [:progress, :status].include?(key)}
+      snapshot.attributes.should == get.attributes
       snapshot.destroy
     end
 

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

@@ -49,15 +49,15 @@ describe 'Fog::AWS::EC2::Volume' do
     before(:each) do
       @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
       @volume = AWS[:ec2].volumes.new(:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1')
-      @server.wait_for { state == 'running' }
+      @server.wait_for { ready? }
     end
 
     after(:each) do
       @server.destroy
       if @volume.id
-        @volume.wait_for { status == 'attached' }
+        @volume.wait_for { state == 'attached' }
         @volume.server = nil
-        @volume.wait_for { status == 'available' }
+        @volume.wait_for { ready? }
         @volume.destroy
       end
     end

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

@@ -40,8 +40,9 @@ describe 'Fog::AWS::EC2::Volumes' do
 
     it "should return a Fog::AWS::EC2::Volume if a matching volume exists" do
       volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1, :device => 'dev/sdz1')
+      volume.wait_for { ready? }
       get = AWS[:ec2].volumes.get(volume.id)
-      volume.attributes.reject { |key, value| [:device, :status].include?(key) }.should == get.attributes.reject { |key, value| [:device, :status].include?(key) }
+      volume.attributes.should == get.attributes
       volume.destroy
     end
 

data/spec/aws/models/s3/directories_spec.rb

@@ -32,7 +32,7 @@ describe 'Fog::AWS::S3::Directories' do
     end
 
     it "should return nil if no matching directory exists" do
-      AWS[:s3].directories.get('fogdirectoryname').should be_nil
+      AWS[:s3].directories.get('fognotadirectory').should be_nil
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 83
-  version: 0.0.83
+  - 84
+  version: 0.0.84
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -07:00
+date: 2010-04-28 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency