fog 0.7.1 → 0.7.2

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

@@ -31,10 +31,28 @@ module Fog
           new_attributes = data.reject {|key,value| !['keyFingerprint', 'keyMaterial', 'keyName'].include?(key)}
           merge_attributes(new_attributes)
           true
+
+        end
+
+        def write(path="#{ENV['HOME']}/.ssh/fog_#{Fog.credential.to_s}_#{name}.pem")
+          
+          if writable?
+            split_private_key = private_key.split(/\n/)
+            File.open(path, "w") do |f|
+              split_private_key.each {|line| f.puts line}
+              f.chmod 0600
+            end
+            "Key file built: #{path}"
+          else
+            "Invalid private key"
+          end
         end
 
-        private
+        def writable?
+          !!(private_key && ENV.has_key?('HOME'))
+        end
 
+          private
       end
 
     end

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

@@ -82,7 +82,7 @@ module Fog
         def key_pair
           requires :key_name
 
-          connection.keypairs.all(key_name).first
+          connection.key_pairs.all(key_name).first
         end
 
         def key_pair=(new_keypair)
@@ -218,24 +218,18 @@ module Fog
         #I tried to call it monitoring= and be smart with attributes[]
         #but in #save a merge_attribute is called after run_instance
         #thus making an un-necessary request. Use this until finding a clever solution
-        def monitor=(boolean)
-
-          #we don't have a server yet. the status silently goes in the attributes for run_instances
-          if !identity
-            self.monitoring=boolean
-          end
-
-          case boolean
+        def monitor=(new_monitor)
+          if identity
+            case new_monitor
             when true
               response = connection.monitor_instances(identity)
             when false
               response = connection.unmonitor_instances(identity)
             else
               raise ArgumentError.new("only Boolean allowed here")
+            end
           end
-
-          #set the attribute, there is only one instance_id here
-          response.body['instancesSet'][0]['monitoring'] == 'enabled' ? self.monitoring=true : self.monitoring=false
+          self.monitoring = new_monitor
         end
 
       end

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

@@ -61,7 +61,7 @@ module Fog
         end
 
         def public_ip_address
-          addresses.first
+          addresses['public'].first
         end
 
         def public_key_path
@@ -98,8 +98,8 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :addresses, :identity, :public_key, :username
-          Fog::SSH.new(addresses['public'].first, username, credentials).run([
+          requires :public_ip_address, :identity, :public_key, :username
+          Fog::SSH.new(public_ip_address, username, credentials).run([
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l #{username}},
@@ -112,19 +112,19 @@ module Fog
         end
 
         def ssh(commands)
-          requires :addresses, :identity, :username
+          requires :public_ip_address, :identity, :username
 
           options = {}
           options[:key_data] = [private_key] if private_key
-          Fog::SSH.new(addresses['public'].first, username, options).run(commands)
+          Fog::SSH.new(public_ip_address, username, options).run(commands)
         end
 
         def scp(local_path, remote_path)
-          requires :addresses, :username
+          requires :public_ip_address, :username
 
           options = {}
           options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(addresses['public'].first, username, options).upload(local_path, remote_path)
+          Fog::SCP.new(public_ip_address, username, options).upload(local_path, remote_path)
         end
 
         def username

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

@@ -43,6 +43,10 @@ module Fog
             instance = @data[:instances][instance_id]
             volume = @data[:volumes][volume_id]
             if instance && volume
+              unless volume['status'] == 'available'
+                raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable")
+              end
+
               data = {
                 'attachTime'  => Time.now,
                 'device'      => device,

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

@@ -20,7 +20,7 @@ module Fog
           request(
             'Action'            => 'CreateSecurityGroup',
             'GroupName'         => name,
-            'GroupDescription'  => CGI.escape(description),
+            'GroupDescription'  => description,
             :parser             => Fog::Parsers::AWS::Compute::Basic.new
           )
         end
@@ -33,8 +33,8 @@ module Fog
           response = Excon::Response.new
           unless @data[:security_groups][name]
             data = {
-              'groupDescription'  => CGI.escape(description).gsub('%20', '+'),
-              'groupName'         => CGI.escape(name).gsub('%20', '+'),
+              'groupDescription'  => description,
+              'groupName'         => name,
               'ipPermissions'     => [],
               'ownerId'           => @owner_id
             }

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

@@ -62,6 +62,8 @@ module Fog
             @data[:tags][key] ||= {}
             @data[:tags][key][value] ||= []
             @data[:tags][key][value] = @data[:tags][key][value] & tagged
+            
+            tagged.each {|resource| @data[:"#{resource['resourceType']}s"][resource['resourceId']]['tagSet'][key] = value}
           end
 
           response = Excon::Response.new

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

@@ -38,6 +38,10 @@ module Fog
         def create_volume(availability_zone, size, snapshot_id = nil)
           response = Excon::Response.new
           if availability_zone && size
+            if snapshot_id && !@data[:snapshots][snapshot_id]
+              raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.")
+            end
+
             response.status = 200
             volume_id = Fog::AWS::Mock.volume_id
             data = {

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

@@ -37,6 +37,49 @@ module Fog
         end
 
       end
+      
+      class Mock
+        def delete_tags(resources, tags)
+          tagged = resources.map do |resource_id|
+            type = case resource_id
+            when /^ami\-[a-z0-9]{8}$/i
+              'image'
+            when /^i\-[a-z0-9]{8}$/i
+              'instance'
+            when /^snap\-[a-z0-9]{8}$/i
+              'snapshot'
+            when /^vol\-[a-z0-9]{8}$/i
+              'volume'
+            end
+            if type && @data[:"#{type}s"][resource_id]
+              { 'resourceId' => resource_id, 'resourceType' => type }
+            else
+              raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist"))
+            end
+          end
+          
+          tags.each do |key, value|
+            @data[:tags][key][value] = @data[:tags][key][value] - tagged
+          end
+          
+          tagged.each do |resource|
+            object = @data[:"#{resource['resourceType']}s"][resource['resourceId']]
+            tags.each do |key, value|
+              tagset = object['tagSet']
+              tagset.delete(key) if tagset.has_key?(key) && (value.nil? || tagset[key] == value)
+            end
+          end
+          
+          response = Excon::Response.new
+          response.status = true
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return'    => true
+          }
+          response
+        end
+      end
+      
     end
   end
 end

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

@@ -74,20 +74,16 @@ module Fog
             filters = {'instance-id' => [*filters]}
           end
 
-          if filters.keys.any? {|key| key =~ /^tag/}
-            Formatador.display_line("[yellow][WARN] describe_instances tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
-            Fog::Mock.not_implemented
-          end
-
           response = Excon::Response.new
 
           instance_set = @data[:instances].values
-
+          instance_set = apply_tag_filters(instance_set, filters)
+          
           aliases = {
             'architecture'      => 'architecture',
             'availability-zone' => 'availabilityZone',
             'client-token'      => 'clientToken',
-            'dns-token'         => 'dnsName',
+            'dns-name'         => 'dnsName',
             'group-id'          => 'groupId',
             'image-id'          => 'imageId',
             'instance-id'       => 'instanceId',

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

@@ -59,11 +59,6 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead[/] [light_black](#{caller.first})[/]")
           end
 
-          if filters.keys.any? {|key| key =~ /^tag/}
-            Formatador.display_line("[yellow][WARN] describe_snapshots tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
-            Fog::Mock.not_implemented
-          end
-
           response = Excon::Response.new
 
           snapshot_set = @data[:snapshots].values
@@ -75,6 +70,8 @@ module Fog
             Formatador.display_line("[yellow][WARN] describe_snapshots with RestorableBy is not mocked[/] [light_black](#{caller.first})[/]")
           end
 
+          snapshot_set = apply_tag_filters(snapshot_set, filters)
+          
           aliases = {
             'description' => 'description',
             'owner-id'    => 'ownerId',
@@ -85,11 +82,12 @@ module Fog
             'volume-id'   => 'volumeId',
             'volume-size' => 'volumeSize'
           }
+          
           for filter_key, filter_value in filters
             aliased_key = aliases[filter_key]
             snapshot_set = snapshot_set.reject{|snapshot| ![*filter_value].include?(snapshot[aliased_key])}
           end
-
+          
           snapshot_set.each do |snapshot|
             case snapshot['status']
             when 'in progress', 'pending'

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

@@ -50,15 +50,11 @@ module Fog
             filters = {'volume-id' => [*filters]}
           end
 
-          if filters.keys.any? {|key| key =~ /^tag/}
-            Formatador.display_line("[yellow][WARN] describe_volumes tag filters are not yet mocked[/] [light_black](#{caller.first})[/]")
-            Fog::Mock.not_implemented
-          end
-
           response = Excon::Response.new
 
           volume_set = @data[:volumes].values
-
+          volume_set = apply_tag_filters(volume_set, filters)
+          
           aliases = {
             'availability-zone' => 'availabilityZone',
             'create-time' => 'createTime',

data/lib/fog/core.rb

@@ -8,6 +8,7 @@ $LOAD_PATH.unshift __LIB_DIR__ unless
 require 'rubygems'
 require 'base64'
 require 'cgi'
+require 'uri'
 require 'excon'
 require 'fileutils'
 require 'formatador'

data/lib/fog/core/connection.rb

@@ -13,7 +13,7 @@ module Fog
       unless block_given?
         if (parser = params.delete(:parser))
           body = Nokogiri::XML::SAX::PushParser.new(parser)
-          block = lambda { |chunk| body << chunk }
+          block = lambda { |chunk, remaining, total| body << chunk }
         end
       end
 

data/lib/fog/core/credentials.rb

@@ -18,7 +18,10 @@ module Fog
 
   # @return [String] The path for configuration_file
   def self.credentials_path
-    @credential_path ||= File.expand_path(ENV["FOG_RC"] || (ENV['HOME'] && '~/.fog'))
+    @credential_path ||= begin
+      path = ENV["FOG_RC"] || (ENV['HOME'] && '~/.fog')
+      File.expand_path(path) if path
+    end
   end
 
   # @return [String] The new path for credentials file
@@ -85,6 +88,7 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :rackspace_api_key:
   :rackspace_username:
   :rackspace_servicenet:
+  :rackspace_cdn_ssl:
   :slicehost_password:
   :terremark_username:
   :terremark_password:

data/lib/fog/core/parser.rb

@@ -15,8 +15,7 @@ module Fog
       end
 
       def characters(string)
-        @value ||= ''
-        @value << string.strip
+        @value = string
       end
 
       def start_element(name, attrs = [])

data/lib/fog/core/ssh.rb

@@ -51,11 +51,10 @@ module Fog
         begin
           Net::SSH.start(@address, @username, @options) do |ssh|
             commands.each do |command|
-              escaped_command = command.sub(/'/, %{'"'"'})
-              result = Result.new(escaped_command)
+              result = Result.new(command)
               ssh.open_channel do |ssh_channel|
                 ssh_channel.request_pty
-                ssh_channel.exec(%{bash -lc '#{escaped_command}'}) do |channel, success|
+                ssh_channel.exec(command) do |channel, success|
                   unless success
                     raise "Could not execute command: #{command.inspect}"
                   end

data/lib/fog/dns/models/aws/record.rb

@@ -16,7 +16,7 @@ module Fog
         attribute :created_at,  :aliases => ['SubmittedAt']
 
         def initialize(attributes={})
-          self.ttl    ||= 3600
+          self.ttl ||= 3600
           super
         end
 

data/lib/fog/dns/models/bluebox/zone.rb

@@ -19,6 +19,7 @@ module Fog
         attribute :minimum
 
         def initialize(attributes = {})
+          self.ttl ||= 3600
           super(attributes)
         end
 

data/lib/fog/storage/models/rackspace/directory.rb

@@ -38,7 +38,13 @@ module Fog
           requires :key
           @public_url ||= begin
             begin response = connection.cdn.head_container(key)
-              response.headers['X-CDN-Enabled'] == 'True' && response.headers['X-CDN-URI']
+              if response.headers['X-CDN-Enabled'] == 'True'
+                if connection.rackspace_cdn_ssl == true
+                  response.headers['X-CDN-SSL-URI']
+                else
+                  response.headers['X-CDN-URI']
+                end
+              end
             rescue Fog::Service::NotFound
               nil
             end
@@ -56,7 +62,7 @@ module Fog
           end
           true
         end
-
+        
       end
 
     end

data/lib/fog/storage/rackspace.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
-      recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
+      recognizes :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl, :persistent
       recognizes :provider # remove post deprecation
 
       model_path 'fog/storage/models/rackspace'
@@ -68,6 +68,7 @@ module Fog
 
       class Real
         include Utils
+        attr_reader :rackspace_cdn_ssl
 
         def initialize(options={})
           unless options.delete(:provider)
@@ -81,6 +82,7 @@ module Fog
           require 'json'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
+          @rackspace_cdn_ssl = options[:rackspace_cdn_ssl]
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']
 

data/lib/fog/storage/requests/rackspace/delete_container.rb

@@ -12,7 +12,7 @@ module Fog
           response = request(
             :expects  => 204,
             :method   => 'DELETE',
-            :path     => CGI.escape(name)
+            :path     => URI.escape(name)
           )
           response
         end

data/lib/fog/storage/requests/rackspace/delete_object.rb

@@ -13,7 +13,7 @@ module Fog
           response = request(
             :expects  => 204,
             :method   => 'DELETE',
-            :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"
+            :path     => "#{URI.escape(container)}/#{URI.escape(object)}"
           )
           response
         end