command-t 1.11 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e542a39c30001daa8498a0dadc7e646fa5c9d342
-  data.tar.gz: 4a1aedd0bc94d9afae2fa03c6ded35a8e1e4b9c1
+  metadata.gz: 90e1677bd5292b9f4953505a0441d0e82f8c93c0
+  data.tar.gz: eee2671da9e31c05f2bdf091427c273ea706b940
 SHA512:
-  metadata.gz: 6ee44802106f493bc3138703b3b86c9b615c2d44a6fecfa348a22da310213605452c9205151c023ea65717c620b288885e546720b80de497019cc9cf639763e2
-  data.tar.gz: e27e0fe5744d7f5b6833ad767ec8f04f2540c84d80f1d90464a26a6f9cd16981bf0ca985ca4fc8206b57a4a231eb06514eeb866a6d55dd542e22d03cd7004c8a
+  metadata.gz: ff4cd01ca300a6344a22b5619a967726805509bd8c046272b535d790b571784ee17eb69eb18c7cd7ac38e03d22ef6d0f1919529ba5570213b986f244fe30aa4e
+  data.tar.gz: 45862ab7a28dc0ec6c85d2885f2f426d212d37eaab5c7914a522139d6b52d393dfad0d00785ef43ff637375f532e7cd9fc7982d3a448a5eaec03fd586cdb74d1

data/README.txt

@@ -108,6 +108,10 @@ by looking at the output of:
 
   :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
+Or, for very old versions of Ruby which don't define `RUBY_PATCHLEVEL`:
+
+  :ruby puts RUBY_VERSION
+
 A suitable Ruby environment for Windows can be installed using the Ruby
 1.8.7-p299 RubyInstaller available at:
 
@@ -357,6 +361,10 @@ issuing this command:
 
   :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
+Or, for very old versions of Ruby which don't define `RUBY_PATCHLEVEL`:
+
+  :ruby puts RUBY_VERSION
+
 Finally, beware that if you change your installation method for Command-T (for
 example, switching from one plugin manager to another) you should verify that
 you remove all of the files installed by the previous installation method; if
@@ -884,10 +892,10 @@ settings can be used to control behavior:
       Vim's |'wildignore'| setting is used to determine which files should be
       excluded from listings. This is a comma-separated list of glob patterns.
       It defaults to the empty string, but common settings include "*.o,*.obj"
-      (to exclude object files) or ".git,.svn" (to exclude SCM metadata
-      directories). For example:
+      (to exclude object files) or "**/.git/*,**/.svn/*" (to exclude SCM
+      metadata directories). For example:
 
-        :set wildignore+=*.o,*.obj,.git
+        :set wildignore+=*.o,*.obj
 
       A pattern such as "vendor/rails/**" would exclude all files and
       subdirectories inside the "vendor/rails" directory (relative to
@@ -900,6 +908,30 @@ settings can be used to control behavior:
       |g:CommandTWildIgnore| setting to apply an override that takes effect
       only during Command-T searches.
 
+      Note that there are some differences among file scanners
+      (see |g:CommandTFileScanner|) with respect to 'wildignore' handling:
+
+      - The default "ruby" scanner explores the filesystem recursively using a
+        depth-first search, and any directory (or subdirectory) which matches
+        the 'wildignore' pattern is not explored. So, if your 'wildignore'
+        contains "node_modules" then that entire sub-hierarchy will be
+        ignored. Additionally, wildcard patterns like "node_modules/**" or
+        "**/node_modules/*" will cause the entire sub-hierarchy to be ignored.
+
+      - The "git" and "find" scanners apply 'wildignore' filtering only after
+        completing their scans. Filtering only applies to files and not
+        directories. This means that in the "node_modules" example case, the
+        "node_modules" directory is not considered itself, and when we examine
+        a file like "node_modules/foo/bar" the "node_modules" pattern does
+        not match it (because "bar" does not match it). To exclude
+        any "node_modules" directory anywhere in the hierarchy and all of its
+        descendants we must use a pattern like "**/node_modules/*". To do this
+        only for a top-level "node_modules", use "node_modules/**".
+
+      - The "watchman" scanner is intended for use with massive hierarchies
+        where speed is of the utmost import, so it doesn't consult
+        'wildignore' at all.
+
 
 FAQ                                             *command-t-faq*
 
@@ -1075,21 +1107,21 @@ Command-T is written and maintained by Greg Hurrell <greg@hurrell.net>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
-  Abhinav Gupta           Marian Schubert         Scott Bronson
-  Andy Waite              Matthew Todd            Seth Fowler
-  Anthony Panozzo         Mike Lundy              Shlomi Fish
-  Artem Nezvigin          Nadav Samet             Steven Moazami
-  Ben Osheroff            Nate Kane               Sung Pae
-  Daniel Hahler           Nicholas Alpi           Thomas Pelletier
-  David Szotten           Noon Silk               Ton van den Heuvel
+  Abhinav Gupta           Lucas de Vries          Roland Puntaier
+  Aleksandrs Ļedovskis    Marcus Brito            Ross Lagerwall
+  Andy Waite              Marian Schubert         Scott Bronson
+  Anthony Panozzo         Matthew Todd            Seth Fowler
+  Artem Nezvigin          Mike Lundy              Shlomi Fish
+  Ben Osheroff            Nadav Samet             Steven Moazami
+  Daniel Hahler           Nate Kane               Sung Pae
+  David Szotten           Nicholas Alpi           Thomas Pelletier
+  Emily Strickland        Noon Silk               Ton van den Heuvel
   Felix Tjandrawibawa     Ole Petter Bang         Victor Hugo Borja
   Gary Bernhardt          Patrick Hayes           Vít Ondruch
   Ivan Ukhov              Paul Jolly              Woody Peterson
   Jacek Wysocki           Pavel Sergeev           Yan Pritzker
   Jeff Kreeftmeijer       Rainux Luo              Yiding Jia
   Kevin Webster           Richard Feldman         Zak Johnson
-  Lucas de Vries          Roland Puntaier
-  Marcus Brito            Ross Lagerwall
 
 As this was the first Vim plug-in I had ever written I was heavily influenced
 by the design of the LustyExplorer plug-in by Stephen Bach, which I understand
@@ -1183,6 +1215,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.11.1 (29 August 2014)
+
+- compatibility fixes with Ruby 1.8.6 (patch from Emily Strickland)
+- compatibility fixes with Ruby 1.8.5
+- fix 'wildignore' being ignored (bug present since 1.11)
+- fix current working directory being ignored when |g:CommandTTraverseSCM| is
+  set to "pwd" (bug present since 1.11)
+- performance improvements
+
 1.11 (15 August 2014)
 
 - improve edge-case handling in match results window code (patches from

data/Rakefile

@@ -30,11 +30,11 @@ def clear
   "\033[0m"
 end
 
-def warn str
+def warn(str)
   puts "#{yellow}warning: #{str}#{clear}"
 end
 
-def err str
+def err(str)
   puts "#{red}error: #{str}#{clear}"
 end
 

data/doc/command-t.txt

@@ -108,6 +108,10 @@ by looking at the output of:
 
   :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
+Or, for very old versions of Ruby which don't define `RUBY_PATCHLEVEL`:
+
+  :ruby puts RUBY_VERSION
+
 A suitable Ruby environment for Windows can be installed using the Ruby
 1.8.7-p299 RubyInstaller available at:
 
@@ -357,6 +361,10 @@ issuing this command:
 
   :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
 
+Or, for very old versions of Ruby which don't define `RUBY_PATCHLEVEL`:
+
+  :ruby puts RUBY_VERSION
+
 Finally, beware that if you change your installation method for Command-T (for
 example, switching from one plugin manager to another) you should verify that
 you remove all of the files installed by the previous installation method; if
@@ -884,10 +892,10 @@ settings can be used to control behavior:
       Vim's |'wildignore'| setting is used to determine which files should be
       excluded from listings. This is a comma-separated list of glob patterns.
       It defaults to the empty string, but common settings include "*.o,*.obj"
-      (to exclude object files) or ".git,.svn" (to exclude SCM metadata
-      directories). For example:
+      (to exclude object files) or "**/.git/*,**/.svn/*" (to exclude SCM
+      metadata directories). For example:
 
-        :set wildignore+=*.o,*.obj,.git
+        :set wildignore+=*.o,*.obj
 
       A pattern such as "vendor/rails/**" would exclude all files and
       subdirectories inside the "vendor/rails" directory (relative to
@@ -900,6 +908,30 @@ settings can be used to control behavior:
       |g:CommandTWildIgnore| setting to apply an override that takes effect
       only during Command-T searches.
 
+      Note that there are some differences among file scanners
+      (see |g:CommandTFileScanner|) with respect to 'wildignore' handling:
+
+      - The default "ruby" scanner explores the filesystem recursively using a
+        depth-first search, and any directory (or subdirectory) which matches
+        the 'wildignore' pattern is not explored. So, if your 'wildignore'
+        contains "node_modules" then that entire sub-hierarchy will be
+        ignored. Additionally, wildcard patterns like "node_modules/**" or
+        "**/node_modules/*" will cause the entire sub-hierarchy to be ignored.
+
+      - The "git" and "find" scanners apply 'wildignore' filtering only after
+        completing their scans. Filtering only applies to files and not
+        directories. This means that in the "node_modules" example case, the
+        "node_modules" directory is not considered itself, and when we examine
+        a file like "node_modules/foo/bar" the "node_modules" pattern does
+        not match it (because "bar" does not match it). To exclude
+        any "node_modules" directory anywhere in the hierarchy and all of its
+        descendants we must use a pattern like "**/node_modules/*". To do this
+        only for a top-level "node_modules", use "node_modules/**".
+
+      - The "watchman" scanner is intended for use with massive hierarchies
+        where speed is of the utmost import, so it doesn't consult
+        'wildignore' at all.
+
 
 FAQ                                             *command-t-faq*
 
@@ -1075,21 +1107,21 @@ Command-T is written and maintained by Greg Hurrell <greg@hurrell.net>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
-  Abhinav Gupta           Marian Schubert         Scott Bronson
-  Andy Waite              Matthew Todd            Seth Fowler
-  Anthony Panozzo         Mike Lundy              Shlomi Fish
-  Artem Nezvigin          Nadav Samet             Steven Moazami
-  Ben Osheroff            Nate Kane               Sung Pae
-  Daniel Hahler           Nicholas Alpi           Thomas Pelletier
-  David Szotten           Noon Silk               Ton van den Heuvel
+  Abhinav Gupta           Lucas de Vries          Roland Puntaier
+  Aleksandrs Ļedovskis    Marcus Brito            Ross Lagerwall
+  Andy Waite              Marian Schubert         Scott Bronson
+  Anthony Panozzo         Matthew Todd            Seth Fowler
+  Artem Nezvigin          Mike Lundy              Shlomi Fish
+  Ben Osheroff            Nadav Samet             Steven Moazami
+  Daniel Hahler           Nate Kane               Sung Pae
+  David Szotten           Nicholas Alpi           Thomas Pelletier
+  Emily Strickland        Noon Silk               Ton van den Heuvel
   Felix Tjandrawibawa     Ole Petter Bang         Victor Hugo Borja
   Gary Bernhardt          Patrick Hayes           Vít Ondruch
   Ivan Ukhov              Paul Jolly              Woody Peterson
   Jacek Wysocki           Pavel Sergeev           Yan Pritzker
   Jeff Kreeftmeijer       Rainux Luo              Yiding Jia
   Kevin Webster           Richard Feldman         Zak Johnson
-  Lucas de Vries          Roland Puntaier
-  Marcus Brito            Ross Lagerwall
 
 As this was the first Vim plug-in I had ever written I was heavily influenced
 by the design of the LustyExplorer plug-in by Stephen Bach, which I understand
@@ -1183,6 +1215,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.11.1 (29 August 2014)
+
+- compatibility fixes with Ruby 1.8.6 (patch from Emily Strickland)
+- compatibility fixes with Ruby 1.8.5
+- fix 'wildignore' being ignored (bug present since 1.11)
+- fix current working directory being ignored when |g:CommandTTraverseSCM| is
+  set to "pwd" (bug present since 1.11)
+- performance improvements
+
 1.11 (15 August 2014)
 
 - improve edge-case handling in match results window code (patches from

data/ruby/command-t/controller.rb

@@ -50,16 +50,17 @@ module CommandT
       if arg && arg.size > 0
         @path = File.expand_path(arg, VIM::pwd)
       else
-        traverse = get_string('g:CommandTTraverseSCM') || 'file'
+        traverse = VIM::get_string('g:CommandTTraverseSCM') || 'file'
         case traverse
         when 'file'
           @path = nearest_ancestor(VIM::current_file_dir, scm_markers)
         when 'dir'
           @path = nearest_ancestor(VIM::pwd, scm_markers)
+        else
+          @path = VIM::pwd
         end
       end
 
-      @path             = VIM::pwd unless @path
       @active_finder    = file_finder
       file_finder.path  = @path
       show
@@ -130,7 +131,7 @@ module CommandT
       end
     end
 
-    def accept_selection options = {}
+    def accept_selection(options = {})
       selection = @match_window.selection
       hide
       open_selection(selection, options) unless selection.nil?
@@ -203,21 +204,21 @@ module CommandT
     end
 
     def tab_command
-      get_string('g:CommandTAcceptSelectionTabCommand') || 'tabe'
+      VIM::get_string('g:CommandTAcceptSelectionTabCommand') || 'tabe'
     end
 
     def split_command
-      get_string('g:CommandTAcceptSelectionSplitCommand') || 'sp'
+      VIM::get_string('g:CommandTAcceptSelectionSplitCommand') || 'sp'
     end
 
     def vsplit_command
-      get_string('g:CommandTAcceptSelectionVSplitCommand') || 'vs'
+      VIM::get_string('g:CommandTAcceptSelectionVSplitCommand') || 'vs'
     end
 
   private
 
     def scm_markers
-      markers = get_string('g:CommandTSCMDirectories')
+      markers = VIM::get_string('g:CommandTSCMDirectories')
       markers = markers && markers.split(/\s*,\s*/)
       markers = %w[.git .hg .svn .bzr _darcs] unless markers && markers.length
       markers
@@ -231,11 +232,11 @@ module CommandT
       @initial_window   = $curwin
       @initial_buffer   = $curbuf
       @match_window     = MatchWindow.new \
-        :highlight_color      => get_string('g:CommandTHighlightColor'),
-        :match_window_at_top  => get_bool('g:CommandTMatchWindowAtTop'),
-        :match_window_reverse => get_bool('g:CommandTMatchWindowReverse'),
+        :highlight_color      => VIM::get_string('g:CommandTHighlightColor'),
+        :match_window_at_top  => VIM::get_bool('g:CommandTMatchWindowAtTop'),
+        :match_window_reverse => VIM::get_bool('g:CommandTMatchWindowReverse'),
         :min_height           => min_height,
-        :debounce_interval    => get_number('g:CommandTInputDebounce', 50),
+        :debounce_interval    => VIM::get_number('g:CommandTInputDebounce') || 50,
         :prompt               => @prompt
       @focus            = @prompt
       @prompt.focus
@@ -245,12 +246,12 @@ module CommandT
     end
 
     def max_height
-      @max_height ||= get_number('g:CommandTMaxHeight', 0)
+      @max_height ||= VIM::get_number('g:CommandTMaxHeight') || 0
     end
 
     def min_height
       @min_height ||= begin
-        min_height = get_number('g:CommandTMinHeight', 0)
+        min_height = VIM::get_number('g:CommandTMinHeight') || 0
         min_height = max_height if max_height != 0 && min_height > max_height
         min_height
       end
@@ -259,9 +260,9 @@ module CommandT
     def case_sensitive?
       if @prompt.abbrev.match(/[A-Z]/)
         if VIM::exists?('g:CommandTSmartCase')
-          smart_case = get_bool('g:CommandTSmartCase')
+          smart_case = VIM::get_bool('g:CommandTSmartCase')
         else
-          smart_case = get_bool('&smartcase')
+          smart_case = VIM::get_bool('&smartcase')
         end
 
         if smart_case
@@ -270,47 +271,24 @@ module CommandT
       end
 
       if VIM::exists?('g:CommandTIgnoreCase')
-        return !get_bool('g:CommandTIgnoreCase')
+        return !VIM::get_bool('g:CommandTIgnoreCase')
       end
 
       false
     end
 
-    def get_number(name, default = nil)
-      VIM::exists?(name) ? ::VIM::evaluate("#{name}").to_i : default
-    end
-
-    def get_bool(name)
-      VIM::exists?(name) ? ::VIM::evaluate("#{name}").to_i != 0 : nil
-    end
-
-    def get_string(name)
-      VIM::exists?(name) ? ::VIM::evaluate("#{name}").to_s : nil
-    end
-
-    # expect a string or a list of strings
-    def get_list_or_string name
-      return nil unless VIM::exists?(name)
-      list_or_string = ::VIM::evaluate("#{name}")
-      if list_or_string.kind_of?(Array)
-        list_or_string.map { |item| item.to_s }
-      else
-        list_or_string.to_s
-      end
-    end
-
     # Backslash-escape space, \, |, %, #, "
-    def sanitize_path_string str
+    def sanitize_path_string(str)
       # for details on escaping command-line mode arguments see: :h :
       # (that is, help on ":") in the Vim documentation.
       str.gsub(/[ \\|%#"]/, '\\\\\0')
     end
 
     def default_open_command
-      if !get_bool('&modified') ||
-        get_bool('&hidden') ||
-        get_bool('&autowriteall') && !get_bool('&readonly')
-        get_string('g:CommandTAcceptSelectionCommand') || 'e'
+      if !VIM::get_bool('&modified') ||
+        VIM::get_bool('&hidden') ||
+        VIM::get_bool('&autowriteall') && !VIM::get_bool('&readonly')
+        VIM::get_string('g:CommandTAcceptSelectionCommand') || 'e'
       else
         'sp'
       end
@@ -336,7 +314,7 @@ module CommandT
       end
     end
 
-    def open_selection selection, options = {}
+    def open_selection(selection, options = {})
       command = options[:command] || default_open_command
       selection = File.expand_path selection, @path
       selection = relative_path_under_working_directory selection
@@ -347,7 +325,7 @@ module CommandT
       @active_finder.open_selection command, selection, options
     end
 
-    def map key, function, param = nil
+    def map(key, function, param = nil)
       ::VIM::command "noremap <silent> <buffer> #{key} " \
         ":call CommandT#{function}(#{param})<CR>"
     end
@@ -387,7 +365,7 @@ module CommandT
         'SelectPrev'            => ['<C-p>', '<C-k>', '<Up>'],
         'ToggleFocus'           => '<Tab>',
       }.each do |key, value|
-        if override = get_list_or_string("g:CommandT#{key}Map")
+        if override = VIM::get_list_or_string("g:CommandT#{key}Map")
           Array(override).each do |mapping|
             map mapping, key
           end
@@ -430,14 +408,14 @@ module CommandT
 
     def file_finder
       @file_finder ||= CommandT::FileFinder.new nil,
-        :max_depth              => get_number('g:CommandTMaxDepth'),
-        :max_files              => get_number('g:CommandTMaxFiles'),
-        :max_caches             => get_number('g:CommandTMaxCachedDirectories'),
-        :always_show_dot_files  => get_bool('g:CommandTAlwaysShowDotFiles'),
-        :never_show_dot_files   => get_bool('g:CommandTNeverShowDotFiles'),
-        :scan_dot_directories   => get_bool('g:CommandTScanDotDirectories'),
-        :wild_ignore            => get_string('g:CommandTWildIgnore'),
-        :scanner                => get_string('g:CommandTFileScanner')
+        :max_depth              => VIM::get_number('g:CommandTMaxDepth'),
+        :max_files              => VIM::get_number('g:CommandTMaxFiles'),
+        :max_caches             => VIM::get_number('g:CommandTMaxCachedDirectories'),
+        :always_show_dot_files  => VIM::get_bool('g:CommandTAlwaysShowDotFiles'),
+        :never_show_dot_files   => VIM::get_bool('g:CommandTNeverShowDotFiles'),
+        :scan_dot_directories   => VIM::get_bool('g:CommandTScanDotDirectories'),
+        :wild_ignore            => VIM::get_string('g:CommandTWildIgnore'),
+        :scanner                => VIM::get_string('g:CommandTFileScanner')
     end
 
     def jump_finder
@@ -446,7 +424,7 @@ module CommandT
 
     def tag_finder
       @tag_finder ||= CommandT::TagFinder.new \
-        :include_filenames => get_bool('g:CommandTTagIncludeFilenames')
+        :include_filenames => VIM::get_bool('g:CommandTTagIncludeFilenames')
     end
   end # class Controller
 end # module CommandT