riddle 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973588631e152d0f6cf14fb46dedc1f8e59d7b0e4851dd827ecdac1970ddc4a5
-  data.tar.gz: d97f69db627d09822b65346e5aa0a28ab1d9a3fc95a5f4d721fbc1b7f4aa83b8
+  metadata.gz: a860b9ec8b23910ccc19ccb24c1e6b5e23e0d5a23522b51399a915859dbe5f5b
+  data.tar.gz: 4c3f3b27ff3246cfbbf9dcfc75af8e25370ffdc15c6543eda64b2e3b45ea2c76
 SHA512:
-  metadata.gz: df8d12baf0b15ffc325174f873f30a2dec7ff3edd1f6bdb40bd166e447093068cecc10bfe484d223d37e8f87ec629635bee7a4c497d3b81e0ba7ba1a46473439
-  data.tar.gz: 8332b2356d384ec0400c7cc82f5e7316a94e4b54a966ca704387d50e4ed0e95aac7611e254cca3105cca0f68f2762df60bef66d24730dca261705641c8960248
+  metadata.gz: ab43f391a4086352d1e84a3c440d56cf51937f2726139da12bf7119ed783554c0e9da79762724e1d256eb969f6102ed9bb84f52385c3ecd3ace7ce20a11e5504
+  data.tar.gz: 00dfaef9019672f5f26ec1efa985c4c257048b7e6a5cb9c59e246bdddca1a35ed30d11dca21ac031c74a9c84f1c98ecf8710a9ed484d823fca97e41aba1db082

data/.travis.yml

@@ -10,14 +10,22 @@ env:
   - SPHINX_BIN=ext/sphinx/bin/
   - secure: aP3wCZnnqim/yBWbO8+N2DAJIDVuqewUayK3nBphR/Jt1POIMbqCIuHwk/SG/JfMc6pJIlH0QOX8wI3fF3y5GO6aIrN8xKAX0DoDm+Gkvk/YEk3cK/2fJUwvocR89M99EoV8ctLPaR03B3dm3h2Dh2oe8NQRBfcrL3WtiHHq3d0=
   matrix:
-  - SPHINX_VERSION=2.0.10
-  - SPHINX_VERSION=2.1.9
-  - SPHINX_VERSION=2.2.11
-  - SPHINX_VERSION=3.0.2
+  - SPHINX_VERSION=2.0.10 SPHINX_ENGINE=sphinx
+  - SPHINX_VERSION=2.1.9 SPHINX_ENGINE=sphinx
+  - SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
+  - SPHINX_VERSION=3.0.2 SPHINX_ENGINE=sphinx
+  - SPHINX_VERSION=2.6.3 SPHINX_ENGINE=manticore
 before_script:
 - killall searchd; echo ''
-- "./bin/loadsphinx $SPHINX_VERSION"
+- "./bin/loadsphinx $SPHINX_VERSION $SPHINX_ENGINE"
+addons:
+  apt:
+    packages:
+    - cmake
+    - bison
+    - flex
 before_install:
+- pip install --upgrade --user awscli
 - gem update --system
 after_script:
 - killall searchd; echo ''

data/HISTORY

@@ -1,3 +1,7 @@
+2.3.2 - September 23rd 2018
+- Fix attempt to modify a frozen string when generating configuration.
+- Test against Manticore 2.6.3.
+
 2.3.1 - March 25th 2018
 - Handle parsing of invalid configuration files without endlessly looping.
 - Test against mysql2 0.5.

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.3.1'
+    gem 'riddle', '~> 2.3.2'
 
 ## Usage
 

data/bin/loadsphinx

@@ -1,14 +1,28 @@
 #!/usr/bin/env bash
 
 version=$1
-name="sphinx-$version"
-url="http://sphinxsearch.com/files/$name-release.tar.gz"
+engine=$2
+name="$engine-$version"
 bucket="thinking-sphinx"
 directory="ext/sphinx"
 prefix="`pwd`/$directory"
 file="ext/$name.tar.gz"
 
+if [ "$engine" == "sphinx" ]; then
+  url="http://sphinxsearch.com/files/$name-release.tar.gz"
+else
+  url="https://github.com/manticoresoftware/manticore.git"
+fi
+
 download_and_compile_source () {
+  if [ "$engine" == "sphinx" ]; then
+    download_and_compile_sphinx
+  else
+    download_and_compile_manticore
+  fi
+}
+
+download_and_compile_sphinx () {
   curl -O $url
   tar -zxf $name-release.tar.gz
   cd $name-release
@@ -19,6 +33,19 @@ download_and_compile_source () {
   rm -rf $name-release.tar.gz $name-release
 }
 
+download_and_compile_manticore () {
+  git clone $url $engine
+  cd $engine
+  git checkout $version
+  mkdir build
+  cd build
+  cmake -D WITH_MYSQL=TRUE -D WITH_PGSQL=TRUE -D DISABLE_TESTING=TRUE -D CMAKE_INSTALL_PREFIX=$prefix ..
+  make -j4
+  make install
+  cd ../..
+  rm -rf $engine
+}
+
 load_cache () {
   mkdir ext
   curl -o $file http://$bucket.s3.amazonaws.com/bincaches/$name.tar.gz

data/lib/riddle/configuration/index.rb

@@ -25,8 +25,7 @@ module Riddle
       def render
         raise ConfigurationError, "#{@name} #{@sources.inspect} #{@path} #{@parent}" unless valid?
 
-        inherited_name = "#{name}"
-        inherited_name << " : #{parent}" if parent
+        inherited_name = parent ? "#{name} : #{parent}" : "#{name}"
         (
           @sources.collect { |s| s.render } +
           ["index #{inherited_name}", "{"] +

data/riddle.gemspec

@@ -5,7 +5,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = '2.3.1'
+  s.version     = '2.3.2'
   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.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake