Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a542bfdd
Commit
a542bfdd
authored
Aug 21, 2017
by
tcharding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update vendored package heredoc
parent
4aaf39a5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
47 deletions
+56
-47
Godeps.json
Godeps/Godeps.json
+1
-1
LICENSE
vendor/github.com/MakeNowJust/heredoc/LICENSE
+21
-21
README.md
vendor/github.com/MakeNowJust/heredoc/README.md
+7
-7
heredoc.go
vendor/github.com/MakeNowJust/heredoc/heredoc.go
+27
-18
No files found.
Godeps/Godeps.json
View file @
a542bfdd
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
},
},
{
{
"ImportPath"
:
"github.com/MakeNowJust/heredoc"
,
"ImportPath"
:
"github.com/MakeNowJust/heredoc"
,
"Rev"
:
"
1d91351acdc1cb2f2c995864674b754134b86ca7
"
"Rev"
:
"
bb23615498cded5e105af4ce27de75b089cbe851
"
},
},
{
{
"ImportPath"
:
"github.com/Microsoft/go-winio"
,
"ImportPath"
:
"github.com/Microsoft/go-winio"
,
...
...
vendor/github.com/MakeNowJust/heredoc/LICENSE
View file @
a542bfdd
The MIT License (MIT)
The MIT License (MIT)
Copyright (c) 2014
TSUYUSATO Kitsune
Copyright (c) 2014
-2017 TSUYUSATO Kitsune
Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
vendor/github.com/MakeNowJust/heredoc/README.md
View file @
a542bfdd
#
heredoc [](https://drone.io/github.com/MakeNowJust/heredoc/latest
) [](https://gowalker.org/github.com/MakeNowJust/heredoc)
#
heredoc [](https://circleci.com/gh/MakeNowJust/heredoc
) [](https://gowalker.org/github.com/MakeNowJust/heredoc)
##About
##
About
Package heredoc provides the here-document with keeping indent.
Package heredoc provides the here-document with keeping indent.
##Install
##
Install
```
console
```
console
$
go get github.com/MakeNowJust/heredoc
$
go get github.com/MakeNowJust/heredoc
```
```
##Import
##
Import
```
go
```
go
// usual
// usual
...
@@ -19,7 +19,7 @@ import "github.com/MakeNowJust/heredoc"
...
@@ -19,7 +19,7 @@ import "github.com/MakeNowJust/heredoc"
import
.
"github.com/MakeNowJust/heredoc/dot"
import
.
"github.com/MakeNowJust/heredoc/dot"
```
```
##Example
##
Example
```
go
```
go
package
main
package
main
...
@@ -43,11 +43,11 @@ func main() {
...
@@ -43,11 +43,11 @@ func main() {
}
}
```
```
##API Document
##
API Document
-
[
Go Walker - github.com/MakeNowJust/heredoc
](
https://gowalker.org/github.com/MakeNowJust/heredoc
)
-
[
Go Walker - github.com/MakeNowJust/heredoc
](
https://gowalker.org/github.com/MakeNowJust/heredoc
)
-
[
Go Walker - github.com/MakeNowJust/heredoc/dot
](
https://gowalker.org/github.com/MakeNowJust/heredoc/dot
)
-
[
Go Walker - github.com/MakeNowJust/heredoc/dot
](
https://gowalker.org/github.com/MakeNowJust/heredoc/dot
)
##License
##
License
This software is released under the MIT License, see LICENSE.
This software is released under the MIT License, see LICENSE.
vendor/github.com/MakeNowJust/heredoc/heredoc.go
View file @
a542bfdd
// Copyright (c) 2014 TSUYUSATO Kitsune
// Copyright (c) 2014
-2017
TSUYUSATO Kitsune
// This software is released under the MIT License.
// This software is released under the MIT License.
// http://opensource.org/licenses/mit-license.php
// http://opensource.org/licenses/mit-license.php
// Package heredoc provides
the here-document with keeping indent
.
// Package heredoc provides
creation of here-documents from raw strings
.
//
//
// Golang supports raw-string syntax.
// Golang supports raw-string syntax.
// doc := `
// doc := `
// Foo
// Foo
// Bar
// Bar
// `
// `
// But raw-string cannot recognize indent
. Thus such content is
indented string, equivalent to
// But raw-string cannot recognize indent
ation. Thus such content is an
indented string, equivalent to
// "\n\tFoo\n\tBar\n"
// "\n\tFoo\n\tBar\n"
// I dont't want this!
// I dont't want this!
//
//
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
// Foo
// Foo
// Bar
// Bar
// `)
// `)
// I
t i
s equivalent to
// Is equivalent to
// "Foo\nBar\n"
// "Foo\nBar\n"
package
heredoc
package
heredoc
...
@@ -28,11 +28,9 @@ import (
...
@@ -28,11 +28,9 @@ import (
"unicode"
"unicode"
)
)
// heredoc.Doc retutns unindented string as here-document.
const
maxInt
=
int
(
^
uint
(
0
)
>>
1
)
//
// Process of making here-document:
// Doc returns un-indented string as here-document.
// 1. Find most little indent size. (Skip empty lines)
// 2. Remove this indents of lines.
func
Doc
(
raw
string
)
string
{
func
Doc
(
raw
string
)
string
{
skipFirstLine
:=
false
skipFirstLine
:=
false
if
raw
[
0
]
==
'\n'
{
if
raw
[
0
]
==
'\n'
{
...
@@ -41,10 +39,18 @@ func Doc(raw string) string {
...
@@ -41,10 +39,18 @@ func Doc(raw string) string {
skipFirstLine
=
true
skipFirstLine
=
true
}
}
minIndentSize
:=
int
(
^
uint
(
0
)
>>
1
)
// Max value of type int
lines
:=
strings
.
Split
(
raw
,
"
\n
"
)
lines
:=
strings
.
Split
(
raw
,
"
\n
"
)
// 1.
minIndentSize
:=
getMinIndent
(
lines
,
skipFirstLine
)
lines
=
removeIndentation
(
lines
,
minIndentSize
,
skipFirstLine
)
return
strings
.
Join
(
lines
,
"
\n
"
)
}
// getMinIndent calculates the minimum indentation in lines, excluding empty lines.
func
getMinIndent
(
lines
[]
string
,
skipFirstLine
bool
)
int
{
minIndentSize
:=
maxInt
for
i
,
line
:=
range
lines
{
for
i
,
line
:=
range
lines
{
if
i
==
0
&&
skipFirstLine
{
if
i
==
0
&&
skipFirstLine
{
continue
continue
...
@@ -67,23 +73,26 @@ func Doc(raw string) string {
...
@@ -67,23 +73,26 @@ func Doc(raw string) string {
minIndentSize
=
indentSize
minIndentSize
=
indentSize
}
}
}
}
return
minIndentSize
}
// 2.
// removeIndentation removes n characters from the front of each line in lines.
// Skips first line if skipFirstLine is true, skips empty lines.
func
removeIndentation
(
lines
[]
string
,
n
int
,
skipFirstLine
bool
)
[]
string
{
for
i
,
line
:=
range
lines
{
for
i
,
line
:=
range
lines
{
if
i
==
0
&&
skipFirstLine
{
if
i
==
0
&&
skipFirstLine
{
continue
continue
}
}
if
len
(
lines
[
i
])
>=
minIndentSize
{
if
len
(
lines
[
i
])
>=
n
{
lines
[
i
]
=
line
[
minIndentSize
:
]
lines
[
i
]
=
line
[
n
:
]
}
}
}
}
return
lines
return
strings
.
Join
(
lines
,
"
\n
"
)
}
}
//
heredoc.
Docf returns unindented and formatted string as here-document.
// Docf returns unindented and formatted string as here-document.
//
This format is same with package fmt's format
.
//
Formatting is done as for fmt.Printf()
.
func
Docf
(
raw
string
,
args
...
interface
{})
string
{
func
Docf
(
raw
string
,
args
...
interface
{})
string
{
return
fmt
.
Sprintf
(
Doc
(
raw
),
args
...
)
return
fmt
.
Sprintf
(
Doc
(
raw
),
args
...
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment