shaft 0.7 → 0.8

data/README.md

@@ -22,14 +22,14 @@ As easy as:
 
 ## Usage
 
-Your tunnel configurations need to be stored as
-[YAML](http://www.yaml.org) files on your `~/.shaft/` dir.
+Your tunnel configurations need to be stored as records in
+a [YAML](http://www.yaml.org) formatted `~/.shaft` file.
 
 See 'Configuration' for instructions on how to format these
 files.
 
 * Use `shaft all` to get a list of all available tunnels.
-* Use `shaft list` to see which tunnels are currently active.
+* Use `shaft active` to see which tunnels are currently active.
   - You could use the `--short` option to get only the names
     of those lines (this could be useful to insert into your
     shell prompt. Just saying).
@@ -60,6 +60,17 @@ to running:
 
       $ ssh -N -p 22 user@remote-host -L 9999:host:8888
 
+## ZSH Completions
+
+Shaft includes a setup file for automatic completion of tunnel names if you use the ZSH shell.
+
+To install it, you can run:
+
+    $ shaft completions >> ~/.zshrc
+
+(Or output it to any file that your `.zshrc` includes).
+Don't forget to restart your shell!
+
 ## Contributing
 
 1. Fork it

data/bin/shaft

@@ -19,7 +19,7 @@ class ShaftCLI < Thor
     active = get_active
     unless active.empty?
       if options[:short]
-        say active.keys.join(",")
+        say active.keys.join(" ")
       else
         say "Listing currently active tunnels:"
         print_table active
@@ -30,10 +30,22 @@ class ShaftCLI < Thor
   end
 
   desc "all", "Lists all available tunnels"
+  method_options %w( short -s ) => :boolean
   def all
-    say "Listing all available tunnels:"
     tunnels = get_config.keys
-    print_in_columns tunnels
+    if options[:short]
+      say tunnels.join(' ')
+    else
+      say "Listing all available tunnels:"
+      print_in_columns tunnels
+    end
+  end
+
+  desc "completions", "Prints setup code for Zsh completions"
+  def completions
+    fpath = File.expand_path File.join(File.dirname(__FILE__), '..', 'completions')
+    puts "fpath=(#{fpath} $fpath)"
+    puts "compinit"
   end
 
   desc "start [NAME]", "Starts a tunnel"

data/completions/_shaft

@@ -0,0 +1,29 @@
+#compdef shaft
+
+_shaft() {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments \
+    '1: :->command'\
+    '*: :->tunnel'
+
+
+  case $state in
+  command)
+    _arguments "1:Commands:(active start stop restart help all completions)"
+    ;;
+  *)
+    case $words[2] in
+    start)
+      compadd "$@" `shaft all --short`
+    ;;
+    stop|restart)
+      compadd "$@" `shaft active --short`
+    ;;
+    esac
+    ;;
+  esac
+}
+
+_shaft "$@"

data/lib/shaft/version.rb

@@ -1,3 +1,3 @@
 module Shaft
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaft
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -41,6 +41,7 @@ files:
 - README.md
 - Rakefile
 - bin/shaft
+- completions/_shaft
 - lib/shaft.rb
 - lib/shaft/version.rb
 - shaft.gemspec