haproxy-cluster 0.0.3 → 0.0.4

data/lib/haproxy_cluster.rb

@@ -41,11 +41,11 @@ class HAProxyCluster
   # This block would not return until every member of the cluster is available
   # to serve requests.
   # 
-  # wait_for(1!=1){false} #=> true
-  # wait_for(1==1){true}  #=> true
-  # wait_for(1..3){2}     #=> true
-  # wait_for(true){sleep} #=> Timeout
-  def wait_for (condition, &code)
+  # wait_until(1!=1){false} #=> true
+  # wait_until(1==1){true}  #=> true
+  # wait_until(1..3){2}     #=> true
+  # wait_until(true){sleep} #=> Timeout
+  def wait_until (condition, &code)
     results = map(&code)
     delay = 1.5
     loop do

data/lib/haproxy_cluster/cli.rb

@@ -24,7 +24,7 @@ OptionParser.new do |opts|
     options.timeout = o.to_f
   end
   opts.on_tail("--version", "Show version") do
-    puts HAProxyCluster::Version
+    puts HAProxyCluster::VERSION
     exit
   end
   opts.on_tail "URL should be the root of an HA Proxy status page, either http:// or https://"

data/lib/haproxy_cluster/server.rb

@@ -29,17 +29,6 @@ class HAProxyCluster
       modify! :disable
     end
 
-    def wait_until_ok
-      return true if self.ok?
-      start = Time.now
-      until self.ok?
-        raise Timeout if Time.now > start + 10
-        sleep 1
-        @member.poll!
-      end
-      return true
-    end
-
     private
 
     def modify! (how)

data/lib/haproxy_cluster/version.rb

@@ -1,3 +1,3 @@
 class HAProxyCluster
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70365478448260 !ruby/object:Gem::Requirement
+  requirement: &70257308044560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365478448260
+  version_requirements: *70257308044560
 description: ! "  Ruby Gem and command line tool for quickly answering questions like,
   \"Can we\n  survive a rolling restart?\", \"How many transactions per second am
   I seeing?\",\n  \"What's my session backlog?\". Intended for use within continuous