fog 0.0.39 → 0.0.40

data/lib/fog.rb

@@ -40,11 +40,14 @@ module Fog
 
   def self.credentials(key = :default)
     @credentials ||= begin
-      credentials = {}
-      File.open(File.expand_path('~/.fog')) do |file|
-        credentials = YAML.load(file.read)[key]
+      path = File.expand_path('~/.fog')
+      if File.exists?(path)
+        File.open(path) do |file|
+          YAML.load(file.read)[key]
+        end
+      else
+        nil
       end
-      credentials
     end
   end
 

data/lib/fog/aws/ec2.rb

@@ -22,12 +22,16 @@ module Fog
       def self.reload
         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/flavor.rb"
+        load "fog/aws/models/ec2/flavors.rb"
+        load "fog/aws/models/ec2/image.rb"
+        load "fog/aws/models/ec2/images.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"
         load "fog/aws/models/ec2/security_groups.rb"
+        load "fog/aws/models/ec2/server.rb"
+        load "fog/aws/models/ec2/servers.rb"
         load "fog/aws/models/ec2/snapshot.rb"
         load "fog/aws/models/ec2/snapshots.rb"
         load "fog/aws/models/ec2/volume.rb"

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

@@ -6,7 +6,7 @@ module Fog
 
         identity  :public_ip,   'publicIp'
 
-        attribute :instance_id, 'instanceId'
+        attribute :server_id, 'instanceId'
 
         def destroy
           requires :public_ip
@@ -15,9 +15,9 @@ module Fog
           true
         end
 
-        def instance=(new_instance)
-          if new_instance
-            associate(new_instance)
+        def server=(new_server)
+          if new_server
+            associate(new_server)
           else
             disassociate
           end
@@ -26,27 +26,27 @@ module Fog
         def save
           data = connection.allocate_address
           @public_ip = data.body['publicIp']
-          if @instance
-            self.instance = @instance
+          if @server
+            self.server = @server
           end
           true
         end
 
         private
 
-        def associate(new_instance)
+        def associate(new_server)
           if new_record?
-            @instance = new_instance
+            @server = new_server
           else
-            @instance = nil
-            @instance_id = new_instance.id
-            connection.associate_address(@instance_id, @public_ip)
+            @server = nil
+            @server_id = new_server.id
+            connection.associate_address(@server_id, @public_ip)
           end
         end
 
         def disassociate
-          @instance = nil
-          @instance_id = nil
+          @server = nil
+          @server_id = nil
           unless new_record?
             connection.disassociate_address(@public_ip)
           end

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

@@ -11,7 +11,7 @@ module Fog
       class Addresses < Fog::Collection
 
         attribute :public_ip
-        attribute :instance
+        attribute :server
 
         model Fog::AWS::EC2::Address
 
@@ -31,8 +31,8 @@ module Fog
           data['addressesSet'].each do |address|
             addresses << new(address.reject {|key, value| value.nil? || value.empty? })
           end
-          if instance
-            addresses = addresses.select {|address| address.instance_id == instance.id}
+          if server
+            addresses = addresses.select {|address| address.instance_id == server.id}
           end
           self.replace(addresses)
         end
@@ -46,8 +46,8 @@ module Fog
         end
 
         def new(attributes = {})
-          if instance
-            super({ :instance => instance }.merge!(attributes))
+          if server
+            super({ :server => server }.merge!(attributes))
           else
             super(attributes)
           end

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

@@ -0,0 +1,19 @@
+module Fog
+  module AWS
+    class EC2
+
+      class Flavor < Fog::Model
+
+        identity :id
+
+        attribute :bits
+        attribute :cores
+        attribute :disk
+        attribute :name
+        attribute :ram
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Fog
+  module AWS
+    class EC2
+
+      def flavors
+        Fog::AWS::EC2::Flavors.new(:connection => self)
+      end
+
+      class Flavors < Fog::Collection
+
+        model Fog::AWS::EC2::Flavor
+
+        def all
+          if @loaded
+            clear
+          end
+          @loaded = true
+          data = [
+            { :bits => 32, :cores => 1, :disk => 160,  :id => 'm1.small',  :name => 'Small Instance',       :ram => 1740.8},
+            { :bits => 64, :cores => 4, :disk => 850,  :id => 'm1.large',  :name => 'Large Instance',       :ram => 7680},
+            { :bits => 64, :cores => 8, :disk => 1690, :id => 'm1.xlarge', :name => 'Extra Large Instance', :ram => 15360},
+
+            { :bits => 32, :cores =>  5, :disk => 350,  :id => 'c1.medium', :name => 'High-CPU Medium',      :ram => 1740.8},
+            { :bits => 64, :cores => 20, :disk => 1690, :id => 'c1.xlarge', :name => 'High-CPU Extra Large', :ram => 7168},
+
+            { :bits => 64, :cores => 13, :disk => 850,  :id => 'm2.2xlarge', :name => 'High Memory Double Extra Large',    :ram => 35020.8},
+            { :bits => 64, :cores => 26, :disk => 1690, :id => 'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
+          ]
+          for flavor in data
+            self << new(flavor)
+          end
+          self
+        end
+
+        def get(flavor_id)
+          all.detect {|flavor| flavor.id = flavor_id}
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Fog
+  module AWS
+    class EC2
+
+      class Image < Fog::Model
+
+        identity :id,             'imageId'
+
+        attribute :architecture
+        attribute :location,      'imageLocation'
+        attribute :owner_id,      'imageOwnerId'
+        attribute :state,         'imageState'
+        attribute :type,          'imageType'
+        attribute :is_public,     'isPublic'
+        attribute :kernel_id,     'kernelId'
+        attribute :platform
+        attribute :product_codes, 'productCodes'
+        attribute :ramdisk_id,    'ramdiskId'
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Fog
+  module AWS
+    class EC2
+
+      def images
+        Fog::AWS::EC2::Images.new(:connection => self)
+      end
+
+      class Images < Fog::Collection
+
+        attribute :image_id
+
+        model Fog::AWS::EC2::Image
+
+        def initialize(attributes)
+          @image_id ||= []
+          super
+        end
+
+        def all(image_id = @image_id)
+          @image_id = image_id
+          if @loaded
+            clear
+          end
+          @loaded = true
+          data = connection.describe_images('ImageId' => image_id).body
+          data['imagesSet'].each do |image|
+            self << new(image)
+          end
+          self
+        end
+
+        def get(image_id)
+          if image_id
+            all(image_id).first
+          end
+        rescue Excon::Errors::BadRequest
+          nil
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/aws/models/ec2/{instance.rb → server.rb}

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class EC2
 
-      class Instance < Fog::Model
+      class Server < Fog::Model
 
         identity  :id,                'instanceId'
 
@@ -12,10 +12,10 @@ module Fog
         attribute :group_id,          'groupId'
         attribute :image_id,          'imageId'
         attribute :state,             'instanceState'
-        attribute :type,              'instanceType'
+        attribute :flavor_id,            'instanceType'
         attribute :kernel_id,         'kernelId'
         attribute :key_name,          'keyName'
-        attribute :launch_time,       'launchTime'
+        attribute :created_at,        'launchTime'
         attribute :monitoring
         attribute :product_codes,     'productCodes'
         attribute :private_dns_name,  'privateDnsName'
@@ -26,7 +26,7 @@ module Fog
         def addresses
           requires :id
 
-          connection.addresses(:instance => self)
+          connection.addresses(:server => self)
         end
 
         def destroy
@@ -44,6 +44,18 @@ module Fog
         #   @group_id = new_security_group.name
         # end
 
+        def flavor_id
+          @flavor && @flavor.id || 'm1.small'
+        end
+
+        def flavor=(new_flavor)
+          @flavor = new_flavor
+        end
+
+        def flavor
+          @flavor || connection.flavors.all.detect {|flavor| flavor.id == @flavor_id}
+        end
+
         def key_pair
           requires :key_name
 
@@ -70,9 +82,12 @@ module Fog
           end
         end
 
+        def ready?
+          @state == 'running'
+        end
+
         def reboot
           requires :id
-
           connection.reboot_instances(@id)
           true
         end
@@ -80,16 +95,13 @@ module Fog
         def save
           requires :image_id
 
-          options = {}
+          options = {'InstanceType' => flavor}
           if @availability_zone
             options['Placement.AvailabilityZone'] = @availability_zone
           end
           if @group_id
             options['SecurityGroup'] = @group_id
           end
-          if @type
-            options['InstanceType'] = @type
-          end
           if @kernel_id
             options['KernelId'] = @kernel_id
           end
@@ -113,7 +125,7 @@ module Fog
         def volumes
           requires :id
 
-          connection.volumes(:instance => self)
+          connection.volumes(:server => self)
         end
 
         private

data/lib/fog/aws/models/ec2/{instances.rb → servers.rb}

@@ -2,28 +2,28 @@ module Fog
   module AWS
     class EC2
 
-      def instances
-        Fog::AWS::EC2::Instances.new(:connection => self)
+      def servers
+        Fog::AWS::EC2::Servers.new(:connection => self)
       end
 
-      class Instances < Fog::Collection
+      class Servers < Fog::Collection
 
-        attribute :instance_id
+        attribute :server_id
 
-        model Fog::AWS::EC2::Instance
+        model Fog::AWS::EC2::Server
 
         def initialize(attributes)
-          @instance_id ||= []
+          @server_id ||= []
           super
         end
 
-        def all(instance_id = @instance_id)
-          @instance_id = instance_id
+        def all(server_id = @server_id)
+          @server_id = server_id
           if @loaded
             clear
           end
           @loaded = true
-          data = connection.describe_instances(instance_id).body
+          data = connection.describe_instances(server_id).body
           data['reservationSet'].each do |reservation|
             reservation['instancesSet'].each do |instance|
               self << new(instance)
@@ -32,9 +32,9 @@ module Fog
           self
         end
 
-        def get(instance_id)
-          if instance_id
-            all(instance_id).first
+        def get(server_id)
+          if server_id
+            all(server_id).first
           end
         rescue Excon::Errors::BadRequest
           nil

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

@@ -7,9 +7,9 @@ module Fog
         identity  :id, 'snapshotId'
 
         attribute :progress
-        attribute :start_time,  'startTime'
+        attribute :created_at,  'startTime'
         attribute :status
-        attribute :volume_id,    'volumeId'
+        attribute :volume_id,   'volumeId'
 
         def destroy
           requires :id

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

@@ -6,11 +6,11 @@ module Fog
 
         identity  :id,         'volumeId'
 
-        attribute :attach_time,       'attachTime'
+        attribute :attached_at,       'attachTime'
         attribute :availability_zone, 'availabilityZone'
-        attribute :create_time,       'createTime'
+        attribute :created_at,        'createTime'
         attribute :device
-        attribute :instance_id,       'instanceId'
+        attribute :server_id,         'instanceId'
         attribute :size
         attribute :snapshot_id,       'snapshotId'
         attribute :status
@@ -29,9 +29,9 @@ module Fog
           true
         end
 
-        def instance=(new_instance)
-          if new_instance
-            attach(new_instance)
+        def server=(new_server)
+          if new_server
+            attach(new_server)
           else
             detach
           end
@@ -43,8 +43,8 @@ module Fog
           data = connection.create_volume(@availability_zone, @size, @snapshot_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
-          if @instance
-            self.instance = @instance
+          if @server
+            self.server = @server
           end
           true
         end
@@ -57,20 +57,20 @@ module Fog
 
         private
 
-        def attach(new_instance)
+        def attach(new_server)
           if new_record?
-            @instance = new_instance
-            @availability_zone = new_instance.availability_zone
-          elsif new_instance
-            @instance = nil
-            @instance_id = new_instance.id
-            connection.attach_volume(@instance_id, @id, @device)
+            @server = new_server
+            @availability_zone = new_server.availability_zone
+          elsif new_server
+            @server = nil
+            @server_id = new_server.id
+            connection.attach_volume(@server_id, @id, @device)
           end
         end
 
         def detach
-          @instance = nil
-          @instance_id = nil
+          @server = nil
+          @server_id = nil
           unless new_record?
             connection.detach_volume(@id)
           end