riddle 2.4.2 → 2.4.3
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.
- checksums.yaml +4 -4
- data/.circleci/config.yml +117 -0
- data/HISTORY +4 -0
- data/bin/loadsphinx +22 -4
- data/lib/riddle/controller.rb +2 -2
- data/riddle.gemspec +1 -1
- metadata +6 -6
- data/.travis.yml +0 -32
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 529a5b86abcbf7e07ea9abeaba9a1d63cbef7f73fa4db650bd3b13366b56a59a
|
|
4
|
+
data.tar.gz: fbbaec361b8ec24d6026d58261e81c520fcea6b521b24c7b55d2dd10a9d47891
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5c0ab62b26ee3c73ce4361ebba6bfbad447d7e011dcb99e4937cd4cfd1d8d15e51726d3d4ba7977c82c6f3960221f9346226b0a9c5879e21c64a204fa67e6ec2
|
|
7
|
+
data.tar.gz: 3a0157b2a59a99ff1ccda333979e765e1cb491962f1061097a899de85b39d3160366004e96b0cd98e16660d1d2796363329c94ceea9b0c3ad0e8a60b03aae289
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
version: 2.1
|
|
2
|
+
|
|
3
|
+
orbs:
|
|
4
|
+
ruby: circleci/ruby@1.0
|
|
5
|
+
|
|
6
|
+
workflows:
|
|
7
|
+
test:
|
|
8
|
+
jobs:
|
|
9
|
+
- test:
|
|
10
|
+
name: "Sphinx 2.2"
|
|
11
|
+
sphinx_version: 2.2.11
|
|
12
|
+
sphinx_engine: sphinx
|
|
13
|
+
debian: jessie
|
|
14
|
+
ruby: '2.4.6'
|
|
15
|
+
- test:
|
|
16
|
+
name: "Sphinx 3.4"
|
|
17
|
+
sphinx_version: 3.4.1
|
|
18
|
+
sphinx_engine: sphinx
|
|
19
|
+
debian: buster
|
|
20
|
+
matrix:
|
|
21
|
+
parameters:
|
|
22
|
+
ruby: [ '2.4.10', '2.5.9', '2.6.9', '2.7.5', '3.0.3' ]
|
|
23
|
+
- test:
|
|
24
|
+
name: "Manticore 3.5"
|
|
25
|
+
sphinx_version: 3.5.4
|
|
26
|
+
sphinx_engine: manticore
|
|
27
|
+
debian: buster
|
|
28
|
+
matrix:
|
|
29
|
+
parameters:
|
|
30
|
+
ruby: [ '2.4.10', '2.5.9', '2.6.9', '2.7.5', '3.0.3' ]
|
|
31
|
+
- test:
|
|
32
|
+
name: "Manticore 4.0"
|
|
33
|
+
sphinx_version: 4.0.2
|
|
34
|
+
sphinx_engine: manticore
|
|
35
|
+
debian: buster
|
|
36
|
+
matrix:
|
|
37
|
+
parameters:
|
|
38
|
+
ruby: [ '2.4.10', '2.5.9', '2.6.9', '2.7.5', '3.0.3' ]
|
|
39
|
+
|
|
40
|
+
jobs:
|
|
41
|
+
test:
|
|
42
|
+
parameters:
|
|
43
|
+
ruby:
|
|
44
|
+
type: string
|
|
45
|
+
sphinx_version:
|
|
46
|
+
type: string
|
|
47
|
+
sphinx_engine:
|
|
48
|
+
type: string
|
|
49
|
+
debian:
|
|
50
|
+
type: string
|
|
51
|
+
|
|
52
|
+
docker:
|
|
53
|
+
- image: circleci/ruby:<< parameters.ruby >>-<< parameters.debian >>
|
|
54
|
+
|
|
55
|
+
- image: circleci/mysql:5.7
|
|
56
|
+
environment:
|
|
57
|
+
MYSQL_ROOT_PASSWORD: riddle
|
|
58
|
+
MYSQL_DATABASE: riddle
|
|
59
|
+
|
|
60
|
+
working_directory: ~/app
|
|
61
|
+
|
|
62
|
+
steps:
|
|
63
|
+
- checkout
|
|
64
|
+
|
|
65
|
+
- restore_cache:
|
|
66
|
+
keys:
|
|
67
|
+
- v1-dependencies-<< parameters.ruby >>
|
|
68
|
+
|
|
69
|
+
- run:
|
|
70
|
+
name: install bundler
|
|
71
|
+
command: |
|
|
72
|
+
if [ "<< parameters.ruby >>" == "2.7.5" ]; then
|
|
73
|
+
export BUNDLER_VERSION=2.1.4
|
|
74
|
+
elif [ "<< parameters.ruby >>" == "3.0.3" ]; then
|
|
75
|
+
export BUNDLER_VERSION=2.1.4
|
|
76
|
+
else
|
|
77
|
+
export BUNDLER_VERSION=1.17.3
|
|
78
|
+
fi
|
|
79
|
+
export BUNDLE_PATH=vendor/bundle
|
|
80
|
+
gem install bundler:$BUNDLER_VERSION
|
|
81
|
+
|
|
82
|
+
- run:
|
|
83
|
+
name: install dependencies
|
|
84
|
+
command: |
|
|
85
|
+
bundle install --jobs=4 --retry=3 --path vendor/bundle
|
|
86
|
+
bundle update
|
|
87
|
+
|
|
88
|
+
- save_cache:
|
|
89
|
+
paths:
|
|
90
|
+
- ./vendor/bundle
|
|
91
|
+
key: v1-dependencies-<< parameters.ruby >>
|
|
92
|
+
|
|
93
|
+
- run:
|
|
94
|
+
name: set up sphinx
|
|
95
|
+
command: "./bin/loadsphinx << parameters.sphinx_version >> << parameters.sphinx_engine >>"
|
|
96
|
+
|
|
97
|
+
- run:
|
|
98
|
+
name: wait for MySQL to be ready
|
|
99
|
+
command: |
|
|
100
|
+
for i in `seq 1 10`;
|
|
101
|
+
do
|
|
102
|
+
nc -z 127.0.0.1 3306 && echo Success && exit 0
|
|
103
|
+
echo -n .
|
|
104
|
+
sleep 1
|
|
105
|
+
done
|
|
106
|
+
echo Failed waiting for MySQL && exit 1
|
|
107
|
+
|
|
108
|
+
- run:
|
|
109
|
+
name: tests
|
|
110
|
+
environment:
|
|
111
|
+
CI: "true"
|
|
112
|
+
MYSQL_HOST: 127.0.0.1
|
|
113
|
+
MYSQL_USER: root
|
|
114
|
+
MYSQL_PASSWORD: riddle
|
|
115
|
+
SPHINX_VERSION: << parameters.sphinx_version >>
|
|
116
|
+
SPHINX_ENGINE: << parameters.sphinx_engine >>
|
|
117
|
+
command: bundle exec rspec
|
data/HISTORY
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
2.4.3 - December 20th 2021
|
|
2
|
+
- Use File.exist? instead of the deprecated File.exists?.
|
|
3
|
+
- Switched CI over to CircleCI, and testing against newer Sphinx/Manticore releases.
|
|
4
|
+
|
|
1
5
|
2.4.2 - April 4th 2020
|
|
2
6
|
- Ensure parsing of files with a common section are rendered the same way.
|
|
3
7
|
|
data/bin/loadsphinx
CHANGED
|
@@ -14,7 +14,7 @@ load_sphinx () {
|
|
|
14
14
|
format="deb"
|
|
15
15
|
distro="trusty";;
|
|
16
16
|
2.2.11)
|
|
17
|
-
url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~
|
|
17
|
+
url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~jessie_amd64.deb"
|
|
18
18
|
format="deb";;
|
|
19
19
|
3.0.3)
|
|
20
20
|
url="http://sphinxsearch.com/files/sphinx-3.0.3-facc3fb-linux-amd64.tar.gz"
|
|
@@ -22,6 +22,15 @@ load_sphinx () {
|
|
|
22
22
|
3.1.1)
|
|
23
23
|
url="http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-linux-amd64.tar.gz"
|
|
24
24
|
format="gz";;
|
|
25
|
+
3.2.1)
|
|
26
|
+
url="http://sphinxsearch.com/files/sphinx-3.2.1-f152e0b-linux-amd64.tar.gz"
|
|
27
|
+
format="gz";;
|
|
28
|
+
3.3.1)
|
|
29
|
+
url="http://sphinxsearch.com/files/sphinx-3.3.1-b72d67b-linux-amd64.tar.gz"
|
|
30
|
+
format="gz";;
|
|
31
|
+
3.4.1)
|
|
32
|
+
url="http://sphinxsearch.com/files/sphinx-3.4.1-efbcc65-linux-amd64.tar.gz"
|
|
33
|
+
format="gz";;
|
|
25
34
|
*)
|
|
26
35
|
echo "No Sphinx version $version available"
|
|
27
36
|
exit 1;;
|
|
@@ -34,7 +43,9 @@ load_sphinx () {
|
|
|
34
43
|
|
|
35
44
|
if [ "$format" == "deb" ]; then
|
|
36
45
|
curl --location $url -o sphinx.deb
|
|
37
|
-
sudo apt-get install
|
|
46
|
+
sudo apt-get install libodbc1
|
|
47
|
+
sudo dpkg -i ./sphinx.deb
|
|
48
|
+
sudo apt-get install -f
|
|
38
49
|
else
|
|
39
50
|
curl $url -o sphinx.tar.gz
|
|
40
51
|
tar -zxvf sphinx.tar.gz
|
|
@@ -51,14 +62,21 @@ load_manticore () {
|
|
|
51
62
|
2.7.5)
|
|
52
63
|
url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.7.5/manticore_2.7.5-181204-4a31c54-release-stemmer.xenial_amd64-bin.deb";;
|
|
53
64
|
2.8.2)
|
|
54
|
-
url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.8.2/manticore_2.8.2-190402-
|
|
65
|
+
url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.8.2/manticore_2.8.2-190402-4e81114d-release-stemmer.stretch_amd64-bin.deb";;
|
|
66
|
+
3.4.2)
|
|
67
|
+
url="https://github.com/manticoresoftware/manticoresearch/releases/download/3.4.2/manticore_3.4.2-200410-6903305-release.xenial_amd64-bin.deb";;
|
|
68
|
+
3.5.4)
|
|
69
|
+
url="https://repo.manticoresearch.com/repository/manticoresearch_buster/pool/m/manticore/manticore_3.5.4-201211-13f8d08d_amd64.deb";;
|
|
70
|
+
4.0.2)
|
|
71
|
+
url="https://repo.manticoresearch.com/repository/manticoresearch_buster/pool/m/manticore/manticore_4.0.2-210921-af497f245_amd64.deb";;
|
|
55
72
|
*)
|
|
56
73
|
echo "No Manticore version $version available"
|
|
57
74
|
exit 1;;
|
|
58
75
|
esac
|
|
59
76
|
|
|
60
77
|
curl --location $url -o manticore.deb
|
|
61
|
-
sudo
|
|
78
|
+
sudo dpkg -i ./manticore.deb
|
|
79
|
+
sudo apt-get install -f
|
|
62
80
|
}
|
|
63
81
|
|
|
64
82
|
if [ "$engine" == "sphinx" ]; then
|
data/lib/riddle/controller.rb
CHANGED
|
@@ -18,7 +18,7 @@ module Riddle
|
|
|
18
18
|
end
|
|
19
19
|
|
|
20
20
|
def sphinx_version
|
|
21
|
-
`#{indexer} 2>&1`[/Sphinx (\d+\.\d+(\.\d+|(?:-dev|(\-id64)?\-beta)))/,
|
|
21
|
+
`#{indexer} 2>&1`[/(Sphinx|Manticore) (\d+\.\d+(\.\d+|(?:-dev|(\-id64)?\-beta)))/, 2]
|
|
22
22
|
rescue
|
|
23
23
|
nil
|
|
24
24
|
end
|
|
@@ -74,7 +74,7 @@ module Riddle
|
|
|
74
74
|
end
|
|
75
75
|
|
|
76
76
|
def pid
|
|
77
|
-
if File.
|
|
77
|
+
if File.exist?(configuration.searchd.pid_file)
|
|
78
78
|
File.read(configuration.searchd.pid_file)[/\d+/]
|
|
79
79
|
else
|
|
80
80
|
nil
|
data/riddle.gemspec
CHANGED
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.4.
|
|
4
|
+
version: 2.4.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Pat Allan
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2021-12-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -59,8 +59,8 @@ executables: []
|
|
|
59
59
|
extensions: []
|
|
60
60
|
extra_rdoc_files: []
|
|
61
61
|
files:
|
|
62
|
+
- ".circleci/config.yml"
|
|
62
63
|
- ".gitignore"
|
|
63
|
-
- ".travis.yml"
|
|
64
64
|
- Gemfile
|
|
65
65
|
- HISTORY
|
|
66
66
|
- LICENCE
|
|
@@ -112,7 +112,7 @@ homepage: http://pat.github.io/riddle/
|
|
|
112
112
|
licenses:
|
|
113
113
|
- MIT
|
|
114
114
|
metadata: {}
|
|
115
|
-
post_install_message:
|
|
115
|
+
post_install_message:
|
|
116
116
|
rdoc_options: []
|
|
117
117
|
require_paths:
|
|
118
118
|
- lib
|
|
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
128
128
|
version: '0'
|
|
129
129
|
requirements: []
|
|
130
130
|
rubygems_version: 3.0.3
|
|
131
|
-
signing_key:
|
|
131
|
+
signing_key:
|
|
132
132
|
specification_version: 4
|
|
133
133
|
summary: An API for Sphinx, written in and for Ruby.
|
|
134
134
|
test_files: []
|
data/.travis.yml
DELETED
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
language: ruby
|
|
2
|
-
dist: xenial
|
|
3
|
-
rvm:
|
|
4
|
-
- 2.3.8
|
|
5
|
-
- 2.4.0
|
|
6
|
-
- 2.5.8
|
|
7
|
-
- 2.6.6
|
|
8
|
-
- 2.7.1
|
|
9
|
-
- jruby-9.2.9.0
|
|
10
|
-
env:
|
|
11
|
-
matrix:
|
|
12
|
-
- SPHINX_VERSION=2.1.9 SPHINX_ENGINE=sphinx
|
|
13
|
-
- SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
|
|
14
|
-
- SPHINX_VERSION=3.0.3 SPHINX_ENGINE=sphinx
|
|
15
|
-
- SPHINX_VERSION=3.1.1 SPHINX_ENGINE=sphinx
|
|
16
|
-
- SPHINX_VERSION=2.6.4 SPHINX_ENGINE=manticore
|
|
17
|
-
- SPHINX_VERSION=2.7.5 SPHINX_ENGINE=manticore
|
|
18
|
-
- SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
|
|
19
|
-
before_script:
|
|
20
|
-
- killall searchd; echo ''
|
|
21
|
-
- "./bin/loadsphinx $SPHINX_VERSION $SPHINX_ENGINE"
|
|
22
|
-
addons:
|
|
23
|
-
apt:
|
|
24
|
-
packages:
|
|
25
|
-
- libodbc1
|
|
26
|
-
services:
|
|
27
|
-
- mysql
|
|
28
|
-
before_install:
|
|
29
|
-
- gem update --system
|
|
30
|
-
after_script:
|
|
31
|
-
- killall searchd; echo ''
|
|
32
|
-
sudo: false
|