List command: add update notice (#12)

Add `HAS UPDATES` note to `list` command

Minor test fixes

Author: outcatcher

.github/workflows/main.yaml

@@ -29,9 +29,7 @@ jobs:
         with:
           go-version: "1.24"
           cache: true
-      - name: Install Task
-        uses: arduino/setup-task@v2
       - name: Start tests
         env:
           GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
-        run: task test
+        run: go test -v --tags=test -count=1 ./...

app/app.go

@@ -88,7 +88,7 @@ func (a *Application) WithConfig(cfg cfg) {
 
 type remoteClient interface {
 	// GetLatestRelease - retrieves latest repository release.
-	GetLatestRelease(ctx context.Context, owner, repo string) (*remote.Release, error)
+	GetLatestRelease(ctx context.Context, repoURL string) (*remote.Release, error)
 	// DownloadFile downloads binary file.
 	DownloadFile(ctx context.Context, downloadURL string, writer io.Writer) error
 }

app/app_test.go

@@ -45,9 +45,6 @@ func TestAppWorkflow(t *testing.T) {
 		expectedConfigPath    = "./config.cfg"
 		expectedLocalFilename = "localFilePath"
 
-		expectedTestOwner = "outcatcher"
-		expectedTestRepo  = "asdfasdf"
-
 		expectecdDownloadURL = "https://adfsgijnasdfgj.test"
 	)
 
@@ -71,7 +68,7 @@ func TestAppWorkflow(t *testing.T) {
 
 	mockRemote := mocks.NewMockremoteClient(t)
 	mockRemote.
-		On("GetLatestRelease", ctx, expectedTestOwner, expectedTestRepo).
+		On("GetLatestRelease", ctx, expectecdURL).
 		Return(&remote.Release{
 			Name:        "123",
 			Description: "234",

app/list.go

@@ -2,12 +2,45 @@
 package app
 
 import (
-	"github.com/outcatcher/hipapu/internal/config"
+	"context"
+	"fmt"
+
+	"github.com/outcatcher/hipapu/internal/local"
+	"github.com/outcatcher/hipapu/internal/remote"
 )
 
+// Installation to be synced.
+type Installation struct {
+	// Remote repo release information
+	Release *remote.Release
+	// Local file info
+	LocalFile *local.FileInfo
+}
+
 // List lists all existing installations.
 //
 // It would be better to add a type for return, but it's such a waste of code.
-func (a *Application) List() []config.Installation {
-	return a.config.GetInstallations()
+func (a *Application) List(ctx context.Context) ([]Installation, error) {
+	installations := a.config.GetInstallations()
+
+	result := make([]Installation, len(installations))
+
+	for idx, installation := range installations {
+		release, err := a.remote.GetLatestRelease(ctx, installation.RepoURL)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get release info: %w", err)
+		}
+
+		file, err := a.files.GetFileInfo(installation.LocalPath)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get installation file info: %w", err)
+		}
+
+		result[idx] = Installation{
+			Release:   release,
+			LocalFile: file,
+		}
+	}
+
+	return result, nil
 }

app/mocks/mock_remoteClient.go

@@ -8,10 +8,8 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
-	"github.com/outcatcher/hipapu/internal/config"
 	"github.com/schollz/progressbar/v3"
 )
 
@@ -23,7 +21,10 @@ var (
 
 // Synchronize runs synchronization of all new releases replacing local files reporting the progress.
 func (a *Application) Synchronize(ctx context.Context) error {
-	installations := a.config.GetInstallations()
+	installations, err := a.List(ctx)
+	if err != nil {
+		return fmt.Errorf("sync error: %w", err)
+	}
 
 	if len(installations) == 0 {
 		return ErrEmptyInstallationList
@@ -50,29 +51,18 @@ func (a *Application) Synchronize(ctx context.Context) error {
 
 //nolint:cyclop,funlen  // rewriting makes it less readable
 func (a *Application) syncInstallation(
-	ctx context.Context, installation config.Installation,
+	ctx context.Context, installation Installation,
 ) error {
-	file, err := a.files.GetFileInfo(installation.LocalPath)
-	if err != nil {
-		return fmt.Errorf("failed to get file info: %w", err)
-	}
-
-	urlParts := strings.Split(installation.RepoURL, "/")
-	owner, repo := urlParts[len(urlParts)-2], urlParts[len(urlParts)-1]
-
 	a.log().InfoContext(ctx,
 		"Starting sync of installation",
-		"owner", owner,
-		"repo", repo,
-		"local path", installation.LocalPath,
+		"owner", installation.Release.Owner,
+		"repo", installation.Release.Repo,
+		"local path", installation.LocalFile.FilePath,
 	)
 
-	release, err := a.remote.GetLatestRelease(ctx, owner, repo)
-	if err != nil {
-		return fmt.Errorf("failed to get release info: %w", err)
-	}
+	release, file := installation.Release, installation.LocalFile
 
-	if !release.PublishedAt.After(file.LastModified) {
+	if !release.PublishedAt.After(installation.LocalFile.LastModified) {
 		a.log().Info(
 			"Current installation is up to date",
 			"published at", release.PublishedAt.Format(time.RFC3339),
@@ -140,9 +130,9 @@ func (a *Application) syncInstallation(
 	}
 
 	a.log().Info("Finished sync of installation",
-		"owner", owner,
-		"repo", repo,
-		"local path", installation.LocalPath,
+		"owner", release.Owner,
+		"repo", release.Repo,
+		"local path", file.FilePath,
 		"download URL", downloadURL,
 	)
 

app/sync.go

@@ -6,15 +6,14 @@ import (
 	"fmt"
 
 	"github.com/outcatcher/hipapu/app"
-	"github.com/outcatcher/hipapu/internal/config"
 	"github.com/urfave/cli/v3"
 )
 
 // DefaultCommandName - name of default command.
 const DefaultCommandName = commandNameList
 
 type application interface {
-	List() []config.Installation
+	List(ctx context.Context) ([]app.Installation, error)
 	Add(remoteURL, localPath string) error
 	Synchronize(ctx context.Context) error
 }

cmd/handlers/actions.go

@@ -21,13 +21,22 @@ func (h *ActionHandlers) CommandList() *cli.Command {
 	}
 }
 
-func (h *ActionHandlers) list(_ context.Context, cmd *cli.Command) error {
-	installations := h.app.List()
+func (h *ActionHandlers) list(ctx context.Context, cmd *cli.Command) error {
+	installations, err := h.app.List(ctx)
+	if err != nil {
+		return fmt.Errorf("error handling `list` command: %w", err)
+	}
 
 	_, _ = fmt.Fprintln(cmd.Writer, "Installations:")
 
-	for i, installation := range installations {
-		_, _ = fmt.Fprintf(cmd.Writer, "  %d) %s <---> %s\n", i+1, installation.RepoURL, installation.LocalPath)
+	for i, inst := range installations {
+		statusString := fmt.Sprintf("  %d) %s <---> %s", i+1, inst.Release.RepoURL, inst.LocalFile.FilePath)
+
+		if inst.Release.PublishedAt.After(inst.LocalFile.LastModified) {
+			statusString += " (HAS UPDATES)"
+		}
+
+		_, _ = fmt.Fprintln(cmd.Writer, statusString)
 	}
 
 	return nil

cmd/handlers/list.go

@@ -8,9 +8,12 @@ package handlers //nolint:testpackage  // don't want to make useless tests overl
 import (
 	"bytes"
 	"testing"
+	"time"
 
+	"github.com/outcatcher/hipapu/app"
 	"github.com/outcatcher/hipapu/cmd/handlers/mocks"
-	"github.com/outcatcher/hipapu/internal/config"
+	"github.com/outcatcher/hipapu/internal/local"
+	"github.com/outcatcher/hipapu/internal/remote"
 	"github.com/stretchr/testify/require"
 )
 
@@ -24,15 +27,21 @@ func TestList(t *testing.T) {
 		expectedRepoPath = "test-repo-path-add"
 	)
 
-	expectedInstallations := []config.Installation{
+	expectedInstallations := []app.Installation{
 		{
-			RepoURL:   expectedRepoPath,
-			LocalPath: expectedFilePath,
+			Release: &remote.Release{
+				PublishedAt: time.Now(),
+				RepoURL:     expectedRepoPath,
+			},
+			LocalFile: &local.FileInfo{
+				FilePath:     expectedFilePath,
+				LastModified: time.Now().Add(-1 * time.Second),
+			},
 		},
 	}
 
 	appMock := mocks.NewMockapplication(t)
-	appMock.On("List").Once().Return(expectedInstallations)
+	appMock.On("List", ctx).Once().Return(expectedInstallations, nil)
 
 	hdl := &ActionHandlers{app: appMock}
 
@@ -54,4 +63,5 @@ func TestList(t *testing.T) {
 
 	require.Contains(t, line2, expectedRepoPath)
 	require.Contains(t, line2, expectedFilePath)
+	require.Contains(t, line2, "HAS UPDATE")
 }