From 778e91c04f3f159dd0aef303a7e97b4377a747ee Mon Sep 17 00:00:00 2001 From: drew Date: Thu, 4 Dec 2025 20:19:28 +0400 Subject: [PATCH] fix: renaming the project --- .goreleaser.yml | 11 +++++----- CONTRIBUTING.md | 12 +++++------ README.md | 22 ++++++++++---------- config/config.go | 2 +- fetcher/fetcher.go | 2 +- fetcher/fetcher_test.go | 2 +- go.mod | 28 +++++++++++-------------- main.go | 2 +- public/index.html | 46 +++++++++++++++++++++-------------------- snapcraft.yaml | 8 +++---- tui/choice.go | 2 +- 11 files changed, 68 insertions(+), 69 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 8ed8134960f9ec00c01c96d4d192e5b55bc9605d..966fad9dd47a02205426037862c777158f8cf8fd 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,7 +12,7 @@ before: # 'builds' defines the matrix of binaries to create. builds: - # The main build configuration for your CLI. - # The binary name will be 'email-cli'. + # The binary name will be 'matcha'. id: "matcha" # The main entrypoint of your application. main: . @@ -36,11 +36,12 @@ archives: # This will create .tar.gz files. format: tar.gz # A template for the archive file names. - # e.g., email-cli_1.2.3_darwin_amd64.tar.gz + # e.g., matcha_1.2.3_darwin_amd64.tar.gz name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}" # Files to include in the archive. files: - LICENSE + - README.md # 'checksum' creates a file with SHA256 checksums for all artifacts. @@ -72,7 +73,7 @@ release: # 'brews' configures the Homebrew tap integration. brews: - # The configuration for your Homebrew tap. - # The name of your formula file will be 'email-cli.rb'. + # The name of your formula file will be 'matcha.rb'. name: matcha # The GitHub repository for your Homebrew tap. tap: @@ -97,9 +98,9 @@ brews: dependencies: [] # The test block for your formula. - # This command will be run by `brew test email-cli`. + # This command will be run by `brew test matcha`. test: | - system "#{bin}/email-cli --version" + system "#{bin}/matcha --version" # The installation instructions for your formula. # This tells Homebrew to just install the binary. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ed6eacf32e14313368a9ac021759c2d6c346891e..fd41d79be8dbb130800a201dcb7fba938005d3ef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to Email CLI +# Contributing to Matcha -First off, thank you for considering contributing to Email CLI! It's people like you that make this project great. +First off, thank you for considering contributing to Matcha! It's people like you that make this project great. ## How Can I Contribute? @@ -38,7 +38,7 @@ To get started with development, you'll need to have Go installed. 1. Clone the repository: ```bash git clone https://github.com/floatpane/matcha.git - cd email-cli + cd matcha ``` 2. Install dependencies: ```bash @@ -46,13 +46,13 @@ To get started with development, you'll need to have Go installed. ``` 3. Build the project: ```bash - go build -o email-cli + go build -o matcha ``` 4. Run the application: ```bash - ./email-cli + ./matcha ``` ## Code of Conduct -Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. Please read the [Code of Conduct](CODE_OF_CONDUCT.md). +Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. Please read the [Code of Conduct](CODE_OF_CONDUCT.md). \ No newline at end of file diff --git a/README.md b/README.md index 73c8d04d3729e52c40e8d26d8b1669da04178df1..a46f2881dbd2d91ef0e1ae84671319f112fc8dcb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Matcha Client 🍵 +# Matcha 🍵
@@ -23,7 +23,7 @@ [![macOS](https://img.shields.io/badge/macOS-Supported-000000?logo=macos&logoColor=white)](https://www.apple.com/macos) [![Linux](https://img.shields.io/badge/Linux-Supported-FCC624?logo=linux&logoColor=black)](https://www.linux.org/) [![Homebrew](https://img.shields.io/badge/homebrew-tap-21648C.svg?logo=homebrew)](https://brew.sh) -[![Snapcraft](https://img.shields.io/badge/snap-available-82BEA0.svg?logo=snapcraft)](https://snapcraft.io/email-cli) +[![Snapcraft](https://img.shields.io/badge/snap-available-82BEA0.svg?logo=snapcraft)](https://snapcraft.io/matcha) [![Patreon](https://img.shields.io/badge/Patreon-F96854?logo=patreon&logoColor=white)](https://patreon.com/andrinoff) [![GitHub contributors](https://img.shields.io/github/contributors/floatpane/matcha)](https://github.com/floatpane/matcha/graphs/contributors) @@ -46,7 +46,7 @@ A beautiful and functional email client for your terminal, built with Go and the ## Installation 🚀 -There are several ways to install Email CLI. +There are several ways to install Matcha. ### Package Managers @@ -54,13 +54,13 @@ There are several ways to install Email CLI. ```bash brew tap floatpane/matcha -brew install email-cli +brew install matcha ``` After installation, run: ```bash -email-cli +matcha ``` to get started. @@ -68,12 +68,12 @@ to get started. ### Install using Snap ```bash -sudo snap install email-cli +sudo snap install matcha ``` ### Build from Source 🔨 -Email CLI is written in **Go**. To build it manually: +Matcha is written in **Go**. To build it manually: 1. Ensure you have Go installed (`go version`). 2. Clone the repository: @@ -85,20 +85,20 @@ Email CLI is written in **Go**. To build it manually: 3. Navigate to the project folder: ```bash - cd email-cli + cd matcha ``` 4. Build the binary: ```bash - go build -o email-cli + go build -o matcha ``` 5. Run it: ```bash - ./email-cli + ./matcha ``` ## License 📄 -This project is distributed under the MIT License. See the `LICENSE` file for more information. +This project is distributed under the MIT License. See the `LICENSE` file for more information. \ No newline at end of file diff --git a/config/config.go b/config/config.go index 5e66880e22c037e7755d7fa9e031280efc2e0dec..c0eedd55c7fa81a6a8a6535ec7808cb30ae11519 100644 --- a/config/config.go +++ b/config/config.go @@ -20,7 +20,7 @@ func configDir() (string, error) { if err != nil { return "", err } - return filepath.Join(home, ".config", "email-cli"), nil + return filepath.Join(home, ".config", "matcha"), nil } // configFile returns the full path to the configuration file. diff --git a/fetcher/fetcher.go b/fetcher/fetcher.go index 047c5ec30f7b1a683c19acf36c0b64ed5f68399d..23de3e7c802b05dcfeece617bdfbe8532d38a546 100644 --- a/fetcher/fetcher.go +++ b/fetcher/fetcher.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/andrinoff/email-cli/config" "github.com/emersion/go-imap" "github.com/emersion/go-imap/client" "github.com/emersion/go-message/mail" + "github.com/floatpane/matcha/config" "golang.org/x/text/encoding/ianaindex" "golang.org/x/text/transform" ) diff --git a/fetcher/fetcher_test.go b/fetcher/fetcher_test.go index 23985a2d809af5c6408290183c33e7007fd98383..72449ec087db100d2882275c341b18b5533bab0b 100644 --- a/fetcher/fetcher_test.go +++ b/fetcher/fetcher_test.go @@ -3,7 +3,7 @@ package fetcher import ( "testing" - "github.com/andrinoff/email-cli/config" + "github.com/floatpane/matcha/config" ) // TestFetchEmails is an integration test that requires a live IMAP server and valid credentials. diff --git a/go.mod b/go.mod index 95bd4b8799a734e2d991e7f3e2cda499fe70e5ae..6d8efa6348434d9f2c006cf8ea149e40118b22f3 100644 --- a/go.mod +++ b/go.mod @@ -3,42 +3,38 @@ module github.com/floatpane/matcha go 1.24.5 require ( - github.com/PuerkitoBio/goquery v1.10.3 // indirect + github.com/PuerkitoBio/goquery v1.10.3 + github.com/charmbracelet/bubbles v0.21.0 + github.com/charmbracelet/bubbletea v1.3.6 + github.com/charmbracelet/lipgloss v1.1.0 + github.com/emersion/go-imap v1.2.1 + github.com/emersion/go-message v0.18.2 + github.com/google/uuid v1.6.0 + github.com/yuin/goldmark v1.7.13 + golang.org/x/text v0.27.0 +) + +require ( github.com/andybalholm/cascadia v1.3.3 // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect - github.com/aymerick/douceur v0.2.0 // indirect - github.com/charmbracelet/bubbles v0.21.0 // indirect - github.com/charmbracelet/bubbletea v1.3.6 // indirect github.com/charmbracelet/colorprofile v0.3.1 // indirect - github.com/charmbracelet/lipgloss v1.1.0 // indirect github.com/charmbracelet/x/ansi v0.9.3 // indirect github.com/charmbracelet/x/cellbuf v0.0.13 // indirect github.com/charmbracelet/x/term v0.2.1 // indirect - github.com/emersion/go-imap v1.2.1 // indirect - github.com/emersion/go-imap/v2 v2.0.0-beta.5 // indirect - github.com/emersion/go-message v0.18.2 // indirect github.com/emersion/go-sasl v0.0.0-20241020182733-b788ff22d5a6 // indirect github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect - github.com/google/uuid v1.6.0 // indirect - github.com/gorilla/css v1.0.1 // indirect - github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // 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.16 // indirect - github.com/microcosm-cc/bluemonday v1.0.27 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/termenv v0.16.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/sahilm/fuzzy v0.1.1 // indirect - github.com/spf13/cobra v1.9.1 // indirect - github.com/spf13/pflag v1.0.7 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - github.com/yuin/goldmark v1.7.13 // indirect golang.org/x/net v0.39.0 // indirect golang.org/x/sync v0.16.0 // indirect golang.org/x/sys v0.34.0 // indirect - golang.org/x/text v0.27.0 // indirect ) diff --git a/main.go b/main.go index 09a49dbe0cebd6ccd6aff1354b97f2941704e52c..5ae0204d5d87331b0ce72befc5968cc39790d927 100644 --- a/main.go +++ b/main.go @@ -306,7 +306,7 @@ func sendEmail(cfg *config.Config, msg tui.SendEmailMsg) tea.Cmd { log.Printf("Could not read image file %s: %v", imgPath, err) continue } - cid := fmt.Sprintf("%s%s@%s", uuid.NewString(), filepath.Ext(imgPath), "email-cli") + cid := fmt.Sprintf("%s%s@%s", uuid.NewString(), filepath.Ext(imgPath), "matcha") images[cid] = []byte(base64.StdEncoding.EncodeToString(imgData)) body = strings.Replace(body, imgPath, "cid:"+cid, 1) } diff --git a/public/index.html b/public/index.html index 1701983f0121f4d47a2a5c4d8f60722d2cc96f52..5244b03f2a666050c5afa11ce53f97d997f9898b 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - Email CLI - Your Terminal Email Client + Matcha - Your Terminal Email Client @@ -18,15 +18,15 @@
-
Email CLI
+
Matcha
What would you like to do?
@@ -124,7 +126,7 @@
Email CLI Preview
@@ -221,20 +223,20 @@ ~ $ brew tap andrinoff/email-clibrew tap floatpane/matcha
~ $ brew install email-clibrew install matcha
~ $ - email-cli + matcha
@@ -257,7 +259,7 @@
git clone - https://github.com/andrinoff/email-cli.git
@@ -277,8 +279,8 @@
cd email-cli && go build -o - email-clicd matcha && go build -o + matcha
@@ -298,7 +300,7 @@
./email-cli./matcha
@@ -399,7 +401,7 @@

For support, please open an issue on the GitHub repository. @@ -428,22 +430,22 @@