Merge lp:~darkxst/ppa-purge/bash-completion into lp:ppa-purge

[Tim Lunn]

I have added bash autocompletion for installed ppas and also a few of the other options. I had to changes the options slightly since its a real pain to complete strings with a ':', however the script is still backwards compatible with the old use i.e. ppa:name/ppa still works but wont have bash completion.

[lp:~darkxst/ppa-purge/bash-completion]

62. By Tim Lunn on 2012-12-06

fix changelog version

63. By Tim Lunn on 2012-12-06

fix tabs in usage page

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-30 10:12:27 +0000
+++ debian/changelog	2012-12-06 04:10:23 +0000
@@ -1,3 +1,8 @@
+ppa-purge (0.2.8+bzr58) raring; urgency=low
+
+  * Add bash autocompletion and tweak options slightly. (LP: #1064205)
+ -- Tim Lunn <[e-mail]>  Thu, 06 Dec 2012 14:12:52 +1100
+
 ppa-purge (0.2.8+bzr57) raring; urgency=low
 
   [ Tim Lunn ]

=== modified file 'debian/control'
--- debian/control	2012-11-30 10:12:27 +0000
+++ debian/control	2012-12-06 04:10:23 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Lorenzo De Liso <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 7.0.50~), bash-completion
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/ppa-purge
 

=== added file 'debian/ppa-purge.bash-completion'
--- debian/ppa-purge.bash-completion	1970-01-01 00:00:00 +0000
+++ debian/ppa-purge.bash-completion	2012-12-06 04:10:23 +0000
@@ -0,0 +1,80 @@
+# /usr/share/bash-completion/completions/ppa-purge
+# Debian ppa-purge(1) completion -*- shell-script -*-
+
+_update_server(){
+    local i
+    for (( i=1; i < ${#words[@]}-1; i++)) ; do
+        case "${words[i]}" in
+            -s)
+                SERVER=${words[i+1]}
+                ;;
+            *)
+            ;;
+        esac
+    done
+}
+
+_update_owner(){
+    local i
+    for (( i=1; i < ${#words[@]}-1; i++)) ; do
+        case "${words[i]}" in
+            -o)
+                OWNER=${words[i+1]}
+                ;;
+            *)
+            ;;
+        esac
+    done
+}
+
+_ppa_names(){
+    _update_server
+    _update_owner
+    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | grep "$OWNER" | command sed "s#.*$SERVER\/.*\/\(.*\)\/.*#\1#"
+}
+
+_ppa_host(){
+    grep -hs "^deb\ .*tp\:\/\/.*\/.*\/.*" /etc/apt/sources.list.d/*.list | command sed "s#^deb.*\:\/\/\(.*\)\/.*\/.*/.*#\1#" | uniq
+}
+
+_ppa_owner(){
+    _update_server
+    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | command sed "s#.*$SERVER\/\(.*\)\/.*\/.*#\1#"
+}
+
+_ppa_list(){
+    _update_server
+    _update_owner
+    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | grep "$OWNER" | command sed "s#.*$SERVER\/\(.*\/.*\)\/.*#\1#" 
+
+}
+_ppa_purge(){
+    OWNER=""
+    SERVER="ppa.launchpad.net"
+    local cur prev words cword opts
+    _init_completion || return
+
+    opts="-p -s -o -d -y -i -h"
+
+    case "${prev}" in
+        -p)
+            COMPREPLY=( $( compgen -W "$(_ppa_names)" -- $cur ) )
+            return 0
+            ;;
+        -s)
+            COMPREPLY=( $( compgen -W "$(_ppa_host)" -- $cur ) )
+            return 0
+            ;;
+        -o)
+            COMPREPLY=( $( compgen -W "$(_ppa_owner)" -- $cur ) )
+            return 0
+            ;;
+        *)
+        ;;
+    esac
+    
+    COMPREPLY=( $( compgen -W '${opts} $(_ppa_list)' -- "$cur" ) )
+
+   return 0
+} &&
+complete -F _ppa_purge ppa-purge

=== modified file 'debian/rules'
--- debian/rules	2010-07-23 23:46:57 +0000
+++ debian/rules	2012-12-06 04:10:23 +0000
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh $@ --with bash-completion
 

=== modified file 'ppa-purge'
--- ppa-purge	2012-11-21 09:30:49 +0000
+++ ppa-purge	2012-12-06 04:10:23 +0000
@@ -31,6 +31,7 @@
 	echo
 	echo "Options:"
 	echo "	-p [ppaname]		PPA name to be disabled (default: ppa)"
+	echo "	-o [ppaowner]		PPA owner"
 	echo "	-s [host]		Repository server (default: ppa.launchpad.net)"
 	echo "	-d [distribution]	Override the default distribution choice."
 	echo "	-y 			Pass "-y --force-yes" to apt-get or "-y" to aptitude"
@@ -38,13 +39,13 @@
 	echo "	-h			Display this help text"
 	echo
 	echo "Example usage commands:"
-	echo "	sudo ppa-purge xorg-edgers"
+	echo "	sudo ppa-purge -o xorg-edgers"
 	echo "	will remove https://launchpad.net/~xorg-edgers/+archive/ppa"
 	echo
-	echo "	sudo ppa-purge -p xorg-testing sarvatt"
+	echo "	sudo ppa-purge -o sarvatt -p xorg-testing"
 	echo "	will remove https://launchpad.net/~sarvatt/+archive/xorg-testing"
 	echo
-	echo "	sudo ppa-purge ppa:ubuntu-x-swat/x-updates"
+	echo "	sudo ppa-purge [ppa:]ubuntu-x-swat/x-updates"
 	echo "	will remove https://launchpad.net/~ubuntu-x-swat/+archive/x-updates"
 	echo
 	echo "Notice: If ppa-purge fails for some reason and you wish to try again,"
@@ -54,22 +55,27 @@
 	exit $1
 }
 
+
 # Command line options
-while getopts "p:s:d:yih\?" opt; do
+while getopts "p:o:s:d:yih\?" opt; do
 	case "$opt" in
 		p ) PPANAME="$OPTARG"				;;
-		s ) PPAHOST="$OPTARG"				;;
-		d ) DIST="$OPTARG"				;;
+		o ) PPAOWNER="$OPTARG"				;;
+		s ) PPAHOST="$OPTARG"   			;;
+		d ) DIST="$OPTARG"					;;
 		y ) FORCEINSTALL="true"				;;
-		i ) APTALT="true" 				;;
-		h ) usage 0;					;;
-		\?) usage 1;					;;
+		i ) APTALT="true"					;;
+		h ) usage 0;						;;
+		\?) usage 1;						;;
 		* ) warn "Unknown option '$opt'"; usage 1;	;;
 	esac
 done
 shift $(($OPTIND -1))
 
-PPAOWNER=$1
+if [ -z "$PPAOWNER" ]; then
+    PPAOWNER=$1
+fi
+
 APTARG=""
 if [ ! -z "$APTALT" ]; then
 	if [ ! -z "$FORCEINSTALL" ]; then
@@ -86,6 +92,11 @@
 if echo $1 | grep -q "^ppa:"; then
 	PPAOWNER=$(echo $1 | sed "s#^ppa:\(.*\)/\(.*$\)#\1#")
 	PPANAME=$(echo $1 | sed "s#^ppa:\(.*\)/\(.*$\)#\2#")
+else 
+    if echo $1 | grep -q "^.*/.*$"; then
+        PPAOWNER=$(echo $1 | sed "s#^\(.*\)/\(.*$\)#\1#")
+    	PPANAME=$(echo $1 | sed "s#^\(.*\)/\(.*$\)#\2#")
+    fi
 fi
 
 if [ -z "$PPAOWNER" ]; then