Avoid using StringScanner#captures, not available before Ruby 2.5

pgeraghty · Sep 24, 2019 · 6ade861 · 6ade861
1 parent ec4d4ae
commit 6ade861
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/ansible/output.rb b/lib/ansible/output.rb
@@ -20,7 +20,7 @@ def self.to_html(line, stream='')
       s = StringScanner.new(ERB::Util.h line)
       while(!s.eos?)
         if s.scan(/\e\[([0-1])?[;]?(3[0-7]|90|1)m/)
-          bold, colour = s.captures
+          bold, colour = s[1], s[2]
           styles = []
 
           styles << COLOR[bold] if bold.to_i == 1

diff --git a/spec/ansible/output_spec.rb b/spec/ansible/output_spec.rb
@@ -58,9 +58,10 @@ module Output
         it 'handles situations where no style attribute should be added to the tag' do
           output = "\e[0;99Nothing\e[0m"
 
-          s = instance_double("StringScanner", captures: [])
+          s = instance_double("StringScanner")
           allow(s).to receive(:eos?).and_return(false, true)
           allow(s).to receive(:scan).and_return(true, '')
+          allow(s).to receive(:[]).and_return(nil, nil)
 
           class_double("StringScanner", new: s).as_stubbed_const