godot 0.1.0 → 0.2.0

data/.travis.yml

@@ -1,8 +1,7 @@
 rvm:
   - 1.9.3
   - 1.9.2
+  - 1.8.7
   - jruby-19mode
   - rbx-19mode
-  - ruby-head
-  - jruby-head
 script: script/ci.sh

data/lib/godot.rb

@@ -3,7 +3,7 @@ require "socket"
 
 class Godot
   attr_reader :host, :port
-  attr_writer :interval, :timeout
+  attr_accessor :trace, :interval, :timeout
 
   def self.wait!(host, port)
     new(host, port).wait!
@@ -21,31 +21,29 @@ class Godot
     new(host, port).match(pattern, path, options)
   end
 
-  def initialize(host, port)
+  def initialize(host, port, options = {})
     @host = host
     @port = port
-  end
-
-  def interval
-    @interval || 1
-  end
-
-  def timeout
-    @timeout || 10
+    @interval = options[:interval] || 1
+    @trace = options[:trace] || false
+    @timeout = options[:timeout] || 10
   end
 
   def wait!
+    socket = nil
     Timeout.timeout(timeout) do
-      socket = nil
       until socket
         begin
           Timeout.timeout(interval) do
             socket = TCPSocket.open(host, port)
           end
-        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Timeout::Error, Errno::EHOSTUNREACH
+        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Timeout::Error, Errno::EHOSTUNREACH, Errno::EHOSTDOWN
+          $stderr.putc "." if trace
         end
       end
     end
+  ensure
+    socket.close if socket
   end
 
   def wait
@@ -62,7 +60,7 @@ class Godot
   end
 
   def match(pattern, path = "", options = "-ks")
-    match!(pattern, options)
+    match!(pattern, path, options)
     true
   rescue Timeout::Error
     false

data/lib/godot/version.rb

@@ -1,3 +1,3 @@
 class Godot
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/contexts/without_server_context.rb

@@ -2,7 +2,7 @@ shared_context "without a server", :target => false do
   let(:godot) { Godot.new("localhost", 1) }
 
   before do
-    godot.stub(:timeout).and_return(0.1)
-    godot.stub(:interval).and_return(0.01)
+    godot.stub(:timeout).and_return(1)
+    godot.stub(:interval).and_return(1)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec