updates

ignite · Jun 7, 2024 · 1a7bcf0 · 1a7bcf0
1 parent c59d5e7
commit 1a7bcf0
Show file tree

Hide file tree

Showing 8 changed files with 420 additions and 93 deletions.
diff --git a/marketplace/cmd/details.go b/marketplace/cmd/details.go
@@ -2,11 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"hash/fnv"
-	"io"
-	"os"
 	"strconv"
-	"strings"
 	"text/tabwriter"
 
 	"github.com/charmbracelet/lipgloss"
@@ -21,10 +17,11 @@ var (
 	linkStyle = lipgloss.NewStyle().
 			Foreground(lipgloss.Color("10")).
 			Underline(true)
-	installaitonStyle = lipgloss.NewStyle().
+
+	installationStyle = lipgloss.NewStyle().
 				Border(lipgloss.NormalBorder()).
-				BorderForeground(lipgloss.Color("9")).
-				MarginLeft(15)
+				BorderForeground(lipgloss.Color("9"))
+
 	commandStyle = lipgloss.NewStyle().
 			Foreground(lipgloss.Color("2")).
 			Bold(true)
@@ -33,7 +30,7 @@ var (
 // NewDetailsCmd creates a new details command that shows the details of an ignite application repository.
 func NewDetailsCmd() *cobra.Command {
 	return &cobra.Command{
-		Use:     "details [name]",
+		Use:     "details [app name]",
 		Aliases: []string{"info"},
 		Short:   "Show the details of an ignite application repository",
 		Args:    cobra.ExactArgs(1),
@@ -46,63 +43,34 @@ func NewDetailsCmd() *cobra.Command {
 			client := xgithub.NewClient(githubToken)
 			registryQuerier := registry.NewRegistryQuerier(client)
 
-			repo, err := registryQuerier.GetAppDetails(cmd.Context(), args[0])
+			appDetails, err := registryQuerier.GetAppDetails(cmd.Context(), args[0])
 			if err != nil {
 				return err
 			}
 
 			session.StopSpinner()
-			printRepoDetails(repo)
-			return nil
-		},
-	}
-}
-
-func printRepoDetails(repo *registry.AppRepositoryDetails) {
-	w := &tabwriter.Writer{}
-	w.Init(os.Stdout, 0, 8, 0, '\t', 0)
-	printItem := func(s string, v interface{}) {
-		fmt.Fprintf(w, "%s:\t%v\n", s, v)
-	}
-
-	printItem("Description", repo.Description)
-	tags := make([]string, len(repo.Tags))
-	for i, tag := range repo.Tags {
-		tags[i] = lipgloss.NewStyle().Background(colorFromText(tag)).Render(tag)
-	}
-	printItem("Tags", strings.Join(tags, " "))
-	printItem("Stars", strconv.Itoa(repo.Stars))
-	printItem("License", repo.License)
-	printItem("URL", linkStyle.Render(repo.URL))
-	printItem("Apps", "")
-	w.Flush()
-
-	printAppsTable(repo)
-}
 
-func printAppsTable(repo *registry.AppRepositoryDetails) {
-	printItem := func(w io.Writer, s string, v interface{}) {
-		fmt.Fprintf(w, "\t%s:\t%v\n", s, v)
-	}
+			w := &tabwriter.Writer{}
+			printItem := func(s string, v interface{}) {
+				fmt.Fprintf(w, "\t%s:\t%v\n", s, v)
+			}
+			w.Init(cmd.OutOrStdout(), 0, 8, 0, '\t', 0)
 
-	w := &tabwriter.Writer{}
-	w.Init(os.Stdout, 16, 8, 0, '\t', 0)
+			printItem("Name", appDetails.App.Name)
+			printItem("Description", appDetails.App.Description)
+			printItem("Stars", strconv.Itoa(appDetails.Stars))
+			printItem("Go version", appDetails.App.GoVersion)
+			printItem("Ignite version", appDetails.App.IgniteVersion)
+			printItem("Documentation", appDetails.App.DocumentationURL)
+			printItem("Repository", linkStyle.Render(appDetails.URL))
 
-	printItem(w, "Name", repo.App.Name)
-	printItem(w, "Description", repo.App.Description)
-	printItem(w, "Path", repo.App.Path)
-	printItem(w, "Go Version", repo.App.GoVersion)
-	printItem(w, "Ignite Version", repo.App.IgniteVersion)
+			fmt.Fprintln(w, installationStyle.Render(fmt.Sprintf(
+				"🚀 Install via: %s", commandStyle.Render(fmt.Sprintf("ignite app -g install %s", appDetails.App.PackageURL)),
+			)))
 
-	fmt.Fprintln(w, installaitonStyle.Render(fmt.Sprintf(
-		"🚀 Install via: %s", commandStyle.Render(fmt.Sprintf("ignite app -g install %s", repo.App.PackageURL)),
-	)))
+			w.Flush()
 
-	w.Flush()
-}
-
-func colorFromText(text string) lipgloss.Color {
-	h := fnv.New64a()
-	h.Write([]byte(text))
-	return lipgloss.Color(strconv.FormatUint(h.Sum64()%16, 10))
+			return nil
+		},
+	}
 }
diff --git a/marketplace/cmd/install.go b/marketplace/cmd/install.go
@@ -1,15 +1,42 @@
 package cmd
 
-import "github.com/spf13/cobra"
+import (
+	"os"
+
+	"github.com/spf13/cobra"
+
+	ignitecmd "github.com/ignite/cli/v28/ignite/cmd"
+	"github.com/ignite/cli/v28/ignite/pkg/cliui"
+
+	"github.com/ignite/apps/marketplace/pkg/xgithub"
+	"github.com/ignite/apps/marketplace/registry"
+)
 
 func NewInstallCmd() *cobra.Command {
 	c := &cobra.Command{
-		Use:   "install [name]",
-		Short: "Install an ignite app by registry name",
-		Args:  cobra.NoArgs,
-		RunE: func(cmd *cobra.Command, _ []string) error {
+		Use:   "install [app name]",
+		Short: "Install an ignite app by app name",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			githubToken, _ := cmd.Flags().GetString(githubTokenFlag)
+
+			session := cliui.New(cliui.WithStdout(os.Stdout))
+			defer session.End()
+
+			client := xgithub.NewClient(githubToken)
+			registryQuerier := registry.NewRegistryQuerier(client)
+
+			appDetails, err := registryQuerier.GetAppDetails(cmd.Context(), args[0])
+			if err != nil {
+				return err
+			}
+
+			// here we are using the ignite app install command to install the app
+			// we do this in order to not duplicate logic.
+			igniteAppInstallCmd := ignitecmd.NewAppInstall()
+			igniteAppInstallCmd.SetArgs([]string{"-g", appDetails.App.PackageURL})
 
-			return nil
+			return igniteAppInstallCmd.ExecuteContext(cmd.Context())
 		},
 	}
 

diff --git a/marketplace/cmd/list.go b/marketplace/cmd/list.go
@@ -18,7 +18,7 @@ const descriptionLimit = 75
 func NewListCmd() *cobra.Command {
 	c := &cobra.Command{
 		Use:   "list",
-		Short: "List all the ignite apps",
+		Short: "List all the ignite apps from the app registry",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			var githubToken, _ = cmd.Flags().GetString(githubTokenFlag)

diff --git a/marketplace/cmd/marketplace.go b/marketplace/cmd/marketplace.go
@@ -22,7 +22,6 @@ func NewMarketplace() *cobra.Command {
 It also helps you to get more information about an app.
 Please note this command uses the Github API that a very limited rate limit for unauthenticated requests
 so it's recommended to use the --github-token flag you want to use marketplace commands frequently.`,
-		SilenceUsage:  true,
 		SilenceErrors: true,
 	}
 

diff --git a/marketplace/go.mod b/marketplace/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/goccy/go-yaml v1.11.2
 	github.com/google/go-github/v56 v56.0.0
 	github.com/hashicorp/go-plugin v1.6.0
-	github.com/ignite/cli/v28 v28.3.0
+	github.com/ignite/cli/v28 v28.4.0
 	github.com/muesli/termenv v0.15.2
 	github.com/spf13/cobra v1.8.0
 	github.com/stretchr/testify v1.8.4
@@ -23,7 +23,10 @@ require (
 	cosmossdk.io/log v1.3.0 // indirect
 	cosmossdk.io/math v1.2.0 // indirect
 	cosmossdk.io/store v1.0.2 // indirect
+	cosmossdk.io/x/evidence v0.1.0 // indirect
+	cosmossdk.io/x/feegrant v0.1.0 // indirect
 	cosmossdk.io/x/tx v0.13.0 // indirect
+	cosmossdk.io/x/upgrade v0.1.0 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	filippo.io/edwards25519 v1.0.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -33,26 +36,39 @@ require (
 	github.com/DataDog/zstd v1.5.5 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
+	github.com/alecthomas/chroma v0.8.2 // indirect
+	github.com/atotto/clipboard v0.1.2 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/briandowns/spinner v1.23.0 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
+	github.com/calmh/randomart v1.1.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/charmbracelet/bubbles v0.7.6 // indirect
+	github.com/charmbracelet/bubbletea v0.23.2 // indirect
+	github.com/charmbracelet/charm v0.8.6 // indirect
+	github.com/charmbracelet/glamour v0.2.1-0.20210402234443-abe9cda419ba // indirect
+	github.com/charmbracelet/glow v1.4.1 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
+	github.com/cilium/ebpf v0.9.1 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
 	github.com/cockroachdb/errors v1.11.1 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v0.0.0-20231102162011-844f0582c2eb // indirect
 	github.com/cockroachdb/redact v1.1.5 // indirect
 	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
 	github.com/cometbft/cometbft v0.38.2 // indirect
 	github.com/cometbft/cometbft-db v0.9.1 // indirect
+	github.com/containerd/console v1.0.4-0.20230508195404-8d3c090fd31c // indirect
+	github.com/containerd/containerd v1.7.11 // indirect
+	github.com/cosiner/argv v0.1.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
 	github.com/cosmos/cosmos-db v1.0.0 // indirect
 	github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
@@ -61,25 +77,36 @@ require (
 	github.com/cosmos/gogogateway v1.2.0 // indirect
 	github.com/cosmos/gogoproto v1.4.11 // indirect
 	github.com/cosmos/iavl v1.0.0 // indirect
+	github.com/cosmos/ibc-go/modules/capability v1.0.0 // indirect
+	github.com/cosmos/ibc-go/v8 v8.0.0 // indirect
 	github.com/cosmos/ics23/go v0.10.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
+	github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
+	github.com/derekparker/trie v0.0.0-20221213183930-4c74548207f4 // indirect
 	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
+	github.com/dlclark/regexp2 v1.2.0 // indirect
+	github.com/docker/docker v24.0.7+incompatible // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
 	github.com/emicklei/dot v1.6.0 // indirect
+	github.com/emicklei/proto v1.12.2 // indirect
+	github.com/emicklei/proto-contrib v0.15.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/getsentry/sentry-go v0.25.0 // indirect
+	github.com/go-delve/delve v1.21.0 // indirect
+	github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-git/go-git/v5 v5.11.0 // indirect
@@ -105,11 +132,15 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-dap v0.9.1 // indirect
 	github.com/google/go-github/v48 v48.2.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/gookit/color v1.5.4 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gorilla/handlers v1.5.2 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/gorilla/rpc v1.2.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
@@ -123,6 +154,9 @@ require (
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/iancoleman/strcase v0.3.0 // indirect
+	github.com/ignite/ignite-files/nodetime v0.0.4 // indirect
+	github.com/ignite/ignite-files/protoc v0.0.1 // indirect
+	github.com/ignite/web v0.6.1 // indirect
 	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -140,17 +174,34 @@ require (
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/meowgorithm/babyenv v1.3.1 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/microcosm-cc/bluemonday v1.0.23 // indirect
+	github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/moby/moby v24.0.7+incompatible // indirect
+	github.com/moby/patternmatcher v0.6.0 // indirect
+	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
+	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/muesli/gitcha v0.2.0 // indirect
+	github.com/muesli/go-app-paths v0.2.1 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
+	github.com/muesli/sasquatch v0.0.0-20200811221207-66979d92330a // indirect
+	github.com/nqd/flat v0.2.0 // indirect
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
 	github.com/oklog/run v1.1.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onsi/gomega v1.28.1 // indirect
+	github.com/opencontainers/runc v1.1.7 // indirect
+	github.com/otiai10/copy v1.14.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
@@ -160,12 +211,16 @@ require (
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/radovskyb/watcher v1.0.7 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/rs/cors v1.10.1 // indirect
 	github.com/rs/zerolog v1.31.0 // indirect
+	github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
+	github.com/sahilm/fuzzy v0.1.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
+	github.com/segmentio/ksuid v1.0.3 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.1 // indirect
@@ -181,9 +236,14 @@ require (
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tidwall/btree v1.7.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
+	github.com/yuin/goldmark v1.4.13 // indirect
+	github.com/yuin/goldmark-emoji v1.0.1 // indirect
 	github.com/zondax/hid v0.9.2 // indirect
 	github.com/zondax/ledger-go v0.14.3 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
+	go.starlark.net v0.0.0-20220816155156-cfacd8902214 // indirect
+	golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20231108232855-2478ac86f678 // indirect
 	golang.org/x/net v0.19.0 // indirect