VimMate 0.6.5 → 0.6.6

data/CHANGELOG

@@ -1,5 +1,21 @@
 = Changelog
 
+=== Version 0.6.6
+- # 15198: After a file was opened in Vim, the focus was not in Vim, so if you
+  started typing, you would type in the file list, not in Vim. This has been
+  corrected. Thanks to Gerda Shank for the bug report.
+- # 14387: A new option is now available to start a login shell by default in
+  the terminal window. The option :terminals_login_shell is set to false by
+  default. If set to true, it will launch the $SHELL command if defined, the
+  shell defined in /etc/passwd if defined and /bin/sh otherwise. In all cases,
+  it will pass the -l option to the shell. Thanks to Pablo Castellazzi for the
+  patch.
+- # 14886: When filtering, directories that contain no matching files are now
+  automatically hidden. Also, a new option is now available to automatically
+  expand the file tree when filtering. The option is
+  :files_auto_expand_on_filter and is set to false by default. Thanks to
+  Stefan for the original patch.
+
 === Version 0.6.5
 - VimMate would crash when VTE was not present when using shortcut keys
 - Changed some shortcut keys:

data/Rakefile

@@ -71,6 +71,26 @@ desc 'Remove rdoc and package'
 task :clobber => [:clobber_rdoc, :clobber_package]
 
 desc 'Upload rdoc to Rubyforge'
-task :upload_rdoc => [:rdoc] do
+task :upload_rdoc => [:add_tracker] do
   sh "scp -r html bennygui@rubyforge.org:/var/www/gforge-projects/vimmate"
 end
+
+desc 'Add google tracker'
+task :add_tracker => [:rdoc] do
+  Dir['html/**/*.html'].each do |file|
+    h = File.read(file).sub(/<\/body>/, <<-EOS)
+      <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+      </script>
+      <script type='text/javascript'>
+      //<![CDATA[
+      _uacct = "UA-2894512-3";
+      if (typeof(window['urchinTracker']) != "undefined") { urchinTracker(); }
+      //]]>
+      </script>		
+      </body>
+    EOS
+    open(file, 'w') do |f|
+      f.write(h)
+    end
+  end
+end

data/lib/vimmatelib/config.rb

@@ -44,6 +44,7 @@ module VimMate
       :file_hover_selection => false,
       :file_directory_separator => true,
       :files_filter_active => true,
+      :files_auto_expand_on_filter => false,
       :files_refresh_interval => 10,
       :files_default_open_in_tabs => true,
       :files_use_ellipsis => true,
@@ -61,6 +62,7 @@ module VimMate
       :terminals_audible_bell => false,
       :terminals_visible_bell => false,
       :terminals_autoexec => "",
+      :terminals_login_shell => false,
       :subversion_enabled => true,
     }.freeze
 

data/lib/vimmatelib/files_window.rb

@@ -46,6 +46,8 @@ module VimMate
     TYPE = 4
     # Column used to store the status of the file
     STATUS = 5
+    # Visiblity of row
+    VISIBLE = 6    
     # Type of row: file
     TYPE_FILE = 0
     # Type of row: directory
@@ -67,7 +69,8 @@ module VimMate
                                            Gdk::Pixbuf,
                                            String,
                                            Fixnum,
-                                           String)
+                                           String,
+                                           FalseClass)
       @gtk_tree_store.set_sort_column_id(SORT)
 
       # Filtered Tree Store
@@ -75,14 +78,8 @@ module VimMate
       @gtk_filtered_tree_model.set_visible_func do |model, iter|
         if @filter_string.nil? or @filter_string.empty?
           true
-        elsif iter[TYPE] == TYPE_DIRECTORY or iter[TYPE] == TYPE_SEPARATOR
-          true
         else
-          if not iter[NAME] or iter[NAME].index(@filter_string)
-            true
-          else
-            false
-          end
+          iter[VISIBLE]
         end
       end
       
@@ -271,14 +268,51 @@ module VimMate
 
     # Set a filter: files must contain this string
     def filter=(filter)
+      if filter.empty?
+        clear_filter
+        return
+      end
       @filter_string = filter
+      
+      # Filter tree view so only directories and separators with matching
+      # elements are set visible
+      visible_path = Hash.new(false)
+      
+      @gtk_tree_store.each do |model,path,iter|
+        if iter[NAME] and iter[TYPE] == TYPE_FILE
+          if iter[VISIBLE] = iter[NAME].index(@filter_string)
+            begin
+              visible_path[path.to_s] = true
+            end while path.up!
+          end
+        else
+          iter[VISIBLE] = true
+          if iter[TYPE] == TYPE_SEPARATOR
+            visible_path[path.to_s] = true
+          end
+        end
+      end
+
+      @gtk_tree_store.each do |model,path,iter|
+        if not visible_path[path.to_s]
+          iter[VISIBLE] = false
+          if iter[TYPE] == TYPE_DIRECTORY and Config[:file_directory_separator]
+            if iter.next!
+              iter[VISIBLE] = false
+            end
+          end
+        end
+      end
+
       @gtk_filtered_tree_model.refilter
+      @gtk_tree_view.expand_all if Config[:files_auto_expand_on_filter]
     end
 
     # Clear the filter
     def clear_filter
       @filter_string = ""
       @gtk_filtered_tree_model.refilter
+      @gtk_tree_view.collapse_all if Config[:files_auto_expand_on_filter]
       filter
     end
 

data/lib/vimmatelib/terminals_window.rb

@@ -145,7 +145,16 @@ module VimMate
       gtk_terminal.signal_connect("window-title-changed") do |terminal|
         @gtk_notebook.set_tab_label_text(terminal, terminal.window_title)
       end
-      gtk_terminal.pid = gtk_terminal.fork_command
+      if (Config[:terminals_login_shell])
+       begin
+         require 'etc'
+       rescue LoadError
+       end
+       shell = (ENV["SHELL"] || Etc.getpwnam(Etc.getlogin).shell rescue nil || "/bin/sh") 
+       gtk_terminal.pid = gtk_terminal.fork_command(shell, ["-l"])
+      else
+        gtk_terminal.pid = gtk_terminal.fork_command
+      end
       gtk_terminal.feed_child(Config[:terminals_autoexec])
       gtk_terminal.show
       gtk_terminal

data/lib/vimmatelib/version.rb

@@ -24,6 +24,6 @@ SOFTWARE.
 module VimMate
 
   # VimMate's version
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end
 

data/lib/vimmatelib/vim_window.rb

@@ -68,6 +68,7 @@ module VimMate
         raise "Unknow open kind: #{kind}"
       end
       `gvim --servername #{@vim_server_name} --remote-send '<ESC><ESC><ESC>:buffer #{path}<CR>'`
+      focus_vim
       self
     end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: VimMate
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
-date: 2007-09-29 00:00:00 -04:00
+  version: 0.6.6
+date: 2007-11-03 00:00:00 -04:00
 summary: VimMate is a graphical add-on to Vim with IDE-like features.
 require_paths: 
 - lib