Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e7d3fe44
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e7d3fe44
编写于
4月 17, 2017
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Only set the encoding before passing to Ansi2html
上级
dac23fa2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
12 deletion
+15
-12
lib/gitlab/ci/trace.rb
lib/gitlab/ci/trace.rb
+0
-2
lib/gitlab/ci/trace/stream.rb
lib/gitlab/ci/trace/stream.rb
+8
-3
spec/lib/gitlab/ci/trace/stream_spec.rb
spec/lib/gitlab/ci/trace/stream_spec.rb
+7
-7
未找到文件。
lib/gitlab/ci/trace.rb
浏览文件 @
e7d3fe44
...
...
@@ -50,8 +50,6 @@ module Gitlab
end
def
read
return
unless
exist?
stream
=
Gitlab
::
Ci
::
Trace
::
Stream
.
new
do
if
current_path
File
.
open
(
current_path
,
"rb"
)
...
...
lib/gitlab/ci/trace/stream.rb
浏览文件 @
e7d3fe44
...
...
@@ -14,9 +14,7 @@ module Gitlab
def
initialize
@stream
=
yield
@stream
.
binmode
# Ci::Ansi2html::Converter would read from @stream directly
@stream
.
set_encoding
(
Encoding
.
default_external
)
@stream
.
binmode
if
@stream
end
def
valid?
...
...
@@ -58,12 +56,14 @@ module Gitlab
end
def
html_with_state
(
state
=
nil
)
set_encoding_for_ansi2html
::
Ci
::
Ansi2html
.
convert
(
stream
,
state
)
end
def
html
(
last_lines:
nil
)
text
=
raw
(
last_lines:
last_lines
)
stream
=
StringIO
.
new
(
text
)
set_encoding_for_ansi2html
(
stream
)
::
Ci
::
Ansi2html
.
convert
(
stream
).
html
end
...
...
@@ -117,6 +117,11 @@ module Gitlab
chunks
.
join
.
lines
.
last
(
last_lines
).
join
end
def
set_encoding_for_ansi2html
(
stream
=
@stream
)
# Ci::Ansi2html::Converter would read from @stream directly
stream
.
set_encoding
(
Encoding
.
default_external
)
end
end
end
end
...
...
spec/lib/gitlab/ci/trace/stream_spec.rb
浏览文件 @
e7d3fe44
...
...
@@ -34,12 +34,12 @@ describe Gitlab::Ci::Trace::Stream do
end
context
'when the trace contains ANSI sequence and Unicode'
do
let
(
:io
)
do
File
.
open
(
expand_fixture_path
(
'trace/ansi-sequence-and-unicode'
))
let
(
:stream
)
do
described_class
.
new
do
File
.
open
(
expand_fixture_path
(
'trace/ansi-sequence-and-unicode'
))
end
end
let
(
:stream
)
{
described_class
.
new
{
io
}
}
it
'forwards to the next linefeed, case 1'
do
stream
.
limit
(
7
)
...
...
@@ -60,11 +60,11 @@ describe Gitlab::Ci::Trace::Stream do
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/30796
it
'reads in binary, output as Encoding.default_external'
do
stream
.
limit
(
29
)
stream
.
limit
(
52
)
result
=
io
.
read
# Ci::Ansi2html::Converter would read with each_line
result
=
stream
.
html
expect
(
result
).
to
eq
(
"
\e
[01;32m許功蓋
\e
[0m
\n
"
)
expect
(
result
.
lines
.
first
).
to
eq
(
"ヾ(´༎ຶД༎ຶ`)ノ<br><span class=
\"
term-fg-green
\"
>許功蓋</span><br>
"
)
expect
(
result
.
encoding
).
to
eq
(
Encoding
.
default_external
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录