fog 0.0.13 → 0.0.14

data/Rakefile

@@ -15,9 +15,8 @@ begin
     gem.summary = %Q{fog = clouds + you}
     gem.email = "me@geemus.com"
     gem.homepage = "http://github.com/geemus/fog"
-    gem.authors = ["Wesley Beary"]
+    gem.authors = ["geemus (Wesley Beary)"]
     gem.rubyforge_project = "fog"
-  
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/bin/fog

@@ -9,15 +9,44 @@ elsif File.exists?(File.expand_path('~/.fog'))
   @credentials = YAML.load(File.open(File.expand_path('~/.fog')).read)
 end
 
+@ec2 = Fog::AWS::EC2.new(
+  :aws_access_key_id => @credentials['aws_access_key_id'],
+  :aws_secret_access_key => @credentials['aws_secret_access_key']
+)
+
 @s3 = Fog::AWS::S3.new(
   :aws_access_key_id => @credentials['aws_access_key_id'],
   :aws_secret_access_key => @credentials['aws_secret_access_key']
 )
 
+def addresses
+  @ec2.addresses
+end
+
 def buckets
   @s3.buckets
 end
 
+def instances
+  @ec2.instances
+end
+
+def key_pairs
+  @ec2.key_pairs
+end
+
+def security_groups
+  @ec2.security_groups
+end
+
+def snapshots
+  @ec2.snapshots
+end
+
+def volumes
+  @ec2.volumes
+end
+
 ARGV.clear # Avoid passing args to IRB
 IRB.setup(nil)
 @irb = IRB::Irb.new(nil)

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Wesley Beary"]
-  s.date = %q{2009-10-05}
+  s.authors = ["geemus (Wesley Beary)"]
+  s.date = %q{2009-10-09}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -139,6 +139,8 @@ Gem::Specification.new do |s|
      "lib/fog/response.rb",
      "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
+     "spec/aws/models/ec2/instance_spec.rb",
+     "spec/aws/models/ec2/instances_spec.rb",
      "spec/aws/models/ec2/key_pair_spec.rb",
      "spec/aws/models/ec2/key_pairs_spec.rb",
      "spec/aws/models/ec2/security_group_spec.rb",
@@ -215,6 +217,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
+     "spec/aws/models/ec2/instance_spec.rb",
+     "spec/aws/models/ec2/instances_spec.rb",
      "spec/aws/models/ec2/key_pair_spec.rb",
      "spec/aws/models/ec2/key_pairs_spec.rb",
      "spec/aws/models/ec2/security_group_spec.rb",

data/lib/fog/aws/ec2.rb

@@ -28,6 +28,8 @@ module Fog
 
         load "fog/aws/models/ec2/address.rb"
         load "fog/aws/models/ec2/addresses.rb"
+        load "fog/aws/models/ec2/instance.rb"
+        load "fog/aws/models/ec2/instances.rb"
         load "fog/aws/models/ec2/key_pair.rb"
         load "fog/aws/models/ec2/key_pairs.rb"
         load "fog/aws/models/ec2/security_group.rb"

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

@@ -23,6 +23,11 @@ module Fog
           true
         end
 
+        def instance=(new_instance)
+          @instance_id = new_instance.instance_id
+          connection.associate_address(@instance_id, @public_ip)
+        end
+
         def reload
           new_attributes = addresses.get(@public_ip).attributes
           merge_attributes(new_attributes)

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

@@ -9,6 +9,7 @@ module Fog
       class Addresses < Fog::Collection
 
         attribute :public_ip
+        attribute :instance_id
 
         def initialize(attributes)
           @public_ip ||= []
@@ -27,6 +28,9 @@ module Fog
               :connection => connection
             }.merge!(address))
           end
+          if instance_id
+            addresses = addresses.select {|address| address.instance_id == instance_id}
+          end
           addresses
         end
 

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

@@ -24,12 +24,7 @@ module Fog
         attribute :user_data
 
         def address
-          connection.addresses.select {|address| address.instance_id == @instance_id}.first
-        end
-
-        def address=(new_address)
-          new_address.instance_id = @instance_id
-          connection.associate_address(@instance_id, new_address.public_ip)
+          connection.addresses(:instance_id => instance_id).all.first
         end
 
         def destroy
@@ -110,12 +105,7 @@ module Fog
         end
 
         def volumes
-          connection.volumes.all.select {|volume| volume.instance_id == @instance_id}
-        end
-
-        def volume=(new_volume)
-          new_volume.instance_id = @instance_id
-          connection.attach_volume(@instance_id, new_volume.volume_id, new_volume.device)
+          connection.volumes(:instance_id => instance_id)
         end
 
         private

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

@@ -10,16 +10,24 @@ module Fog
 
         attribute :instance_id
 
+        def initialize(attributes)
+          @instance_id ||= []
+          super
+        end
+
         def all(instance_id = [])
-          data = connection.describe_instances(instance_id)
+          data = connection.describe_instances(instance_id).body
           instances = Fog::AWS::EC2::Instances.new({
-            :connection   => connection
+            :connection   => connection,
+            :instance_id  => instance_id
           }.merge!(attributes))
-          data['instancesSet'].each do |instance|
-            instances << Fog::AWS::EC2::Instances.new({
-              :connection => connection,
-              :instances  => self
-            }.merge!(instance))
+          data['reservationSet'].each do |reservation|
+            reservation['instancesSet'].each do |instance|
+              instances << Fog::AWS::EC2::Instance.new({
+                :connection => connection,
+                :instances  => self
+              }.merge!(instance))
+            end
           end
           instances
         end

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

@@ -11,7 +11,7 @@ module Fog
         attribute :instance_id,       'instanceId'
         attribute :size
         attribute :snapshot_id,       'snapshotId'
-        attribute :status,            'status'
+        attribute :status
         attribute :volume_id,         'volumeId'
         
         def initialize(attributes = {})
@@ -26,6 +26,11 @@ module Fog
           true
         end
 
+        def instance=(new_instance)
+          @instance_id = new_instance.instance_id
+          connection.attach_volume(@instance_id, @volume_id, @device)
+        end
+
         def reload
           new_attributes = volumes.get(@volume_id).attributes
           merge_attributes(new_attributes)

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

@@ -9,6 +9,7 @@ module Fog
       class Volumes < Fog::Collection
 
         attribute :volume_id
+        attribute :instance_id
 
         def initialize(attributes)
           @volume_id ||= []
@@ -27,6 +28,9 @@ module Fog
               :volumes    => self
             }.merge!(volume))
           end
+          if instance_id
+            volumes = volumes.select {|volume| volume.instance_id == instance_id}
+          end
           volumes
         end
 

data/lib/fog/aws/models/s3/buckets.rb

@@ -44,7 +44,7 @@ module Fog
               options[key] = value
             end
           end
-          bucket.objects.merge_attributes(:options => options)
+          bucket.objects.merge_attributes(options)
           data['Contents'].each do |object|
             owner = Fog::AWS::S3::Owner.new(object.delete('Owner').merge!(:connection => connection))
             bucket.objects << Fog::AWS::S3::Object.new({

data/lib/fog/aws/models/s3/objects.rb

@@ -4,11 +4,17 @@ module Fog
 
       class Objects < Fog::Collection
 
-        attribute :options
+        attribute :delimiter,     'Delimiter'
+        attribute :is_truncated,  'IsTruncated'
+        attribute :marker,        'Marker'
+        attribute :max_keys,      'MaxKeys'
+        attribute :prefix,        'Prefix'
 
         def all(options = {})
-          merge_attributes(:options => options)
-          bucket.buckets.get(bucket.name, @options).objects
+          bucket.buckets.get(
+            bucket.name,
+            options.reject {|key, value| !['delimiter', 'marker', 'max-keys', 'prefix'].include?(key)}
+          ).objects
         end
 
         def bucket
@@ -75,7 +81,12 @@ module Fog
         end
 
         def reload
-          all(@options)
+          all({
+            'delimiter'   => @delimiter,
+            'marker'      => @marker,
+            'max-keys'    => @max_keys,
+            'prefix'      => @prefix
+          })
         end
 
         private

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

@@ -0,0 +1,108 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::Instance' do
+
+  describe "#initialize" do
+
+    it "should remap attributes from parser" # do
+    #       instance = Fog::AWS::EC2::Instance.new(
+    #         'instanceId'  => 'i-00000000',
+    #         'publicIp'    => '0.0.0.0'
+    #       )
+    #       instance.instance_id.should == 'i-00000000'
+    #       instance.public_ip.should == '0.0.0.0'
+    #     end
+
+  end
+
+  describe "#address" do
+    it "should have tests"
+  end
+
+  describe "#destroy" do
+
+    it "should return true if the instance is deleted" do
+      instance = ec2.instances.create(:image_id => 'ami-5ee70037')
+      instance.destroy.should be_true
+    end
+
+  end
+
+  describe "#instances" do
+
+    it "should return a Fog::AWS::EC2::Instances" do
+      ec2.instances.new.instances.should be_a(Fog::AWS::EC2::Instances)
+    end
+
+    it "should be the instances the instance is related to" do
+      instances = ec2.instances
+      instances.new.instances.should == instances
+    end
+
+  end
+
+  describe "#key_pair" do
+    it "should have tests"
+  end
+
+  describe "#key_pair=" do
+    it "should have tests"
+  end
+
+  describe "#monitoring=" do
+    it "should have tests"
+  end
+
+  describe "#placement=" do
+    it "should have tests"
+  end
+
+  describe "#reload" do
+
+    before(:each) do
+      @instance = ec2.instances.create(:image_id => 'ami-5ee70037')
+      @reloaded = @instance.reload
+    end
+
+    after(:each) do
+      @instance.destroy
+    end
+
+    it "should return a Fog::AWS::EC2::Instance" do
+      @reloaded.should be_a(Fog::AWS::EC2::Instance)
+    end
+
+    it "should reset attributes to remote state" do
+      @instance.attributes.should == @reloaded.attributes
+    end
+
+  end
+
+  describe "#save" do
+
+    before(:each) do
+      @instance = ec2.instances.new
+    end
+
+    it "should return true when it succeeds" do
+      @instance.save.should be_true
+      @instance.destroy
+    end
+
+    it "should not exist in instances before save" do
+      @instance.instances.get(@instance.instance_id).should be_nil
+    end
+
+    it "should exist in buckets after save" do
+      @instance.save
+      @instance.instances.get(@instance.instance_id).should_not be_nil
+      @instance.destroy
+    end
+
+  end
+
+  describe "#volumes" do
+    it "should have tests"
+  end
+
+end

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

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe 'Fog::AWS::EC2::Instances' do
+
+  describe "#all" do
+
+    it "should return a Fog::AWS::EC2::Instances" do
+      ec2.instances.all.should be_a(Fog::AWS::EC2::Instances)
+    end
+
+    it "should include persisted instances" do
+      instance = ec2.instances.create(:image_id => 'ami-5ee70037')
+      ec2.instances.get(instance.instance_id).should_not be_nil
+      instance.destroy
+    end
+
+  end
+
+  describe "#create" do
+
+    before(:each) do
+      @instance = ec2.instances.create(:image_id => 'ami-5ee70037')
+    end
+
+    after(:each) do
+      @instance.destroy
+    end
+
+    it "should return a Fog::AWS::EC2::Instance" do
+      @instance.should be_a(Fog::AWS::EC2::Instance)
+    end
+
+    it "should exist on ec2" do
+      ec2.instances.get(@instance.instance_id).should_not be_nil
+    end
+
+  end
+
+  describe "#get" do
+
+    it "should return a Fog::AWS::EC2::Instance if a matching instance exists" do
+      instance = ec2.instances.create(:image_id => 'ami-5ee70037')
+      get = ec2.instances.get(instance.instance_id)
+      instance.attributes.should == get.attributes
+      instance.destroy
+    end
+
+    it "should return nil if no matching instance exists" do
+      ec2.instances.get('i-00000000').should be_nil
+    end
+
+  end
+
+  describe "#new" do
+
+    it "should return a Fog::AWS::EC2::Instance" do
+      ec2.instances.new(:image_id => 'ami-5ee70037').should be_a(Fog::AWS::EC2::Instance)
+    end
+
+  end
+
+  describe "#reload" do
+
+    it "should return a Fog::AWS::EC2::Instances" do
+      ec2.instances.all.reload.should be_a(Fog::AWS::EC2::Instances)
+    end
+
+  end
+
+end

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

@@ -4,14 +4,16 @@ describe 'Fog::AWS::EC2::KeyPair' do
 
   describe "#initialize" do
 
-    it "should remap attributes from parser" #do
-    #   address = Fog::AWS::EC2::KeyPair.new(
-    #     'instanceId'  => 'i-00000000',
-    #     'publicIp'    => '0.0.0.0'
-    #   )
-    #   address.instance_id.should == 'i-00000000'
-    #   address.public_ip.should == '0.0.0.0'
-    # end
+    it "should remap attributes from parser" do
+      key_pair = Fog::AWS::EC2::KeyPair.new(
+        'keyFingerprint'  => 'fingerprint',
+        'keyMaterial'     => 'material',
+        'keyName'         => 'name'
+      )
+      key_pair.fingerprint.should == 'fingerprint'
+      key_pair.material.should == 'material'
+      key_pair.name.should == 'name'
+    end
 
   end
 

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

@@ -4,14 +4,18 @@ describe 'Fog::AWS::EC2::SecurityGroup' do
 
   describe "#initialize" do
 
-    it "should remap attributes from parser" #do
-    #   address = Fog::AWS::EC2::SecurityGroup.new(
-    #     'instanceId'  => 'i-00000000',
-    #     'publicIp'    => '0.0.0.0'
-    #   )
-    #   address.instance_id.should == 'i-00000000'
-    #   address.public_ip.should == '0.0.0.0'
-    # end
+    it "should remap attributes from parser" do
+      security_group = Fog::AWS::EC2::SecurityGroup.new(
+        'groupDescription' => 'description',
+        'groupName'        => 'name',
+        'ipPermissions'    => 'permissions',
+        'ownerId'          => 'owner'
+      )
+      security_group.group_description.should == 'description'
+      security_group.group_name.should == 'name'
+      security_group.ip_permissions.should == 'permissions'
+      security_group.owner_id.should == 'owner'
+    end
 
   end
 

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

@@ -4,14 +4,16 @@ describe 'Fog::AWS::EC2::Snapshots' do
 
   describe "#initialize" do
 
-    it "should remap attributes from parser" # do
-    #       snapshot = Fog::AWS::EC2::Address.new(
-    #         'instanceId'  => 'i-00000000',
-    #         'publicIp'    => '0.0.0.0'
-    #       )
-    #       address.instance_id.should == 'i-00000000'
-    #       address.public_ip.should == '0.0.0.0'
-    #     end
+    it "should remap attributes from parser" do
+      snapshot = Fog::AWS::EC2::Snapshot.new(
+        'snapshotId'  => 'snap-00000000',
+        'startTime'   => 'now',
+        'volumeId'    => 'vol-00000000'
+      )
+      snapshot.snapshot_id.should == 'snap-00000000'
+      snapshot.start_time.should == 'now'
+      snapshot.volume_id.should == 'vol-00000000'
+    end
 
   end
 

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

@@ -11,8 +11,19 @@ describe 'Fog::AWS::EC2::Snapshots' do
     it "should include persisted snapshots" do
       volume = ec2.volumes.create
       snapshot = volume.snapshots.create
-      ec2.snapshots.get(snapshot.snapshot_id).should_not be_nil
+      ec2.snapshots.all.map {|snapshot| snapshot.snapshot_id}.should include(snapshot.snapshot_id)
       snapshot.destroy
+      volume.destroy
+    end
+
+    it "should limit snapshots by volume_id if present" do
+      volume = ec2.volumes.create
+      other_volume = ec2.volumes.create
+      snapshot = volume.snapshots.create
+      other_volume.snapshots.all.map {|snapshot| snapshot.snapshot_id}.should_not include(snapshot.snapshot_id)
+      snapshot.destroy
+      other_volume.destroy
+      volume.destroy
     end
 
   end

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

@@ -4,14 +4,22 @@ describe 'Fog::AWS::EC2::Volume' do
 
   describe "#initialize" do
 
-    it "should remap attributes from parser" # do
-    #       volume = Fog::AWS::EC2::Address.new(
-    #         'instanceId'  => 'i-00000000',
-    #         'publicIp'    => '0.0.0.0'
-    #       )
-    #       address.instance_id.should == 'i-00000000'
-    #       address.public_ip.should == '0.0.0.0'
-    #     end
+    it "should remap attributes from parser" do
+      volume = Fog::AWS::EC2::Volume.new(
+        'attachmentTime'    => 'now',
+        'availabilityZone'  => 'us-east-1a',
+        'createTime'        => 'recently',
+        'instanceId'        => 'i-00000000',
+        'snapshotId'        => 'snap-00000000',
+        'volumeId'          => 'vol-00000000'
+      )
+      volume.attachment_time.should == 'now'
+      volume.availability_zone.should == 'us-east-1a'
+      volume.create_time.should == 'recently'
+      volume.instance_id.should == 'i-00000000'
+      volume.snapshot_id.should == 'snap-00000000'
+      volume.volume_id.should == 'vol-00000000'
+    end
 
   end
 

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

@@ -96,7 +96,9 @@ describe 'Fog::AWS::S3::Objects' do
       file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
       object = @bucket.objects.create(:key => 'fogobjectname', :body => file)
       url = @bucket.objects.get_url('fogobjectname', Time.now + 60 * 10)
-      open(url).read.should == File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r').read
+      unless Fog.mocking?
+        open(url).read.should == File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r').read
+      end
       object.destroy
     end
 

data/spec/aws/requests/s3/get_object_spec.rb

@@ -38,7 +38,9 @@ describe 'S3.get_object' do
     it 'should return a signed expiring url' do
       url = s3.get_object_url('foggetobject', 'fog_get_object', Time.now + 60 * 10)
       file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
-      open(url).read.should == file.read
+      unless Fog.mocking?
+        open(url).read.should == file.read
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'open-uri'
 
 current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../lib/fog"
-# Fog.mock!
+Fog.mock!
 
 def credentials
   @credentials ||= begin

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
-- Wesley Beary
+- geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -07:00
+date: 2009-10-09 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,6 +172,8 @@ files:
 - lib/fog/response.rb
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
+- spec/aws/models/ec2/instance_spec.rb
+- spec/aws/models/ec2/instances_spec.rb
 - spec/aws/models/ec2/key_pair_spec.rb
 - spec/aws/models/ec2/key_pairs_spec.rb
 - spec/aws/models/ec2/security_group_spec.rb
@@ -269,6 +271,8 @@ summary: fog = clouds + you
 test_files: 
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
+- spec/aws/models/ec2/instance_spec.rb
+- spec/aws/models/ec2/instances_spec.rb
 - spec/aws/models/ec2/key_pair_spec.rb
 - spec/aws/models/ec2/key_pairs_spec.rb
 - spec/aws/models/ec2/security_group_spec.rb