RubyGems - fog - Versions diffs - 0.1.3 → 0.1.4 - Mend

fog 0.1.3 → 0.1.4

Files changed (89) hide show

data/fog.gemspec CHANGED

@@ -7,7 +7,7 @@ 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'
-  s.version           = '0.1.3'
+  s.version           = '0.1.4'
   s.date              = '2010-05-26'
   s.rubyforge_project = 'fog'

data/lib/fog.rb CHANGED

@@ -26,7 +26,15 @@ require 'fog/parser'
 require 'fog/ssh'
 module Fog
-  class Error < StandardError; end
+  module Errors
+    class Error < StandardError; end
+    class MockNotImplemented < Fog::Errors::Error; end
+    class NotFound < Fog::Errors::Error; end
+  end
 end
 require 'fog/aws'
@@ -38,10 +46,8 @@ require 'fog/vcloud'
 module Fog
-  class MockNotImplemented < Fog::Error; end
   unless const_defined?(:VERSION)
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
   module Mock
@@ -54,6 +60,11 @@ module Fog
       raise ArgumentError, "delay must be non-negative" unless new_delay >= 0
       @delay = new_delay
     end
+    def self.not_implemented
+      raise Fog::Errors::MockNotImplemented.new("Contributions welcome!")
+    end
   end
   def self.mock!

data/lib/fog/aws/ec2.rb CHANGED

@@ -2,7 +2,8 @@ module Fog
   module AWS
     module EC2
-      class Error < Fog::Error; end
+      class Error < Fog::Errors::Error; end
+      class NotFound < Fog::Errors::NotFound; end
       def self.new(options={})
@@ -226,7 +227,14 @@ module Fog
             })
           rescue Excon::Errors::Error => error
             if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
-              raise Fog::AWS::EC2::Error.new("#{match[1]} => #{match[2]}")
+              new_error = case match[1].split('.').last
+              when 'NotFound'
+                Fog::AWS::EC2::NotFound.new(match[2])
+              else
+                Fog::AWS::EC2::Error.new("#{match[1]} => #{match[2]}")
+              end
+              new_error.set_backtrace(error.backtrace)
+              raise new_error
             else
               raise error
             end

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

@@ -51,7 +51,7 @@ module Fog
           if public_ip
             all(public_ip).first
           end
-        rescue Excon::Errors::BadRequest
+        rescue Fog::Errors::NotFound
           nil
         end

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

@@ -38,7 +38,7 @@ module Fog
           if image_id
             all(image_id).first
           end
-        rescue Excon::Errors::BadRequest
+        rescue Fog::Errors::NotFound
           nil
         end
       end

data/lib/fog/aws/models/ec2/key_pairs.rb CHANGED

@@ -38,7 +38,7 @@ module Fog
           if key_name
             all(key_name).first
           end
-        rescue Excon::Errors::BadRequest
+        rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/aws/models/ec2/security_groups.rb CHANGED

@@ -38,7 +38,7 @@ module Fog
           if group_name
             all(group_name).first
           end
-        rescue Excon::Errors::BadRequest
+        rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/aws/models/ec2/servers.rb CHANGED

@@ -44,7 +44,7 @@ module Fog
           if server_id
             all(server_id).first
           end
-        rescue Excon::Errors::BadRequest
+        rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/aws/models/ec2/snapshots.rb CHANGED

@@ -54,7 +54,7 @@ module Fog
           if snapshot_id
             all(snapshot_id).first
           end
-        rescue Excon::Errors::BadRequest
+        rescue Fog::Errors::NotFound
           nil
         end

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

@@ -47,7 +47,7 @@ module Fog
           if volume_id
             all(volume_id).first
           end
-        rescue Excon::Errors::BadRequest
+        rescue Fog::Errors::NotFound
           nil
         end

data/lib/fog/aws/requests/ec2/describe_reserved_instances.rb CHANGED

@@ -37,7 +37,7 @@ module Fog
       class Mock
         def describe_reserved_instances(reserved_instances_id = {})
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/ec2/modify_image_attributes.rb CHANGED

@@ -30,7 +30,7 @@ module Fog
       class Mock
         def modify_image_attributes(image_id, attribute, operation_type, options = {})
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

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

@@ -47,7 +47,7 @@ module Fog
       class Mock
         def create_load_balancer(availability_zones, lb_name, listeners)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/elb/delete_load_balancer.rb CHANGED

@@ -30,7 +30,7 @@ module Fog
       class Mock
         def delete_load_balancer(lb_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb CHANGED

@@ -33,7 +33,7 @@ module Fog
       class Mock
         def deregister_instances_from_load_balancer(instance_ids, lb_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
         alias :deregister_instances :deregister_instances_from_load_balancer

data/lib/fog/aws/requests/elb/describe_instance_health.rb CHANGED

@@ -34,7 +34,7 @@ module Fog
       class Mock
         def describe_instance_health(lb_name, instance_ids = [])
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/elb/describe_load_balancers.rb CHANGED

@@ -48,7 +48,7 @@ module Fog
       class Mock
         def describe_load_balancers(lb_name = [])
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb CHANGED

@@ -32,7 +32,7 @@ module Fog
       class Mock
         def disable_availability_zones_for_load_balancer(availability_zones, lb_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
         alias :disable_zones :disable_availability_zones_for_load_balancer

data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb CHANGED

@@ -32,7 +32,7 @@ module Fog
       class Mock
         def enable_availability_zones_for_load_balancer(availability_zones, lb_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
         alias :enable_zones :enable_availability_zones_for_load_balancer

data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb CHANGED

@@ -33,7 +33,7 @@ module Fog
       class Mock
         def register_instances_with_load_balancer(instance_ids, lb_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
         alias :register_instances :register_instances_with_load_balancer

data/lib/fog/aws/requests/s3/get_bucket_acl.rb CHANGED

@@ -44,7 +44,7 @@ module Fog
       class Mock
         def get_bucket_acl(bucket_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/get_bucket_logging.rb CHANGED

@@ -44,7 +44,7 @@ module Fog
       class Mock
         def get_bucket_logging(bucket_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/get_bucket_object_versions.rb CHANGED

@@ -74,7 +74,7 @@ module Fog
       class Mock
         def get_bucket_object_versions(bucket_name, options = {})
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/get_bucket_versioning.rb CHANGED

@@ -34,7 +34,7 @@ module Fog
       class Mock
         def get_bucket_versioning(bucket_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/get_object_acl.rb CHANGED

@@ -55,7 +55,7 @@ module Fog
       class Mock
         def get_object_acl(bucket_name, object_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/get_object_torrent.rb CHANGED

@@ -46,7 +46,7 @@ module Fog
       class Mock
         def get_object_object(bucket_name, object_name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/put_bucket_acl.rb CHANGED

@@ -71,7 +71,7 @@ DATA
       class Mock
         def put_bucket_acl(bucket_name, acl)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/put_bucket_logging.rb CHANGED

@@ -78,7 +78,7 @@ DATA
       class Mock
         def put_bucket_logging(bucket_name, logging_status)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/s3/put_bucket_versioning.rb CHANGED

@@ -31,7 +31,7 @@ DATA
       class Mock
         def put_bucket_versioning(bucket_name, status)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/aws/requests/simpledb/select.rb CHANGED

@@ -31,7 +31,7 @@ module Fog
       class Mock
         def select(select_expression, next_token = nil)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/delete_container.rb CHANGED

@@ -22,7 +22,7 @@ module Fog
       class Mock
         def delete_container(name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/delete_object.rb CHANGED

@@ -23,7 +23,7 @@ module Fog
       class Mock
         def delete_object(container, object)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/get_container.rb CHANGED

@@ -48,7 +48,7 @@ module Fog
       class Mock
         def get_container(container, options = {})
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/get_containers.rb CHANGED

@@ -38,7 +38,7 @@ module Fog
       class Mock
         def get_containers(options = {})
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/get_object.rb CHANGED

@@ -24,7 +24,7 @@ module Fog
       class Mock
         def get_object(container, object)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/head_container.rb CHANGED

@@ -28,7 +28,7 @@ module Fog
       class Mock
         def head_container(container)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/head_containers.rb CHANGED

@@ -25,7 +25,7 @@ module Fog
       class Mock
         def head_containers
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/head_object.rb CHANGED

@@ -23,7 +23,7 @@ module Fog
       class Mock
         def head_object(container, object)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/put_container.rb CHANGED

@@ -22,7 +22,7 @@ module Fog
       class Mock
         def put_container(name)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/files/put_object.rb CHANGED

@@ -25,7 +25,7 @@ module Fog
       class Mock
         def put_object(container, object, data)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end

data/lib/fog/rackspace/requests/servers/get_flavor_details.rb CHANGED

@@ -25,7 +25,7 @@ module Fog
       class Mock
         def get_flavor_details(flavor_id)
-          raise MockNotImplemented.new("Contributions welcome!")
+          Fog::Mock.not_implemented
         end
       end