init cargo workspace (#252)

* init cargo workspaces

* nix: fix assets path

* doc: update rtp vim plugin

* vim: add error message if loading vim plugin from vim/

.gitignore

@@ -1,4 +1,9 @@
+# Cargo build directory
 /target
-/vim/doc/tags
+
+# Nix build directory
 /result
 /result-lib
+
+# Vim plugins doc tags file
+/*/vim/doc/tags

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Make use of cargo workspace feature
+- [**BREAKING**] Because of workspace feature, the vim plugin is now accessible at `/email-manager/vim` instead of `/vim`
+
 ### Fixed
 
 - Blur in list msg screenshot [#181]

Cargo.lock

@@ -169,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -179,9 +179,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "dirs-next"
@@ -206,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.28"
+version = "0.8.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -484,9 +484,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -526,9 +526,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.103"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6"
+checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673"
 
 [[package]]
 name = "lock_api"
@@ -728,9 +728,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 
 [[package]]
 name = "openssl"
-version = "0.10.36"
+version = "0.10.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
+checksum = "2bc6b9e4403633698352880b22cbe2f0e45dd0177f6fabe4585536e56a3e4f75"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
@@ -748,9 +748,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.67"
+version = "0.9.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058"
+checksum = "1c571f25d3f66dd427e417cebf73dbe2361d6125cf6e3a70d143fdf97c9f5150"
 dependencies = [
  "autocfg",
  "cc",
@@ -876,15 +876,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.20"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb"
+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
 
 [[package]]
 name = "precomputed-hash"
@@ -894,9 +894,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.29"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
+checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
 dependencies = [
  "unicode-xid",
 ]
@@ -1188,9 +1188,9 @@ checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
 
 [[package]]
 name = "slab"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "smallvec"
@@ -1200,12 +1200,13 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
 
 [[package]]
 name = "string_cache"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a"
+checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
 dependencies = [
  "lazy_static",
  "new_debug_unreachable",
+ "parking_lot 0.11.2",
  "phf_shared",
  "precomputed-hash",
  "serde",
@@ -1231,9 +1232,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "syn"
-version = "1.0.80"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194"
+checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1470,9 +1471,9 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
 
 [[package]]
 name = "xml5ever"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59"
+checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865"
 dependencies = [
  "log",
  "mac",

Cargo.toml

@@ -1,35 +1,4 @@
-[package]
+[workspace]
-name = "himalaya"
+members = [
-description = "CLI email client"
+  "email-manager",
-version = "0.5.1"
+]
-authors = ["soywod <clement.douin@posteo.net>"]
-edition = "2018"
-
-[dependencies]
-ammonia = "3.1.2"
-anyhow = "1.0.44"
-atty = "0.2.14"
-chrono = "0.4.19"
-clap = { version = "2.33.3", default-features = false, features = ["suggestions", "color"] }
-env_logger = "0.8.3"
-html-escape = "0.2.9"
-imap = "3.0.0-alpha.4"
-imap-proto = "0.14.3"
-# This commit includes the de/serialization of the ContentType
-# lettre = { version = "0.10.0-rc.1", features = ["serde"] }
-lettre = {git = "https://github.com/TornaxO7/lettre/", branch = "master", features = ["serde"] }
-log = "0.4.14"
-mailparse = "0.13.6"
-native-tls = "0.2"
-regex = "1.5.4"
-rfc2047-decoder = "0.1.2"
-serde = { version = "1.0.118", features = ["derive"] }
-serde_json = "1.0.61"
-shellexpand = "2.1.0"
-termcolor = "1.1"
-terminal_size = "0.1.15"
-toml = "0.5.8"
-tree_magic = "0.2.3"
-unicode-width = "0.1.7"
-url = "2.2.2"
-uuid = { version = "0.8", features = ["v4"] }

README.md

@@ -4,7 +4,7 @@
 [![gh-actions](https://github.com/soywod/himalaya/workflows/nix-build/badge.svg)](https://github.com/soywod/himalaya/actions?query=workflow%3Anix-build)
 [![Homebrew](https://img.shields.io/badge/dynamic/json.svg?url=https://formulae.brew.sh/api/formula/himalaya.json&query=$.versions.stable&label=homebrew)](https://formulae.brew.sh/formula/himalaya)
 
-CLI email client
+CLI email manager
 
 *The project is under active development. Do not use in production before the
 `v1.0.0` (see the [roadmap](https://github.com/soywod/himalaya/milestone/5)).*

email-manager/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "himalaya"
+description = "CLI email manager"
+version = "0.5.1"
+authors = ["soywod <clement.douin@posteo.net>"]
+edition = "2018"
+
+[dependencies]
+ammonia = "3.1.2"
+anyhow = "1.0.44"
+atty = "0.2.14"
+chrono = "0.4.19"
+clap = { version = "2.33.3", default-features = false, features = ["suggestions", "color"] }
+env_logger = "0.8.3"
+html-escape = "0.2.9"
+imap = "3.0.0-alpha.4"
+imap-proto = "0.14.3"
+# This commit includes the de/serialization of the ContentType
+# lettre = { version = "0.10.0-rc.1", features = ["serde"] }
+lettre = { git = "https://github.com/TornaxO7/lettre/", branch = "master", features = ["serde"] }
+log = "0.4.14"
+mailparse = "0.13.6"
+native-tls = "0.2"
+regex = "1.5.4"
+rfc2047-decoder = "0.1.2"
+serde = { version = "1.0.118", features = ["derive"] }
+serde_json = "1.0.61"
+shellexpand = "2.1.0"
+termcolor = "1.1"
+terminal_size = "0.1.15"
+toml = "0.5.8"
+tree_magic = "0.2.3"
+unicode-width = "0.1.7"
+url = "2.2.2"
+uuid = { version = "0.8", features = ["v4"] }

email-manager/assets/himalaya.desktop

@@ -3,7 +3,7 @@ Type=Application
 Name=himalaya
 DesktopName=Himalaya
 GenericName=Mail Reader
-Comment=CLI email client
+Comment=CLI email manager
 Comment[lo]=CLI ອີເມວໄຄລແອນທີ່ຂຽນດ້ວຍພາສາRust
 Comment[th]=CLI อีเมล์ไคลแอนท์ที่เขียนด้วยภาษาRust
 Terminal=true

email-manager/vim/README.md

@@ -8,7 +8,7 @@ this plugin with your favorite plugin manager. For example with
 [vim-plug](https://github.com/junegunn/vim-plug), add to your `.vimrc`:
 
 ```viml
-Plug 'soywod/himalaya', {'rtp': 'vim'}
+Plug 'soywod/himalaya', {'rtp': 'email-manager/vim'}
 ```
 
 Then:

email-manager/vim/doc/himalaya.txt

@@ -1,4 +1,4 @@
-*himalaya.txt* - CLI email client
+*himalaya.txt* - CLI email manager
                                                         
     _/    _/  _/_/_/  _/      _/    _/_/    _/        _/_/  _/      _/   _/_/ 
    _/    _/    _/    _/_/  _/_/  _/    _/  _/      _/    _/  _/  _/   _/    _/

email-manager/vim/plugin/himalaya.vim

@@ -0,0 +1,19 @@
+if exists("g:loaded_himalaya")
+  finish
+endif
+
+if !executable("himalaya")
+  throw "Himalaya CLI not found, see https://github.com/soywod/himalaya#installation"
+endif
+
+" Backup cpo
+let s:cpo_backup = &cpo
+set cpo&vim
+
+command! -nargs=* Himalaya call himalaya#msg#list(<f-args>)
+
+" Restore cpo
+let &cpo = s:cpo_backup
+unlet s:cpo_backup
+
+let g:loaded_himalaya = 1

flake.nix

@@ -1,5 +1,5 @@
 {
-  description = "CLI email client";
+  description = "CLI email manager";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

vim/plugin/himalaya.vim

@@ -1,19 +1 @@
-if exists("g:loaded_himalaya")
+echoerr 'Cannot load himalaya: please change the rtp path from "vim" to "email-manager/vim" (https://github.com/soywod/himalaya/tree/development/email-manager/vim).'
-  finish
-endif
-
-if !executable("himalaya")
-  throw "Himalaya CLI not found, see https://github.com/soywod/himalaya#installation"
-endif
-
-" Backup cpo
-let s:cpo_backup = &cpo
-set cpo&vim
-
-command! -nargs=* Himalaya call himalaya#msg#list(<f-args>)
-
-" Restore cpo
-let &cpo = s:cpo_backup
-unlet s:cpo_backup
-
-let g:loaded_himalaya = 1

wiki

@@ -1 +1 @@
-Subproject commit 3c74b676f07f72c58c4107edef720c02b54c680e
+Subproject commit 099cf9db0916df048af7d6bffd35cd1a7ac7d88d