cistern 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83399a872cc26926353a8186ca5a2eeb5e35694f
-  data.tar.gz: a63f6fc98003b05aa829e18d976718a3698ba2e7
+  metadata.gz: 9db40e93bb01c7cf0fd8c04ae34fc87d1c90ec7a
+  data.tar.gz: bc3dce9fd3632ee078fe99e716ab8af79a26a7ff
 SHA512:
-  metadata.gz: 2a456bdd5e6b9578d3c56abe014e1dad0d8b1bb3371808198cb683797a95860997f17aabbea453a635462a25f71d0576181b02cb108d7bfd72521f717ea427dc
-  data.tar.gz: 094d70ac588adbf30f9430845e44ba80209149a96301822302d2f2bc044eb8e02cb2c569b8bd2c275b59adb01c1849331e228b2d664a55290992489b0236f6a5
+  metadata.gz: ae821dfb3d91a24edb3e268c7647df00a24e6aa5628592ed311ab97fa3ea90808cc777de0cb98adabcf3dd86bc6e13e8fd2a4e107db55d68868cfae198455cc8
+  data.tar.gz: 90a80c9f6ed3a56fe979b9304ec3a82843d0b1984d0bff9bfc6ed9a3b4f1c708a01c78ef2b2f00f02f2f3f46e6e3c061b1c4e8a3615ca614da343a0fda5f44e3

data/lib/cistern/service.rb

@@ -32,9 +32,22 @@ class Cistern::Service
         def self.service
           #{klass.name}
         end
+
+        class Real
+        end
+
+        class Mock
+        end
       EOS
 
       klass.send(:const_set, :Timeout, Class.new(Cistern::Error))
+
+      klass::Mock.send(:include, klass::Collections)
+      klass::Mock.send(:extend, Cistern::WaitFor)
+      klass::Mock.timeout_error = klass::Timeout
+      klass::Real.send(:include, klass::Collections)
+      klass::Real.send(:extend, Cistern::WaitFor)
+      klass::Real.timeout_error = klass::Timeout
     end
 
     def collection_path(collection_path)
@@ -154,12 +167,7 @@ class Cistern::Service
       validate_options(options)
       setup_requirements
 
-      klass = self.const_get(self.mocking? ? :Mock : :Real)
-
-      klass.send(:include, service::Collections)
-      klass.send(:extend, Cistern::WaitFor)
-      klass.timeout_error = service::Timeout
-      klass.new(options)
+      self.const_get(self.mocking? ? :Mock : :Real).new(options)
     end
 
     def reset!

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/cistern/wait_for.rb

@@ -2,15 +2,29 @@ require 'timeout'
 
 module Cistern
   module WaitFor
-    DEFAULT_TIMEOUT       = 180 # 3 minutes
-    DEFAULT_POLL_INTERVAL = 10  # 10 seconds
-
-    def timeout; @timeout || DEFAULT_TIMEOUT; end
-    def timeout=(timeout); @timeout = timeout; end
-    def poll_interval; @poll_interval || DEFAULT_POLL_INTERVAL; end
-    def poll_interval=(poll_interval); @poll_interval = poll_interval; end
-    def timeout_error=(timeout_error); @timeout_error = timeout_error; end
-    def timeout_error; @timeout_error || self.const_defined?(:Timeout) && self.const_get(:Timeout) || ::Timeout::Error; end
+    def timeout
+      @timeout || Cistern.timeout
+    end
+
+    def timeout=(timeout)
+      @timeout = timeout
+    end
+
+    def poll_interval
+      @poll_interval || Cistern.poll_interval
+    end
+
+    def poll_interval=(poll_interval)
+      @poll_interval = poll_interval
+    end
+
+    def timeout_error=(timeout_error)
+      @timeout_error = timeout_error
+    end
+
+    def timeout_error
+      @timeout_error || self.const_defined?(:Timeout) && self.const_get(:Timeout) || ::Timeout::Error
+    end
 
     def wait_for(timeout = self.timeout, interval = self.poll_interval, &block)
       duration = 0

data/lib/cistern.rb

@@ -26,3 +26,6 @@ module Cistern
     @formatter ||= Cistern::Formatter.default
   end
 end
+
+Cistern.timeout       = 180 # 3 minutes
+Cistern.poll_interval = 15  # 15 seconds

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email: