add github actions workflow

- fixed file write for the '--inplace' option

.github/workflows/binary-release.yml

@@ -0,0 +1,118 @@
+name: binary release
+
+on:
+    push:
+        tags:
+        - '[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+          - name: Get the version
+            id:   get_version
+            run:  echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+            
+          - name: checkout
+            uses: actions/checkout@v2
+    
+          - name: Setup Go
+            uses: actions/setup-go@v2
+            with:
+              go-version: '1.13.0'
+        
+          - name: Build
+            run:  make -j $(nproc) compile VERSION=${{ steps.get_version.outputs.VERSION }}
+            
+          - name: create release
+            id:   create_release
+            uses: actions/create-release@latest
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                tag_name: ${{ steps.get_version.outputs.VERSION }}
+                release_name: Release ${{ steps.get_version.outputs.VERSION }}
+                draft: false
+                prerelease: false
+                
+          - name: darwin-386
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-darwin-386
+                asset_name: ${{ github.event.repository.name }}-darwin-386
+                asset_content_type: application/octet-stream
+                
+          - name: darwin-amd64
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-darwin-amd64
+                asset_name: ${{ github.event.repository.name }}-darwin-amd64
+                asset_content_type: application/octet-stream
+               
+          - name: freebsd-386
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-freebsd-386
+                asset_name: ${{ github.event.repository.name }}-freebsd-386
+                asset_content_type: application/octet-stream
+                
+          - name: freebsd-amd64
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-freebsd-amd64
+                asset_name: ${{ github.event.repository.name }}-freebsd-amd64
+                asset_content_type: application/octet-stream
+                
+          - name: linux-386
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-linux-386
+                asset_name: ${{ github.event.repository.name }}-linux-386
+                asset_content_type: application/octet-stream
+                
+          - name: linux-amd64
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-linux-amd64
+                asset_name: ${{ github.event.repository.name }}-linux-amd64
+                asset_content_type: application/octet-stream
+                
+          - name: windows-386
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-windows-386.exe
+                asset_name: ${{ github.event.repository.name }}-windows-386.exe
+                asset_content_type: application/octet-stream
+                
+          - name: windows-amd64
+            uses: actions/upload-release-asset@v1
+            env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            with:
+                upload_url: ${{ steps.create_release.outputs.upload_url }} 
+                asset_path: ./bin/${{ github.event.repository.name }}-windows-amd64.exe
+                asset_name: ${{ github.event.repository.name }}-windows-amd64.exe
+                asset_content_type: application/octet-stream
+

.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: build
+
+on:
+    push:
+        branches:
+        - master
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+          - name: checkout
+            uses: actions/checkout@v2
+    
+          - name: Setup Go
+            uses: actions/setup-go@v2
+            with:
+              go-version: '1.13.0'
+        
+          - name: Build
+            run:  make -j $(nproc)
+

Makefile

@@ -1,21 +1,30 @@
-NAME=multini
-VERSION=0.2.1
-GOCMD=go
-LDFLAGS:="$(LDFLAGS) -X 'main.Version=$(VERSION)'"
-GOBUILD=$(GOCMD) build -ldflags=$(LDFLAGS)
-SRCMAIN=.
-BINDIR=bin
-BIN=$(BINDIR)/$(NAME)
-README=README
-LICENSE=LICENSE
-TEST=./run_test.sh
-PREFIX=/usr
+NAME     = multini
+VERSION  = dev_$(shell date +%F_%T)
+GOCMD    = go
+LDFLAGS := "$(LDFLAGS) -X 'main.Version=$(VERSION)'"
+GOBUILD  = $(GOCMD) build -ldflags=$(LDFLAGS)
+SRCMAIN  = ./cmd/$(NAME)
+SRCDOC   = ./doc
+SRCTEST  = ./test
+BINDIR   = bin
+BIN      = $(BINDIR)/$(NAME)
+README   = $(SRCDOC)/README
+LICENSE  = LICENSE
+TEST     = $(SRCTEST)/run_test.sh
+PREFIX   = /usr
+
+.PHONY: all prep doc build check-build freebsd-386 darwin-386 linux-386 windows-386 freebsd-amd64 darwin-amd64 linux-amd64 windows-amd64 compile install check-install uninstall clean test
 
 all: build
 
 prep: clean
+	go mod init; go mod tidy
 	mkdir $(BINDIR)
 	
+doc: check-build
+	test -d $(SRCDOC) || mkdir $(SRCDOC)
+	$(BIN) --help > $(README)
+	
 build: prep
 	$(GOBUILD) -o $(BIN) $(SRCMAIN)
 
@@ -48,7 +57,7 @@ windows-amd64: prep
 
 compile: freebsd-386 darwin-386 linux-386 windows-386 freebsd-amd64 darwin-amd64 linux-amd64 windows-amd64
 	
-install: check-build
+install: check-build doc
 	install -m 755 -d         $(PREFIX)/bin/
 	install -m 755 $(BIN)     $(PREFIX)/bin/
 	install -m 755 -d         $(PREFIX)/share/licenses/$(NAME)/
@@ -71,3 +80,4 @@ clean:
 	
 test: check-build
 	$(TEST) $(BIN)
+

cmd/multini/actions.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"multini/output"
-	"multini/types"
+	"multini/internal/output"
+	"multini/internal/types"
 )
 
 func chk() int {

cmd/multini/args.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"os"
 
-	"multini/output"
-	"multini/types"
+	"multini/internal/output"
+	"multini/internal/types"
 
 	"github.com/juju/gnuflag"
 )
@@ -100,7 +100,7 @@ func init() {
 }
 
 func parseArgs() error {
-	gnuflag.Parse(true)
+	gnuflag.Parse(false)
 
 	// info
 	switch {

cmd/multini/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"multini/output"
-	"multini/types"
+	"multini/internal/output"
+	"multini/internal/types"
 )
 
 const (

cmd/multini/reader.go

@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"multini/output"
-	"multini/types"
+	"multini/internal/output"
+	"multini/internal/types"
 )
 
 var (
@@ -26,15 +26,15 @@ var (
 
 	RxBodyPrefix    string         = `(?P<` + NgPrefix + `>\s+)?`
 	RxSectionName   string         = `\[(?P<` + NgSection + `>.+)\]`
-	RxKey           string         = `(?P<` + NgKey + `>(?:[^;#=]+[^\s=;#]|[^;#=]))?`
+	RxKey           string         = `(?P<` + NgKey + `>(?:[^;#/=]+[^\s=;#/]|[^;#/=]))?`
 	RxKeyPostfix    string         = `(?P<` + NgKeyPostfix + `>\s+)?`
 	RxValuePrefix   string         = `(?P<` + NgValuePrefix + `>\s+)?`
-	RxValue         string         = `(?P<` + NgValue + `>(?:[^;#]+[^\s;#]|[^;#]))?`
+	RxValue         string         = `(?P<` + NgValue + `>(?:[^;#/]+[^\s;#/]|[^;#/]))?`
 	RxValuePostfix  string         = `(?P<` + NgValuePostfix + `>\s+)?`
 	RxKeyVal        string         = RxKey + RxKeyPostfix + `=` + RxValuePrefix + RxValue + RxValuePostfix
 	RxBody          string         = `(?:` + RxSectionName + `|` + RxKeyVal + `)?`
 	RxBodyPostfix   string         = `(?P<` + NgPostifx + `>\s+)?`
-	RxCommentPrefix string         = `(?P<` + NgCommentPrefix + `>[#;]\s*)`
+	RxCommentPrefix string         = `(?P<` + NgCommentPrefix + `>([#;]|//)\s*)`
 	RxCommentText   string         = `(?P<` + NgComment + `>.+)?`
 	RxComment       string         = `(?:` + RxCommentPrefix + RxCommentText + `)?`
 	Rx              string         = RxBodyPrefix + RxBody + RxBodyPostfix + RxComment

cmd/multini/writer.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"multini/types"
+	"multini/internal/types"
 )
 
 // Source: https://gist.github.com/var23rav/23ae5d0d4d830aff886c3c970b8f6c6b
@@ -114,7 +114,7 @@ func iniWriteInplace(filename string, ini *types.Ini) error {
 		}
 		mode = info.Mode()
 	}
-	targetFile, err := os.OpenFile(realfilename, os.O_WRONLY|os.O_CREATE, mode)
+	targetFile, err := os.OpenFile(realfilename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, mode)
 	if err == nil {
 		datawriter := bufio.NewWriter(targetFile)
 		_, err = datawriter.WriteString(ini.Full())

go.mod

@@ -0,0 +1,5 @@
+module multini
+
+go 1.13
+
+require github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d

go.sum

@@ -0,0 +1,2 @@
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d h1:c93kUJDtVAXFEhsCh5jSxyOJmFHuzcihnslQiX8Urwo=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=

internal/types/ini.go

@@ -89,6 +89,14 @@ func (obj *Ini) GetKeyVal(section, key, value string) error {
 func (obj *Ini) AddSection(section string) *Section {
 	sect, err := obj.FindSection(section)
 	if err != nil {
+		sectSize := len(obj.Sections)
+		if sectSize > 1 {
+			prevSect := obj.Sections[sectSize-1].(*Section)
+			lineSize := len(prevSect.Lines)
+			if lineSize == 0 || lineSize > 0 && prevSect.Lines[lineSize-1].Type() != TEmptyLine {
+				obj.Sections[sectSize-1].(*Section).Lines = append(obj.Sections[sectSize-1].(*Section).Lines, &EmptyLine{})
+			}
+		}
 		var newSection Section
 		newSection.Name = section
 		newSection.Prefix = obj.Sections[len(obj.Sections)-1].Indent()

test/data/expected_ini/test_add_keyval.sh.ini

@@ -10,7 +10,7 @@ DefKey3=NoSpaces!
 	Key2 = 2
 	Key3 = 3
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/expected_ini/test_add_keyval_existing.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/expected_ini/test_add_section.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3
@@ -17,4 +17,5 @@ DefKey3=NoSpaces!
 	[SectionWithIndent]
 	Key=Value
 [SectionWithoutNewLineBefore]
+
 [NewSection]

test/data/expected_ini/test_del_key.sh.ini

@@ -8,7 +8,7 @@ DefKey3=NoSpaces!
 [SimpleSection] # Comment For Section
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/expected_ini/test_del_key_multiple.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	
 	[SectionWithIndent]
 	Key=Value

test/data/expected_ini/test_del_keyval.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 3
 	

test/data/expected_ini/test_del_section.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/expected_ini/test_set_keyval.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = onlyone
 	
 	[SectionWithIndent]

test/data/in_ini/test_add_keyval.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_add_keyval_existing.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_add_section.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_del_key.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_del_key_multiple.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_del_keyval.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_del_section.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_get_key.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_get_key_multiple.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_get_section.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_get_section_list.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/data/in_ini/test_set_keyval.sh.ini

@@ -9,7 +9,7 @@ DefKey3=NoSpaces!
 	Key1 = 1
 	Key2 = 2
 
-[MultipleKeySection]
+[MultipleKeySection] // C style comment
 	Key = 1
 	Key = 2
 	Key = 3

test/run_test.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
 DEF='\e[0m'; BLD='\e[1m'; RED='\e[31m'; GRN='\e[32m'; WHT='\e[97m'
+
 ScriptFullname=$(readlink -e "$0")
 ScriptName=$(echo "$ScriptFullname" | awk -F '/' '{print $NF;}')
 ScriptDir=$(dirname "$ScriptFullname")
-TestDir="$ScriptDir/tests"
+TestDir="$ScriptDir/data"
 Multini=$(readlink -e "$1")
 
 if [[ -z "$Multini" ]]; then