Skip to content

Commit 3428f7f

Browse files
committed
[DSL] Removes DSL gem from test tasks
1 parent 0203af9 commit 3428f7f

File tree

5 files changed

+2
-30
lines changed

5 files changed

+2
-30
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ See also [`doc/examples`](https://github.com/elastic/elasticsearch-ruby/blob/mai
4040
This repository contains these additional Ruby libraries:
4141

4242
* [`elasticsearch-extensions`](https://github.com/elastic/elasticsearch-ruby/tree/main/elasticsearch-extensions), *deprecated*.
43-
* [`elasticsearch-dsl`](https://github.com/elastic/elasticsearch-ruby/tree/main/elasticsearch-dsl),
44-
which provides a Ruby API for the [Elasticsearch Query DSL](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html),
43+
* [`elasticsearch-dsl`](https://github.com/elastic/elasticsearch-dsl-ruby) which provides a Ruby API for the [Elasticsearch Query DSL](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html),
4544

4645
Please see their respective READMEs for information and documentation.
4746

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ require 'pathname'
5858
CURRENT_PATH = Pathname(File.expand_path(__dir__))
5959
SUBPROJECTS = [
6060
'elasticsearch',
61-
'elasticsearch-dsl',
6261
'elasticsearch-api'
6362
].freeze
6463

elasticsearch/bin/elastic_ruby_console

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,12 @@
11
#!/usr/bin/env ruby
22

33
$LOAD_PATH.unshift(File.expand_path('../../elasticsearch/lib', __dir__))
4-
$LOAD_PATH.unshift(File.expand_path('../../elasticsearch-dsl/lib', __dir__))
54
$LOAD_PATH.unshift(File.expand_path('../../elasticsearch-api/lib', __dir__))
65

76
require 'elasticsearch'
87
require 'elasticsearch-api'
9-
require 'elasticsearch-dsl'
10-
11-
gems_not_loaded = ['elasticsearch-dsl'].reject do |gem|
12-
begin
13-
(require gem) || true
14-
rescue LoadError
15-
false
16-
end
17-
end
18-
19-
unless gems_not_loaded.empty?
20-
warn "The following gems were not loaded: [#{gems_not_loaded.join(', ')}]. Please install and require them explicitly."
21-
end
228

239
include Elasticsearch
24-
include Elasticsearch::DSL if defined?(Elasticsearch::DSL)
2510

2611
begin
2712
require 'pry'

rake_tasks/test_tasks.rake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
UNIT_TESTED_PROJECTS = [
1919
'elasticsearch',
20-
'elasticsearch-dsl',
2120
'elasticsearch-api'
2221
].freeze
2322

rake_tasks/update_version.rake

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,12 @@ task :update_changelog do
6161
log_entries = {}
6262
log_entries[:client] = log.select { |l| l =~ /\[CLIENT\]/ }
6363
log_entries[:api] = log.select { |l| l =~ /\[API\]/ }
64-
log_entries[:dsl] = log.select { |l| l =~ /\[DSL\]/ }
6564

6665
changelog = File.read(File.open('CHANGELOG.md', 'r'))
6766

6867
changelog_update = ''
6968

70-
if log.any? { |l| l =~ /CLIENT|API|DSL/ }
69+
if log.any? { |l| l =~ /CLIENT|API/ }
7170
changelog_update << "## #{args[:new]}\n\n"
7271
end
7372

@@ -89,15 +88,6 @@ task :update_changelog do
8988
changelog_update << "\n\n"
9089
end
9190

92-
unless log_entries[:dsl].empty?
93-
changelog_update << "### DSL\n\n"
94-
changelog_update << log_entries[:dsl]
95-
.map { |l| l.gsub /\[DSL\] /, '' }
96-
.map { |l| "#{l}" }
97-
.join("\n")
98-
changelog_update << "\n\n"
99-
end
100-
10191
File.open('CHANGELOG.md', 'w+') { |f| f.write changelog_update and f.write changelog }
10292

10393
puts "\n\n", "= DIFF ".ansi(:faint) + ('='*93).ansi(:faint)

0 commit comments

Comments
 (0)