fog 0.3.7 → 0.3.8

data/lib/fog/aws/elb.rb

@@ -17,7 +17,6 @@ module Fog
       class Mock
 
         def initialize(options={})
-          Fog::Mock.not_implemented
         end
 
       end
@@ -59,9 +58,10 @@ module Fog
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
+          @path       = options[:path]      || '/'
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
         end
 
         def reload
@@ -80,6 +80,7 @@ module Fog
               :aws_access_key_id  => @aws_access_key_id,
               :hmac               => @hmac,
               :host               => @host,
+              :path               => @path,
               :version            => '2009-11-25'
             }
           )

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS
@@ -32,6 +32,7 @@ module Fog
         end
 
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           data = connection.allocate_address
           @public_ip = data.body['publicIp']
           if @server

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/address'
 
 module Fog
@@ -7,19 +7,23 @@ module Fog
 
       class Addresses < Fog::Collection
 
-        attribute :public_ip
+        attribute :filters
         attribute :server
 
         model Fog::AWS::Compute::Address
 
         def initialize(attributes)
-          @public_ip ||= []
+          @filters ||= {}
           super
         end
 
-        def all(public_ip = @public_ip)
-          @public_ip = public_ip
-          data = connection.describe_addresses(public_ip).body
+        def all(filters = @filters)
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('public-ip' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'public-ip' => [*filters]}
+          end
+          @filters = filters
+          data = connection.describe_addresses(filters).body
           load(
             data['addressesSet'].map do |address|
               address.reject {|key, value| value.nil? || value.empty? }
@@ -33,10 +37,8 @@ module Fog
 
         def get(public_ip)
           if public_ip
-            all(public_ip).first
+            self.class.new(:connection => connection).all('public-ip' => public_ip).first
           end
-        rescue Fog::Errors::NotFound
-          nil
         end
 
         def new(attributes = {})

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/flavor'
 
 module Fog
@@ -11,25 +11,27 @@ module Fog
 
         def all
           data = [
-            { :bits => 0,  :cores => 2,   :disk => 0,    :id => 't1.micro',   :name => 'Micro Instance',       :ram => 613},
+            { :bits => 0,  :cores =>   2,  :disk => 0,    :id =>  't1.micro',   :name => 'Micro Instance',       :ram => 613},
 
-            { :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 =>   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 => 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 => 6.5, :disk => 420,  :id => 'm2.xlarge',  :name => 'High-Memory Extra Large',           :ram => 17510.4},
-            { :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},
+            { :bits => 64, :cores =>  6.5, :disk => 420,  :id =>  'm2.xlarge',  :name => 'High-Memory Extra Large',           :ram => 17510.4},
+            { :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},
+
+            { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552}
           ]
           load(data)
           self
         end
 
         def get(flavor_id)
-          all.detect {|flavor| flavor.id == flavor_id}
+          self.class.new(:connection => connection).all.detect {|flavor| flavor.id == flavor_id}
         end
 
       end

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS
@@ -21,6 +21,7 @@ module Fog
         attribute :ramdisk_id,            :aliases => 'ramdiskId'
         attribute :root_device_type,      :aliases => 'rootDeviceType'
         attribute :root_device_name,      :aliases => 'rootDeviceName'
+        attribute :tags,                  :aliases => 'tagSet'
 
         def deregister(delete_snapshot = false)
           connection.deregister_image(@id)

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/image'
 
 module Fog
@@ -7,27 +7,25 @@ module Fog
 
       class Images < Fog::Collection
 
-        attribute :image_id
+        attribute :filters
 
         model Fog::AWS::Compute::Image
 
         def initialize(attributes)
-          @image_id ||= []
+          @filters ||= {}
           super
         end
 
-        def all(image_id = @image_id)
-          @image_id = image_id
-          data = connection.describe_images('ImageId' => image_id).body
+        def all(filters = @filters)
+          @filters = filters
+          data = connection.describe_images(@filters).body
           load(data['imagesSet'])
         end
 
         def get(image_id)
           if image_id
-            all(image_id).first
+            self.class.new(:connection => connection).all('image-id' => image_id).first
           end
-        rescue Fog::Errors::NotFound
-          nil
         end
       end
 

data/lib/fog/aws/models/compute/key_pair.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

data/lib/fog/aws/models/compute/key_pairs.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/key_pair'
 
 module Fog
@@ -12,22 +12,24 @@ module Fog
         model Fog::AWS::Compute::KeyPair
 
         def initialize(attributes)
-          @key_name ||= []
+          @filters ||= {}
           super
         end
 
-        def all(key_name = @key_name)
-          @key_name = key_name
-          data = connection.describe_key_pairs(key_name).body
+        def all(filters = @filters)
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('key-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'key-name' => [*filters]}
+          end
+          @filters = filters
+          data = connection.describe_key_pairs(filters).body
           load(data['keySet'])
         end
 
         def get(key_name)
           if key_name
-            all(key_name).first
+            self.class.new(:connection => connection).all('key-name' => key_name).first
           end
-        rescue Fog::Errors::NotFound
-          nil
         end
 
       end

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS

data/lib/fog/aws/models/compute/security_groups.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/security_group'
 
 module Fog
@@ -7,27 +7,29 @@ module Fog
 
       class SecurityGroups < Fog::Collection
 
-        attribute :group_name
+        attribute :filters
 
         model Fog::AWS::Compute::SecurityGroup
 
         def initialize(attributes)
-          @group_name ||= []
+          @filters ||= {}
           super
         end
 
-        def all(group_name = @group_name)
-          @group_name = group_name
-          data = connection.describe_security_groups(group_name).body
+        def all(filters = @filters)
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('group-name' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'group-name' => [*filters]}
+          end
+          @filters = filters
+          data = connection.describe_security_groups(@filters).body
           load(data['securityGroupInfo'])
         end
 
         def get(group_name)
           if group_name
-            all(group_name).first
+            self.class.new(:connection => connection).all('group-name' => group_name).first
           end
-        rescue Fog::Errors::NotFound
-          nil
         end
 
       end

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS
@@ -12,6 +12,7 @@ module Fog
         attribute :ami_launch_index,      :aliases => 'amiLaunchIndex'
         attribute :availability_zone,     :aliases => 'availabilityZone'
         attribute :block_device_mapping,  :aliases => 'blockDeviceMapping'
+        attribute :client_token,          :aliases => 'clientToken'
         attribute :dns_name,              :aliases => 'dnsName'
         attribute :groups
         attribute :flavor_id,             :aliases => 'instanceType'
@@ -29,10 +30,12 @@ module Fog
         attribute :root_device_name,      :aliases => 'rootDeviceName'
         attribute :root_device_type,      :aliases => 'rootDeviceType'
         attribute :state,                 :aliases => 'instanceState'
+        attribute :state_reason,          :aliases => 'stateReason'
         attribute :subnet_id,             :aliases => 'subnetId'
+        attribute :tags,                  :aliases => 'tagSet'
         attribute :user_data
 
-        attr_accessor :password, :username
+        attr_accessor :password
         attr_writer   :private_key, :private_key_path, :public_key, :public_key_path
 
         def initialize(attributes={})
@@ -60,6 +63,7 @@ module Fog
           true
         end
 
+        remove_method :flavor_id
         def flavor_id
           @flavor && @flavor.id || @flavor_id
         end
@@ -82,6 +86,7 @@ module Fog
           @key_name = new_keypair && new_keypair.name
         end
 
+        remove_method :monitoring=
         def monitoring=(new_monitoring)
           if new_monitoring.is_a?(Hash)
             @monitoring = new_monitoring['state']
@@ -124,10 +129,12 @@ module Fog
         end
 
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :image_id
 
           options = {
             'BlockDeviceMapping'          => block_device_mapping,
+            'ClientToken'                 => client_token,
             'InstanceType'                => flavor_id,
             'KernelId'                    => kernel_id,
             'KeyName'                     => key_name,
@@ -191,12 +198,12 @@ module Fog
 
         def volumes
           requires :id
-
           connection.volumes(:server => self)
         end
 
         private
 
+        remove_method :state=
         def state=(new_state)
           if new_state.is_a?(Hash)
             @state = new_state['name']

data/lib/fog/aws/models/compute/servers.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/server'
 
 module Fog
@@ -7,18 +7,24 @@ module Fog
 
       class Servers < Fog::Collection
 
+        attribute :filters
+
         attribute :server_id
 
         model Fog::AWS::Compute::Server
 
         def initialize(attributes)
-          @server_id ||= []
+          @filters ||= {}
           super
         end
 
-        def all(server_id = @server_id)
-          @server_id = server_id
-          data = connection.describe_instances(server_id).body
+        def all(filters = @filters)
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('instance-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'instance-id' => [*filters]}
+          end
+          @filters = filters
+          data = connection.describe_instances(filters).body
           load(
             data['reservationSet'].map do |reservation|
               reservation['instancesSet'].map do |instance|
@@ -42,13 +48,13 @@ module Fog
 
           # make sure port 22 is open in the first security group
           security_group = connection.security_groups.get(server.groups.first)
-          ip_permission = security_group.ip_permissions.detect do |ip_permission|
+          authorized = security_group.ip_permissions.detect do |ip_permission|
             ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
             ip_permission['fromPort'] == 22 &&
             ip_permission['ipProtocol'] == 'tcp' &&
             ip_permission['toPort'] == 22
           end
-          unless ip_permission
+          unless authorized
             security_group.authorize_port_range(22..22)
           end
 
@@ -60,7 +66,7 @@ module Fog
 
         def get(server_id)
           if server_id
-            all(server_id).first
+            self.class.new(:connection => connection).all('instance-id' => server_id).first
           end
         rescue Fog::Errors::NotFound
           nil

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module AWS
@@ -15,6 +15,7 @@ module Fog
         attribute :created_at,  :aliases => 'startTime'
         attribute :owner_id,    :aliases => 'ownerId'
         attribute :state,       :aliases => 'status'
+        attribute :tags,        :aliases => 'tagSet'
         attribute :volume_id,   :aliases => 'volumeId'
         attribute :volume_size, :aliases => 'volumeSize'
 
@@ -30,6 +31,7 @@ module Fog
         end
 
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :volume_id
 
           data = connection.create_snapshot(@volume_id, @description).body
@@ -40,7 +42,6 @@ module Fog
 
         def volume
           requires :id
-
           connection.describe_volumes(@volume_id)
         end
 

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/aws/models/compute/snapshot'
 
 module Fog
@@ -7,26 +7,23 @@ module Fog
 
       class Snapshots < Fog::Collection
 
-        attribute :owner,         :aliases => 'Owner'
-        attribute :restorable_by, :aliases => 'RestorableBy'
-        attribute :snapshot_id
+        attribute :filters
         attribute :volume
 
         model Fog::AWS::Compute::Snapshot
 
         def initialize(attributes)
-          @snapshot_id ||= []
+          @filters ||= { 'RestorableBy' => 'self' }
           super
         end
 
-        def all(snapshot_id = @snapshot_id, options = {})
-          options = {
-            'Owner' => @owner || 'self',
-            'RestorableBy' => @restorable_by
-          }
-          options = options.reject {|key,value| value.nil? || value.to_s.empty?}
-          merge_attributes(options)
-          data = connection.describe_snapshots(snapshot_id).body
+        def all(filters = @filters, options = {})
+          unless filters.is_a?(Hash)
+            Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
+            filters = {'snapshot-id' => [*filters]}
+          end
+          @filters = filters
+          data = connection.describe_snapshots(filters.merge!(options)).body
           load(data['snapshotSet'])
           if volume
             self.replace(self.select {|snapshot| snapshot.volume_id == volume.id})
@@ -36,10 +33,8 @@ module Fog
 
         def get(snapshot_id)
           if snapshot_id
-            all(snapshot_id).first
+            self.class.new(:connection => connection).all('snapshot-id' => snapshot_id).first
           end
-        rescue Fog::Errors::NotFound
-          nil
         end
 
         def new(attributes = {})