Add support for --ordered and --version

Increase version to v0.2.1

Author: gdm85

README.md

@@ -1,4 +1,4 @@
-# coshell v0.1.5
+# coshell v0.2.1
 
 A no-frills dependency-free replacement for GNU parallel, perfect for initramfs usage.
 

cosh/cosh.go

@@ -1,6 +1,6 @@
 /*
- * coshell v0.1.5 - a no-frills dependency-free replacement for GNU parallel
- * Copyright (C) 2014-2015 gdm85 - https://github.com/gdm85/coshell/
+ * coshell v0.2.1 - a no-frills dependency-free replacement for GNU parallel
+ * Copyright (C) 2014-2018 gdm85 - https://github.com/gdm85/coshell/
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -106,10 +106,14 @@ type CommandGroup struct {
 	deinterlace bool
 	halt        bool
 	masterId    int
+	ordered     bool
 }
 
-func NewCommandGroup(deinterlace, halt bool, masterId int) *CommandGroup {
-	return &CommandGroup{deinterlace: deinterlace, halt: halt, masterId: masterId}
+func NewCommandGroup(deinterlace, halt bool, masterId int, ordered bool) *CommandGroup {
+	if ordered {
+		deinterlace = true
+	}
+	return &CommandGroup{deinterlace: deinterlace, halt: halt, masterId: masterId, ordered: ordered}
 }
 
 func (cg *CommandGroup) Start() error {
@@ -125,44 +129,60 @@ func (cg *CommandGroup) Start() error {
 }
 
 type event struct {
-	i        int
+	index    int
 	error    error
 	exitCode int
 }
 
 // Returns sum of all exit codes of individual commands
 func (cg *CommandGroup) Join() (err error, exitCode int) {
 
-	chainOfEvents := make(chan event, len(cg.commands))
+	completedCommands := make(chan event, len(cg.commands))
 
 	// join all and update cumulative exit status
 	for i := 0; i < len(cg.commands); i++ {
 		go func(i int) {
 			if err := cg.commands[i].Wait(); err != nil {
 				if exitError, ok := err.(*exec.ExitError); ok {
 					if status, ok := exitError.Sys().(syscall.WaitStatus); ok {
-						chainOfEvents <- event{i: i, exitCode: status.ExitStatus()}
+						completedCommands <- event{index: i, exitCode: status.ExitStatus()}
 						return
 					} else {
-						chainOfEvents <- event{i: i, error: errors.New("cannot read exit error status")}
+						completedCommands <- event{index: i, error: errors.New("cannot read exit error status")}
 						return
 					}
 				} else {
-					chainOfEvents <- event{i: i, error: err}
+					completedCommands <- event{index: i, error: err}
 					return
 				}
 			}
 
-			chainOfEvents <- event{i: i, exitCode: 0}
+			// completed successfully
+			completedCommands <- event{index: i, exitCode: 0}
 		}(i)
 	}
 
+	orderedDisplay := make([]event, len(cg.commands))
+	displayedSoFar := 0
+
 	count := 0
-	for ev := range chainOfEvents {
+	for ev := range completedCommands {
 		// print deinterlaced output
 		if cg.deinterlace {
-			if err = cg.outputs[ev.i].ReplayOutputs(); err != nil {
-				return
+			if cg.ordered {
+				// store ordered
+				orderedDisplay[ev.index] = ev
+
+				if displayedSoFar == ev.index {
+					if err = cg.outputs[ev.index].ReplayOutputs(); err != nil {
+						return
+					}
+					displayedSoFar++
+				}
+			} else {
+				if err = cg.outputs[ev.index].ReplayOutputs(); err != nil {
+					return
+				}
 			}
 		}
 
@@ -180,9 +200,9 @@ func (cg *CommandGroup) Join() (err error, exitCode int) {
 		}
 
 		// make these objects no more usable
-		cg.commands[ev.i] = nil
+		cg.commands[ev.index] = nil
 		if cg.deinterlace {
-			cg.outputs[ev.i] = nil
+			cg.outputs[ev.index] = nil
 		}
 
 		if cg.halt && ev.exitCode != 0 {
@@ -200,7 +220,8 @@ func (cg *CommandGroup) Join() (err error, exitCode int) {
 			return
 		}
 
-		if cg.masterId != -1 && cg.masterId == ev.i {
+		// if master aborts, show its output
+		if cg.masterId != -1 && cg.masterId == ev.index {
 			if cg.deinterlace {
 				// dump outputs that are available
 				for _, output := range cg.outputs {
@@ -221,11 +242,11 @@ func (cg *CommandGroup) Join() (err error, exitCode int) {
 
 func (cg *CommandGroup) Add(commandLines ...string) error {
 	// some common values for all commands
-	env := os.Environ()
 	cwd, err := os.Getwd()
 	if err != nil {
 		return err
 	}
+	env := os.Environ()
 
 	// prepare commands to be executed
 	commands := make([]*exec.Cmd, len(commandLines))

cosh/cosh_test.go

@@ -1,6 +1,6 @@
 /*
- * coshell v0.1.5 - a no-frills dependency-free replacement for GNU parallel
- * Copyright (C) 2014-2015 gdm85 - https://github.com/gdm85/coshell/
+ * coshell v0.2.1 - a no-frills dependency-free replacement for GNU parallel
+ * Copyright (C) 2014-2018 gdm85 - https://github.com/gdm85/coshell/
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -25,24 +25,24 @@ import (
 
 type OptionsCombination struct {
 	Deinterlace bool
-	Halt bool
+	Halt        bool
 }
 
 var (
 	combinations = []OptionsCombination{
-		{true,true},
-		{false,true},
-		{true,false},
-		{false,false},
+		{true, true},
+		{false, true},
+		{true, false},
+		{false, false},
 	}
 	testCommandLines = []string{"echo alpha >/dev/null", "echo beta >/dev/null", "echo gamma >/dev/null", "echo delta >/dev/null"}
 )
 
 func TestCommandGroupOptions(t *testing.T) {
 	for _, c := range combinations {
-		for masterId := -1; masterId<len(testCommandLines); masterId++ {
+		for masterId := -1; masterId < len(testCommandLines); masterId++ {
 			var exitCode int
-			cg := NewCommandGroup(c.Deinterlace, c.Halt, masterId)
+			cg := NewCommandGroup(c.Deinterlace, c.Halt, masterId, false)
 			err := cg.Add(testCommandLines...)
 			if err != nil {
 				t.Fatal(err.Error())

coshell.go

@@ -1,6 +1,6 @@
 /*
- * coshell v0.1.5 - a no-frills dependency-free replacement for GNU parallel
- * Copyright (C) 2014-2015 gdm85 - https://github.com/gdm85/coshell/
+ * coshell v0.2.1 - a no-frills dependency-free replacement for GNU parallel
+ * Copyright (C) 2014-2018 gdm85 - https://github.com/gdm85/coshell/
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@ func fatal(err error) {
 }
 
 func main() {
-	var deinterlace, halt, nextMightBeMasterId bool
+	var deinterlace, ordered, halt, nextMightBeMasterId bool
 	masterId := -1
 	if len(os.Args) > 1 {
 		for i := 1; i < len(os.Args); i++ {
@@ -97,19 +97,26 @@ func main() {
 
 			switch os.Args[i] {
 			case "--help", "-h":
-				fmt.Printf("coshell v0.1.4 by gdm85 - Licensed under GNU GPLv2\n")
+				fmt.Printf("coshell v0.2.1 by gdm85 - Licensed under GNU GPLv2\n")
 				fmt.Printf("Usage:\n\tcoshell [--help|-h] [--deinterlace|-d] [--halt-all|-a] < list-of-commands\n")
 				fmt.Printf("\t\t--deinterlace | -d\t\tShow individual output of processes in blocks, second order of termination\n\n")
+				fmt.Printf("\t\t--ordered | -o\t\tImplies --deinterlace, will output block of processes one after another, second original order specified in input\n\n")
 				fmt.Printf("\t\t--halt-all | -a\t\tTerminate neighbour processes as soon as any has failed, using its exit code\n\n")
 				fmt.Printf("\t\t--master=0 | -m=0\t\tTerminate neighbour processes as soon as command from specified input line exits and use its exit code; if no id is specified, 0 is assumed\n\n")
 				fmt.Printf("Each line read from standard input will be run as a command via `sh -c`\n")
 				os.Exit(0)
+			case "--version", "-v":
+				fmt.Printf("coshell v0.2.1 by gdm85 - Licensed under GNU GPLv2\n")
+				os.Exit(0)
 			case "--halt-all", "-a":
 				halt = true
 				continue
 			case "--deinterlace", "-d":
 				deinterlace = true
 				continue
+			case "--ordered", "-o":
+				ordered = true
+				continue
 			default:
 				fmt.Fprintf(os.Stderr, "Invalid parameter specified: %s\n", os.Args[i])
 			}
@@ -146,7 +153,7 @@ func main() {
 		return
 	}
 
-	cg := cosh.NewCommandGroup(deinterlace, halt, masterId)
+	cg := cosh.NewCommandGroup(deinterlace, halt, masterId, ordered)
 
 	err := cg.Add(commandLines...)
 	if err != nil {