add build arg support

Author: yuyang

Dotamfile.hcl

@@ -8,9 +8,29 @@ temp "Tempfile" {
     }
 }
 
+git "dev" {
+    add_type = "u"
+    commit = ""
+}
+
+docker {
+    repo = "deoops/dotam"
+    tag = "{{versions.prod}}"
+    username = "$reg_passwd"
+    passpord = "$reg_passwd"
+}
+
 var "data" {
     temp = <<TEMP
 abc
 bcd
         TEMP
+}
+
+arg "reg_user" {
+    type = "string"
+}
+
+arg "reg_passwd" {
+    type = "string"
 }

README.en.md

@@ -9,6 +9,7 @@
 * 模板插件完整支持
 * cli基本命令支持`build, init`
 * plugin完整支持
+* 完善文档
 
 **todos:**
 
@@ -18,11 +19,20 @@
     - [x] yaml
     - [x] hcl
 - [ ] !! init命令
+- [ ] !! 文档
+    - [ ] template syntax
+        - [ ] en
+        - [ ] zh
 - [ ] ! 自举
 - [ ] ! git 插件
 - [ ] ! docker 插件
 - [ ] ! refactor code
+- [ ] !! build args
 
 ----
 
 ## V 2.0.0
+
+**目标：**
+
+* 兼容drone

TODO.md

@@ -1,2 +1,8 @@
-abcd
-{{#success build.status}}
+abc
+bcd
+        
+        
+{{#success build.status}}
+
+
+abc

Tempfile

@@ -30,6 +30,8 @@ func (r RunCmd) Run(args []string) (extCode int) {
 	var err error
 	var dotamFile string
 	var renderData pongo2.Context
+	var buildArgs []string
+	log.WithFields(log.Fields{"BUILD": "ARGS"}).Debug(args)
 
 	defer func() {
 		if err != nil {
@@ -48,7 +50,17 @@ func (r RunCmd) Run(args []string) (extCode int) {
 		}
 		dotamFile = Abs(defaultConf)
 	} else {
-		dotamFile = Abs(args[0])
+		dotamFile, buildArgs = ParseBuildArgs(args)
+		if dotamFile == "" {
+			if !exist {
+				err = errors.New("you need at least a conf file, pls see help doc")
+				return
+			} else {
+				dotamFile = defaultConf
+			}
+		}
+		log.WithFields(log.Fields{"BUILD": "PARSED ARGS"}).Debug(buildArgs)
+
 	}
 
 	data := ReadFile(dotamFile)
@@ -61,23 +73,20 @@ func (r RunCmd) Run(args []string) (extCode int) {
 	if config.Var != nil {
 		renderData = VarToTplContext(config.Var)
 	}
-	log.Debug("ooo")
 	log.Debug(renderData)
-	log.Debug("******")
 
 	newDotamSrc, err := Render(string(data), renderData)
 	if err != nil {
 		// log.Error(err)
 		return -1
 	}
-	log.Debug("!!!!")
+
 	log.Debug(newDotamSrc)
 
 	newConfig := DotamConf{}
 	if err = parseConf(&newConfig, newDotamSrc, dotamFile); err != nil {
 		return
 	}
-	log.Debug("00000")
 	log.Debug(newConfig)
 
 	if err = RunTasks(newConfig); err != nil {

build.go

@@ -1,2 +1,7 @@
 {{data}}
-{{ "{{#success build.status}}"|safe }}
+{{ "{{#success build.status}}"|safe }}
+{# foothing{{#abc}} #}
+{% comment %}
+foo
+{% endcomment%}
+abc

example/.dotam/Tempfile

@@ -29,7 +29,6 @@ func TestExist(t *testing.T) {
 	results := []bool{}
 
 	for _, f := range files {
-		t.Log(Exist(f))
 		results = append(results, Exist(f))
 	}
 	if !reflect.DeepEqual(expects, results) {
@@ -46,6 +45,32 @@ func TestParseYaml(t *testing.T) {
 		fmt.Println(err)
 		t.Fail()
 	}
-	fmt.Println(c)
 
 }
+
+func TestParseArgs(t *testing.T) {
+	data := []string{"Dotamfile.hcl", "reg_user=tom", "reg_pass=foo"}
+	data2 := []string{"reg_user=tom", "foo=bar"}
+
+	f, a := ParseBuildArgs(data)
+	if !reflect.DeepEqual([]string{"reg_user=tom", "reg_pass=foo"}, a) {
+		t.Log(a)
+		t.Fail()
+	}
+
+	if f != "Dotamfile.hcl" {
+		t.Log(f)
+		t.Fail()
+	}
+
+	f2, a2 := ParseBuildArgs(data2)
+	if !reflect.DeepEqual([]string{"reg_user=tom", "foo=bar"}, a2) {
+		t.Log(a2)
+		t.Fail()
+	}
+
+	if f2 != "" {
+		t.Log(f2)
+		t.Fail()
+	}
+}

main_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 
 	"github.com/flosch/pongo2"
 	log "github.com/sirupsen/logrus"
@@ -108,3 +109,17 @@ func Exist(path string) bool {
 	}
 
 }
+
+func ParseBuildArgs(src []string) (dotamFile string, dest []string) {
+
+	str := strings.Join(src, " ")
+	for _, d := range DEFAULT_DOTAMFILES {
+		if strings.Contains(str, d) {
+			dotamFile = d
+		}
+		str = strings.Replace(str, d, "", -1)
+		str = strings.TrimSpace(str)
+	}
+	dest = strings.Split(str, " ")
+	return
+}