fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/fog.gemspec

@@ -6,8 +6,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-maestrodev'
-  s.version           = '1.15.0.20130927082724'
-  s.date              = '2013-09-27'
+  s.version           = '1.18.0.20131111203459'
+  s.date              = '2013-11-11'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.25.0')
+  s.add_dependency('excon', '~>0.28.0')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')
@@ -50,11 +50,10 @@ Gem::Specification.new do |s|
   s.add_dependency('net-ssh', '>=2.1.3')
   s.add_dependency('nokogiri', '~>1.5')
   s.add_dependency('ruby-hmac')
-  s.add_dependency('unicode', "~> 0.4.4")
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('jekyll')
+  s.add_development_dependency('jekyll') unless RUBY_PLATFORM == 'java'
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
   s.add_development_dependency('yard')
@@ -65,9 +64,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency('fission')
   s.add_development_dependency('pry')
   s.add_development_dependency('google-api-client', '~>0.6.2')
-  s.add_development_dependency('vcr', '~>2.5.0')
-  s.add_development_dependency('webmock', '~>1.11.0')
-#  s.add_development_dependency('ruby-libvirt','~>0.4.0')
+  s.add_development_dependency('unf')
+  if ENV["FOG_USE_LIBVIRT"] && RUBY_PLATFORM != 'java'
+    s.add_development_dependency('ruby-libvirt','~>0.4.0')
+  end
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

data/lib/fog/atmos/models/storage/file.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :content_length,  :aliases => ['bytes', 'Content-Length'], :type => :integer
         attribute :content_type,    :aliases => ['content_type', 'Content-Type']
         attribute :objectid,        :aliases => :ObjectID
+        attribute :created_at,      :aliases => :ctime
 
         def body
           attributes[:body] ||= if objectid
@@ -42,14 +43,15 @@ module Fog
           true
         end
 
-        # def owner=(new_owner)
-        #   if new_owner
-        #     attributes[:owner] = {
-        #       :display_name => new_owner['DisplayName'],
-        #       :id           => new_owner['ID']
-        #     }
-        #   end
-        # end
+        def meta_data
+         requires :directory, :key
+          service.get_namespace([directory.key, key].join('/') + "?metadata/system")
+        end
+
+        def file_size
+          data = meta_data
+          meta_data.headers["x-emc-meta"].match(/size=\d+/).to_s.gsub(/size=/,"")
+        end
 
         def public=(new_public)
           # NOOP - we don't need to flag files as public, getting the public URL for a file handles it.

data/lib/fog/atmos/models/storage/files.rb

@@ -24,6 +24,11 @@ module Fog
           data[:DirectoryEntry] = [data[:DirectoryEntry]] if data[:DirectoryEntry].kind_of? Hash
           files = data[:DirectoryEntry].select {|de| de[:FileType] == 'regular'}
           files.each do |s|
+            data = service.head_namespace(directory.key + s[:Filename], :parse => false)
+            headers = Hash[data.headers["x-emc-meta"].split(", ").collect{|s|s.split("=")}]
+            s[:content_length] = data.headers["Content-Length"]
+            s[:content_type] = data.headers["Content-Type"]
+            s[:created_at] = headers["ctime"]
             s[:directory] = directory
           end
           # TODO - Load additional file meta?

data/lib/fog/atmos/storage.rb

@@ -155,6 +155,10 @@ module Fog
           signature = Base64.encode64( digest ).chomp()
           params[:headers]["x-emc-signature"] = signature
 
+          params.delete(:host) #invalid excon request parameter
+
+          parse = params.delete(:parse)        
+        
           begin
             response = @connection.request(params, &block)
           rescue Excon::Errors::HTTPStatusError => error
@@ -166,7 +170,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            if params[:parse]
+            if parse
               document = Fog::ToHashDocument.new
               parser = Nokogiri::XML::SAX::PushParser.new(document)
               parser << response.body

data/lib/fog/aws/auto_scaling.rb

@@ -148,7 +148,6 @@ module Fog
               :expects    => 200,
               :idempotent => idempotent,
               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-              :host       => @host,
               :method     => 'POST',
               :parser     => parser
             })

data/lib/fog/aws/cloud_formation.rb

@@ -103,7 +103,6 @@ module Fog
               :expects    => 200,
               :idempotent => idempotent,
               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-              :host       => @host,
               :method     => 'POST',
               :parser     => parser
             })

data/lib/fog/aws/cloud_watch.rb

@@ -155,7 +155,6 @@ module Fog
             :expects    => 200,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
             :idempotent => idempotent,
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/compute.rb

@@ -223,7 +223,6 @@ module Fog
                 :subnets => [],
                 :vpcs => [],
                 :dhcp_options => [],
-                :internet_gateways => [],
                 :route_tables => [],
                 :account_attributes => [
                   {
@@ -372,7 +371,7 @@ module Fog
           @region                 = options[:region] ||= 'us-east-1'
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.compute'
-          @version                = options[:version]     ||  '2012-12-01'
+          @version                = options[:version]     ||  '2013-10-01'
 
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
@@ -437,7 +436,6 @@ module Fog
               :expects    => 200,
               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
               :idempotent => idempotent,
-              :host       => @host,
               :method     => 'POST',
               :parser     => parser
             })

data/lib/fog/aws/data_pipeline.rb

@@ -92,7 +92,6 @@ module Fog
           # Params for all DataPipeline requests
           params.merge!({
             :expects => 200,
-            :host => @host,
             :method => :post,
             :path => '/',
           })

data/lib/fog/aws/elb.rb

@@ -31,10 +31,12 @@ module Fog
       request :deregister_instances_from_load_balancer
       request :describe_instance_health
       request :describe_load_balancers
+      request :describe_load_balancer_attributes
       request :describe_load_balancer_policies
       request :describe_load_balancer_policy_types
       request :disable_availability_zones_for_load_balancer
       request :enable_availability_zones_for_load_balancer
+      request :modify_load_balancer_attributes
       request :register_instances_with_load_balancer
       request :set_load_balancer_listener_ssl_certificate
       request :set_load_balancer_policies_of_listener
@@ -189,7 +191,6 @@ module Fog
             :expects    => 200,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
             :idempotent => idempotent,
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/iam.rb

@@ -88,6 +88,10 @@ module Fog
             hash[key] = {
               :owner_id => Fog::AWS::Mock.owner_id,
               :server_certificates => {},
+              :access_keys => [{
+                "Status" => "Active",
+                "AccessKeyId" => key
+              }],
               :users => Hash.new do |uhash, ukey|
                 uhash[ukey] = {
                   :user_id     => Fog::AWS::Mock.key_id,
@@ -102,7 +106,9 @@ module Fog
                 ghash[gkey] = {
                   :group_id   => Fog::AWS::Mock.key_id,
                   :arn        => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:group/#{gkey}",
-                  :members    => []
+                  :members    => [],
+                  :created_at  => Time.now,
+                  :policies    => {}
                 }
               end
             }
@@ -203,7 +209,6 @@ module Fog
             :expects    => 200,
             :idempotent => idempotent,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -25,7 +25,7 @@ module Fog
         attribute :vpc_zone_identifier,       :aliases => 'VPCZoneIdentifier'
 
         def initialize(attributes={})
-          attributes['Instances'] = []
+          self.instances = []
           self.default_cooldown = 300
           self.desired_capacity = 0
           self.enabled_metrics = []
@@ -35,7 +35,7 @@ module Fog
           self.max_size = 0
           self.min_size = 0
           self.suspended_processes = []
-          self.tags = []
+          self.tags = {}
           self.termination_policies = ['Default']
           super
         end

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

@@ -30,7 +30,7 @@ module Fog
         def destroy
           requires :id
 
-          service.delete_route_table (id)
+          service.delete_route_table(id)
           true
         end
 

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

@@ -12,6 +12,7 @@ module Fog
 
         attr_accessor :architecture
         attribute :ami_launch_index,         :aliases => 'amiLaunchIndex'
+        attribute :associate_public_ip,      :aliases => 'associatePublicIP'
         attribute :availability_zone,        :aliases => 'availabilityZone'
         attribute :block_device_mapping,     :aliases => 'blockDeviceMapping'
         attribute :network_interfaces,       :aliases => 'networkInterfaces'
@@ -64,7 +65,7 @@ module Fog
           prepare_service_value(attributes)
 
           self.image_id   ||= begin
-            self.username = 'ubuntu'
+            self.username ||= 'ubuntu'
             case @service.instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
             when 'ap-northeast-1'
               'ami-5e0fa45f'
@@ -172,6 +173,20 @@ module Fog
           # use of Security Group Ids when working in a VPC.
           if subnet_id
             options.delete('SecurityGroup')
+            if associate_public_ip
+              options['NetworkInterface.0.DeviceIndex'] = 0
+              options['NetworkInterface.0.AssociatePublicIpAddress'] = associate_public_ip
+              options['NetworkInterface.0.SubnetId'] = options['SubnetId']
+              options.delete('SubnetId')
+              if options['SecurityGroupId'].kind_of?(Array)
+                options['SecurityGroupId'].each {|id|
+                  options["NetworkInterface.0.SecurityGroupId.#{options['SecurityGroupId'].index(id)}"] = id
+                }
+              else
+                options["NetworkInterface.0.SecurityGroupId.0"] = options['SecurityGroupId']
+              end
+              options.delete('SecurityGroupId')              
+            end
           else
             options.delete('SubnetId')
           end

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

@@ -42,7 +42,7 @@ module Fog
           self.groups ||= ["default"]
           self.flavor_id ||= 't1.micro'
           self.image_id   ||= begin
-            self.username = 'ubuntu'
+            self.username ||= 'ubuntu'
 
             # Old 'connection' is renamed as service and should be used instead
             prepare_service_value(attributes)

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -35,6 +35,16 @@ module Fog
           super
         end
 
+        def cross_zone_load_balancing?
+          requires :id
+          service.describe_load_balancer_attributes(id).body['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['CrossZoneLoadBalancing']['Enabled']
+        end
+
+        def cross_zone_load_balancing= value
+          requires :id
+          service.modify_load_balancer_attributes(id, 'CrossZoneLoadBalancing' => {'Enabled' => value})
+        end
+
         def register_instances(instances)
           requires :id
           data = service.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']

data/lib/fog/aws/models/iam/access_key.rb

@@ -14,7 +14,11 @@ module Fog
         def save
           requires :username
 
-          data = service.create_access_key('UserName'=> username).body["AccessKey"]
+          if !persisted?
+            data = service.create_access_key('UserName'=> username).body["AccessKey"]
+          else
+            data = service.update_access_key(id, status, "UserName" => username).body["AccessKey"]
+          end
           merge_attributes(data)
           true
         end

data/lib/fog/aws/models/iam/access_keys.rb

@@ -11,7 +11,6 @@ module Fog
 
         def initialize(attributes = {})
           @username = attributes[:username]
-          raise ArgumentError.new("Can't get an access_key's user without a username") unless @username
           super
         end
 

data/lib/fog/aws/parsers/compute/describe_internet_gateways.rb

@@ -26,7 +26,7 @@ module Fog
             if @in_tag_set
               case name
                 when 'item'
-                  @vpc['tagSet'][@tag['key']] = @tag['value']
+                  @internet_gateway['tagSet'][@tag['key']] = @tag['value']
                   @tag = {}
                 when 'key', 'value'
                   @tag[name] = value

data/lib/fog/aws/parsers/compute/describe_reserved_instances.rb

@@ -23,9 +23,10 @@ module Fog
               @reserved_instance = {}
             when 'requestId'
               @response[name] = value
-            when 'start'
+            when 'start','end'
               @reserved_instance[name] = Time.parse(value)
             end
+
           end
 
         end

data/lib/fog/aws/parsers/compute/run_instances.rb

@@ -74,6 +74,8 @@ module Fog
               @response[name] = value
             when 'ebsOptimized'
               @instance['ebsOptimized'] = (value == 'true')
+            when 'associatePublicIP'
+              @instance['associatePublicIP'] = (value == 'true')              
             end
           end
 

data/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DescribeLoadBalancerAttributes < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DescribeLoadBalancerAttributesResult' => { 'LoadBalancerAttributes' => {} }, 'ResponseMetadata' => {} }
+            @stack = []
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name 
+            when 'CrossZoneLoadBalancing'
+              @cross_zone_load_balancing = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Enabled'
+              if @cross_zone_load_balancing
+                @cross_zone_load_balancing['Enabled'] = value == 'true' ? true : false
+              end
+            when 'CrossZoneLoadBalancing'
+              @response['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['CrossZoneLoadBalancing'] = @cross_zone_load_balancing
+              @cross_zone_load_balancing = nil
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/iam/get_group_policy.rb

@@ -7,15 +7,21 @@ module Fog
         # http://docs.amazonwebservices.com/IAM/latest/APIReference/API_GetGroupPolicy.html
 
           def reset
-            @response = {}
+            @response = { 'Policy' => {} }
           end
 
           def end_element(name)
             case name
-            when 'GroupName', 'PolicyName', 'PolicyDocument'
-              @response[name] = @value
+            when 'GroupName', 'PolicyName'
+              @response[name] = value
+            when 'PolicyDocument'
+              @response['Policy'][name] = if decoded_string = URI.decode(value)
+                                  Fog::JSON.decode(decoded_string) rescue value
+                                else
+                                  value
+                                end
             when 'RequestId'
-              @response[name] = @value
+              @response[name] = value
             end
           end
 

data/lib/fog/aws/parsers/storage/get_bucket_tagging.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Parsers
+    module Storage
+      module AWS
+
+        class GetBucketTagging < Fog::Parsers::Base
+
+          def reset
+            @in_tag = {}
+            @response = {'BucketTagging' => {}}
+          end
+
+          def start_element(name, *args)
+            super
+            if name == 'Tag'
+              @in_tag = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Tag'
+              @response['BucketTagging'].merge!(@in_tag)
+              @in_tag = {}
+            when 'Key'
+              @in_tag[value] = nil
+            when 'Value'
+              @in_tag = {@in_tag.keys.first => value}
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/rds.rb

@@ -215,7 +215,6 @@ module Fog
               :expects    => 200,
               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
               :idempotent => idempotent,
-              :host       => @host,
               :method     => 'POST',
               :parser     => parser
             })

data/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb

@@ -72,16 +72,17 @@ module Fog
           if load_balancer_names = options.delete('LoadBalancerNames')
             options.merge!(AWS.indexed_param('LoadBalancerNames.member.%d', [*load_balancer_names]))
           end
+          
           if tags = options.delete('Tags')
-            tags.each_with_index do |tag, i|
-              tag.each do |key, value|
-                options["Tags.member.#{i+1}.#{key}"] = value unless value.nil?
-              end
+            tags.each_with_index do |(key, value), i|
+              options["Tags.member.#{i+1}.Key"] = key.to_s # turns symbol into string
+              options["Tags.member.#{i+1}.Value"] = value
             end
           end
           if termination_policies = options.delete('TerminationPolicies')
             options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
           end
+          
           request({
             'Action'                  => 'CreateAutoScalingGroup',
             'AutoScalingGroupName'    => auto_scaling_group_name,

data/lib/fog/aws/requests/compute/copy_image.rb

@@ -26,7 +26,7 @@ module Fog
             'Action'          => 'CopyImage',
             'SourceImageId'   => source_image_id,
             'SourceRegion'    => source_region,
-            'Name'            => source_region,
+            'Name'            => name,
             'Description'     => description,
             'ClientToken'     => client_token,
             :parser           => Fog::Parsers::Compute::AWS::CopyImage.new

data/lib/fog/aws/requests/compute/create_internet_gateway.rb

@@ -33,16 +33,17 @@ module Fog
 
       class Mock
         def create_internet_gateway()
-        self.data[:internet_gateways].push({
-          'internetGatewayId' => Fog::AWS::Mock.request_id,
+          gateway_id = Fog::AWS::Mock.internet_gateway_id
+        self.data[:internet_gateways][gateway_id] = {
+          'internetGatewayId' => gateway_id,
           'attachmentSet'     => {},
           'tagSet'            => {}
-        })
+        }
          Excon::Response.new(
             :status => 200,
             :body   => {
               'requestId' => Fog::AWS::Mock.request_id,
-              'internetGatewaySet' => self.data[:internet_gateways]
+              'internetGatewaySet' => [self.data[:internet_gateways][gateway_id]]
             }
           )
         end

data/lib/fog/aws/requests/compute/create_tags.rb

@@ -53,6 +53,8 @@ module Fog
               'snapshot'
             when /^vol\-[a-z0-9]{8}$/i
               'volume'
+            when /^igw\-[a-z0-9]{8}$/i
+              'internet_gateway'
             end
             if type && ((type == 'image' && visible_images[resource_id]) || self.data[:"#{type}s"][resource_id])
               { 'resourceId' => resource_id, 'resourceType' => type }

data/lib/fog/aws/requests/compute/create_volume.rb

@@ -22,7 +22,7 @@ module Fog
         #     * 'createTime'<~Time> - Timestamp for creation
         #     * 'size'<~Integer> - Size in GiBs for volume
         #     * 'snapshotId'<~String> - Snapshot volume was created from, if any
-        #     * 'status's<~String> - State of volume
+        #     * 'status'<~String> - State of volume
         #     * 'volumeId'<~String> - Reference to volume
         #     * 'volumeType'<~String> - Type of volume
         #     * 'iops'<~Integer> - Number of IOPS the volume supports

data/lib/fog/aws/requests/compute/delete_internet_gateway.rb

@@ -30,7 +30,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if internet_gateway_id
               response.status = 200
-              self.data[:internet_gateways].reject! { |v| v['internetGatewayId'] == internet_gateway_id }
+              self.data[:internet_gateways].delete(internet_gateway_id)
             
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/aws/requests/compute/describe_internet_gateways.rb

@@ -40,7 +40,7 @@ module Fog
 
       class Mock
         def describe_internet_gateways(filters = {})
-          internet_gateways = self.data[:internet_gateways]
+          internet_gateways = self.data[:internet_gateways].values
 
           if filters['internet-gateway-id']
             internet_gateways = internet_gateways.reject {|internet_gateway| internet_gateway['internetGatewayId'] != filters['internet-gateway-id']}

data/lib/fog/aws/requests/compute/describe_reserved_instances.rb

@@ -25,6 +25,7 @@ module Fog
         #       * 'start'<~Time> - start time for reservation
         #       * 'state'<~String> - state of reserved instance purchase, in .[pending-payment, active, payment-failed, retired]
         #       * 'usagePrice"<~Float> - usage price of reserved instances, per hour
+        #       * 'end' - time reservation stopped being applied (i.e sold or canceled - as of version 2013/10/01)
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html]
         def describe_reserved_instances(filters = {})

data/lib/fog/aws/requests/compute/purchase_reserved_instances_offering.rb

@@ -45,6 +45,7 @@ module Fog
           self.data[:reserved_instances][reserved_instances_id] = reserved_instance_offering.merge({
             'reservedInstancesId' => reserved_instances_id,
             'start'               => Time.now,
+            'end'                 => Time.now,
             'instanceCount'       => instance_count,
             'state'               => 'payment-pending',
             'tagSet'              => []

data/lib/fog/aws/requests/compute/run_instances.rb

@@ -141,6 +141,7 @@ module Fog
             instance_id = Fog::AWS::Mock.instance_id
             instance = {
               'amiLaunchIndex'      => i,
+              'associatePublicIP'   => options['associatePublicIP'] || false,
               'architecture'        => 'i386',
               'blockDeviceMapping'  => [],
               'clientToken'         => options['clientToken'],
@@ -155,7 +156,7 @@ module Fog
               'keyName'             => options['KeyName'],
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone(@region), 'groupName' => nil, 'tenancy' => 'default' },
+              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone(@region), 'groupName' => nil, 'tenancy' => options['Placement.Tenancy'] || 'default' },
               'privateDnsName'      => nil,
               'productCodes'        => [],
               'reason'              => nil,

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -121,6 +121,7 @@ module Fog
             },
             'Instances' => [],
             'ListenerDescriptions' => listeners,
+            'LoadBalancerAttributes' => {'CrossZoneLoadBalancing' => {'Enabled' => false}},
             'LoadBalancerName' => lb_name,
             'Policies' => {
               'AppCookieStickinessPolicies' => [],