Refactor to exit nonzero for unknown bookmarks

bash_integration/shell_driver

@@ -19,12 +19,15 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 function jump {
+  local dest
   #echo "jump called with $*"
   if [ $# -lt 1 ]; then
     jump-bin --help
   elif [ ${1:0:1} == "-" ]; then
     jump-bin $*
   else
-    cd "$(jump-bin $*)"
+    dest="$(jump-bin $*)" && cd "$dest"
   fi
 }
+
+# vim: ft=sh et sw=2 ts=2 sts=2

bin/jump-bin

@@ -28,7 +28,7 @@ require 'optparse'
 
 options = {}
 begin
-  OptionParser.new do |opts|
+  opts = OptionParser.new do |opts|
     opts.banner = "Usage: jump [options] [BOOKMARK[/path/to/subfolder]]"
 
     opts.on("-a", "--add BOOKMARK", "Saves the current directory in BOOKMARK") do |v|
@@ -57,7 +57,8 @@ begin
       puts opts
       exit
     end
-  end.parse!
+  end
+  opts.parse!
 rescue OptionParser::InvalidOption
   if $!.args.first == "--bc"
     # This is an hidden method used by bash_completion
@@ -72,6 +73,8 @@ end
 
 bookmarks = Bookmarks.new
 
+### handle options, if present
+
 if options.has_key?(:add)
   bookmarks.add(Dir.pwd, options[:add])
   bookmarks.save
@@ -87,16 +90,24 @@ if options.has_key?(:del)
   end
 end
 
-puts bookmarks if options.has_key?(:list)
-if ARGV.size == 1
-  expanded_path = bookmarks.expand_path(ARGV[0])
-  if expanded_path.nil?
-    STDERR.puts "Unknown bookmark: '#{ARGV[0]}'."
-    puts Dir.pwd
-  else
-    puts expanded_path
-  end
-elsif ARGV.size > 1
-  STDERR.puts "Wrong arguments."
-  puts Dir.pwd
+if options.has_key?(:list)
+  puts bookmarks
 end
+
+exit if ARGV.empty?
+
+### remaining argument(s) must be a single bookmark
+
+if ARGV.size > 1
+  STDERR.puts opts
+  exit 1
+end
+
+expanded_path = bookmarks.expand_path(ARGV[0])
+if expanded_path.nil?
+  STDERR.puts "Unknown bookmark: '#{ARGV[0]}'."
+  exit 42
+else
+  puts expanded_path
+end
+

zsh_integration/jump

@@ -21,7 +21,7 @@ _jump()
 {
   local user_input
   read -cA user_input
-  local cur prev 
+  local cur prev
   reply=()
 
   cur="${user_input[$#user_input]}"
@@ -41,19 +41,22 @@ _jump()
   else
     reply=( $(jump-bin --bc ${cur}) )
     return 0
-  fi 
+  fi
 }
 
 function jump {
+  local args dest
   args=$*
   #echo "jump called with |$args|"
   if [[ $#args -lt 1 ]]; then
     jump-bin --help
   elif [[ ${args[0,1]} = "-" ]]; then
     jump-bin $*
   else
-    cd "$(jump-bin $*)"
+    dest="$(jump-bin $*)" && cd "$dest"
   fi
 }
 
 compctl -K _jump -S '' jump
+
+# vim: ft=zsh et sw=2 ts=2 sts=2