Skip to content
This repository was archived by the owner on Oct 22, 2020. It is now read-only.

Commit 4c57752

Browse files
committed
Fix indentation level increasing upon subsequent errors
1 parent e656824 commit 4c57752

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

lib/cli/loaded_module.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def run
4444
end
4545

4646
context.module.cleanup
47+
self.indent_level = 1
4748
end
4849

4950
def check

lib/cli/output.rb

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@ module Cli
44
# Methods for handling output to the screen.
55
module Output
66
def indent_cursor(level = 1)
7-
@indent_level += level
7+
self.indent_level += level
88
yield
9-
@indent_level -= level
9+
self.indent_level -= level
1010
end
1111

1212
def remove_new_lines_and_wrap_text(s, padding = 0, width = 78)
1313
s.tr("\n", '')
14-
.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n#{@indent * @indent_level}#{' ' * padding}").chomp
14+
.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n#{@indent * indent_level}#{' ' * padding}").chomp
1515
.gsub(/\s+$/, '')
1616
end
1717

1818
def wrap_text(s, padding = 0, width = 78)
19-
s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n#{@indent * @indent_level}#{' ' * padding}").chomp
19+
s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n#{@indent * indent_level}#{' ' * padding}").chomp
2020
.gsub(/\s+$/, '')
2121
end
2222

2323
def indent_without_wrap(s)
24-
s.gsub(/\n/, "\n#{@indent * @indent_level}")
24+
s.gsub(/\n/, "\n#{@indent * indent_level}")
2525
end
2626

2727
def print_std(msg)
28-
puts "#{@indent * @indent_level}#{msg}"
28+
puts "#{@indent * indent_level}#{msg}"
2929
end
3030

3131
def print_info(msg)
32-
print "#{@indent * @indent_level}[-] ".light_blue
32+
print "#{@indent * indent_level}[-] ".light_blue
3333
puts wrap_text(msg, 4, 90)
3434
end
3535

3636
def print_good(msg)
37-
print "#{@indent * @indent_level}[+] ".green
37+
print "#{@indent * indent_level}[+] ".green
3838
puts wrap_text(msg, 4, 90)
3939
end
4040

4141
def print_bad(msg)
42-
print "#{@indent * @indent_level}[!] ".red
42+
print "#{@indent * indent_level}[!] ".red
4343
puts wrap_text(msg, 4, 90)
4444
end
4545

4646
def print_warning(msg)
47-
print "#{@indent * @indent_level}[!] ".yellow
47+
print "#{@indent * indent_level}[!] ".yellow
4848
puts wrap_text(msg, 4, 90)
4949
end
5050

@@ -82,12 +82,14 @@ def print_header_separator(widths)
8282
end
8383

8484
def print_table_row(data, widths)
85-
print @indent * @indent_level
85+
print @indent * indent_level
8686
data.keys.each do |col|
8787
padding = widths[col] - data[col].to_s.length
8888
print("#{data[col]}#{' ' * padding} ")
8989
end
9090
puts ''
9191
end
92+
93+
attr_accessor :indent_level
9294
end
9395
end

0 commit comments

Comments
 (0)