Merge branch 'repo-var' into completion

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "remux"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2021"
 authors = [ "Valerie Wolfe <sleeplessval@gmail.com>" ]
 description = "A friendly command shortener for tmux"

bash_completion/remux

@@ -0,0 +1,19 @@
+_remux() {
+	local word
+	COMPREPLY=()
+	word="${COMP_WORDS[COMP_CWORD]}"
+
+	case $COMP_CWORD in
+	1)
+		COMPREPLY=( `compgen -W 'attach detach has help list new path switch title' -- "$word"` )
+		;;
+	2)
+		COMPREPLY=( `compgen -W "$(remux l -q $word)"` )
+		;;
+	esac
+
+	return 0
+}
+
+complete -F _remux remux
+

man/remux.1

@@ -135,6 +135,9 @@ Default: '>'
 .It Ev REMUX_NEW_WINDOW
 Provides a default windows name when creating a new session. Unused if empty.
 Default: (unset)
+.It Ev REMUX_REPO_FILE
+The filename to match on when trying to find the root of a repository.
+Default: '.git'
 .El
 .Sh EXIT STATUS
 .Bl -tag -Width Ds

src/command/share.rs

@@ -56,7 +56,7 @@ pub fn attach(state: &mut State) {
 	state.nest_deinit();
 }
 
-pub fn context_action(state: &State) {
+pub fn context_action(state: &mut State) {
 	if !state.session {
 		if let Some(repository) = &state.repository {
 			let target = repository.name.clone();
@@ -72,7 +72,7 @@ pub fn context_action(state: &State) {
 		}
 	}
 	//	fallback behavior is list
-	list(&state);
+	list(state);
 }
 
 pub fn detach(state: &mut State) {
@@ -114,10 +114,12 @@ pub fn has(state: &mut State) {
 	exit( if success { 0 } else { 1 });
 }
 
-pub fn list(state: &State) {
+pub fn list(state: &mut State) {
 	//	get session list
 	let sessions = util::get_sessions().unwrap_or(Vec::new());
 
+	let search = state.target();
+
 	//	handle empty case
 	if sessions.len() == 0 {
 		println!("no sessions");
@@ -129,25 +131,32 @@ pub fn list(state: &State) {
 	let current_symbol	= env_var(env::CURRENT_SYMBOL);
 
 	//	pretty print session list
-	println!("sessions:");
+	if !state.flags.quiet { println!("sessions:"); }
-	for session in sessions.into_iter() {
+	for session in sessions {
 		let name = session.name.unwrap_or("[untitled]".to_string());
-		let id = session.id.unwrap();
 
-		let attached = session.attached.unwrap_or(0) > 0;
+		if search.is_some() && !name.starts_with(search.as_ref().unwrap()) { continue; }
-		let current = Some(name.clone()) == state.title;
 
-		println!(
+		if !state.flags.quiet {
-			" {current} {name}{reset} ({bold}{blue}{id}{reset}) {bold}{green}{attach}{reset}",
+			let id = session.id.unwrap();
-			//	values
+
-			attach		= if attached { attach_symbol.clone() } else { "".to_string() },
+			let attached = session.attached.unwrap_or(0) > 0;
-			current		= if current { current_symbol.clone() } else { " ".to_string() },
+			let current = Some(name.clone()) == state.title;
-			//	formatting
+
-			bold		= style::Bold,
+			println!(
-			blue		= color::Fg(color::Blue),
+				" {current} {name}{reset} ({bold}{blue}{id}{reset}) {bold}{green}{attach}{reset}",
-			green		= color::Fg(color::LightGreen),
+				//	values
-			reset		= style::Reset,
+				attach		= if attached { attach_symbol.clone() } else { "".to_string() },
-		);
+				current		= if current { current_symbol.clone() } else { " ".to_string() },
+				//	formatting
+				bold		= style::Bold,
+				blue		= color::Fg(color::Blue),
+				green		= color::Fg(color::LightGreen),
+				reset		= style::Reset,
+			);
+		} else {
+			print!("{name} ");
+		}
 	}
 }
 

src/env.rs

@@ -5,6 +5,7 @@ pub type EnvVar = (&'static str, &'static str);
 pub static ATTACH_SYMBOL: EnvVar	= ("REMUX_ATTACH_SYMBOL", "*");
 pub static CURRENT_SYMBOL: EnvVar	= ("REMUX_CURRENT_SYMBOL", ">");
 pub static NEW_WINDOW_NAME: EnvVar	= ("REMUX_NEW_WINDOW", "");
+pub static REPO_FILE:		EnvVar	= ("REMUX_REPO_FILE", ".git");
 
 pub static TMUX: &str				= "TMUX";
 

src/main.rs

@@ -38,7 +38,7 @@ fn main() {
 		Some("help")
 			=>	help(&mut args),
 		None
-			=>	command::share::context_action(&state),
+			=>	command::share::context_action(&mut state),
 
 		Some("a" | "attach")
 			=>	command::share::attach(&mut state),
@@ -50,7 +50,7 @@ fn main() {
 			=>	command::share::has(&mut state),
 
 		Some("l" | "ls" | "list")
-			=>	command::share::list(&state),
+			=>	command::share::list(&mut state),
 
 		Some("n" | "new")
 			=>	command::share::new(&mut state),

src/state.rs

@@ -6,7 +6,7 @@ use std::{
 use pico_args::Arguments;
 
 use crate::{
-	env::TMUX,
+	env::{ env_var, REPO_FILE, TMUX },
 	error,
 	flag::Flags,
 	util::{ find, session_name }
@@ -82,7 +82,7 @@ pub struct Repository {
 
 impl Repository {
 	pub fn find() -> Option<Repository> {
-		let path = find(".git", env::current_dir().unwrap());
+		let path = find(&env_var(REPO_FILE), env::current_dir().unwrap());
 		if let Some(path) = path {
 			let name = path.file_name().unwrap().to_string_lossy().to_string();
 			let inner = Repository {

src/util.rs

@@ -51,7 +51,7 @@ pub fn terminal_enforce() {
 }
 
 ///	recursively propagate up directories to find a child
-pub fn find(target: &'static str, path: PathBuf) -> Option<PathBuf> {
+pub fn find(target: &str, path: PathBuf) -> Option<PathBuf> {
 	if path.join(target).exists() { return Some(path); }
 
 	let parent = path.parent();