command-t 1.12 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d28350a8f515cb7471b5fa00a9074b0721b6c30
-  data.tar.gz: 246ebc958cfc16da936f2a71c72414505e8bd159
+  metadata.gz: 46092d285a715fa372926a9ba7a6c9c52fd3bd83
+  data.tar.gz: 6cbb54f1c5e3be27a255812b04d82119bc179a21
 SHA512:
-  metadata.gz: 694364fc9b561d94529c0bebb1e02491b641b9fefb0cb02f942268affea2672ea6776f8b8b1074ca15d9d3fe09a7696f8d7d7a9cd1062c686ebdb61967a1a96c
-  data.tar.gz: cf34b852f36ef42b54b29e70ce2e9e30949a598a28fce5ab16aaa9b29068eef222df4412a3107490d678d298e5dff522327727e617b79f3cb698349ae6571898
+  metadata.gz: 370557a99ef3c9410797bf1abb003ede91f1e6c4177ea7ef811fcbf7c0ed4be846a6f0c01ea7125cce29aa7b8866dc9185e784b0ccce0a55277ae73c80ec3504
+  data.tar.gz: a0d3d1e129b3de1620947edd09bf22baab78219484f180b933e4dbcd65351b70ff75c3c006abce461b7e92805a1ad9a257d4b15b07a7f7ffadd45b796ac2fd06

data/README.txt

@@ -1291,6 +1291,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.13 (29 April 2015)
+
+- avoid "W10: Warning: Changing a readonly file" when starting Vim in
+  read-only mode (ie. as `view` or with the `-R` option)
+- fix infinite loop on |<Tab>| (regression introduced in 1.12)
+
 1.12 (9 April 2015)
 
 - add |:CommandTLoad| command

data/doc/command-t.txt

@@ -1291,6 +1291,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.13 (29 April 2015)
+
+- avoid "W10: Warning: Changing a readonly file" when starting Vim in
+  read-only mode (ie. as `view` or with the `-R` option)
+- fix infinite loop on |<Tab>| (regression introduced in 1.12)
+
 1.12 (9 April 2015)
 
 - add |:CommandTLoad| command

data/plugin/command-t.vim

@@ -1,7 +1,7 @@
-" Copyright 2010-2014 Greg Hurrell. All rights reserved.
+" Copyright 2010-2015 Greg Hurrell. All rights reserved.
 " Licensed under the terms of the BSD 2-clause license.
 
-if exists("g:command_t_loaded") || &cp
+if exists('g:command_t_loaded') || &cp
   finish
 endif
 let g:command_t_loaded = 1
@@ -14,10 +14,10 @@ command! -nargs=? -complete=dir CommandT call commandt#CommandTShowFileFinder(<q
 command! CommandTFlush call commandt#CommandTFlush()
 command! CommandTLoad call commandt#CommandTLoad()
 
-if !hasmapto(':CommandT<CR>') && maparg('<Leader>t', 'n') == ''
+if !hasmapto(':CommandT<CR>') && maparg('<Leader>t', 'n') ==# ''
   silent! nnoremap <unique> <silent> <Leader>t :CommandT<CR>
 endif
 
-if !hasmapto(':CommandTBuffer<CR>') && maparg('<Leader>b', 'n') == ''
+if !hasmapto(':CommandTBuffer<CR>') && maparg('<Leader>b', 'n') ==# ''
   silent! nnoremap <unique> <silent> <Leader>b :CommandTBuffer<CR>
 endif

data/ruby/command-t.rb

@@ -1,9 +1,10 @@
-# Copyright 2014 Greg Hurrell. All rights reserved.
+# Copyright 2014-2015 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 module CommandT
   autoload :Controller,    'command-t/controller'
   autoload :Finder,        'command-t/finder'
+  autoload :Metadata,      'command-t/metadata'
   autoload :MRU,           'command-t/mru'
   autoload :MatchWindow,   'command-t/match_window'
   autoload :PathUtilities, 'command-t/path_utilities'

data/ruby/command-t/controller.rb

@@ -202,7 +202,7 @@ module CommandT
     def cancel
       hide
     end
-    guard :toggle_focus
+    guard :cancel
 
     def select_next
       @match_window.select_next

data/ruby/command-t/extconf.rb

@@ -1,6 +1,8 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-2015 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
+require 'pathname'
+
 begin
   require 'mkmf'
 rescue LoadError
@@ -45,3 +47,20 @@ end
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 create_makefile('ext')
+
+# Create `metadata.rb`, which is used to diagnose installation problems.
+basedir = Pathname.new(__FILE__).dirname
+(basedir + 'metadata.rb').open('w') do |f|
+  f.puts <<-END.gsub(/^    /, '')
+    # This file was generated by #{(basedir + 'extconf.rb').to_s}
+    module CommandT
+      module Metadata
+        EXPECTED_RUBY_VERSION = #{RUBY_VERSION.inspect}
+        EXPECTED_RUBY_PATCHLEVEL = #{
+          defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL.inspect : nil.inspect
+        }
+        UNKNOWN = false
+      end # module Metadata
+    end # module CommandT
+  END
+end

data/ruby/command-t/match_window.rb

@@ -52,6 +52,7 @@ module CommandT
         set 'bufhidden', 'unload' # unload buf when no longer displayed
         set 'buftype', 'nofile'   # buffer is not related to any file
         set 'modifiable', false   # prevent manual edits
+        set 'readonly', false     # avoid W10 "Changing a readonly file"
         set 'swapfile', false     # don't create a swapfile
         set 'wrap', false         # don't soft-wrap
         set 'number', false       # don't show line numbers

data/ruby/command-t/metadata.rb

@@ -0,0 +1,8 @@
+# This file was generated by extconf.rb
+module CommandT
+  module Metadata
+    EXPECTED_RUBY_VERSION = "2.0.0"
+    EXPECTED_RUBY_PATCHLEVEL = 481
+    UNKNOWN = false
+  end # module Metadata
+end # module CommandT

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

@@ -18,10 +18,10 @@ module CommandT
         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?
+          sockname = extract_value(
+            Watchman::Utils.load(get_raw_sockname),
+            'sockname'
+          )
 
           UNIXSocket.open(sockname) do |socket|
             root = Pathname.new(@path).realpath.to_s
@@ -32,7 +32,7 @@ module CommandT
 
               # 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')
+              extract_value(result)
             end
 
             query = ['query', root, {
@@ -42,14 +42,25 @@ module CommandT
             paths = Watchman::Utils.query(query, socket)
 
             # could return error if watch is removed
-            raise WatchmanError, paths['error'] if paths.has_key?('error')
-
-            paths['files']
+            extract_value(paths, 'files')
           end
         rescue Errno::ENOENT, WatchmanError
           # watchman executable not present, or unable to fulfil request
           super
         end
+
+      private
+
+        def extract_value(object, key = nil)
+          raise WatchmanError, object['error'] if object.has_key?('error')
+          object[key]
+        end
+
+        def get_raw_sockname
+          raw_sockname = %x{watchman --output-encoding=bser get-sockname}
+          raise WatchmanError, 'get-sockname failed' if !$?.exitstatus.zero?
+          raw_sockname
+        end
       end # class WatchmanFileScanner
     end # class FileScanner
   end # class Scanner

data/ruby/command-t/settings.rb

@@ -33,6 +33,7 @@ module CommandT
       list
       modifiable
       number
+      readonly
       relativenumber
       spell
       swapfile

data/ruby/command-t/stub.rb

@@ -3,10 +3,13 @@
 
 module CommandT
   class Stub
+    @@expected_version = Metadata::EXPECTED_RUBY_VERSION
+    @@expected_patchlevel = Metadata::EXPECTED_RUBY_PATCHLEVEL
     @@patch_level = defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL : '[unknown]'
     @@load_error = ['command-t.vim could not load the C extension',
                     'Please see INSTALLATION and TROUBLE-SHOOTING in the help',
                     "Vim Ruby version: #{RUBY_VERSION}-p#{@@patch_level}",
+                    "Expected version: #{@@expected_version}-p#{@@expected_patchlevel}",
                     'For more information type:    :help command-t']
 
     [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command-t
 version: !ruby/object:Gem::Version
-  version: '1.12'
+  version: '1.13'
 platform: ruby
 authors:
 - Greg Hurrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Command-T provides a fast, intuitive mechanism for opening files with a
@@ -43,6 +43,7 @@ files:
 - ruby/command-t/match_window.rb
 - ruby/command-t/matcher.c
 - ruby/command-t/matcher.h
+- ruby/command-t/metadata.rb
 - ruby/command-t/mru.rb
 - ruby/command-t/path_utilities.rb
 - ruby/command-t/prompt.rb