Update to @erichs' latest version of Composure
Was having issues with iTerm and composure's old binding of edit-and-execute. This version removes that, so just updated rather than edit.pull/119/merge
Travis Swicegood
parent
773370bacd
commit
3e7c0fbda0
|
|
@ -1,36 +1,45 @@
|
|||
#!/bin/bash
|
||||
# Composure - don't fear the UNIX chainsaw...
|
||||
# by erichs, 2012
|
||||
# composure - by erichs
|
||||
# light-hearted shell functions for intuitive shell programming
|
||||
|
||||
# these are a set of light-hearted shell functions that aim to make
|
||||
# programming the shell easier and more intuitive
|
||||
# install: source this script in your ~/.profile or ~/.${SHELL}rc script
|
||||
|
||||
# latest source available at http://git.io/composure
|
||||
# known to work on bash, zsh, and ksh93
|
||||
|
||||
source_composure ()
|
||||
{
|
||||
if [ -z "$EDITOR" ]
|
||||
then
|
||||
export EDITOR=vi
|
||||
fi
|
||||
|
||||
if $(tty -s) # is this a TTY?
|
||||
then
|
||||
bind '"\C-j": edit-and-execute-command'
|
||||
fi
|
||||
# define default metadata keywords:
|
||||
about () { :; }
|
||||
group () { :; }
|
||||
param () { :; }
|
||||
author () { :; }
|
||||
example () { :; }
|
||||
|
||||
cite ()
|
||||
{
|
||||
about () { :; }
|
||||
about creates a new meta keyword for use in your functions
|
||||
local keyword=$1
|
||||
param 1: keyword
|
||||
example $ cite url
|
||||
example $ url http://somewhere.com
|
||||
group composure
|
||||
|
||||
# this is the storage half of the 'metadata' system:
|
||||
# we create dynamic metadata keywords with function wrappers around
|
||||
# the NOP command, ':'
|
||||
|
||||
# anything following a keyword will get parsed as a positional
|
||||
# parameter, but stay resident in the ENV. As opposed to shell
|
||||
# comments, '#', which do not get parsed, thus are not available
|
||||
# at runtime.
|
||||
|
||||
# a BIG caveat--your metadata must be roughly parsable: do not use
|
||||
# contractions, and consider single or double quoting if it contains
|
||||
# non-alphanumeric characters
|
||||
|
||||
typeset keyword
|
||||
for keyword in $*; do
|
||||
eval "function $keyword { :; }"
|
||||
done
|
||||
}
|
||||
|
||||
cite about param example
|
||||
|
||||
draft ()
|
||||
{
|
||||
about wraps last command into a new function
|
||||
|
|
@ -38,36 +47,73 @@ source_composure ()
|
|||
example $ ls
|
||||
example $ draft list
|
||||
example $ list
|
||||
local name=$1
|
||||
eval 'function ' $name ' { ' $(fc -ln -1) '; }'
|
||||
group composure
|
||||
|
||||
typeset func=$1
|
||||
eval 'function ' $func ' { ' $(fc -ln -1) '; }'
|
||||
typeset file=$(mktemp /tmp/draft.XXXX)
|
||||
typeset -f $func > $file
|
||||
transcribe $func $file draft
|
||||
rm $file 2>/dev/null
|
||||
}
|
||||
|
||||
write ()
|
||||
glossary ()
|
||||
{
|
||||
about prints function declaration to stdout
|
||||
param name of function or functions, separated by spaces
|
||||
example $ write myfunction
|
||||
example $ write func1 func2 func3 > ~/funcs.sh
|
||||
local func
|
||||
for func in $*
|
||||
do
|
||||
# trim trailing semicolons generated by declare -f
|
||||
declare -f $func | sed "s/^\(.*\);$/\1/"
|
||||
echo
|
||||
about displays help summary for all functions, or summary for a group of functions
|
||||
param 1: optional, group name
|
||||
example $ glossary
|
||||
example $ glossary misc
|
||||
group composure
|
||||
|
||||
typeset targetgroup=${1:-}
|
||||
|
||||
for func in $(listfunctions); do
|
||||
typeset about="$(metafor $func about)"
|
||||
if [ -n "$targetgroup" ]; then
|
||||
typeset group="$(metafor $func group)"
|
||||
if [ "$group" != "$targetgroup" ]; then
|
||||
continue # skip non-matching groups, if specified
|
||||
fi
|
||||
fi
|
||||
letterpress "$about" $func
|
||||
done
|
||||
}
|
||||
|
||||
revise ()
|
||||
letterpress ()
|
||||
{
|
||||
about loads function into editor for revision
|
||||
param name of function or functions, separated by spaces
|
||||
example $ revise myfunction
|
||||
example $ revise func1 func2 func3
|
||||
local temp=$(mktemp /tmp/revise.XXXX)
|
||||
write $* > $temp
|
||||
$EDITOR $temp
|
||||
eval "$(cat $temp)"
|
||||
rm $temp
|
||||
typeset metadata=$1 leftcol=${2:- } rightcol
|
||||
|
||||
if [ -z "$metadata" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
OLD=$IFS; IFS=$'\n'
|
||||
for rightcol in $metadata; do
|
||||
printf "%-20s%s\n" $leftcol $rightcol
|
||||
done
|
||||
IFS=$OLD
|
||||
}
|
||||
|
||||
listfunctions ()
|
||||
{
|
||||
# unfortunately, there does not seem to be a easy, portable way to list just the
|
||||
# names of the defined shell functions...
|
||||
|
||||
# here's a hack I modified from a StackOverflow post:
|
||||
# we loop over the ps listing for the current process ($$), and print the last column (CMD)
|
||||
# stripping any leading hyphens bash sometimes throws in there
|
||||
|
||||
typeset x ans
|
||||
typeset this=$(for x in $(ps -p $$); do ans=$x; done; printf "%s\n" $ans | sed 's/^-*//')
|
||||
case "$this" in
|
||||
bash)
|
||||
typeset -F | awk '{print $3}'
|
||||
;;
|
||||
*)
|
||||
# trim everything following '()' in ksh
|
||||
typeset +f | sed 's/().*$//'
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
metafor ()
|
||||
|
|
@ -75,120 +121,131 @@ source_composure ()
|
|||
about prints function metadata associated with keyword
|
||||
param 1: function name
|
||||
param 2: meta keyword
|
||||
example $ metafor reference example
|
||||
local func=$1 keyword=$2
|
||||
write $func | sed -n "s/^ *$keyword \([^([].*\)$/\1/p"
|
||||
example $ metafor glossary example
|
||||
group composure
|
||||
typeset func=$1 keyword=$2
|
||||
|
||||
# this sed-fu is the retrieval half of the 'metadata' system:
|
||||
# first 'cat' the function definition,
|
||||
# then 'grep' for the metadata keyword, and
|
||||
# then parse and massage the matching line
|
||||
typeset -f $func | sed -n "s/;$//;s/^[ ]*$keyword \([^([].*\)*$/\1/p"
|
||||
}
|
||||
|
||||
reference ()
|
||||
{
|
||||
about displays help summary for all functions, or help for specific function
|
||||
param 1: optional, function name
|
||||
example $ reference
|
||||
example $ reference metafor
|
||||
about displays apidoc help for a specific function
|
||||
param 1: function name
|
||||
example $ reference revise
|
||||
group composure
|
||||
|
||||
printline ()
|
||||
typeset func=$1
|
||||
|
||||
typeset about="$(metafor $func about)"
|
||||
letterpress "$about" $func
|
||||
|
||||
typeset params="$(metafor $func param)"
|
||||
if [ -n "$params" ]; then
|
||||
printf "parameters:\n"
|
||||
letterpress "$params"
|
||||
fi
|
||||
|
||||
typeset examples="$(metafor $func example)"
|
||||
if [ -n "$examples" ]; then
|
||||
printf "examples:\n"
|
||||
letterpress "$examples"
|
||||
fi
|
||||
}
|
||||
|
||||
revise ()
|
||||
{
|
||||
local metadata=$1 lhs=${2:- }
|
||||
about loads function into editor for revision
|
||||
param 1: name of function
|
||||
example $ revise myfunction
|
||||
group composure
|
||||
|
||||
if [[ -z "$metadata" ]]
|
||||
typeset func=$1
|
||||
typeset temp=$(mktemp /tmp/revise.XXXX)
|
||||
|
||||
# populate tempfile...
|
||||
if [ -f ~/.composure/$func.inc ]; then
|
||||
# ...with contents of latest git revision...
|
||||
cat ~/.composure/$func.inc >> $temp
|
||||
else
|
||||
# ...or from ENV if not previously versioned
|
||||
typeset -f $func >> $temp
|
||||
fi
|
||||
|
||||
if [ -z "$EDITOR" ]
|
||||
then
|
||||
typeset EDITOR=vi
|
||||
fi
|
||||
|
||||
$EDITOR $temp
|
||||
source $temp
|
||||
|
||||
transcribe $func $temp revise
|
||||
rm $temp
|
||||
}
|
||||
|
||||
transcribe ()
|
||||
{
|
||||
typeset func=$1
|
||||
typeset file=$2
|
||||
typeset operation="$3"
|
||||
|
||||
if git --version >/dev/null 2>&1; then
|
||||
if [ -d ~/.composure ]; then
|
||||
(
|
||||
cd ~/.composure
|
||||
if git rev-parse 2>/dev/null; then
|
||||
if [ ! -f $file ]; then
|
||||
printf "%s\n" "Oops! Couldn't find $file to version it for you..."
|
||||
return
|
||||
fi
|
||||
|
||||
OLD=$IFS; IFS=$'\n'
|
||||
local line
|
||||
for line in $metadata
|
||||
do
|
||||
printf "%-20s%s\n" $lhs $line
|
||||
done
|
||||
IFS=$OLD
|
||||
}
|
||||
|
||||
help ()
|
||||
{
|
||||
local func=$1
|
||||
|
||||
local about="$(metafor $func about)"
|
||||
printline "$about" $func
|
||||
|
||||
local params="$(metafor $func param)"
|
||||
if [[ -n "$params" ]]
|
||||
then
|
||||
echo "parameters:"
|
||||
printline "$params"
|
||||
cp $file ~/.composure/$func.inc
|
||||
git add --all .
|
||||
git commit -m "$operation $func"
|
||||
fi
|
||||
|
||||
local examples="$(metafor $func example)"
|
||||
if [[ -n "$examples" ]]
|
||||
then
|
||||
echo "examples:"
|
||||
printline "$examples"
|
||||
fi
|
||||
|
||||
unset printline
|
||||
}
|
||||
|
||||
if [[ -n "$1" ]]
|
||||
then
|
||||
help $1
|
||||
)
|
||||
else
|
||||
for func in $(compgen -A function); do
|
||||
local about="$(metafor $func about)"
|
||||
printline "$about" $func
|
||||
if [ "$USE_COMPOSURE_REPO" = "0" ]; then
|
||||
return # if you say so...
|
||||
fi
|
||||
printf "%s\n" "I see you don't have a ~/.composure repo..."
|
||||
typeset input
|
||||
typeset valid=0
|
||||
while [ $valid != 1 ]; do
|
||||
printf "\n%s" 'would you like to create one? y/n: '
|
||||
read input
|
||||
case $input in
|
||||
y|yes|Y|Yes|YES)
|
||||
(
|
||||
echo 'creating git repository for your functions...'
|
||||
mkdir ~/.composure
|
||||
cd ~/.composure
|
||||
git init
|
||||
echo "composure stores your function definitions here" > README.txt
|
||||
git add README.txt
|
||||
git commit -m 'initial commit'
|
||||
)
|
||||
# if at first you don't succeed...
|
||||
transcribe "$func" "$file" "$operation"
|
||||
valid=1
|
||||
;;
|
||||
n|no|N|No|NO)
|
||||
printf "%s\n" "ok. add 'export USE_COMPOSURE_REPO=0' to your startup script to disable this message."
|
||||
valid=1
|
||||
;;
|
||||
*)
|
||||
printf "%s\n" "sorry, didn't get that..."
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
|
||||
unset help printline
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
install_composure ()
|
||||
{
|
||||
echo 'stay calm. installing composure elements...'
|
||||
|
||||
# find our absolute PATH
|
||||
SOURCE="${BASH_SOURCE[0]}"
|
||||
while [ -h "$SOURCE" ]
|
||||
do
|
||||
SOURCE="$(readlink "$SOURCE")"
|
||||
done
|
||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||
|
||||
# vim: automatically chmod +x scripts with #! lines
|
||||
done_previously () { [ ! -z "$(grep BufWritePost | grep bin | grep chmod)" ]; }
|
||||
|
||||
if [ -f ~/.vimrc ] && ! $(<~/.vimrc done_previously)
|
||||
then
|
||||
echo 'vimrc: adding automatic chmod+x for files with shebang (#!) lines...'
|
||||
echo 'au BufWritePost * if getline(1) =~ "^#!" | if getline(1) =~ "/bin/" | silent execute "!chmod a+x <afile>" | endif | endif' >> ~/.vimrc
|
||||
fi
|
||||
|
||||
# source this file in your startup: .bashrc, or .bash_profile
|
||||
local done=0
|
||||
done_previously () { [ ! -z "$(grep source | grep $DIR | grep composure)" ]; }
|
||||
|
||||
[ -f ~/.bashrc ] && $(<~/.bashrc done_previously) && done=1
|
||||
! (($done)) && [ -f ~/.bash_profile ] && $(<~/.bash_profile done_previously) && done=1
|
||||
|
||||
if ! (($done))
|
||||
then
|
||||
echo 'sourcing composure from .bashrc...'
|
||||
echo "source $DIR/$(basename $0)" >> ~/.bashrc
|
||||
fi
|
||||
|
||||
echo 'composure installed.'
|
||||
}
|
||||
|
||||
if [[ "$BASH_SOURCE" == "$0" ]]
|
||||
then
|
||||
install_composure
|
||||
else
|
||||
source_composure
|
||||
unset install_composure source_composure
|
||||
fi
|
||||
|
||||
: <<EOF
|
||||
License: The MIT License
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue