jump 0.3.1 → 0.3.2

data/Changelog

@@ -1,3 +1,8 @@
+Thu Feb 21 12:49:52 CET 2013  Flavio Castelli <flavio@castelli.name>
+
+	Version 0.3.2:
+		* complete even after the first children.
+
 Wed Feb 06 09:08:54 CET 2013  Flavio Castelli <flavio@castelli.name>
 
 	Version 0.3.1:

data/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+# tools
+gem 'rake'
+gem 'jeweler'
+
+# devel deps
+gem 'fakefs'
+
+# runtime deps
+gem 'terminal-table', '>= 1.4.4'

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bash_integration/bash_completion/jump

@@ -28,7 +28,7 @@ _jump()
 
   if [[ ${prev} == "-d" || ${prev} == "--del" ]] ; then
     # complete the del command with a list of the available bookmarks
-    local bookmarks=$(jump --bc)
+    local bookmarks=$(jump --complete)
     COMPREPLY=( $(compgen -W "${bookmarks}" -- ${cur}) )
     return 0
   fi
@@ -37,7 +37,7 @@ _jump()
     COMPREPLY="$(compgen -W "${opts}" -- ${cur}) "
     return 0
   else
-    local bookmarks=$(jump --bc ${cur})
+    local bookmarks=$(jump --complete ${cur})
     COMPREPLY=( $(compgen -W "${bookmarks}" -- ${cur}) )
     return 0
   fi 

data/bin/jump-bin

@@ -60,10 +60,10 @@ begin
   end
   opts.parse!
 rescue OptionParser::InvalidOption
-  if $!.args.first == "--bc"
-    # This is an hidden method used by bash_completion
+  if $!.args.first == "--complete"
+    # This is an hidden method used by the shell completion
     bookmarks = Bookmarks.new
-    puts bookmarks.bash_completion(ARGV[0])
+    puts bookmarks.complete(ARGV[0])
     exit 0
   else
     STDERR.puts $!

data/lib/bookmarks.rb

@@ -83,49 +83,34 @@ class Bookmarks
     end
   end
 
-  def bash_completion text
-    if text.nil? || text.empty?
-      # nothing is provided -> return all the bookmarks
-      @bookmarks.keys.sort.join(' ')
-    elsif text.include? '/'
-      if text.index('/') == 0
-        # this is an absolute path (eg: /foo)
-        return text
-      end
+  def sorted_bookmarks()  sorted_list @bookmarks.keys  end
+  def sorted_list(terms)  terms.sort.join ' '  end
 
-      # [bookmark]/path
-      bookmark = text[0, text.index('/')]
-      path = text[text.index('/')+1, text.size]
-      if @bookmarks.has_key?(bookmark)
-        # this is a known bookmark
-        entries = []
-        Dir.foreach(@bookmarks[bookmark]) do |filename|
-          next if !path.empty? && (filename =~ /\A#{path}.*/).nil?
-          if File.directory?(File.join(@bookmarks[bookmark], filename))
-            next if filename == "." || filename == ".."
-            entries << File.join(bookmark, filename)
-          end
-        end
+  # Provide a list of completion options, starting with given prefix
+  def complete prefix
+    # Special cases:
+    #   - nothing is provided: return all the bookmarks
+    #   - absolute path: don't complete
+    return sorted_bookmarks if prefix.nil? || prefix.empty?
+    return prefix if prefix.start_with? File::SEPARATOR
 
-        if entries.empty?
-          text
-        else
-          entries << "#{bookmark}/"
-          entries.sort.join(' ')
-        end
-      else
-        # this is an unknown bookmark
-        text
-      end
-    else
-      # text could match one of the bookmarks
-      matches = @bookmarks.keys.find_all { |b| b =~ /\A#{text}/ }
-      if matches.empty?
-        text
-      else
-        matches.sort.join(' ')
+    bookmark, path = prefix.split File::SEPARATOR, 2 # File.split only does path/basename
+
+    completions = [  ]
+    if path.nil?
+      # still in 1st element, could match several bookmarks
+      completions += @bookmarks.keys.find_all { |b| b.start_with? prefix }
+    elsif @bookmarks.has_key?(bookmark)
+      # bookmark known, complete further
+      completions += Dir.chdir(@bookmarks[bookmark]) do
+        Dir.glob(["#{path}*"]) \
+          .select { |f| File.directory? f } \
+          .collect { |f| File.join bookmark, f }
       end
     end
+    completions.map! { |d| d + File::SEPARATOR }
+    completions << prefix if completions.empty?
+    sorted_list completions
   end
 
   # Simplifies given path by replacing the user's homedir with ~

data/test/bookmarks_test.rb

@@ -23,6 +23,7 @@ require 'bookmarks'
 require 'fileutils'
 
 class BookmarksTest < Test::Unit::TestCase
+
   def setup
     @test_bookmarks = { "foo" => "/tmp/foo",
                         "bar" => "/tmp/bar",
@@ -35,7 +36,6 @@ class BookmarksTest < Test::Unit::TestCase
 
       @bookmarks = Bookmarks.new
     end
-
   end
 
   def test_expand_path
@@ -93,48 +93,5 @@ EOF
       assert_equal expected_bookmarks, contents
     end
   end
-
-  def test_bash_completion
-    FakeFS do
-      FileUtils.rm "~/.jumprc"
-      bookmarks = Bookmarks.new
-      bookmarks.add("/home/flavio/templates", "templates")
-      bookmarks.add("/home/flavio/templates", "test")
-      bookmarks.add("/home/flavio/test/rails_app", "rails")
-
-      FileUtils.mkdir_p "/home/flavio/templates/foo/bar"
-      FileUtils.mkdir_p "/home/flavio/test/rails_app/log"
-      FileUtils.mkdir_p "/home/flavio/test/rails_app/locale"
-      FileUtils.mkdir_p "/home/flavio/test/rails_app/app/model"
-      FileUtils.touch "/home/flavio/test/rails_app/local_file"
-
-      # should handle absolute paths
-      assert_equal "/rails", bookmarks.bash_completion('/rails')
-
-      # should return all the bookmarks
-      assert_equal "rails templates test", bookmarks.bash_completion(nil)
-      assert_equal "rails templates test", bookmarks.bash_completion('')
-
-      # no matches => should return the same text
-      assert_equal "foo", bookmarks.bash_completion("foo")
-
-      # should complete the text
-      assert_equal "templates test", bookmarks.bash_completion("te")
-      assert_equal "rails", bookmarks.bash_completion("ra")
-
-      # /home/flavio/templates/bar doesn't exist => should return the same text
-      assert_equal "templates/bar", bookmarks.bash_completion("templates/bar")
-      assert_equal( "templates/bar/1/2",
-                    bookmarks.bash_completion("templates/bar/1/2"))
-
-      # should expand the path
-      assert_equal  "rails/ rails/locale rails/log",
-                    bookmarks.bash_completion("rails/lo")
-
-      # should expand the path
-      assert_equal  "rails/ rails/app rails/locale rails/log",
-                    bookmarks.bash_completion("rails/")
-    end
-  end
-
 end
+

data/test/completion_test.rb

@@ -0,0 +1,107 @@
+# This file is part of the jump project
+#
+# Copyright (C) 2010 Flavio Castelli <flavio@castelli.name>
+# Copyright (C) 2010 Giuseppe Capizzi <gcapizzi@gmail.com>
+#
+# jump is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# jump is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Keep; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+require "test_helper"
+require 'bookmarks'
+require 'fileutils'
+
+class BookmarkCompletionTest < Test::Unit::TestCase
+  
+  def setup
+    FakeFS do
+      @bookmarks = Bookmarks.new
+      @bookmarks.add("/home/flavio/templates", "templates")
+      @bookmarks.add("/home/flavio/templates", "test")
+      @bookmarks.add("/home/flavio/test/rails_app", "rails")
+      @bookmarks.add("/home/flavio/test/another_rails_app", "rails2")
+
+      FileUtils.mkdir_p "/home/flavio/templates/foo/bar"
+      FileUtils.mkdir_p "/home/flavio/templates/baz"
+      FileUtils.mkdir_p "/home/flavio/test/rails_app/log"
+      FileUtils.mkdir_p "/home/flavio/test/rails_app/locale"
+      FileUtils.mkdir_p "/home/flavio/test/rails_app/app/model"
+      FileUtils.touch   "/home/flavio/test/rails_app/local_file"
+      FileUtils.mkdir_p "/home/flavio/test/another_rails_app"
+    end
+  end
+
+  def test_absolute_path
+    FakeFS do
+      assert_equal "/rails", @bookmarks.complete('/rails')
+    end
+  end
+
+  def test_empty_completes_to_all
+    FakeFS do
+      assert_equal "rails rails2 templates test", @bookmarks.complete(nil)
+      assert_equal "rails rails2 templates test", @bookmarks.complete('')
+    end
+  end
+
+  def test_no_matches # => should return the same text
+    FakeFS do
+      assert_equal "foo", @bookmarks.complete("foo")
+    end
+  end
+
+  def test_no_matches_with_suffix
+    FakeFS do
+      assert_equal "foo/meh/zzz", @bookmarks.complete("foo/meh/zzz")
+    end
+  end
+
+  def test_prefix
+    FakeFS do
+      assert_equal "templates/ test/", @bookmarks.complete("te")
+      assert_equal "rails/ rails2/", @bookmarks.complete("ra")
+    end
+  end
+
+  def test_nonexisting_suffix
+    FakeFS do
+      # /home/flavio/templates/bar doesn't exist => should return the same text
+      assert_equal "templates/bar", @bookmarks.complete("templates/bar")
+      assert_equal "templates/bar/1/2",
+                   @bookmarks.complete("templates/bar/1/2")
+    end
+  end
+
+  def test_completes_children_after_separator
+    FakeFS do
+      assert_equal "rails/app/ rails/locale/ rails/log/",
+                   @bookmarks.complete("rails/")
+    end
+  end
+
+  def test_completes_suffix
+    FakeFS do
+      assert_equal "rails/locale/ rails/log/",
+                   @bookmarks.complete("rails/lo")
+    end
+  end
+
+  def test_completes_suffix_path
+    FakeFS do
+      assert_equal "rails/app/model/",
+                   @bookmarks.complete("rails/app/")
+    end
+  end
+
+end

data/zsh_integration/jump

@@ -31,7 +31,7 @@ _jump()
 
   if [[ ${prev} = "-d" || ${prev} = "--del" ]] ; then
     # complete the del command with a list of the available bookmarks
-    reply=( $(jump-bin --bc) )
+    reply=( $(jump-bin --complete) )
     return 0
   fi
 
@@ -39,7 +39,7 @@ _jump()
     reply=( --help -h --add -a --del -d --list -l )
     return 0
   else
-    reply=( $(jump-bin --bc ${cur}) )
+    reply=( $(jump-bin --complete ${cur}) )
     return 0
   fi
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jump
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +123,7 @@ extra_rdoc_files:
 files:
 - COPYING.txt
 - Changelog
+- Gemfile
 - POST_INSTALL.txt
 - README.rdoc
 - Rakefile
@@ -67,6 +132,7 @@ files:
 - bash_integration/shell_driver
 - lib/bookmarks.rb
 - test/bookmarks_test.rb
+- test/completion_test.rb
 - test/test_helper.rb
 - zsh_integration/jump
 - bin/jump-bin
@@ -110,4 +176,5 @@ signing_key:
 specification_version: 3
 summary: A bookmarking system for bash and zsh shells
 test_files:
+- test/completion_test.rb
 - test/bookmarks_test.rb