[general] Merge Forg.interval and Fog.timeout into a single file.

lib/fog/core.rb

@@ -20,7 +20,6 @@ require 'fog/core/current_machine'
 require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'
-require 'fog/core/interval'
 require 'fog/core/logger'
 require 'fog/core/model'
 require 'fog/core/mock'
@@ -29,8 +28,8 @@ 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'
+require 'fog/core/wait_for_defaults'
 require 'fog/core/class_from_string'
 require 'fog/core/uuid'
 

lib/fog/core/timeout.rb

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

lib/fog/core/wait_for_defaults.rb

@@ -8,4 +8,14 @@ module Fog
     raise ArgumentError, "interval must be non-negative" unless interval >= 0
     @interval = interval
   end
+  
+  @timeout = 600
+  def self.timeout
+    @timeout
+  end
+
+  def self.timeout=(timeout)
+    raise ArgumentError, "timeout must be non-negative" unless timeout >= 0
+    @timeout = timeout
+  end
 end