jump 0.2.1 → 0.3.0

data/POST_INSTALL.txt

@@ -5,26 +5,20 @@ Notes for bash users:
   while OSX users can install it via ports, fink or brew.
 
   Now that jump is installed execute the following command:
-    sudo cp `gem contents jump | grep completion` /path_to/bash_completion.d
+    sudo cp `jump-bin --bash-integration`/bash_completion/jump /path_to/bash_completion.d
 
   The 'bash_completion.d' directory is usually located under /etc/.
   OSX users will find this directory under fink/port/brew installation directory (e.g. '/opt/local/etc').
 
+  If you do not want to install <i>bash_completion</i> then add the following code
+  to your bash configuration file (e.g. <i>~/.bash_profile</i> or <i>~/.bashrc'</i>:
 
-  If you do not want to install 'bash_completion' then execute the following command:
-    cp `gem contents jump | grep shell_driver` ~/.jump_shell_driver
-
-  and add the following code to your bash configuration file (e.g. '~/.bash_profile' or '~/.bashrc'):
-
-    source ~/.jump_shell_driver
+    source `jump-bin --bash-integration`/shell_driver
 
   Beware: without bash_completion you won't be able use jump's advanced completion features.
 
 Notes for zsh users:
-  Now that jump is installed execute the following command:
-    cp `gem contents jump | grep zsh` ~/.jump_shell_driver
-
-  and add the following code to your .zshrc file:
+  Now that jump is installed, add the following code to your .zshrc file:
 
-    source ~/.jump_shell_driver
+    source `jump-bin --zsh-integration`
 

data/README.rdoc

@@ -109,7 +109,7 @@ Linux users can install it using their package manager (apt, zypper, yum, emerge
 while OSX users can install it via ports, fink or brew.
 
 Execute the following command once jump has been installed:
-  sudo cp `gem contents jump | grep completion` /path_to/bash_completion.d
+  sudo cp `jump-bin --bash-integration`/bash_completion/jump /path_to/bash_completion.d
 
 The <i>bash_completion.d</i> directory is usually located under <i>/etc/</i>.
 OSX users will find this directory under fink/port/brew installation directory (e.g. <i>/opt/local/etc</i>).
@@ -123,22 +123,17 @@ Take a look at the previous section in order to figure out your <i>GEM PATH</i>.
 
 === Without bash-completion
 
-If you do not want to install <i>bash_completion</i> then execute the following command:
-  cp `gem contents jump | grep shell_driver` ~/.jump_shell_driver
+If you do not want to install <i>bash_completion</i> then add the following code
+to your bash configuration file (e.g. <i>~/.bash_profile</i> or <i>~/.bashrc'</i>:
 
-and add the following code to your bash configuration file (e.g. <i>~/.bash_profile</i> or <i>~/.bashrc'</i>:
-
-  source ~/.jump_shell_driver
+  source `jump-bin --bash-integration`/shell_driver
 
 <b>Beware:</b> without bash_completion you won't be able use jump's advanced completion features.
 
 == Zsh integration
 
-After having installed jump execute the following command:
-  cp `gem contents jump | grep zsh` ~/.jump_shell_driver
-
-and add the following code to your .zshrc file:
+After having installed jump, add the following code to your .zshrc file:
 
-  source ~/.jump_shell_driver
+  source `jump-bin --zsh-integration`
 
 (c) 2010 Flavio Castelli and Giuseppe Capizzi

data/Rakefile

@@ -19,7 +19,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 task :default => "test"
@@ -68,7 +68,6 @@ begin
     gem.executables = ['jump-bin']
     gem.test_files   = Dir[*['test/**/*_test.rb']]
 
-    gem.has_rdoc         = true
     gem.extra_rdoc_files = ["README.rdoc"]
     gem.rdoc_options = ['--line-numbers', "--main", "README.rdoc"]
 
@@ -76,7 +75,7 @@ begin
     gem.email   = %w(flavio@castelli.name gcapizzi@gmail.com)
     gem.homepage = "http://github.com/flavio/jump"
 
-    gem.add_dependency "terminal-table"
+    gem.add_dependency "terminal-table", '>= 1.4.4'
     gem.add_development_dependency "fakefs"
 
     gem.platform = Gem::Platform::RUBY

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/bin/jump-bin

@@ -43,6 +43,16 @@ begin
       options[:list] = true
     end
 
+    opts.on("--bash-integration", "Prints the path to directory containing the Bash integration files") do
+      puts "#{File.dirname(THIS_FILE)}/../bash_integration"
+      exit
+    end
+
+    opts.on("--zsh-integration", "Prints the path to the ZSH integration file") do
+      puts "#{File.dirname(THIS_FILE)}/../zsh_integration/jump"
+      exit
+    end
+
     opts.on_tail("-h", "--help", "Show this message") do
       puts opts
       exit

data/lib/bookmarks.rb

@@ -73,9 +73,10 @@ class Bookmarks
       "No bookmarks saved"
     else
       bookmarks_table = table do |t|
+        t.style = { :border_y => '', :border_i => '' }
         t.headings = "Bookmark", "Path"
         @bookmarks.keys.sort.each do |bookmark|
-          t << [bookmark, @bookmarks[bookmark]]
+          t << [bookmark, simplify_path(@bookmarks[bookmark])]
         end
       end
       bookmarks_table.to_s
@@ -127,6 +128,11 @@ class Bookmarks
     end
   end
 
+  # Simplifies given path by replacing the user's homedir with ~
+  def simplify_path(path)
+    path.gsub /^#{File.expand_path '~'}/, '~'
+  end
+
   # Expands paths that could start with a bookmark (e.g. [bookmark]/sub/path)
   def expand_path(path_with_bookmark)
     if path_with_bookmark.index("/").nil?

data/test/bookmarks_test.rb

@@ -26,8 +26,9 @@ class BookmarksTest < Test::Unit::TestCase
   def setup
     @test_bookmarks = { "foo" => "/tmp/foo",
                         "bar" => "/tmp/bar",
-                        "complex" => "/tmp/foo/bar/complex"}
+                        "complex" => "#{File.expand_path '~'}/tmp/foo/bar/complex"}
     FakeFS do
+      FileUtils.mkdir_p(File.expand_path('~'))
       File.open(Bookmarks::BOOKMARKS_PATH, 'w') do |file|
         file << YAML::dump(@test_bookmarks)
       end
@@ -65,15 +66,15 @@ class BookmarksTest < Test::Unit::TestCase
 
   def test_to_s
     output = <<EOF
-+----------+----------------------+
-| Bookmark | Path                 |
-+----------+----------------------+
-| bar      | /tmp/bar             |
-| complex  | /tmp/foo/bar/complex |
-| foo      | /tmp/foo             |
-+----------+----------------------+
+---------------------------------
+ Bookmark  Path                  
+---------------------------------
+ bar       /tmp/bar              
+ complex   ~/tmp/foo/bar/complex 
+ foo       /tmp/foo              
+---------------------------------
 EOF
-    assert_equal output, @bookmarks.to_s
+    assert_equal output.chomp, @bookmarks.to_s
   end
 
   def test_save

metadata

@@ -1,69 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jump
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Flavio Castelli
 - Giuseppe Capizzi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-28 00:00:00 +02:00
-default_executable: jump-bin
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: terminal-table
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70508760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70508760
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70507740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: |-
-  Jump is a tool that allows you to quickly change
-                         directories in the bash and zsh shells using bookmarks.
-                         Thanks to Jump, you won't have to type those long paths anymore.
-  
-                         Jump was inspired by go-tool by ActiveState
-                         (http://code.google.com/p/go-tool/).
-email: 
+  prerelease: false
+  version_requirements: *70507740
+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
+  was inspired by go-tool by ActiveState\n                       (http://code.google.com/p/go-tool/)."
+email:
 - flavio@castelli.name
 - gcapizzi@gmail.com
-executables: 
+executables:
 - jump-bin
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - COPYING.txt
 - Changelog
 - POST_INSTALL.txt
@@ -77,71 +60,44 @@ files:
 - test/test_helper.rb
 - zsh_integration/jump
 - bin/jump-bin
-has_rdoc: true
 homepage: http://github.com/flavio/jump
 licenses: []
-
-post_install_message: |+
-  Notes for bash users:
-    It's strongly recommended to install bash_completion. In this way you will have
-    the best user experience.
-    Linux users can install it using their package manager (apt, zypper, yum, emerge...),
-    while OSX users can install it via ports, fink or brew.
-  
-    Now that jump is installed execute the following command:
-      sudo cp `gem contents jump | grep completion` /path_to/bash_completion.d
-  
-    The 'bash_completion.d' directory is usually located under /etc/.
-    OSX users will find this directory under fink/port/brew installation directory (e.g. '/opt/local/etc').
-  
-  
-    If you do not want to install 'bash_completion' then execute the following command:
-      cp `gem contents jump | grep shell_driver` ~/.jump_shell_driver
-  
-    and add the following code to your bash configuration file (e.g. '~/.bash_profile' or '~/.bashrc'):
-  
-      source ~/.jump_shell_driver
-  
-    Beware: without bash_completion you won't be able use jump's advanced completion features.
-  
-  Notes for zsh users:
-    Now that jump is installed execute the following command:
-      cp `gem contents jump | grep zsh` ~/.jump_shell_driver
-  
-    and add the following code to your .zshrc file:
-  
-      source ~/.jump_shell_driver
-  
-rdoc_options: 
+post_install_message: ! "Notes for bash users:\n  It's strongly recommended to install
+  bash_completion. In this way you will have\n  the best user experience.\n  Linux
+  users can install it using their package manager (apt, zypper, yum, emerge...),\n
+  \ while OSX users can install it via ports, fink or brew.\n\n  Now that jump is
+  installed execute the following command:\n    sudo cp `jump-bin --bash-integration`/bash_completion/jump
+  /path_to/bash_completion.d\n\n  The 'bash_completion.d' directory is usually located
+  under /etc/.\n  OSX users will find this directory under fink/port/brew installation
+  directory (e.g. '/opt/local/etc').\n\n  If you do not want to install <i>bash_completion</i>
+  then add the following code\n  to your bash configuration file (e.g. <i>~/.bash_profile</i>
+  or <i>~/.bashrc'</i>:\n\n    source `jump-bin --bash-integration`/shell_driver\n\n
+  \ Beware: without bash_completion you won't be able use jump's advanced completion
+  features.\n\nNotes for zsh users:\n  Now that jump is installed, add the following
+  code to your .zshrc file:\n\n    source `jump-bin --zsh-integration`\n\n"
+rdoc_options:
 - --line-numbers
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A bookmarking system for bash and zsh shells
-test_files: 
+test_files:
 - test/bookmarks_test.rb