command-t 1.6.1 → 1.7

data/ruby/command-t/settings.rb

@@ -1,4 +1,4 @@
-# Copyright 2010 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2014 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:
@@ -24,54 +24,105 @@
 module CommandT
   # Convenience class for saving and restoring global settings.
   class Settings
+    # Settings which apply globally and so must be manually saved and restored
+    GLOBAL_SETTINGS = %w[
+      equalalways
+      hlsearch
+      insertmode
+      report
+      showcmd
+      sidescroll
+      sidescrolloff
+      timeout
+      timeoutlen
+      updatetime
+    ]
+
+    # Settings which can be made locally to the Command-T buffer or window
+    LOCAL_SETTINGS = %w[
+      bufhidden
+      buflisted
+      buftype
+      colorcolumn
+      concealcursor
+      conceallevel
+      cursorline
+      foldcolumn
+      foldlevel
+      list
+      modifiable
+      number
+      relativenumber
+      spell
+      swapfile
+      synmaxcol
+      textwidth
+      wrap
+    ]
+
+    KNOWN_SETTINGS = GLOBAL_SETTINGS + LOCAL_SETTINGS
+
     def initialize
-      save
+      @settings = []
     end
 
-    def save
-      @timeoutlen     = get_number 'timeoutlen'
-      @report         = get_number 'report'
-      @sidescroll     = get_number 'sidescroll'
-      @sidescrolloff  = get_number 'sidescrolloff'
-      @timeout        = get_bool 'timeout'
-      @equalalways    = get_bool 'equalalways'
-      @hlsearch       = get_bool 'hlsearch'
-      @insertmode     = get_bool 'insertmode'
-      @showcmd        = get_bool 'showcmd'
+    def set(setting, value)
+      raise "Unknown setting #{setting}" unless KNOWN_SETTINGS.include?(setting)
+
+      case value
+      when TrueClass, FalseClass
+        @settings.push([setting, get_bool(setting)]) if global?(setting)
+        set_bool setting, value
+      when Numeric
+        @settings.push([setting, get_number(setting)]) if global?(setting)
+        set_number setting, value
+      when String
+        @settings.push([setting, get_string(setting)]) if global?(setting)
+        set_string setting, value
+      end
     end
 
     def restore
-      set_number 'timeoutlen', @timeoutlen
-      set_number 'report', @report
-      set_number 'sidescroll', @sidescroll
-      set_number 'sidescrolloff', @sidescrolloff
-      set_bool 'timeout', @timeout
-      set_bool 'equalalways', @equalalways
-      set_bool 'hlsearch', @hlsearch
-      set_bool 'insertmode', @insertmode
-      set_bool 'showcmd', @showcmd
+      @settings.each do |setting, value|
+        case value
+        when TrueClass, FalseClass
+          set_bool setting, value
+        when Numeric
+          set_number setting, value
+        when String
+          set_string setting, value
+        end
+      end
     end
 
   private
 
-    def get_number setting
-      ::VIM::evaluate("&#{setting}").to_i
+    def global?(setting)
+      GLOBAL_SETTINGS.include?(setting)
     end
 
-    def get_bool setting
+    def get_bool(setting)
       ::VIM::evaluate("&#{setting}").to_i == 1
     end
 
-    def set_number setting, value
-      ::VIM::set_option "#{setting}=#{value}"
+    def get_number(setting)
+      ::VIM::evaluate("&#{setting}").to_i
     end
 
-    def set_bool setting, value
-      if value
-        ::VIM::set_option setting
-      else
-        ::VIM::set_option "no#{setting}"
-      end
+    def get_string(name)
+      ::VIM::evaluate("&#{name}").to_s
+    end
+
+    def set_bool(setting, value)
+      command = global?(setting) ? 'set' : 'setlocal'
+      setting = value ? setting : "no#{setting}"
+      ::VIM::command "#{command} #{setting}"
+    end
+
+    def set_number(setting, value)
+      command = global?(setting) ? 'set' : 'setlocal'
+      ::VIM::command "#{command} #{setting}=#{value}"
     end
+    alias set_string set_number
   end # class Settings
 end # module CommandT

data/ruby/command-t/util.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Wincent Colaiuta. All rights reserved.
+# Copyright 2013-2014 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:
@@ -21,6 +21,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+require 'rbconfig'
+
 module CommandT
   module Util
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command-t
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: '1.7'
 platform: ruby
 authors:
 - Wincent Colaiuta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Command-T provides a fast, intuitive mechanism for opening files with a
@@ -21,22 +21,25 @@ extensions:
 - ruby/command-t/extconf.rb
 extra_rdoc_files: []
 files:
-- README.txt
-- LICENSE
 - Gemfile
+- LICENSE
+- README.txt
 - Rakefile
+- doc/command-t.txt
+- doc/tags
+- plugin/command-t.vim
+- ruby/command-t/Makefile
 - ruby/command-t/controller.rb
 - ruby/command-t/depend
 - ruby/command-t/ext.bundle
 - ruby/command-t/ext.c
 - ruby/command-t/ext.h
 - ruby/command-t/extconf.rb
+- ruby/command-t/finder.rb
 - ruby/command-t/finder/buffer_finder.rb
 - ruby/command-t/finder/file_finder.rb
 - ruby/command-t/finder/jump_finder.rb
 - ruby/command-t/finder/tag_finder.rb
-- ruby/command-t/finder.rb
-- ruby/command-t/Makefile
 - ruby/command-t/match.c
 - ruby/command-t/match.h
 - ruby/command-t/match_window.rb
@@ -44,20 +47,21 @@ files:
 - ruby/command-t/matcher.h
 - ruby/command-t/prompt.rb
 - ruby/command-t/ruby_compat.h
+- ruby/command-t/scanner.rb
 - ruby/command-t/scanner/buffer_scanner.rb
 - ruby/command-t/scanner/file_scanner.rb
+- ruby/command-t/scanner/file_scanner/find_file_scanner.rb
+- ruby/command-t/scanner/file_scanner/ruby_file_scanner.rb
+- ruby/command-t/scanner/file_scanner/watchman_file_scanner.rb
 - ruby/command-t/scanner/jump_scanner.rb
 - ruby/command-t/scanner/tag_scanner.rb
-- ruby/command-t/scanner.rb
 - ruby/command-t/settings.rb
 - ruby/command-t/stub.rb
 - ruby/command-t/util.rb
+- ruby/command-t/vim.rb
 - ruby/command-t/vim/path_utilities.rb
 - ruby/command-t/vim/screen.rb
 - ruby/command-t/vim/window.rb
-- ruby/command-t/vim.rb
-- doc/command-t.txt
-- plugin/command-t.vim
 homepage: https://wincent.com/products/command-t
 licenses: []
 metadata: {}
@@ -67,17 +71,17 @@ require_paths:
 - ruby
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Command-T plug-in for VIM.