Move timeout up to Fog from Fog::Mock.

lib/fog/core.rb

@@ -31,4 +31,5 @@ require 'fog/core/service'
 require 'fog/core/ssh'
 require 'fog/core/scp'
 require 'fog/core/time'
+require 'fog/core/timeout'
 require 'fog/core/wait_for'

lib/fog/core/mock.rb

@@ -21,16 +21,6 @@ module Fog
       @delay
     end
 
-    @timeout = 600
-    def self.timeout
-      @timeout
-    end
-
-    def self.timeout=(new_timeout)
-      raise ArgumentError, "timeout must be non-negative" unless new_timeout >= 0
-      @timeout = new_timeout
-    end
-
     def self.delay=(new_delay)
       raise ArgumentError, "delay must be non-negative" unless new_delay >= 0
       @delay = new_delay

lib/fog/core/model.rb

@@ -42,7 +42,7 @@ module Fog
       attributes.to_json
     end
 
-    def wait_for(timeout=Fog::Mock.timeout, interval=1, &block)
+    def wait_for(timeout=Fog.timeout, interval=1, &block)
       reload
       retries = 3
       Fog.wait_for(timeout, interval) do

lib/fog/core/timeout.rb

@@ -0,0 +1,13 @@
+module Fog
+
+    @timeout = 600
+    def self.timeout
+      @timeout
+    end
+
+    def self.timeout=(new_timeout)
+      raise ArgumentError, "timeout must be non-negative" unless new_timeout >= 0
+      @timeout = new_timeout
+    end
+
+end

lib/fog/core/wait_for.rb

@@ -1,6 +1,6 @@
 module Fog
 
-  def self.wait_for(timeout=Fog::Mock.timeout, interval=1, &block)
+  def self.wait_for(timeout=Fog.timeout, interval=1, &block)
     duration = 0
     start = Time.now
     until yield || duration > timeout