Updating Riddle.

PatrickTulskie · Dec 10, 2009 · 8de0a76 · 8de0a76
1 parent ee2a171
commit 8de0a76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/vendor/riddle/lib/riddle/client.rb b/vendor/riddle/lib/riddle/client.rb
@@ -132,7 +132,7 @@ def initialize(server=nil, port=nil)
       Riddle.version_warning
 
       @server = server || "localhost"
-      @port   = port   || 3312
+      @port   = port   || 9312
       @socket = nil
 
       reset
@@ -474,9 +474,10 @@ def close_socket
     # Connects to the Sphinx daemon, and yields a socket to use. The socket is
     # closed at the end of the block.
     def connect(&block)
-      unless @socket.nil?
+      if @socket && !@socket.closed?
         yield @socket
       else
+        @socket = nil
         open_socket
         begin
           yield @socket

diff --git a/vendor/riddle/lib/riddle/configuration.rb b/vendor/riddle/lib/riddle/configuration.rb
@@ -18,8 +18,6 @@ class ConfigurationError < StandardError #:nodoc:
     attr_accessor :indexer
 
     def initialize
-      Riddle.version_warning
-
       @indexer = Riddle::Configuration::Indexer.new
       @searchd = Riddle::Configuration::Searchd.new
       @indexes = []

diff --git a/vendor/riddle/lib/riddle/controller.rb b/vendor/riddle/lib/riddle/controller.rb
@@ -18,11 +18,12 @@ def sphinx_version
     end
 
     def index(*indexes)
+      options = indexes.last.is_a?(Hash) ? indexes.pop : {}
       indexes << '--all' if indexes.empty?
 
       cmd = "#{indexer} --config #{@path} #{indexes.join(' ')}"
       cmd << " --rotate" if running?
-      `#{cmd}`
+      options[:verbose] ? system(cmd) : `#{cmd}`
     end
 
     def start