riddle 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16cce08cdd0afffbd0189f3ebdafce83928257d2
-  data.tar.gz: 145e3cb7642fde0dd66411ae800b4db94bc2765a
+SHA256:
+  metadata.gz: 34d2ffd1aafa3678203285a425bb6bd893ac8b8e218f6affec4dd0a89136cebe
+  data.tar.gz: 7690d50b67c6d2d7d9b46168c52cfc588f7daa7eb2cafdcacd01f667e8c8e39f
 SHA512:
-  metadata.gz: 5a82eccd82b01e0161d5101f337e59ade78bb1c088f9dbe88c13f13f1fff60e05665c44ec576f2f2b795ba2c5ecde3d4470aea6c314fc1be77896b7cbb4205b1
-  data.tar.gz: 1d3266ef9b83e5f7e71b16fa15cf47910aa82b5d3b8b36c1de678a9a76ecae22070e4d0a6d1ce9479b5a61ea5ea6105f47bb136fd3f955b5b897b28b67b87ebb
+  metadata.gz: 6503e33c3bccdf966e76b2e6da2fabb53b8a4dca7b74ebe52315f303eefaf35fd700fb0dba58f0f675c3fdb90ef4d8d6149c57239d80787cc6cf4ff194407f12
+  data.tar.gz: 45c61b1009289b5d3b4343e718dc3804030dadfd87e9f877fce56503a46397e419c6c0519c1346f9f5961acdc18709bd6b1f8755137128bb9fd2eb9e12974fff

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-- 2.2.8
-- 2.3.5
-- 2.4.2
+- 2.2.9
+- 2.3.6
+- 2.4.3
+- 2.5.0
 - jruby-9.1.14.0
 env:
   global:
@@ -14,9 +15,9 @@ env:
   - SPHINX_VERSION=2.2.6
 before_script:
 - killall searchd; echo ''
-- if (ruby -e "exit RUBY_VERSION.to_f >= 2.4"); then export RUBYOPT="--enable-frozen-string-literal";
-  fi; echo $RUBYOPT
 - "./bin/loadsphinx $SPHINX_VERSION"
+before_install:
+- gem update --system
 after_script:
 - killall searchd; echo ''
 sudo: false

data/HISTORY

@@ -1,3 +1,8 @@
+2.3.0 - January 14th 2018
+- Add controller method for merging indices.
+- Add support for sockets in searchd configuration.
+- Fix handling of command errors when executed via backticks (verbose).
+
 2.2.2 - December 2nd 2017
 - Fix frozen string concatenation for searchd/indexer commands.
 

data/README.markdown

@@ -14,7 +14,7 @@ Riddle is available as a gem, so you can install it directly:
 
 Or include it in a Gemfile:
 
-    gem 'riddle', '~> 2.2.2'
+    gem 'riddle', '~> 2.3.0'
 
 ## Usage
 

data/lib/riddle/0.9.9/configuration/searchd.rb

@@ -23,7 +23,13 @@ module Riddle
         @listen << "9306:mysql41" if @mysql41.is_a?(TrueClass)
         @listen << "#{@mysql41}:mysql41" if @mysql41.is_a?(NUMBER)
 
-        @listen = @listen.collect { |line| "#{@address}:#{line}" } if @address
+        if @listen.empty? && @address
+          @listen << @address
+        else
+          @listen = @listen.collect { |line| "#{@address}:#{line}" } if @address
+        end
+
+        @listen += Array(@socket) if @socket
       end
 
       def settings

data/lib/riddle/configuration/searchd.rb

@@ -27,7 +27,7 @@ module Riddle
       end
 
       attr_accessor *self.settings
-      attr_accessor :mysql41
+      attr_accessor :mysql41, :socket
 
       def render
         raise ConfigurationError unless valid?

data/lib/riddle/controller.rb

@@ -4,6 +4,8 @@ module Riddle
   NoConfigurationFileError = Class.new StandardError
 
   class Controller
+    DEFAULT_MERGE_OPTIONS = {:filters => {}}.freeze
+
     attr_accessor :path, :bin_path, :searchd_binary_name, :indexer_binary_name
 
     def initialize(configuration, path)
@@ -31,6 +33,20 @@ module Riddle
       Riddle::ExecuteCommand.call command, options[:verbose]
     end
 
+    def merge(destination, source, options = {})
+      options = DEFAULT_MERGE_OPTIONS.merge options
+
+      command = "#{indexer} --config \"#{@path}\"".dup
+      command << " --merge #{destination} #{source}"
+      options[:filters].each do |attribute, value|
+        value = value..value unless value.is_a?(Range)
+        command << " --merge-dst-range #{attribute} #{value.min} #{value.max}"
+      end
+      command << " --rotate" if running?
+
+      Riddle::ExecuteCommand.call command, options[:verbose]
+    end
+
     def start(options = {})
       return if running?
       check_for_configuration_file

data/lib/riddle/execute_command.rb

@@ -30,7 +30,11 @@ class Riddle::ExecuteCommand
   attr_reader :command, :verbose
 
   def result_from_backticks
-    output = `#{command}`
+    begin
+      output = `#{command}`
+    rescue SystemCallError => error
+      output = error.message
+    end
 
     Riddle::CommandResult.new command, $?.exitstatus, output
   end

data/riddle.gemspec

@@ -5,7 +5,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = '2.2.2'
+  s.version     = '2.3.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddle
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2018-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riddle
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: An API for Sphinx, written in and for Ruby.