Argument parsing: Switch from docopt to clap

tealdeer-rs · Mar 7, 2020 · 2e9f2c6 · 2e9f2c6
1 parent a9fa0c7
commit 2e9f2c6
Show file tree

Hide file tree

Showing 8 changed files with 182 additions and 126 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/main.rs"
 [dependencies]
 ansi_term = "0.12.0"
 app_dirs = "1.2.1"
-docopt = "1"
+clap = { git = "https://github.com/clap-rs/clap/" }
 env_logger = { version = "0.7", optional = true }
 flate2 = "1"
 log = "0.4"

diff --git a/bash_tealdeer b/bash_tealdeer
@@ -14,7 +14,7 @@ _tealdeer()
 			return
 			;;
 		-o|--os)
-			COMPREPLY=( $(compgen -W 'linux osx sunos windows' -- "${cur}") )
+			COMPREPLY=( $(compgen -W 'linux osx macos sunos windows' -- "${cur}") )
 			return
 			;;
 	esac

diff --git a/fish_tealdeer b/fish_tealdeer
@@ -7,7 +7,7 @@ complete -c tldr -s h -l help        -d 'Print the help message.' -f
 complete -c tldr -s v -l version     -d 'Show version information.' -f
 complete -c tldr -s l -l list        -d 'List all commands in the cache.' -f
 complete -c tldr -s f -l render      -d 'Render a specific markdown file.' -r
-complete -c tldr -s o -l os          -d 'Override the operating system.' -xa 'linux osx sunos windows other'
+complete -c tldr -s o -l os          -d 'Override the operating system.' -xa 'linux osx macos sunos windows'
 complete -c tldr -s u -l update      -d 'Update the local cache.' -f
 complete -c tldr -s c -l clear-cache -d 'Clear the local cache.' -f
 complete -c tldr -s p -l pager       -d 'Use a pager to page output.' -f

diff --git a/src/cache.rs b/src/cache.rs
@@ -136,7 +136,6 @@ impl Cache {
             OsType::OsX => Some("osx"),
             OsType::SunOs => None, // TODO: Does Rust support SunOS?
             OsType::Windows => Some("windows"),
-            OsType::Other => None,
         }
     }