gabriel 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/gabriel.rb

@@ -0,0 +1 @@
+# Nothin' to do here

data/scripts/gabriel.bash

@@ -11,7 +11,7 @@ __god_options="${__god_options_long} ${__god_options_short}"
 
 __god_log_levels="debug info warn error fatal"
 
-__god_task_group_names() {
+__god_tasks_and_groups() {
   god status > /dev/null
   if [ "$?" -eq "0" ]; then
     god status | awk '{ print $1 }' | tr -d \\n | sed 's/:/ /g'
@@ -20,6 +20,15 @@ __god_task_group_names() {
   fi
 }
 
+__god_tasks() {
+  god status > /dev/null
+  if [ "$?" -eq "0" ]; then
+    god status | grep "  " | awk '{ print $1 }' | tr -d \\n | sed 's/:/ /g'
+  else
+    echo ""
+  fi
+}
+
 _god() {
   local cur prev
   cur="${COMP_WORDS[COMP_CWORD]}"
@@ -27,28 +36,30 @@ _god() {
 
   case "${prev}" in
     start|stop|restart|monitor|unmonitor|remove|status)
-      local tasks="$(__god_task_group_names)"
-      COMPREPLY=( $(compgen -W "${tasks}" -- ${cur}) )
+      local tasks_and_groups="$(__god_tasks_and_groups)"
+      COMPREPLY=( $(compgen -W "${tasks_and_groups}" -- ${cur}) )
       return 0
       ;;
     signal)
-      local tasks="$(__god_task_group_names)"
-      COMPREPLY=( $(compgen -W "${tasks}" -A signal -- ${cur}) )
+      local tasks_and_groups="$(__god_tasks_and_groups)"
+      COMPREPLY=( $(compgen -W "${tasks_and_groups}" -A signal -- ${cur}) )
       return 0
       ;;
-    load|-c|--config-file|-P|--pid|-l|--log)
-      COMPREPLY=( $(compgen -A file -- ${cur}) )
+    log)
+      local tasks="$(__god_tasks)"
+      COMPREPLY=( $(compgen -W "${tasks}" -- ${cur}) )
       return 0
       ;;
     --log-level)
       COMPREPLY=( $(compgen -W "${__god_log_levels}" -- ${cur}) )
       return 0
       ;;
+    god)
+      COMPREPLY=( $(compgen -W "${__god_commands} ${__god_options}" -- ${cur}) )
+      return 0
+      ;;
     *)
     ;;
   esac
-
-  COMPREPLY=( $(compgen -W "${__god_commands} ${__god_options}" -- ${cur}) )
-  return 0
 }
-complete -F _god god
+complete -o bashdefault -o default -o nospace -F _god god

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gabriel
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Enrico Bianco
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -04:00
+date: 2010-08-31 00:00:00 -04:00
 default_executable: gabriel-install
 dependencies: []
 
@@ -34,6 +33,7 @@ files:
 - VERSION
 - bin/gabriel-install
 - install
+- lib/gabriel.rb
 - scripts/gabriel.bash
 has_rdoc: true
 homepage: http://github.com/enricob/gabriel
@@ -45,27 +45,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Bash completion for god