Skip to content

Commit 8cf20a2

Browse files
authored
Move to reline (#80)
Too many conflicts on readline that get old versions that behave badly. Use reline instead. Signed-off-by: Phil Dibowitz <phil@ipom.com>
1 parent 19a3663 commit 8cf20a2

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Gemfile.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ PATH
99
mixlib-config
1010
mixlib-log
1111
octokit
12+
reline
1213
sqlite3
1314

1415
GEM
@@ -49,6 +50,7 @@ GEM
4950
histogram
5051
rmagick (>= 5.5)
5152
histogram (0.2.4.1)
53+
io-console (0.8.2)
5254
json (2.12.2)
5355
kramdown (2.5.1)
5456
rexml (>= 3.3.9)
@@ -86,6 +88,8 @@ GEM
8688
racc (1.8.1)
8789
rainbow (3.1.1)
8890
regexp_parser (2.10.0)
91+
reline (0.6.3)
92+
io-console (~> 0.5)
8993
rexml (3.4.1)
9094
rmagick (6.1.1)
9195
observer (~> 0.1)

bin/meeting_stats

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require 'date'
55
require 'sqlite3'
66
require 'fileutils'
77
require 'gruff'
8-
require 'readline'
8+
require 'reline'
99

1010
require_relative '../lib/oss_stats/log'
1111
require_relative '../lib/oss_stats/config/meeting_stats'
@@ -145,7 +145,7 @@ def rename_team(db, config)
145145

146146
setup_readline_completion(teams)
147147

148-
old_name = Readline.readline('Team to rename (TAB to complete): ', true)
148+
old_name = Reline.readline('Team to rename (TAB to complete): ', true)
149149
return if old_name.nil? || old_name.strip.empty?
150150

151151
old_name = old_name.strip
@@ -205,19 +205,19 @@ def setup_readline_completion(options)
205205
options.select { |opt| opt.downcase.start_with?(s.downcase) }
206206
end
207207

208-
Readline.completion_append_character = nil
209-
Readline.completion_proc = comp
208+
Reline.completion_append_character = nil
209+
Reline.completion_proc = comp
210210

211-
if Readline.respond_to?(:completion_case_fold=)
212-
Readline.completion_case_fold = true
211+
if Reline.respond_to?(:completion_case_fold=)
212+
Reline.completion_case_fold = true
213213
end
214214

215215
# Remove space from word break characters so multi-word
216216
# options like "Chef Client" are treated as one word
217-
return unless Readline.respond_to?(:completer_word_break_characters=)
217+
return unless Reline.respond_to?(:completer_word_break_characters=)
218218

219-
original_word_break = Readline.completer_word_break_characters
220-
Readline.completer_word_break_characters =
219+
original_word_break = Reline.completer_word_break_characters
220+
Reline.completer_word_break_characters =
221221
original_word_break.delete(' ')
222222
end
223223

@@ -236,7 +236,7 @@ def prompt_team_or_q(teams)
236236
log.info(' - abort (to quit without saving)')
237237
log.info(' - [f]inish (to save)')
238238
log.info('')
239-
response = Readline.readline('Team?> ', true)
239+
response = Reline.readline('Team?> ', true)
240240

241241
# Handle Ctrl-C or Ctrl-D
242242
return false if response.nil?

oss-stats.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
3636
mixlib-config
3737
mixlib-log
3838
octokit
39+
reline
3940
sqlite3
4041
}.each do |dep|
4142
spec.add_dependency dep

0 commit comments

Comments
 (0)