command-t 1.11.4 → 1.12

data/ruby/command-t/scanner/file_scanner/file_limit_exceeded.rb

@@ -0,0 +1,10 @@
+# Copyright 2014 Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Scanner
+    class FileScanner
+      FileLimitExceeded = Class.new(::RuntimeError)
+    end # class FileScanner
+  end # class Scanner
+end # module Command-T

data/ruby/command-t/scanner/file_scanner/find_file_scanner.rb

@@ -2,49 +2,49 @@
 # Licensed under the terms of the BSD 2-clause license.
 
 require 'open3'
-require 'command-t/vim/path_utilities'
-require 'command-t/scanner/file_scanner'
 
 module CommandT
-  class FileScanner
-    # A FileScanner which shells out to the `find` executable in order to scan.
-    class FindFileScanner < FileScanner
-      include VIM::PathUtilities
+  class Scanner
+    class FileScanner
+      # A FileScanner which shells out to the `find` executable in order to scan.
+      class FindFileScanner < FileScanner
+        include PathUtilities
 
-      def paths!
-        # temporarily set field separator to NUL byte; this setting is
-        # respected by both `readlines` and `chomp!` below, and makes it easier
-        # to parse the output of `find -print0`
-        separator = $/
-        $/ = "\x00"
+        def paths!
+          # temporarily set field separator to NUL byte; this setting is
+          # respected by both `readlines` and `chomp!` below, and makes it easier
+          # to parse the output of `find -print0`
+          separator = $/
+          $/ = "\x00"
 
-        unless @scan_dot_directories
-          dot_directory_filter = [
-            '-not', '-path', "#{@path}/.*/*",           # top-level dot dir
-            '-and', '-not', '-path', "#{@path}/*/.*/*"  # lower-level dot dir
-          ]
-        end
+          unless @scan_dot_directories
+            dot_directory_filter = [
+              '-not', '-path', "#{@path}/.*/*",           # top-level dot dir
+              '-and', '-not', '-path', "#{@path}/*/.*/*"  # lower-level dot dir
+            ]
+          end
 
-        paths = []
-        Open3.popen3(*([
-          'find', '-L',                 # follow symlinks
-          @path,                        # anchor search here
-          '-maxdepth', @max_depth.to_s, # limit depth of DFS
-          '-type', 'f',                 # only show regular files (not dirs etc)
-          dot_directory_filter,         # possibly skip out dot directories
-          '-print0'                     # NUL-terminate results
-        ].flatten.compact)) do |stdin, stdout, stderr|
-          counter = 1
-          stdout.readlines.each do |line|
-            next if path_excluded?(line.chomp!)
-            paths << line[@prefix_len..-1]
-            break if (counter += 1) > @max_files
+          paths = []
+          Open3.popen3(*([
+            'find', '-L',                 # follow symlinks
+            @path,                        # anchor search here
+            '-maxdepth', @max_depth.to_s, # limit depth of DFS
+            '-type', 'f',                 # only show regular files (not dirs etc)
+            dot_directory_filter,         # possibly skip out dot directories
+            '-print0'                     # NUL-terminate results
+          ].flatten.compact)) do |stdin, stdout, stderr|
+            counter = 1
+            stdout.readlines.each do |line|
+              next if path_excluded?(line.chomp!)
+              paths << line[@prefix_len..-1]
+              break if (counter += 1) > @max_files
+            end
           end
+          paths
+        ensure
+          $/ = separator
         end
-        paths
-      ensure
-        $/ = separator
-      end
-    end # class FindFileScanner
-  end # class FileScanner
+      end # class FindFileScanner
+    end # class FileScanner
+  end # class Scanner
 end # module CommandT

data/ruby/command-t/scanner/file_scanner/git_file_scanner.rb

@@ -1,34 +1,54 @@
 # Copyright 2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/scanner/file_scanner/find_file_scanner'
-
 module CommandT
-  class FileScanner
-    # Uses git ls-files to scan for files
-    class GitFileScanner < FindFileScanner
-      def paths!
-        Dir.chdir(@path) do
-          stdin, stdout, stderr = Open3.popen3(*[
-            'git',
-            'ls-files',
-            '--exclude-standard',
-            @path
-          ])
+  class Scanner
+    class FileScanner
+      # Uses git ls-files to scan for files
+      class GitFileScanner < FindFileScanner
+        LsFilesError = Class.new(::RuntimeError)
+
+        def paths!
+          Dir.chdir(@path) do
+            all_files = list_files(%w[git ls-files --exclude-standard -z])
+
+            if @scan_submodules
+              base = nil
+              list_files(%w[
+                git submodule foreach --recursive
+                git ls-files --exclude-standard -z
+              ]).each do |path|
+                if path =~ /\AEntering '(.*)'\n(.*)\z/
+                  base = $~[1]
+                  path = $~[2]
+                end
+                all_files.push(base + File::SEPARATOR + path)
+              end
+            end
 
-          all_files = stdout.readlines.
-            map { |path| path.chomp }.
-            reject { |path| path_excluded?(path, 0) }.
-            take(@max_files).
-            to_a
+            all_files.
+              map { |path| path.chomp }.
+              reject { |path| path_excluded?(path, 0) }.
+              take(@max_files).
+              to_a
+          end
+        rescue LsFilesError
+          super
+        rescue Errno::ENOENT
+          # git executable not present and executable
+          super
+        end
+
+      private
 
-          # will fall back to find if not a git repository or there's an error
-          stderr.gets ? super : all_files
+        def list_files(command)
+          stdin, stdout, stderr = Open3.popen3(*command)
+          stdout.read.split("\0")
+        ensure
+          raise LsFilesError if stderr && stderr.gets
         end
-      rescue Errno::ENOENT => e
-        # git executable not present and executable
-        super
-      end
-    end # class GitFileScanner
-  end # class FileScanner
+
+      end # class GitFileScanner
+    end # class FileScanner
+  end # class Scanner
 end # module CommandT

data/ruby/command-t/scanner/file_scanner/ruby_file_scanner.rb

@@ -1,55 +1,55 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/scanner/file_scanner'
-
 module CommandT
-  class FileScanner
-    # Pure Ruby implementation of a file scanner.
-    class RubyFileScanner < FileScanner
-      def paths!
-        accumulator = []
-        @depth = 0
-        @files = 0
-        add_paths_for_directory(@path, accumulator)
-        accumulator
-      rescue FileLimitExceeded
-        accumulator
-      end
+  class Scanner
+    class FileScanner
+      # Pure Ruby implementation of a file scanner.
+      class RubyFileScanner < FileScanner
+        def paths!
+          accumulator = []
+          @depth = 0
+          @files = 0
+          add_paths_for_directory(@path, accumulator)
+          accumulator
+        rescue FileLimitExceeded
+          accumulator
+        end
 
-    private
+      private
 
-      def looped_symlink?(path)
-        if File.symlink?(path)
-          target = File.expand_path(File.readlink(path), File.dirname(path))
-          target.include?(@path) || @path.include?(target)
+        def looped_symlink?(path)
+          if File.symlink?(path)
+            target = File.expand_path(File.readlink(path), File.dirname(path))
+            target.include?(@path) || @path.include?(target)
+          end
         end
-      end
 
-      def add_paths_for_directory(dir, accumulator)
-        Dir.foreach(dir) do |entry|
-          next if ['.', '..'].include?(entry)
-          path = File.join(dir, entry)
-          unless path_excluded?(path)
-            if File.file?(path)
-              @files += 1
-              raise FileLimitExceeded if @files > @max_files
-              accumulator << path[@prefix_len..-1]
-            elsif File.directory?(path)
-              next if @depth >= @max_depth
-              next if (entry.match(/\A\./) && !@scan_dot_directories)
-              next if looped_symlink?(path)
-              @depth += 1
-              add_paths_for_directory(path, accumulator)
-              @depth -= 1
+        def add_paths_for_directory(dir, accumulator)
+          Dir.foreach(dir) do |entry|
+            next if ['.', '..'].include?(entry)
+            path = File.join(dir, entry)
+            unless path_excluded?(path)
+              if File.file?(path)
+                @files += 1
+                raise FileLimitExceeded if @files > @max_files
+                accumulator << path[@prefix_len..-1]
+              elsif File.directory?(path)
+                next if @depth >= @max_depth
+                next if (entry.match(/\A\./) && !@scan_dot_directories)
+                next if looped_symlink?(path)
+                @depth += 1
+                add_paths_for_directory(path, accumulator)
+                @depth -= 1
+              end
             end
           end
+        rescue Errno::EACCES
+          # skip over directories for which we don't have access
+        rescue ArgumentError
+          # skip over bad file names
         end
-      rescue Errno::EACCES
-        # skip over directories for which we don't have access
-      rescue ArgumentError
-        # skip over bad file names
-      end
-    end # class RubyFileScanner
-  end # class FileScanner
+      end # class RubyFileScanner
+    end # class FileScanner
+  end # class Scanner
 end # module CommandT

data/ruby/command-t/scanner/file_scanner/watchman_file_scanner.rb

@@ -3,54 +3,54 @@
 
 require 'pathname'
 require 'socket'
-require 'command-t/vim/path_utilities'
-require 'command-t/scanner/file_scanner'
-require 'command-t/scanner/file_scanner/find_file_scanner'
 
 module CommandT
-  class FileScanner
-    # A FileScanner which delegates the heavy lifting to Watchman
-    # (https://github.com/facebook/watchman); useful for very large hierarchies.
-    #
-    # Inherits from FindFileScanner so that it can fall back to it in the event
-    # that Watchman isn't available or able to fulfil the request.
-    class WatchmanFileScanner < FindFileScanner
-      # Exception raised when Watchman is unavailable or unable to process the
-      # requested path.
-      class WatchmanUnavailable < RuntimeError; end
-
-      def paths!
-        sockname = Watchman::Utils.load(
-          %x{watchman --output-encoding=bser get-sockname}
-        )['sockname']
-        raise WatchmanUnavailable unless $?.exitstatus.zero?
-
-        UNIXSocket.open(sockname) do |socket|
-          root = Pathname.new(@path).realpath.to_s
-          roots = Watchman::Utils.query(['watch-list'], socket)['roots']
-          if !roots.include?(root)
-            # this path isn't being watched yet; try to set up watch
-            result = Watchman::Utils.query(['watch', root], socket)
-
-            # root_restrict_files setting may prevent Watchman from working
-            raise WatchmanUnavailable if result.has_key?('error')
+  class Scanner
+    class FileScanner
+      # A FileScanner which delegates the heavy lifting to Watchman
+      # (https://github.com/facebook/watchman); useful for very large hierarchies.
+      #
+      # Inherits from FindFileScanner so that it can fall back to it in the event
+      # that Watchman isn't available or able to fulfil the request.
+      class WatchmanFileScanner < FindFileScanner
+        # Exception raised when Watchman is unavailable or unable to process the
+        # requested path.
+        WatchmanError = Class.new(::RuntimeError)
+
+        def paths!
+          sockname = Watchman::Utils.load(
+            %x{watchman --output-encoding=bser get-sockname}
+          )['sockname']
+          raise WatchmanError, 'get-sockname failed' unless $?.exitstatus.zero?
+
+          UNIXSocket.open(sockname) do |socket|
+            root = Pathname.new(@path).realpath.to_s
+            roots = Watchman::Utils.query(['watch-list'], socket)['roots']
+            if !roots.include?(root)
+              # this path isn't being watched yet; try to set up watch
+              result = Watchman::Utils.query(['watch', root], socket)
+
+              # root_restrict_files setting may prevent Watchman from working
+              # or enforce_root_files/root_files (>= version 3.1)
+              raise WatchmanError, result['error'] if result.has_key?('error')
+            end
+
+            query = ['query', root, {
+              'expression' => ['type', 'f'],
+              'fields'     => ['name'],
+            }]
+            paths = Watchman::Utils.query(query, socket)
+
+            # could return error if watch is removed
+            raise WatchmanError, paths['error'] if paths.has_key?('error')
+
+            paths['files']
           end
-
-          query = ['query', root, {
-            'expression' => ['type', 'f'],
-            'fields'     => ['name'],
-          }]
-          paths = Watchman::Utils.query(query, socket)
-
-          # could return error if watch is removed
-          raise WatchmanUnavailable if paths.has_key?('error')
-
-          paths['files']
+        rescue Errno::ENOENT, WatchmanError
+          # watchman executable not present, or unable to fulfil request
+          super
         end
-      end
-    rescue Errno::ENOENT, WatchmanUnavailable
-      # watchman executable not present, or unable to fulfil request
-      super
-    end # class WatchmanFileScanner
-  end # class FileScanner
+      end # class WatchmanFileScanner
+    end # class FileScanner
+  end # class Scanner
 end # module CommandT

data/ruby/command-t/scanner/jump_scanner.rb

@@ -1,33 +1,32 @@
 # Copyright 2011-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/vim/path_utilities'
-require 'command-t/scanner'
-
 module CommandT
-  # Returns a list of files in the jumplist.
-  class JumpScanner < Scanner
-    include VIM::PathUtilities
+  class Scanner
+    # Returns a list of files in the jumplist.
+    class JumpScanner < Scanner
+      include PathUtilities
 
-    def paths
-      jumps_with_filename = jumps.lines.select do |line|
-        line_contains_filename?(line)
-      end
-      filenames = jumps_with_filename[1..-2].map do |line|
-        relative_path_under_working_directory line.split[3]
-      end
+      def paths
+        jumps_with_filename = jumps.lines.select do |line|
+          line_contains_filename?(line)
+        end
+        filenames = jumps_with_filename[1..-2].map do |line|
+          relative_path_under_working_directory line.split[3]
+        end
 
-      filenames.sort.uniq
-    end
+        filenames.sort.uniq
+      end
 
-  private
+    private
 
-    def line_contains_filename?(line)
-      line.split.count > 3
-    end
+      def line_contains_filename?(line)
+        line.split.count > 3
+      end
 
-    def jumps
-      VIM::capture 'silent jumps'
-    end
-  end # class JumpScanner
+      def jumps
+        VIM::capture 'silent jumps'
+      end
+    end # class JumpScanner
+  end # class Scanner
 end # module CommandT

data/ruby/command-t/scanner/mru_buffer_scanner.rb

@@ -1,28 +1,27 @@
 # Copyright 2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/vim/path_utilities'
-require 'command-t/scanner/buffer_scanner'
-
 module CommandT
-  # Returns a list of all open buffers, sorted in MRU order.
-  class MRUBufferScanner < BufferScanner
-    include VIM::PathUtilities
-
-    def paths
-      # Collect all buffers that have not been used yet.
-      unused_buffers = (0..(::VIM::Buffer.count - 1)).map do |n|
-        buffer = ::VIM::Buffer[n]
-        buffer if buffer.name && !MRU.used?(buffer)
-      end
+  class Scanner
+    # Returns a list of all open buffers, sorted in MRU order.
+    class MRUBufferScanner < BufferScanner
+      include PathUtilities
 
-      # Combine all most recently used buffers and all unused buffers, and
-      # return all listed buffer paths.
-      (unused_buffers + MRU.stack).map do |buffer|
-        if buffer && buffer.name
-          relative_path_under_working_directory buffer.name
+      def paths
+        # Collect all buffers that have not been used yet.
+        unused_buffers = (0..(::VIM::Buffer.count - 1)).map do |n|
+          buffer = ::VIM::Buffer[n]
+          buffer if buffer.name && !MRU.used?(buffer)
         end
-      end.compact.reverse
-    end
-  end # class MRUBufferScanner
+
+        # Combine all most recently used buffers and all unused buffers, and
+        # return all listed buffer paths.
+        (unused_buffers + MRU.stack).map do |buffer|
+          if buffer && buffer.name
+            relative_path_under_working_directory buffer.name
+          end
+        end.compact.reverse
+      end
+    end # class MRUBufferScanner
+  end # class Scanner
 end # module CommandT