riddle 2.3.1 → 2.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +13 -5
  3. data/HISTORY +4 -0
  4. data/README.markdown +1 -1
  5. data/bin/loadsphinx +29 -2
  6. data/lib/riddle/configuration/index.rb +1 -2
  7. data/riddle.gemspec +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 973588631e152d0f6cf14fb46dedc1f8e59d7b0e4851dd827ecdac1970ddc4a5
4
- data.tar.gz: d97f69db627d09822b65346e5aa0a28ab1d9a3fc95a5f4d721fbc1b7f4aa83b8
3
+ metadata.gz: a860b9ec8b23910ccc19ccb24c1e6b5e23e0d5a23522b51399a915859dbe5f5b
4
+ data.tar.gz: 4c3f3b27ff3246cfbbf9dcfc75af8e25370ffdc15c6543eda64b2e3b45ea2c76
5
5
  SHA512:
6
- metadata.gz: df8d12baf0b15ffc325174f873f30a2dec7ff3edd1f6bdb40bd166e447093068cecc10bfe484d223d37e8f87ec629635bee7a4c497d3b81e0ba7ba1a46473439
7
- data.tar.gz: 8332b2356d384ec0400c7cc82f5e7316a94e4b54a966ca704387d50e4ed0e95aac7611e254cca3105cca0f68f2762df60bef66d24730dca261705641c8960248
6
+ metadata.gz: ab43f391a4086352d1e84a3c440d56cf51937f2726139da12bf7119ed783554c0e9da79762724e1d256eb969f6102ed9bb84f52385c3ecd3ace7ce20a11e5504
7
+ data.tar.gz: 00dfaef9019672f5f26ec1efa985c4c257048b7e6a5cb9c59e246bdddca1a35ed30d11dca21ac031c74a9c84f1c98ecf8710a9ed484d823fca97e41aba1db082
data/.travis.yml CHANGED
@@ -10,14 +10,22 @@ env:
10
10
  - SPHINX_BIN=ext/sphinx/bin/
11
11
  - secure: aP3wCZnnqim/yBWbO8+N2DAJIDVuqewUayK3nBphR/Jt1POIMbqCIuHwk/SG/JfMc6pJIlH0QOX8wI3fF3y5GO6aIrN8xKAX0DoDm+Gkvk/YEk3cK/2fJUwvocR89M99EoV8ctLPaR03B3dm3h2Dh2oe8NQRBfcrL3WtiHHq3d0=
12
12
  matrix:
13
- - SPHINX_VERSION=2.0.10
14
- - SPHINX_VERSION=2.1.9
15
- - SPHINX_VERSION=2.2.11
16
- - SPHINX_VERSION=3.0.2
13
+ - SPHINX_VERSION=2.0.10 SPHINX_ENGINE=sphinx
14
+ - SPHINX_VERSION=2.1.9 SPHINX_ENGINE=sphinx
15
+ - SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
16
+ - SPHINX_VERSION=3.0.2 SPHINX_ENGINE=sphinx
17
+ - SPHINX_VERSION=2.6.3 SPHINX_ENGINE=manticore
17
18
  before_script:
18
19
  - killall searchd; echo ''
19
- - "./bin/loadsphinx $SPHINX_VERSION"
20
+ - "./bin/loadsphinx $SPHINX_VERSION $SPHINX_ENGINE"
21
+ addons:
22
+ apt:
23
+ packages:
24
+ - cmake
25
+ - bison
26
+ - flex
20
27
  before_install:
28
+ - pip install --upgrade --user awscli
21
29
  - gem update --system
22
30
  after_script:
23
31
  - killall searchd; echo ''
data/HISTORY CHANGED
@@ -1,3 +1,7 @@
1
+ 2.3.2 - September 23rd 2018
2
+ - Fix attempt to modify a frozen string when generating configuration.
3
+ - Test against Manticore 2.6.3.
4
+
1
5
  2.3.1 - March 25th 2018
2
6
  - Handle parsing of invalid configuration files without endlessly looping.
3
7
  - Test against mysql2 0.5.
data/README.markdown CHANGED
@@ -14,7 +14,7 @@ Riddle is available as a gem, so you can install it directly:
14
14
 
15
15
  Or include it in a Gemfile:
16
16
 
17
- gem 'riddle', '~> 2.3.1'
17
+ gem 'riddle', '~> 2.3.2'
18
18
 
19
19
  ## Usage
20
20
 
data/bin/loadsphinx CHANGED
@@ -1,14 +1,28 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
3
  version=$1
4
- name="sphinx-$version"
5
- url="http://sphinxsearch.com/files/$name-release.tar.gz"
4
+ engine=$2
5
+ name="$engine-$version"
6
6
  bucket="thinking-sphinx"
7
7
  directory="ext/sphinx"
8
8
  prefix="`pwd`/$directory"
9
9
  file="ext/$name.tar.gz"
10
10
 
11
+ if [ "$engine" == "sphinx" ]; then
12
+ url="http://sphinxsearch.com/files/$name-release.tar.gz"
13
+ else
14
+ url="https://github.com/manticoresoftware/manticore.git"
15
+ fi
16
+
11
17
  download_and_compile_source () {
18
+ if [ "$engine" == "sphinx" ]; then
19
+ download_and_compile_sphinx
20
+ else
21
+ download_and_compile_manticore
22
+ fi
23
+ }
24
+
25
+ download_and_compile_sphinx () {
12
26
  curl -O $url
13
27
  tar -zxf $name-release.tar.gz
14
28
  cd $name-release
@@ -19,6 +33,19 @@ download_and_compile_source () {
19
33
  rm -rf $name-release.tar.gz $name-release
20
34
  }
21
35
 
36
+ download_and_compile_manticore () {
37
+ git clone $url $engine
38
+ cd $engine
39
+ git checkout $version
40
+ mkdir build
41
+ cd build
42
+ cmake -D WITH_MYSQL=TRUE -D WITH_PGSQL=TRUE -D DISABLE_TESTING=TRUE -D CMAKE_INSTALL_PREFIX=$prefix ..
43
+ make -j4
44
+ make install
45
+ cd ../..
46
+ rm -rf $engine
47
+ }
48
+
22
49
  load_cache () {
23
50
  mkdir ext
24
51
  curl -o $file http://$bucket.s3.amazonaws.com/bincaches/$name.tar.gz
data/lib/riddle/configuration/index.rb CHANGED
@@ -25,8 +25,7 @@ module Riddle
25
25
  def render
26
26
  raise ConfigurationError, "#{@name} #{@sources.inspect} #{@path} #{@parent}" unless valid?
27
27
 
28
- inherited_name = "#{name}"
29
- inherited_name << " : #{parent}" if parent
28
+ inherited_name = parent ? "#{name} : #{parent}" : "#{name}"
30
29
  (
31
30
  @sources.collect { |s| s.render } +
32
31
  ["index #{inherited_name}", "{"] +
data/riddle.gemspec CHANGED
@@ -5,7 +5,7 @@ $:.push File.expand_path('../lib', __FILE__)
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = 'riddle'
8
- s.version = '2.3.1'
8
+ s.version = '2.3.2'
9
9
  s.platform = Gem::Platform::RUBY
10
10
  s.authors = ['Pat Allan']
11
11
  s.email = ['pat@freelancing-gods.com']
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: riddle
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.1
4
+ version: 2.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pat Allan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-03-25 00:00:00.000000000 Z
11
+ date: 2018-09-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake