riddle 1.3.0 → 1.3.1

data/lib/riddle.rb

@@ -2,16 +2,25 @@ require 'socket'
 require 'timeout'
 
 module Riddle #:nodoc:
+  @@mutex          = Mutex.new
+  @@escape_pattern = /[\(\)\|\-!@~"&\/]/
+  
   class ConnectionError < StandardError #:nodoc:
     #
   end
   
+  def self.mutex
+    @@mutex
+  end
+  
   def self.escape_pattern
-    Thread.current[:riddle_escape_pattern] ||= /[\(\)\|\-!@~"&\/]/
+    @@escape_pattern
   end
   
   def self.escape_pattern=(pattern)
-    Thread.current[:riddle_escape_pattern] = pattern
+    mutex.synchronize do
+      @@escape_pattern = pattern
+    end
   end
   
   def self.escape(string)

data/lib/riddle/auto_version.rb

@@ -6,13 +6,10 @@ class Riddle::AutoVersion
     case version
     when '0.9.8', '0.9.9'
       require "riddle/#{version}"
-    when '1.10-beta', '1.10-id64-beta', '1.10-dev'
+    when /1.10/
       require 'riddle/1.10'
     when /2.0.1/
       require 'riddle/2.0.1'
-    else
-      puts "found version: #{version}"
-      exit
     end
   end
 end

data/lib/riddle/client.rb

@@ -123,12 +123,16 @@ module Riddle
       :connection, :key
     attr_reader :queue
     
+    @@connection = nil
+    
     def self.connection=(value)
-      Thread.current[:riddle_connection] = value
+      Riddle.mutex.synchronize do
+        @@connection = value
+      end
     end
 
     def self.connection
-      Thread.current[:riddle_connection]
+      @@connection
     end
     
     # Can instantiate with a specific server and port - otherwise it assumes

data/lib/riddle/controller.rb

@@ -28,6 +28,7 @@ module Riddle
     
     def start
       return if running?
+      check_for_configuration_file
       
       cmd = "#{searchd} --pidfile --config \"#{@path}\""
       
@@ -46,6 +47,7 @@ module Riddle
     
     def stop
       return true unless running?
+      check_for_configuration_file
       
       stop_flag = 'stopwait'
       stop_flag = 'stop' if Riddle.loaded_version.split('.').first == '0'
@@ -83,5 +85,10 @@ module Riddle
     def searchd
       "#{bin_path}#{searchd_binary_name}"
     end
+    
+    def check_for_configuration_file
+      return if File.exist?(@path)
+      raise "Configuration file '#{@path}' does not exist"
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: riddle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 +10:00
+date: 2011-05-09 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2692990953322091417
+      hash: 4547098215792839825
       segments: 
       - 0
       version: "0"