Skip to content

Commit d88b436

Browse files
author
yuyang
committed
support init command
1 parent cd74cb7 commit d88b436

File tree

13 files changed

+169
-56
lines changed

13 files changed

+169
-56
lines changed

.dotam/RELEASE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{{version}}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
dist/
2+
Dotamfile.demo.*

Dotamfile.hcl

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,36 @@ temp "Tempfile" {
66
}
77
}
88

9+
temp "RELEASE" {
10+
src = ".dotam/RELEASE"
11+
dest = "."
12+
var {
13+
version = "{{versions.release}}"
14+
}
15+
}
16+
917
git "dev" {
1018
add_type = "u"
1119
commit = ""
1220
}
1321

14-
docker {
15-
repo = "deoops/dotam"
16-
tag = "{{versions.prod}}"
22+
// docker {
23+
// repo = "deoops/dotam"
24+
// tag = "{{versions.prod}}"
1725

18-
auth {
19-
username = "tom"
20-
password = "pass"
21-
}
22-
}
26+
// auth {
27+
// username = "tom"
28+
// password = "pass"
29+
// }
30+
// }
2331

2432
var "data" {
2533
temp = "foo"
2634
}
2735

2836
var "versions" {
2937
prod = "v0.1.1"
38+
release = "v0.1.3-beta"
3039
}
3140

3241
arg "reg_user" {

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ install:
88
test:
99
go test -v -count=1
1010

11-
.PHONY: run-dev
12-
run-dev:
13-
LOG_LEVEL=debug go run . build
11+
.PHONY: run-dev-build
12+
run-dev-build:
13+
LOG_LEVEL=debug go run . build
14+
15+
.PHONY: run-dev-init
16+
run-dev-init:
17+
LOG_LEVEL=debug go run . init

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Dotam 读法 dot-am, 原意为dotfiles automation。
1818
- [运行](#运行)
1919
- [初始化](#初始化)
2020
- [注意及常见问题](#注意及常见问题)
21+
- [获取支持](#获取支持)
2122
- [语法冲突](#语法冲突)
2223

2324
<!-- /TOC -->
@@ -174,6 +175,13 @@ make install
174175

175176
## 注意及常见问题
176177

178+
179+
### 获取支持
180+
181+
* 你可以随时发送邮件到techmesh@aliyun.com来获取支持,我会在检查邮件时尽快回复。
182+
* 你也可以通过邮件来索要我的个人微信来获取即时支持。
183+
184+
177185
### 语法冲突
178186

179187
如果模板中还有一些用于其他工具的模板标记比如我们的`.drone.yml`中用于slack插件的`{{#success}}`语法,这个会和项目自带的

RELEASE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v0.1.3-beta

const.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ package main
22

33
const SETTINGS_PREFIX = "DOTAM_"
44
const DEFAULT_DOTAMFILE = "Dotamfile.hcl"
5+
const DEMO_YAML = "Dotamfile.demo.yml"
6+
const DEMO_JSON = "Dotamfile.demo.json"
7+
const DEMO_HCL = "Dotamfile.demo.hcl"
58

69
var DEFAULT_DOTAMFILES = [3]string{"Dotamfile.hcl", "Dotamfile.yml", "Dotamfile.json"}

demohcl.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package main
2+
3+
var DemoHcl = string(`
4+
temp "RELEASE" {
5+
src = ".dotam/RELEASE"
6+
dest = "."
7+
var {
8+
version = "{{versions.release}}"
9+
}
10+
}
11+
12+
docker {
13+
repo = "deoops/dotam"
14+
tag = "{{versions.release}}"
15+
16+
auth {
17+
username = "tom"
18+
password = "some key takes you home"
19+
}
20+
}
21+
22+
var "versions" {
23+
prod = "v0.1.1"
24+
release = "v0.1.3-beta"
25+
}
26+
27+
`)

demojson.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package main
2+
3+
var DemoJson = string(`
4+
{
5+
"temp": {
6+
"RELEASE": {
7+
"src": ".dotam/RELEASE",
8+
"dest": ".",
9+
"var": {
10+
"version": "{{versions.release}}"
11+
}
12+
}
13+
},
14+
"docker": {
15+
"repo": "deoops/dotam",
16+
"tag": "{{versions.release}}",
17+
"auth": {
18+
"username": "tom",
19+
"password": "some key takes you home"
20+
}
21+
},
22+
"var": {
23+
"versions": {
24+
"prod": "v0.1.0",
25+
"release": "v0.1.3-beta",
26+
}
27+
}
28+
29+
}
30+
31+
`)

demoyaml.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package main
2+
3+
var DemoYaml = string(`
4+
temp:
5+
RELEASE:
6+
src: ".dotam/RELEASE"
7+
dest: "."
8+
var:
9+
version: "{{versions.release}}"
10+
11+
docker:
12+
repo: "deoops/dotam"
13+
tag: "{{versions.release}}"
14+
auth:
15+
username: tom
16+
password: "some key takes you home"
17+
18+
var:
19+
versions:
20+
prod: "v0.1.0"
21+
release: "v0.1.3-beta"
22+
23+
`)

0 commit comments

Comments
 (0)