Applying 2nd round of review comments

Author: RawanMostafa08

.github/workflows/lint_format.yaml

@@ -1,12 +1,6 @@
 name: Go CI
 
-on:
-  push:
-    branches: [ "main" ]
-
-  pull_request:
-    branches: [ "main" ]
-
+on: [push, pull_request]
 
 jobs:
   build:
@@ -22,9 +16,7 @@ jobs:
 
 
   lint_and_format:
-    if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -37,5 +29,8 @@ jobs:
           version: v1.56.0
           args: --timeout 3m
       - name: Go Format
-        run: gofmt -s -w . && git diff --exit-code
+        uses: Jerome1337/gofmt-action@v1.0.5
+        with:
+          gofmt-path: './src'
+          gofmt-flags: '-l -d'
 

cmd/cat/main.go

@@ -16,17 +16,16 @@ func main() {
 	flag.BoolVar(&numbering, "n", false, "defines whether or not the lines will be ordered")
 	flag.Parse()
 
-	var scanner *bufio.Scanner
-
-	if len(flag.Args()) == 0 || flag.Args()[0] == "-" {
-		scanner = bufio.NewScanner(os.Stdin)
-	} else {
+	scanner := bufio.NewScanner(os.Stdin)
+	if len(flag.Args()) > 0 && flag.Args()[0] != "-" {
 		data, err := os.ReadFile(flag.Args()[0])
 		if err != nil {
 			log.Fatal("Error in reading the file")
 		}
-
 		scanner = bufio.NewScanner(strings.NewReader(string(data)))
 	}
-	internal.Cat(scanner, numbering)
+	err := internal.Cat(scanner, numbering)
+	if err != nil {
+		log.Fatal("Error in scanning std input")
+	}
 }

cmd/head/main.go

@@ -26,5 +26,8 @@ func main() {
 
 	scanner := bufio.NewScanner(strings.NewReader(string(data)))
 
-	internal.Head(scanner, n)
+	err = internal.Head(scanner, n)
+	if err != nil {
+		log.Fatal("Error in scanning std input")
+	}
 }

cmd/tail/main.go

@@ -26,5 +26,8 @@ func main() {
 
 	scanner := bufio.NewScanner(strings.NewReader(string(data)))
 
-	internal.Tail(scanner, n)
+	err = internal.Tail(scanner, n)
+	if err != nil {
+		log.Fatal("Error in scanning std input")
+	}
 }

cmd/wc/main.go

@@ -36,6 +36,9 @@ func main() {
 		isChars = true
 	}
 
-	internal.Wc(scanner, isLines, isWords, isChars)
+	err = internal.Wc(scanner, isLines, isWords, isChars)
+	if err != nil {
+		log.Fatal("Error in scanning std input")
+	}
 
 }

go.mod

@@ -1,3 +1,3 @@
 module github.com/codescalersinternships/Coreutils-Rawan-Mostafa
 
-go 1.22.3
+go 1.18

internal/cat.go

@@ -3,10 +3,9 @@ package internal
 import (
 	"bufio"
 	"fmt"
-	"log"
 )
 
-func Cat(scanner *bufio.Scanner, numbering bool) {
+func Cat(scanner *bufio.Scanner, numbering bool) error {
 
 	scanner.Split(bufio.ScanLines)
 	count := 0
@@ -17,8 +16,6 @@ func Cat(scanner *bufio.Scanner, numbering bool) {
 		} else {
 			fmt.Printf("%s\n", string(scanner.Bytes()))
 		}
-		if scanner.Err() != nil {
-			log.Fatal("Error in scanning std input")
-		}
 	}
+	return scanner.Err()
 }

internal/echo.go

@@ -2,13 +2,13 @@ package internal
 
 import (
 	"fmt"
+	"strings"
 )
 
 func Echo(noNewLine bool, args []string) {
 
-	for _, arg := range args {
-		fmt.Printf("%s ", arg)
-	}
+	argString := strings.Join(args, " ")
+	fmt.Print(argString)
 	if !noNewLine {
 		fmt.Print("\n")
 	}

internal/head.go

@@ -3,10 +3,9 @@ package internal
 import (
 	"bufio"
 	"fmt"
-	"log"
 )
 
-func Head(scanner *bufio.Scanner, n int) {
+func Head(scanner *bufio.Scanner, n int) error {
 
 	scanner.Split(bufio.ScanLines)
 	count := 0
@@ -16,7 +15,5 @@ func Head(scanner *bufio.Scanner, n int) {
 			fmt.Printf("%s \n", string(scanner.Bytes()))
 		}
 	}
-	if scanner.Err() != nil {
-		log.Fatal("Error in scanning std input")
-	}
+	return scanner.Err()
 }

internal/tail.go

@@ -3,10 +3,9 @@ package internal
 import (
 	"bufio"
 	"fmt"
-	"log"
 )
 
-func Tail(scanner *bufio.Scanner, n int) {
+func Tail(scanner *bufio.Scanner, n int) error {
 
 	scanner.Split(bufio.ScanLines)
 	count := 0
@@ -15,14 +14,12 @@ func Tail(scanner *bufio.Scanner, n int) {
 		count++
 		lines = append(lines, string(scanner.Bytes()))
 	}
-	if scanner.Err() != nil {
-		log.Fatal("Error in scanning std input")
-	}
+
 	if n >= len(lines) {
 		n = len(lines)
 	}
 	for i := len(lines) - n; i < len(lines); i++ {
 		fmt.Println(lines[i])
 	}
-
+	return scanner.Err()
 }

internal/wc.go

@@ -3,10 +3,9 @@ package internal
 import (
 	"bufio"
 	"fmt"
-	"log"
 )
 
-func Wc(scanner *bufio.Scanner, isLines bool, isWords bool, isChars bool) {
+func Wc(scanner *bufio.Scanner, isLines bool, isWords bool, isChars bool) error {
 
 	var linesCount int
 	var wordsCount int
@@ -21,9 +20,7 @@ func Wc(scanner *bufio.Scanner, isLines bool, isWords bool, isChars bool) {
 			if char == ' ' || char == '\n' || char == '\t' {
 				wordsCount++
 			}
-			if scanner.Err() != nil {
-				log.Fatal("Error in scanning std input")
-			}
+
 		}
 		wordsCount += 1
 		charsCount += 1
@@ -39,4 +36,5 @@ func Wc(scanner *bufio.Scanner, isLines bool, isWords bool, isChars bool) {
 		fmt.Printf("%d ", charsCount)
 	}
 	fmt.Print("\n")
+	return scanner.Err()
 }

internal/yes.go

@@ -6,8 +6,14 @@ import (
 )
 
 func Yes(inputs []string) {
-	input := strings.Join(inputs, " ")
-	for {
-		fmt.Println(input)
+	if len(inputs) > 0 {
+		input := strings.Join(inputs, " ")
+		for {
+			fmt.Println(input)
+		}
+	} else {
+		for {
+			fmt.Println("y")
+		}
 	}
 }