Merge branch 'main' into arpan/cc-1840-figure-out-test-failure-for-shell-challenge

Author: Arpan-206

built_executables/wc_darwin_amd64

@@ -6,7 +6,7 @@ toolchain go1.24.2
 
 require (
 	github.com/charmbracelet/x/vt v0.0.0-20250122132629-a969ddeb820d
-	github.com/codecrafters-io/tester-utils v0.4.2
+	github.com/codecrafters-io/tester-utils v0.4.5
 	github.com/creack/pty v1.1.24
 	github.com/fatih/color v1.18.0
 	go.chromium.org/luci v0.0.0-20250611085002-a5741c865576
@@ -30,7 +30,7 @@ require (
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/stretchr/testify v1.10.0 // indirect
 	golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
-	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
 	golang.org/x/term v0.32.0 // indirect
 	golang.org/x/text v0.24.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect

built_executables/wc_darwin_arm64

@@ -4,8 +4,8 @@ github.com/charmbracelet/x/vt v0.0.0-20250122132629-a969ddeb820d h1:cIxw4y+aEGux
 github.com/charmbracelet/x/vt v0.0.0-20250122132629-a969ddeb820d/go.mod h1:RB6f81fnGXyFGRenuO1fMdTlBh0Dbp/0+jwiMtgZvJw=
 github.com/charmbracelet/x/wcwidth v0.0.0-20241011142426-46044092ad91 h1:D5OO0lVavz7A+Swdhp62F9gbkibxmz9B2hZ/jVdMPf0=
 github.com/charmbracelet/x/wcwidth v0.0.0-20241011142426-46044092ad91/go.mod h1:Ey8PFmYwH+/td9bpiEx07Fdx9ZVkxfIjWXxBluxF4Nw=
-github.com/codecrafters-io/tester-utils v0.4.2 h1:WwSq/2uEQDPRQuTZtjeswwbzqNoI9cNYPTAY6qYRA4Q=
-github.com/codecrafters-io/tester-utils v0.4.2/go.mod h1:Fyrv4IebzjWtvKfpYf8ooYDoOtjYe2qx8bV7KAJpX+w=
+github.com/codecrafters-io/tester-utils v0.4.5 h1:iSyDAICLI7E8FxMwz0eMRvxCd14P7vfr0KtL8Eh5F8w=
+github.com/codecrafters-io/tester-utils v0.4.5/go.mod h1:Fyrv4IebzjWtvKfpYf8ooYDoOtjYe2qx8bV7KAJpX+w=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
@@ -47,8 +47,8 @@ go.chromium.org/luci v0.0.0-20250611085002-a5741c865576/go.mod h1:Sq6fyDyzMSLbIc
 golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 h1:bsqhLWFR6G6xiQcb+JoGqdKdRU6WzPWmK8E0jxTjzo4=
 golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
 golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
 golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=

built_executables/wc_linux_amd64

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bufio"
 	"errors"
 	"flag"
 	"fmt"
@@ -10,16 +9,6 @@ import (
 	"strings"
 )
 
-// byteCounter implements io.Writer to count bytes written to it.
-type byteCounter struct {
-	count int64
-}
-
-func (bc *byteCounter) Write(p []byte) (int, error) {
-	bc.count += int64(len(p))
-	return len(p), nil
-}
-
 // counts holds the counts for lines, words, and bytes.
 type counts struct {
 	lines, words, bytes int64
@@ -121,38 +110,22 @@ func main() {
 // countReader now accepts flags to potentially optimize (e.g., skip word count if !wFlag)
 func countReader(r io.Reader, countLines, countWords, countBytes bool) (counts, error) {
 	var c counts
-	var readerForScanner = r // Start with the original reader
 
-	// Setup byte counter only if needed
-	var counter *byteCounter
-	if countBytes {
-		counter = &byteCounter{}
-		// If we need bytes, tee the original reader
-		readerForScanner = io.TeeReader(r, counter)
+	data, err := io.ReadAll(r)
+	if err != nil {
+		return counts{}, err
 	}
 
-	// Scanner reads from the (potentially tee'd) reader
-	scanner := bufio.NewScanner(readerForScanner)
-
-	for scanner.Scan() {
-		// Always count lines if requested or if words are needed (scanner works line by line)
-		if countLines || countWords {
-			c.lines++
-		}
-		// Only count words if requested
-		if countWords {
-			c.words += int64(len(strings.Fields(scanner.Text())))
-		}
-		// Byte counting happens via the TeeReader automatically if countBytes is true
+	if countLines {
+		c.lines = int64(strings.Count(string(data), "\n"))
 	}
 
-	if err := scanner.Err(); err != nil {
-		return counts{}, err // Return zero counts and the error
+	if countWords {
+		c.words = int64(len(strings.Fields(string(data))))
 	}
 
-	// Assign byte count if it was calculated
-	if countBytes && counter != nil {
-		c.bytes = counter.count
+	if countBytes {
+		c.bytes = int64(len(data))
 	}
 
 	return c, nil

built_executables/wc_linux_arm64

@@ -418,6 +418,43 @@ func TestWcWithPipedInput(t *testing.T) {
 	}
 }
 
+func TestWcFileWithoutTrailingNewline(t *testing.T) {
+	tmpDir, err := os.MkdirTemp("", "wc-test-*")
+	if err != nil {
+		t.Fatal(err)
+	}
+	currentDir, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Chdir(tmpDir); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Chdir(currentDir)
+	defer cleanupDirectories([]string{tmpDir})
+
+	// Content with 5 lines but only 4 newlines (no trailing newline)
+	content := "First line\nSecond line\nThird line\nFourth line\nFifth line"
+	testFiles := []testFile{
+		{name: "no_trailing_newline.txt", content: []byte(content), mode: 0644},
+	}
+	createTestFiles(t, tmpDir, testFiles)
+
+	output, exitCode, err := runWc(t, "no_trailing_newline.txt")
+	if err != nil {
+		t.Fatalf("Expected no error, got: %v", err)
+	}
+
+	expected := "       4      10      56 no_trailing_newline.txt\n"
+	if output != expected {
+		t.Errorf("Expected output %q, got %q", expected, output)
+	}
+
+	if exitCode != 0 {
+		t.Errorf("Expected exit code 0, got %d", exitCode)
+	}
+}
+
 func cleanupDirectories(dirs []string) {
 	for _, dir := range dirs {
 		if err := os.RemoveAll(dir); err != nil {

go.mod

@@ -113,9 +113,9 @@ func logPath(shell *shell_executable.ShellExecutable, logger *logger.Logger, pre
 		}
 	}
 
-	logger.UpdateSecondaryPrefix("setup")
+	logger.UpdateLastSecondaryPrefix("setup")
 	logger.Infof("PATH is now: %s", path)
-	logger.ResetSecondaryPrefix()
+	logger.ResetSecondaryPrefixes()
 }
 
 func setUpNonExecutable(stageHarness *test_case_harness.TestCaseHarness, shell *shell_executable.ShellExecutable, commandName string) (string, error) {

go.sum

@@ -52,10 +52,10 @@ func testA6(stageHarness *test_case_harness.TestCaseHarness) error {
 
 // TODO: Think of how to encapsulate this inside SetupExecutable function
 func logAvailableExecutables(logger *logger.Logger, executableNames []string) {
-	logger.UpdateSecondaryPrefix("setup")
+	logger.UpdateLastSecondaryPrefix("setup")
 	logger.Infof("Available executables:")
 	for _, executableName := range executableNames {
 		logger.Infof("- %s", executableName)
 	}
-	logger.ResetSecondaryPrefix()
+	logger.ResetSecondaryPrefixes()
 }