command-t 1.6 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e092a4101159c349fa3add3f4654a8ea0ce323
-  data.tar.gz: 0da32ec23fd4db0d33aae16ae131201161872e16
+  metadata.gz: 64b588caab585d019ca8114678e3fa6f7f3642c5
+  data.tar.gz: 26625225d34e10161297f8722d282dfcd0f7541c
 SHA512:
-  metadata.gz: 15aee07c8cbf2e2f6d1dbf5b2da4731adb9a5f359d8a0f4a783d2e9eb998eb56cc4ae2d72d3e4ac4a4bc87a1465f99c63b1dea1f131124869475403c599cf489
-  data.tar.gz: 75ead8da5ba910874aa4172f4c7558e63e4cd95923a9db2daa37ea319a41d5dd8761994117ab81307d9c734085d2dbef49cbd89b1acb8fb2f1552d7a53ce9b3e
+  metadata.gz: 18c544603a39fd969fa1abcb81d8e42d9508fea862d32c5788b87a818aa45ae8194d4e07b5a7922d537e2bb3518024f27d409833faa724253f2cf203e74d5e22
+  data.tar.gz: bc5e0f40d2194b9d38c1971debd033ec1462cfe4381a6ce59e9645702bbd6b003827246233fe69c9632c8082f3298ff53fdadd30be80d5bdae45a0b69058c971

data/README.txt

@@ -68,8 +68,11 @@ If your Vim lacks support you'll see an error message like this:
 
   E319: Sorry, the command is not available in this version
 
-The version of Vim distributed with Mac OS X does not include Ruby support,
-while MacVim does; it is available from:
+The version of Vim distributed with OS X may not include Ruby support (for
+exmaple, Snow Leopard, which was the current version of OS X when Command-T
+was first released, did not support Ruby in the system Vim, but the current
+version of OS X at the time of writing, Mavericks, does). All recent versions
+of MacVim come with Ruby support; it is available from:
 
   http://github.com/b4winckler/macvim/downloads
 
@@ -85,8 +88,14 @@ compatible Ruby install. "Compatible" means the same version as Vim itself
 links against. If you use a different version then Command-T is unlikely
 to work (see TROUBLE-SHOOTING below).
 
-On Mac OS X Snow Leopard, the system comes with Ruby 1.8.7 and all recent
-versions of MacVim (the 7.2 snapshots and 7.3) are linked against it.
+On OS X Snow Leopard, Lion and Mountain Lion, the system comes with Ruby 1.8.7
+and all recent versions of MacVim (the 7.2 snapshots and 7.3) are linked
+against it.
+
+On OS X Mavericks, the default system ruby is 2.0, but MacVim continues to
+link against 1.8.7, which is also present on the system at:
+
+  /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 
 On Linux and similar platforms, the linked version of Ruby will depend on
 your distribution. You can usually find this out by examining the
@@ -112,8 +121,8 @@ it to work responsively even on directory hierarchies containing enormous
 numbers of files. As such, a C compiler is required in order to build the
 extension and complete the installation.
 
-On Mac OS X, this can be obtained by installing the Xcode Tools that come on
-the Mac OS X install disc.
+On OS X, this can be obtained by installing the Xcode Tools from the App
+Store.
 
 On Windows, the RubyInstaller Development Kit can be used to conveniently
 install the necessary tool chain:
@@ -129,8 +138,12 @@ folder.
 
 INSTALLATION                                    *command-t-installation*
 
-Command-T is distributed as a "vimball" which means that it can be installed
-by opening it in Vim and then sourcing it:
+You can install Command-T by obtaining the source files and building the C
+extension. The recommended way to get the source is by using a plug-in
+management system such as Pathogen (see |command-t-pathogen|).
+
+Command-T is also distributed as a "vimball" which means that it can be
+installed by opening it in Vim and then sourcing it:
 
   :e command-t.vba
   :so %
@@ -156,6 +169,14 @@ of the following commands:
   rvm use system
   rbenv local system
 
+Note: If you are on OS X Mavericks and compiling against MacVim, the default
+system Ruby is 2.0 but MacVim still links against the older 1.8.7 Ruby that is
+also bundled with the system; in this case the build command becomes:
+
+  cd ~/.vim/ruby/command-t
+  /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby extconf.rb
+  make
+
 Note: Make sure you compile targeting the same architecture Vim was built for.
 For instance, MacVim binaries are built for i386, but sometimes GCC compiles
 for x86_64. First you have to check the platform Vim was built for:
@@ -170,6 +191,10 @@ and make sure you use the correct ARCHFLAGS during compilation:
   export ARCHFLAGS="-arch i386"
   make
 
+Note: If you are on Fedora 17+, you can install Command-T from the system
+repository with:
+
+  su -c 'yum install vim-command-t'
 
 MANAGING USING PATHOGEN                         *command-t-pathogen*
 
@@ -224,7 +249,7 @@ linked against at compile time. For example, if one is 32-bit and the other is
 64-bit, or one is from the Ruby 1.9 series and the other is from the 1.8
 series, then the plug-in is not likely to work.
 
-As such, on Mac OS X, I recommend using the standard Ruby that comes with the
+As such, on OS X, I recommend using the standard Ruby that comes with the
 system (currently 1.8.7) along with the latest version of MacVim (currently
 version 7.3). If you wish to use custom builds of Ruby or of MacVim (not
 recommmended) then you will have to take extra care to ensure that the exact
@@ -652,6 +677,7 @@ Command-T is written and maintained by Wincent Colaiuta <win@wincent.com>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
+  Andy Waite                Matthew Todd              Steven Moazami
   Anthony Panozzo           Mike Lundy                Sung Pae
   Daniel Hahler             Nate Kane                 Thomas Pelletier
   Felix Tjandrawibawa       Nicholas Alpi             Victor Hugo Borja
@@ -661,7 +687,6 @@ order):
   Lucas de Vries            Rainux Luo                Zak Johnson
   Marcus Brito              Scott Bronson
   Marian Schubert           Seth Fowler
-  Matthew Todd              Steven Moazami
 
 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
@@ -764,16 +789,24 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.6.1 (22 December 2013)
+
+- defer processor count detection until runtime (makes it possible to sensibly
+  build Command-T on one machine and use it on another)
+
 1.6 (16 December 2013)
+
 - on systems with POSIX threads (such as OS X and Linux), Command-T will use
   threads to compute match results in parallel, resulting in a large speed
   boost that is especially noticeable when navigating large projects
 
 1.5.1 (23 September 2013)
+
 - exclude large benchmark fixture file from source exports (patch from Vít
   Ondruch)
 
 1.5 (18 September 2013)
+
 - don't scan "pathological" filesystem structures (ie. circular or
   self-referential symlinks; patch from Marcus Brito)
 - gracefully handle files starting with "+" (patch from Ivan Ukhov)

data/Rakefile

@@ -171,10 +171,10 @@ task :prerelease => ['make:all', 'spec:all', :vimball, :check_tag]
 namespace :upload do
   desc 'Upload current vimball to Amazon S3'
   task :s3 => :vimball do
-    sh 'aws put ' +
+    sh 'aws --curl-options=--insecure put ' +
       "s3.wincent.com/command-t/releases/command-t-#{version}.vba " +
       "command-t-#{version}.vba"
-    sh 'aws put ' +
+    sh 'aws --curl-options=--insecure put ' +
       "s3.wincent.com/command-t/releases/command-t-#{version}.vba?acl " +
       '--public'
   end

data/doc/command-t.txt

@@ -68,8 +68,11 @@ If your Vim lacks support you'll see an error message like this:
 
   E319: Sorry, the command is not available in this version
 
-The version of Vim distributed with Mac OS X does not include Ruby support,
-while MacVim does; it is available from:
+The version of Vim distributed with OS X may not include Ruby support (for
+exmaple, Snow Leopard, which was the current version of OS X when Command-T
+was first released, did not support Ruby in the system Vim, but the current
+version of OS X at the time of writing, Mavericks, does). All recent versions
+of MacVim come with Ruby support; it is available from:
 
   http://github.com/b4winckler/macvim/downloads
 
@@ -85,8 +88,14 @@ compatible Ruby install. "Compatible" means the same version as Vim itself
 links against. If you use a different version then Command-T is unlikely
 to work (see TROUBLE-SHOOTING below).
 
-On Mac OS X Snow Leopard, the system comes with Ruby 1.8.7 and all recent
-versions of MacVim (the 7.2 snapshots and 7.3) are linked against it.
+On OS X Snow Leopard, Lion and Mountain Lion, the system comes with Ruby 1.8.7
+and all recent versions of MacVim (the 7.2 snapshots and 7.3) are linked
+against it.
+
+On OS X Mavericks, the default system ruby is 2.0, but MacVim continues to
+link against 1.8.7, which is also present on the system at:
+
+  /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 
 On Linux and similar platforms, the linked version of Ruby will depend on
 your distribution. You can usually find this out by examining the
@@ -112,8 +121,8 @@ it to work responsively even on directory hierarchies containing enormous
 numbers of files. As such, a C compiler is required in order to build the
 extension and complete the installation.
 
-On Mac OS X, this can be obtained by installing the Xcode Tools that come on
-the Mac OS X install disc.
+On OS X, this can be obtained by installing the Xcode Tools from the App
+Store.
 
 On Windows, the RubyInstaller Development Kit can be used to conveniently
 install the necessary tool chain:
@@ -129,8 +138,12 @@ folder.
 
 INSTALLATION                                    *command-t-installation*
 
-Command-T is distributed as a "vimball" which means that it can be installed
-by opening it in Vim and then sourcing it:
+You can install Command-T by obtaining the source files and building the C
+extension. The recommended way to get the source is by using a plug-in
+management system such as Pathogen (see |command-t-pathogen|).
+
+Command-T is also distributed as a "vimball" which means that it can be
+installed by opening it in Vim and then sourcing it:
 
   :e command-t.vba
   :so %
@@ -156,6 +169,14 @@ of the following commands:
   rvm use system
   rbenv local system
 
+Note: If you are on OS X Mavericks and compiling against MacVim, the default
+system Ruby is 2.0 but MacVim still links against the older 1.8.7 Ruby that is
+also bundled with the system; in this case the build command becomes:
+
+  cd ~/.vim/ruby/command-t
+  /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby extconf.rb
+  make
+
 Note: Make sure you compile targeting the same architecture Vim was built for.
 For instance, MacVim binaries are built for i386, but sometimes GCC compiles
 for x86_64. First you have to check the platform Vim was built for:
@@ -170,6 +191,10 @@ and make sure you use the correct ARCHFLAGS during compilation:
   export ARCHFLAGS="-arch i386"
   make
 
+Note: If you are on Fedora 17+, you can install Command-T from the system
+repository with:
+
+  su -c 'yum install vim-command-t'
 
 MANAGING USING PATHOGEN                         *command-t-pathogen*
 
@@ -224,7 +249,7 @@ linked against at compile time. For example, if one is 32-bit and the other is
 64-bit, or one is from the Ruby 1.9 series and the other is from the 1.8
 series, then the plug-in is not likely to work.
 
-As such, on Mac OS X, I recommend using the standard Ruby that comes with the
+As such, on OS X, I recommend using the standard Ruby that comes with the
 system (currently 1.8.7) along with the latest version of MacVim (currently
 version 7.3). If you wish to use custom builds of Ruby or of MacVim (not
 recommmended) then you will have to take extra care to ensure that the exact
@@ -652,6 +677,7 @@ Command-T is written and maintained by Wincent Colaiuta <win@wincent.com>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
+  Andy Waite                Matthew Todd              Steven Moazami
   Anthony Panozzo           Mike Lundy                Sung Pae
   Daniel Hahler             Nate Kane                 Thomas Pelletier
   Felix Tjandrawibawa       Nicholas Alpi             Victor Hugo Borja
@@ -661,7 +687,6 @@ order):
   Lucas de Vries            Rainux Luo                Zak Johnson
   Marcus Brito              Scott Bronson
   Marian Schubert           Seth Fowler
-  Matthew Todd              Steven Moazami
 
 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
@@ -764,16 +789,24 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.6.1 (22 December 2013)
+
+- defer processor count detection until runtime (makes it possible to sensibly
+  build Command-T on one machine and use it on another)
+
 1.6 (16 December 2013)
+
 - on systems with POSIX threads (such as OS X and Linux), Command-T will use
   threads to compute match results in parallel, resulting in a large speed
   boost that is especially noticeable when navigating large projects
 
 1.5.1 (23 September 2013)
+
 - exclude large benchmark fixture file from source exports (patch from Vít
   Ondruch)
 
 1.5 (18 September 2013)
+
 - don't scan "pathological" filesystem structures (ie. circular or
   self-referential symlinks; patch from Marcus Brito)
 - gracefully handle files starting with "+" (patch from Ivan Ukhov)

data/ruby/command-t/Makefile

@@ -80,7 +80,7 @@ warnflags =
 CCDLFLAGS = 
 CFLAGS   = $(CCDLFLAGS)  -g -Os -pipe $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = -DPROCESSOR_COUNT=4
+DEFS     = 
 CPPFLAGS = -DHAVE_PTHREAD_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
 CXXFLAGS = $(CCDLFLAGS)  -g -Os -pipe  $(ARCH_FLAG)
 ldflags  = -L. -L/usr/local/lib

data/ruby/command-t/controller.rb

@@ -28,6 +28,7 @@ require 'command-t/finder/tag_finder'
 require 'command-t/match_window'
 require 'command-t/prompt'
 require 'command-t/vim/path_utilities'
+require 'command-t/util'
 
 module CommandT
   class Controller
@@ -342,7 +343,11 @@ module CommandT
     end
 
     def list_matches
-      @matches = @active_finder.sorted_matches_for @prompt.abbrev, :limit => match_limit
+      @matches = @active_finder.sorted_matches_for(
+        @prompt.abbrev,
+        :limit   => match_limit,
+        :threads => CommandT::Util.processor_count
+      )
       @match_window.matches = @matches
     end
 

data/ruby/command-t/extconf.rb

@@ -30,61 +30,6 @@ def header(item)
   end
 end
 
-# Stolen, with minor modifications, from:
-#
-#   https://github.com/grosser/parallel/blob/d11e4a3c8c1a2091a0cc2896befa71a94a88d1e7/lib/parallel.rb
-#
-# Number of processors seen by the OS and used for process scheduling.
-#
-# * AIX: /usr/sbin/pmcycles (AIX 5+), /usr/sbin/lsdev
-# * BSD: /sbin/sysctl
-# * Cygwin: /proc/cpuinfo
-# * Darwin: /usr/bin/hwprefs, /usr/sbin/sysctl
-# * HP-UX: /usr/sbin/ioscan
-# * IRIX: /usr/sbin/sysconf
-# * Linux: /proc/cpuinfo
-# * Minix 3+: /proc/cpuinfo
-# * Solaris: /usr/sbin/psrinfo
-# * Tru64 UNIX: /usr/sbin/psrinfo
-# * UnixWare: /usr/sbin/psrinfo
-#
-def processor_count
-  os_name = RbConfig::CONFIG['target_os']
-  if os_name =~ /mingw|mswin/
-    require 'win32ole'
-    result = WIN32OLE.connect('winmgmts://').ExecQuery(
-        'select NumberOfLogicalProcessors from Win32_Processor')
-    result.to_enum.collect(&:NumberOfLogicalProcessors).reduce(:+)
-  elsif File.readable?('/proc/cpuinfo')
-    IO.read('/proc/cpuinfo').scan(/^processor/).size
-  elsif File.executable?('/usr/bin/hwprefs')
-    IO.popen(%w[/usr/bin/hwprefs thread_count]).read.to_i
-  elsif File.executable?('/usr/sbin/psrinfo')
-    IO.popen('/usr/sbin/psrinfo').read.scan(/^.*on-*line/).size
-  elsif File.executable?('/usr/sbin/ioscan')
-    IO.popen(%w[/usr/sbin/ioscan -kC processor]) do |out|
-      out.read.scan(/^.*processor/).size
-    end
-  elsif File.executable?('/usr/sbin/pmcycles')
-    IO.popen(%w[/usr/sbin/pmcycles -m]).read.count("\n")
-  elsif File.executable?('/usr/sbin/lsdev')
-    IO.popen(%w[/usr/sbin/lsdev -Cc processor -S 1]).read.count("\n")
-  elsif File.executable?('/usr/sbin/sysconf') and os_name =~ /irix/i
-    IO.popen(%w[/usr/sbin/sysconf NPROC_ONLN]).read.to_i
-  elsif File.executable?('/usr/sbin/sysctl')
-    IO.popen(%w[/usr/sbin/sysctl -n hw.ncpu]).read.to_i
-  elsif File.executable?('/sbin/sysctl')
-    IO.popen(%w[/sbin/sysctl -n hw.ncpu]).read.to_i
-  else
-    puts 'Unknown platform: ' + RbConfig::CONFIG['target_os']
-    puts 'Assuming 1 processor.'
-    1
-  end
-rescue => e
-  puts "#{e}: assuming 1 processor."
-  1
-end
-
 # mandatory headers
 header('float.h')
 header('ruby.h')
@@ -96,9 +41,4 @@ have_header('pthread.h') # sets HAVE_PTHREAD_H if found
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-count = processor_count
-count = 1 if count < 0   # sanity check
-count = 32 if count > 32 # sanity check
-RbConfig::MAKEFILE_CONFIG['DEFS'] += "-DPROCESSOR_COUNT=#{count}"
-
 create_makefile('ext')

data/ruby/command-t/matcher.c

@@ -139,6 +139,7 @@ VALUE CommandTMatcher_sorted_matches_for(int argc, VALUE *argv, VALUE self)
 
     // check optional options has for overrides
     VALUE limit_option = CommandT_option_from_hash("limit", options);
+    VALUE threads_option = CommandT_option_from_hash("threads", options);
 
     // get unsorted matches
     VALUE scanner = rb_iv_get(self, "@scanner");
@@ -152,14 +153,12 @@ VALUE CommandTMatcher_sorted_matches_for(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eNoMemError, "memory allocation failed");
 
     int err;
-    int thread_count = 1;
+    long thread_count = NIL_P(threads_option) ? 1 : NUM2LONG(threads_option);
 
 #ifdef HAVE_PTHREAD_H
 #define THREAD_THRESHOLD 1000 /* avoid the overhead of threading when search space is small */
     if (path_count < THREAD_THRESHOLD)
         thread_count = 1;
-    else
-        thread_count = PROCESSOR_COUNT; // passed in as preprocessor macro
     pthread_t *threads = malloc(sizeof(pthread_t) * thread_count);
     if (!threads)
         rb_raise(rb_eNoMemError, "memory allocation failed");

data/ruby/command-t/util.rb

@@ -0,0 +1,112 @@
+# Copyright 2013 Wincent Colaiuta. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+module CommandT
+  module Util
+    class << self
+      def processor_count
+        @processor_count ||= begin
+          count = processor_count!
+          count = 1 if count < 1   # sanity check
+          count = 32 if count > 32 # sanity check
+          count
+        end
+      end
+
+    private
+
+      # This method derived from:
+      #
+      #   https://github.com/grosser/parallel/blob/d11e4a3c8c1a/lib/parallel.rb
+      #
+      # Number of processors seen by the OS and used for process scheduling.
+      #
+      # * AIX: /usr/sbin/pmcycles (AIX 5+), /usr/sbin/lsdev
+      # * BSD: /sbin/sysctl
+      # * Cygwin: /proc/cpuinfo
+      # * Darwin: /usr/bin/hwprefs, /usr/sbin/sysctl
+      # * HP-UX: /usr/sbin/ioscan
+      # * IRIX: /usr/sbin/sysconf
+      # * Linux: /proc/cpuinfo
+      # * Minix 3+: /proc/cpuinfo
+      # * Solaris: /usr/sbin/psrinfo
+      # * Tru64 UNIX: /usr/sbin/psrinfo
+      # * UnixWare: /usr/sbin/psrinfo
+      #
+      # Copyright (C) 2013 Michael Grosser <michael@grosser.it>
+      #
+      # Permission is hereby granted, free of charge, to any person obtaining
+      # a copy of this software and associated documentation files (the
+      # "Software"), to deal in the Software without restriction, including
+      # without limitation the rights to use, copy, modify, merge, publish,
+      # distribute, sublicense, and/or sell copies of the Software, and to
+      # permit persons to whom the Software is furnished to do so, subject to
+      # the following conditions:
+      #
+      # The above copyright notice and this permission notice shall be
+      # included in all copies or substantial portions of the Software.
+      #
+      # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+      # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+      # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+      # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+      # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+      #
+      def processor_count!
+        os_name = RbConfig::CONFIG['target_os']
+        if os_name =~ /mingw|mswin/
+          require 'win32ole'
+          result = WIN32OLE.connect('winmgmts://').ExecQuery(
+              'select NumberOfLogicalProcessors from Win32_Processor')
+          result.to_enum.collect(&:NumberOfLogicalProcessors).reduce(:+)
+        elsif File.readable?('/proc/cpuinfo')
+          IO.read('/proc/cpuinfo').scan(/^processor/).size
+        elsif File.executable?('/usr/bin/hwprefs')
+          IO.popen(%w[/usr/bin/hwprefs thread_count]).read.to_i
+        elsif File.executable?('/usr/sbin/psrinfo')
+          IO.popen('/usr/sbin/psrinfo').read.scan(/^.*on-*line/).size
+        elsif File.executable?('/usr/sbin/ioscan')
+          IO.popen(%w[/usr/sbin/ioscan -kC processor]) do |out|
+            out.read.scan(/^.*processor/).size
+          end
+        elsif File.executable?('/usr/sbin/pmcycles')
+          IO.popen(%w[/usr/sbin/pmcycles -m]).read.count("\n")
+        elsif File.executable?('/usr/sbin/lsdev')
+          IO.popen(%w[/usr/sbin/lsdev -Cc processor -S 1]).read.count("\n")
+        elsif File.executable?('/usr/sbin/sysconf') and os_name =~ /irix/i
+          IO.popen(%w[/usr/sbin/sysconf NPROC_ONLN]).read.to_i
+        elsif File.executable?('/usr/sbin/sysctl')
+          IO.popen(%w[/usr/sbin/sysctl -n hw.ncpu]).read.to_i
+        elsif File.executable?('/sbin/sysctl')
+          IO.popen(%w[/sbin/sysctl -n hw.ncpu]).read.to_i
+        else # unknown platform
+          1
+        end
+      rescue
+        1
+      end
+    end
+  end # module Util
+end # module commandT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command-t
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: 1.6.1
 platform: ruby
 authors:
 - Wincent Colaiuta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Command-T provides a fast, intuitive mechanism for opening files with a
@@ -51,6 +51,7 @@ files:
 - ruby/command-t/scanner.rb
 - ruby/command-t/settings.rb
 - ruby/command-t/stub.rb
+- ruby/command-t/util.rb
 - ruby/command-t/vim/path_utilities.rb
 - ruby/command-t/vim/screen.rb
 - ruby/command-t/vim/window.rb