livetext 0.9.10 → 0.9.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cmdargs.rb +93 -0
- data/lib/errors.rb +15 -0
- data/lib/formatline.rb +59 -88
- data/lib/functions.rb +6 -2
- data/lib/helpers.rb +163 -0
- data/lib/html.rb +32 -0
- data/lib/livetext/importable.rb +2 -0
- data/lib/livetext.rb +30 -148
- data/lib/parser/file.rb +8 -0
- data/lib/parser/general.rb +38 -0
- data/lib/parser/import.rb +17 -0
- data/lib/parser/mixin.rb +53 -0
- data/lib/parser/set.rb +145 -0
- data/lib/parser/string.rb +70 -0
- data/lib/parser.rb +5 -0
- data/lib/processor.rb +23 -27
- data/lib/standard.rb +155 -348
- data/lib/userapi.rb +2 -5
- data/livetext.gemspec +1 -2
- data/plugin/bookish.rb +26 -22
- data/plugin/calibre.rb +1 -1
- data/plugin/livemagick.rb +10 -10
- data/plugin/markdown.rb +13 -11
- data/plugin/pyggish.rb +94 -84
- data/plugin/tutorial.rb +10 -5
- data/test/all.rb +3 -0
- data/test/snapshots/OMIT.txt +9 -0
- data/test/{data → snapshots}/basic_formatting/expected-error.txt +0 -0
- data/test/{data → snapshots}/basic_formatting/expected-output.txt +0 -0
- data/test/{data → snapshots}/basic_formatting/source.lt3 +0 -0
- data/test/{data → snapshots}/block_comment/expected-error.txt +0 -0
- data/test/{data → snapshots}/block_comment/expected-output.txt +0 -0
- data/test/{data → snapshots}/block_comment/source.lt3 +0 -0
- data/test/snapshots/clusion.txt +35 -0
- data/test/{data → snapshots}/comments_ignored_1/expected-error.txt +0 -0
- data/test/{data → snapshots}/comments_ignored_1/expected-output.txt +0 -0
- data/test/{data → snapshots}/comments_ignored_1/source.lt3 +0 -0
- data/test/{data → snapshots}/copy_is_raw/expected-error.txt +0 -0
- data/test/{data → snapshots}/copy_is_raw/expected-output.txt +0 -0
- data/test/{data → snapshots}/copy_is_raw/rawtext.inc +0 -0
- data/test/{data → snapshots}/copy_is_raw/source.lt3 +0 -0
- data/test/{data → snapshots}/crap +0 -0
- data/test/{data → snapshots}/def_method/expected-error.txt +0 -0
- data/test/{data → snapshots}/def_method/expected-output.txt +0 -0
- data/test/{data → snapshots}/def_method/source.lt3 +0 -0
- data/test/snapshots/error_inc_line_num/actual-error.txt +14 -0
- data/test/{data/error_inc_line_num/expected-output.txt → snapshots/error_inc_line_num/actual-output.txt} +0 -0
- data/test/snapshots/error_inc_line_num/expected-output.txt +13 -0
- data/test/{data → snapshots}/error_inc_line_num/file2.lt3 +0 -0
- data/test/snapshots/error_inc_line_num/match-error.txt +1 -0
- data/test/snapshots/error_inc_line_num/out-sdiff.txt +14 -0
- data/test/{data → snapshots}/error_inc_line_num/source.lt3 +0 -0
- data/test/snapshots/error_invalid_name/actual-error.txt +10 -0
- data/test/{data/error_no_such_mixin/expected-output.txt → snapshots/error_invalid_name/actual-output.txt} +0 -0
- data/test/{data → snapshots}/error_invalid_name/expected-output.txt +0 -0
- data/test/snapshots/error_invalid_name/match-error.txt +1 -0
- data/test/snapshots/error_invalid_name/out-sdiff.txt +6 -0
- data/test/{data → snapshots}/error_invalid_name/source.lt3 +0 -0
- data/test/{data → snapshots}/error_line_num/expected-output.txt +0 -0
- data/test/snapshots/error_line_num/match-error.txt +1 -0
- data/test/{data → snapshots}/error_line_num/source.lt3 +0 -0
- data/test/{data → snapshots}/error_mismatched_end/expected-output.txt +0 -0
- data/test/snapshots/error_mismatched_end/match-error.txt +1 -0
- data/test/{data → snapshots}/error_mismatched_end/source.lt3 +0 -0
- data/test/snapshots/error_missing_end/actual-error.txt +10 -0
- data/test/{data/example_alpha/expected-error.txt → snapshots/error_missing_end/actual-output.txt} +0 -0
- data/test/{data → snapshots}/error_missing_end/expected-output.txt +1 -0
- data/test/snapshots/error_missing_end/match-error.txt +1 -0
- data/test/snapshots/error_missing_end/out-sdiff.txt +6 -0
- data/test/{data → snapshots}/error_missing_end/source.lt3 +0 -0
- data/test/{data/example_alpha2/expected-error.txt → snapshots/error_name_not_permitted/expected-output.txt} +0 -0
- data/test/snapshots/error_name_not_permitted/match-error.txt +1 -0
- data/test/{data → snapshots}/error_name_not_permitted/source.lt3 +0 -0
- data/test/snapshots/error_no_such_copy/actual-error.txt +10 -0
- data/test/{data/functions/expected-error.txt → snapshots/error_no_such_copy/actual-output.txt} +0 -0
- data/test/{data → snapshots}/error_no_such_copy/expected-output.txt +0 -1
- data/test/snapshots/error_no_such_copy/match-error.txt +1 -0
- data/test/snapshots/error_no_such_copy/out-sdiff.txt +5 -0
- data/test/{data → snapshots}/error_no_such_copy/source.lt3 +0 -0
- data/test/snapshots/error_no_such_inc/actual-error.txt +10 -0
- data/test/{data/hello_world/expected-error.txt → snapshots/error_no_such_inc/actual-output.txt} +0 -0
- data/test/{data → snapshots}/error_no_such_inc/expected-output.txt +0 -0
- data/test/snapshots/error_no_such_inc/match-error.txt +1 -0
- data/test/snapshots/error_no_such_inc/out-sdiff.txt +6 -0
- data/test/{data → snapshots}/error_no_such_inc/source.lt3 +0 -0
- data/test/snapshots/error_no_such_mixin/actual-error.txt +37 -0
- data/test/{data/more_complex_vars/expected-error.txt → snapshots/error_no_such_mixin/actual-output.txt} +0 -0
- data/test/snapshots/error_no_such_mixin/expected-output.txt +5 -0
- data/test/snapshots/error_no_such_mixin/match-error.txt +1 -0
- data/test/snapshots/error_no_such_mixin/out-sdiff.txt +6 -0
- data/test/{data → snapshots}/error_no_such_mixin/source.lt3 +0 -0
- data/test/{data/raw_lines → snapshots/example_alpha}/expected-error.txt +0 -0
- data/test/{data → snapshots}/example_alpha/expected-output.txt +0 -0
- data/test/{data → snapshots}/example_alpha/source.lt3 +0 -0
- data/test/{data/raw_text_block → snapshots/example_alpha2}/expected-error.txt +0 -0
- data/test/{data → snapshots}/example_alpha2/expected-output.txt +0 -0
- data/test/{data → snapshots}/example_alpha2/source.lt3 +0 -0
- data/test/{data → snapshots}/fixit +0 -0
- data/test/{data/simple_copy → snapshots/functions}/expected-error.txt +0 -0
- data/test/{data → snapshots}/functions/expected-output.txt +0 -0
- data/test/{data → snapshots}/functions/source.lt3 +0 -0
- data/test/{data/simple_include → snapshots/hello_world}/expected-error.txt +0 -0
- data/test/{data → snapshots}/hello_world/expected-output.txt +0 -0
- data/test/{data → snapshots}/hello_world/source.lt3 +0 -0
- data/test/{data/simple_mixin → snapshots/more_complex_vars}/expected-error.txt +0 -0
- data/test/{data → snapshots}/more_complex_vars/expected-output.txt +0 -0
- data/test/{data → snapshots}/more_complex_vars/source.lt3 +0 -0
- data/test/{data/simple_vars → snapshots/predef_vars}/expected-error.txt +0 -0
- data/test/snapshots/predef_vars/match-output.txt +6 -0
- data/test/snapshots/predef_vars/source.lt3 +6 -0
- data/test/{data/single_raw_line → snapshots/raw_lines}/expected-error.txt +0 -0
- data/test/{data → snapshots}/raw_lines/expected-output.txt +0 -0
- data/test/{data → snapshots}/raw_lines/source.lt3 +0 -0
- data/test/{data/table_with_heredocs → snapshots/raw_text_block}/expected-error.txt +0 -0
- data/test/{data → snapshots}/raw_text_block/expected-output.txt +0 -0
- data/test/{data → snapshots}/raw_text_block/rawtext.inc +0 -0
- data/test/{data → snapshots}/raw_text_block/source.lt3 +0 -0
- data/test/{data/subset.txt → snapshots/simple_copy/expected-error.txt} +0 -0
- data/test/{data → snapshots}/simple_copy/expected-output.txt +0 -0
- data/test/{data → snapshots}/simple_copy/simplefile.inc +0 -0
- data/test/{data → snapshots}/simple_copy/source.lt3 +0 -0
- data/test/snapshots/simple_import/actual-error.txt +8 -0
- data/test/snapshots/simple_import/actual-output.txt +3 -0
- data/test/snapshots/simple_import/err-sdiff.txt +9 -0
- data/test/snapshots/simple_import/expected-error.txt +0 -0
- data/test/snapshots/simple_import/expected-output.txt +7 -0
- data/test/snapshots/simple_import/out-sdiff.txt +9 -0
- data/test/snapshots/simple_import/simple_import.rb +5 -0
- data/test/snapshots/simple_import/source.lt3 +7 -0
- data/test/snapshots/simple_include/expected-error.txt +0 -0
- data/test/{data → snapshots}/simple_include/expected-output.txt +0 -0
- data/test/{data → snapshots}/simple_include/simplefile.inc +0 -0
- data/test/{data → snapshots}/simple_include/source.lt3 +0 -1
- data/test/snapshots/simple_mixin/expected-error.txt +0 -0
- data/test/{data → snapshots}/simple_mixin/expected-output.txt +0 -0
- data/test/{data → snapshots}/simple_mixin/simple_mixin.rb +0 -0
- data/test/{data → snapshots}/simple_mixin/source.lt3 +0 -0
- data/test/snapshots/simple_vars/expected-error.txt +0 -0
- data/test/{data → snapshots}/simple_vars/expected-output.txt +0 -0
- data/test/{data → snapshots}/simple_vars/source.lt3 +0 -0
- data/test/snapshots/single_raw_line/expected-error.txt +0 -0
- data/test/{data → snapshots}/single_raw_line/expected-output.txt +0 -0
- data/test/{data → snapshots}/single_raw_line/source.lt3 +0 -0
- data/test/snapshots/subset.txt +0 -0
- data/test/snapshots/table_with_heredocs/expected-error.txt +0 -0
- data/test/{data → snapshots}/table_with_heredocs/expected-output.txt +0 -0
- data/test/{data → snapshots}/table_with_heredocs/source.lt3 +0 -0
- data/test/snapshots.rb +169 -0
- data/test/testlines.rb +17 -7
- data/test/unit/all.rb +4 -0
- data/test/unit/formatline.rb +650 -0
- data/test/unit/html.rb +38 -0
- data/test/unit/parser/all.rb +3 -0
- data/test/unit/parser/general.rb +59 -0
- data/test/unit/parser/importable.rb +19 -0
- data/test/unit/parser/mixin.rb +19 -0
- data/test/unit/parser/set.rb +164 -0
- data/test/unit/parser/string.rb +130 -0
- data/test/unit/parser.rb +6 -0
- data/test/unit/standard.rb +23 -0
- data/test/unit/stringparser.rb +140 -0
- metadata +150 -97
- data/test/data/error_inc_line_num/expected-err-line1match.txt +0 -1
- data/test/data/error_invalid_name/expected-err-line1match.txt +0 -1
- data/test/data/error_line_num/expected-err-line1match.txt +0 -1
- data/test/data/error_mismatched_end/expected-err-line1match.txt +0 -1
- data/test/data/error_missing_end/expected-err-line1match.txt +0 -1
- data/test/data/error_name_not_permitted/expected-error.txt +0 -1
- data/test/data/error_name_not_permitted/expected-output.txt +0 -4
- data/test/data/error_no_such_copy/expected-err-line1match.txt +0 -1
- data/test/data/error_no_such_inc/expected-err-line1match.txt +0 -1
- data/test/data/error_no_such_mixin/expected-err-line1match.txt +0 -1
- data/test/data/lines.txt +0 -120
- data/test/extratests.txt +0 -20
- data/test/formatting.rb +0 -110
- data/test/test.rb +0 -140
data/test/test.rb
DELETED
@@ -1,140 +0,0 @@
|
|
1
|
-
def minitest?
|
2
|
-
require 'minitest/autorun'
|
3
|
-
end
|
4
|
-
|
5
|
-
abort "minitest gem is not installed" unless minitest?
|
6
|
-
|
7
|
-
|
8
|
-
$LOAD_PATH << "./lib"
|
9
|
-
|
10
|
-
require 'livetext'
|
11
|
-
|
12
|
-
class TestingLivetext < MiniTest::Test
|
13
|
-
|
14
|
-
TTY = File.open("/dev/tty","w")
|
15
|
-
|
16
|
-
dir = ARGV.first == "cmdline" ? "../" : ""
|
17
|
-
Data = "#{dir}test/data"
|
18
|
-
|
19
|
-
TestLines = []
|
20
|
-
|
21
|
-
Dir.chdir `livetext --path`.chomp.chomp if ARGV.first == "cmdline"
|
22
|
-
|
23
|
-
Dir.chdir(Data)
|
24
|
-
|
25
|
-
f = File.open("lines.txt")
|
26
|
-
loop do
|
27
|
-
item = []
|
28
|
-
4.times { item << f.gets.chomp }
|
29
|
-
raise "Oops? #{item.inspect}" unless item.last == ""
|
30
|
-
TestLines << item
|
31
|
-
break if f.eof?
|
32
|
-
end
|
33
|
-
|
34
|
-
if File.size("subset.txt") == 0
|
35
|
-
puts "Defining via TestLines"
|
36
|
-
TestLines.each.with_index do |item, i|
|
37
|
-
msg, src, exp, blank = *item
|
38
|
-
define_method("test_formatting_#{i}") do
|
39
|
-
actual = FormatLine.parse!(src)
|
40
|
-
if exp[0] == "/" # regex!
|
41
|
-
exp = Regexp.compile(exp[1..-2]) # skip slashes
|
42
|
-
assert_match(exp, actual, msg)
|
43
|
-
else
|
44
|
-
assert_equal(exp, actual, msg)
|
45
|
-
end
|
46
|
-
end
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
TestDirs = Dir.entries(".").reject {|f| ! File.directory?(f) } - %w[. ..]
|
51
|
-
selected = File.readlines("subset.txt").map(&:chomp)
|
52
|
-
Subset = selected.empty? ? TestDirs : selected
|
53
|
-
|
54
|
-
Subset.each do |tdir|
|
55
|
-
define_method("test_#{tdir}") do
|
56
|
-
external_files(tdir)
|
57
|
-
end
|
58
|
-
end
|
59
|
-
|
60
|
-
def green(str)
|
61
|
-
"[32m" + str.to_s + "[0m"
|
62
|
-
end
|
63
|
-
|
64
|
-
def red(str)
|
65
|
-
"[31m" + str.to_s + "[0m"
|
66
|
-
end
|
67
|
-
|
68
|
-
def external_files(base)
|
69
|
-
Dir.chdir(base) do
|
70
|
-
src, out, exp = "source.lt3", "/tmp/#{base}--actual-output.txt", "expected-output.txt"
|
71
|
-
err, erx = "/tmp/#{base}--actual-error.txt", "expected-error.txt"
|
72
|
-
|
73
|
-
# New features - match out/err by regex
|
74
|
-
expout_regex = "expected-out-line1match.txt"
|
75
|
-
experr_regex = "expected-err-line1match.txt"
|
76
|
-
|
77
|
-
cmd = "livetext #{src} >#{out} 2>#{err}"
|
78
|
-
system(cmd)
|
79
|
-
|
80
|
-
output = File.read(out)
|
81
|
-
errors = File.read(err)
|
82
|
-
rx_out = rx_err = nil
|
83
|
-
|
84
|
-
if File.exist?(expout_regex)
|
85
|
-
rx_out = /#{Regexp.escape(File.read(expout_regex).chomp)}/
|
86
|
-
expected = rx_out # "(match test)"
|
87
|
-
else
|
88
|
-
expected = File.read(exp)
|
89
|
-
end
|
90
|
-
|
91
|
-
if File.exist?(experr_regex)
|
92
|
-
rx_err = /#{Regexp.escape(File.read(experr_regex).chomp)}/
|
93
|
-
errexp = rx_err # "(match test)"
|
94
|
-
else
|
95
|
-
errexp = File.read(erx)
|
96
|
-
end
|
97
|
-
|
98
|
-
if rx_out
|
99
|
-
out_ok = output =~ rx_out
|
100
|
-
else
|
101
|
-
out_ok = output == expected
|
102
|
-
end
|
103
|
-
|
104
|
-
if rx_err
|
105
|
-
err_ok = errors =~ rx_err
|
106
|
-
else
|
107
|
-
err_ok = errors == errexp
|
108
|
-
end
|
109
|
-
|
110
|
-
nout = output.split("\n").size
|
111
|
-
nexp = expected.split("\n").size
|
112
|
-
bad_out = "--- Expected (#{nexp} lines): \n#{green(expected)}\n--- Output (#{nout} lines): \n#{red(output)}\n"
|
113
|
-
bad_err = "--- Error Expected: \n#{green(errexp)}\n--- Error Output: \n#{red(errors)}\n"
|
114
|
-
|
115
|
-
assert(out_ok, bad_out)
|
116
|
-
assert(err_ok, bad_err)
|
117
|
-
# only on success
|
118
|
-
system("rm -f #{out} #{err}") if out_ok && err_ok
|
119
|
-
end
|
120
|
-
end
|
121
|
-
|
122
|
-
end
|
123
|
-
|
124
|
-
|
125
|
-
=begin
|
126
|
-
|
127
|
-
You can add any ordinary test method above. But so far, all these tests simply
|
128
|
-
call external_files.
|
129
|
-
|
130
|
-
The external_files method works this way:
|
131
|
-
- If the test (caller) method is test_my_silly_feature, then we will
|
132
|
-
look for a directory called data/my_silly_feature
|
133
|
-
- In here, there must be a source.lt3, expected-output.txt, and expected-error.txt
|
134
|
-
- Technically, any of these can be empty
|
135
|
-
- We run livetext on the source and compare actual vs expected (stdout, stderr)
|
136
|
-
- The "real" output gets checked first
|
137
|
-
- Of course, both must compare correctly for the test to pass
|
138
|
-
|
139
|
-
=end
|
140
|
-
|