File tree Expand file tree Collapse file tree 5 files changed +2
-30
lines changed Expand file tree Collapse file tree 5 files changed +2
-30
lines changed Original file line number Diff line number Diff line change @@ -40,8 +40,7 @@ See also [`doc/examples`](https://github.com/elastic/elasticsearch-ruby/blob/mai
40
40
This repository contains these additional Ruby libraries:
41
41
42
42
* [ ` 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 ) ,
45
44
46
45
Please see their respective READMEs for information and documentation.
47
46
Original file line number Diff line number Diff line change @@ -58,7 +58,6 @@ require 'pathname'
58
58
CURRENT_PATH = Pathname ( File . expand_path ( __dir__ ) )
59
59
SUBPROJECTS = [
60
60
'elasticsearch' ,
61
- 'elasticsearch-dsl' ,
62
61
'elasticsearch-api'
63
62
] . freeze
64
63
Original file line number Diff line number Diff line change 1
1
#!/usr/bin/env ruby
2
2
3
3
$LOAD_PATH. unshift ( File . expand_path ( '../../elasticsearch/lib' , __dir__ ) )
4
- $LOAD_PATH. unshift ( File . expand_path ( '../../elasticsearch-dsl/lib' , __dir__ ) )
5
4
$LOAD_PATH. unshift ( File . expand_path ( '../../elasticsearch-api/lib' , __dir__ ) )
6
5
7
6
require 'elasticsearch'
8
7
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
22
8
23
9
include Elasticsearch
24
- include Elasticsearch ::DSL if defined? ( Elasticsearch ::DSL )
25
10
26
11
begin
27
12
require 'pry'
Original file line number Diff line number Diff line change 17
17
18
18
UNIT_TESTED_PROJECTS = [
19
19
'elasticsearch' ,
20
- 'elasticsearch-dsl' ,
21
20
'elasticsearch-api'
22
21
] . freeze
23
22
Original file line number Diff line number Diff line change @@ -61,13 +61,12 @@ task :update_changelog do
61
61
log_entries = { }
62
62
log_entries [ :client ] = log . select { |l | l =~ /\[ CLIENT\] / }
63
63
log_entries [ :api ] = log . select { |l | l =~ /\[ API\] / }
64
- log_entries [ :dsl ] = log . select { |l | l =~ /\[ DSL\] / }
65
64
66
65
changelog = File . read ( File . open ( 'CHANGELOG.md' , 'r' ) )
67
66
68
67
changelog_update = ''
69
68
70
- if log . any? { |l | l =~ /CLIENT|API|DSL / }
69
+ if log . any? { |l | l =~ /CLIENT|API/ }
71
70
changelog_update << "## #{ args [ :new ] } \n \n "
72
71
end
73
72
@@ -89,15 +88,6 @@ task :update_changelog do
89
88
changelog_update << "\n \n "
90
89
end
91
90
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
-
101
91
File . open ( 'CHANGELOG.md' , 'w+' ) { |f | f . write changelog_update and f . write changelog }
102
92
103
93
puts "\n \n " , "= DIFF " . ansi ( :faint ) + ( '=' *93 ) . ansi ( :faint )
You can’t perform that action at this time.
0 commit comments