jump 0.3.0 → 0.3.1

data/Changelog

@@ -1,3 +1,14 @@
+Wed Feb 06 09:08:54 CET 2013  Flavio Castelli <flavio@castelli.name>
+
+	Version 0.3.1:
+	* exit with a nonzero value for unknown bookmarks.
+
+Wed Mar 07 11:15:01 CET 2012  Flavio Castelli <flavio@castelli.name>
+
+	Version 0.3.0:
+	* better output when listing bookmarks.
+	* added --bash-integration and --zsh-integration help tasks.
+
 Sat Aug 28 09:04:30 CEST 2010  Flavio Castelli  <flavio@castelli.name>
 
 	* added support to zsh

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/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

data/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
+

data/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,10 +41,11 @@ _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
@@ -52,8 +53,10 @@ function jump {
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jump
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70508760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70508760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70507740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +38,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70507740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Jump is a tool that allows you to quickly change\n                       directories
   in the bash and zsh shells using bookmarks.\n                       Thanks to Jump,
   you won't have to type those long paths anymore.\n\n                       Jump
@@ -95,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A bookmarking system for bash and zsh shells