vimmate 0.8.1 → 0.9.0

data/README

@@ -51,11 +51,10 @@ To install:
   {VimMate's homepage}[http://vimmate.rubyforge.org/].
 - You now have 3 choices to install VimMate: manually, with Ruby Gems or with
   <tt>setup.rb</tt>:
-  - With Ruby Gems
-    - Simply run <tt>gem install VimMate</tt> .
-  - With <tt>setup.rb</tt>
-    - Simply run <tt>ruby setup.rb</tt> . Run <tt>ruby setup.rb --help</tt> for
-      more information.
+  - With Ruby Gems from GemCutter
+    - Simply run <tt>gem install vimmate --source http://gemcutter.org</tt> .
+  - Build the gem by yourself
+    - Simply run <tt>rake install</tt>
   - Manually
     - Copy the file <tt>bin/vimmate</tt> and the directory
       <tt>lib/vimmatelib</tt> to a directory somewhere in your path.

data/VERSION

@@ -0,0 +1 @@
+0.9.0

data/bin/vimmate

@@ -18,6 +18,10 @@ OptionParser.new do |opts|
     excludes = list
   end
 
+  opts.on_tail('-w', '--no-detach', 'Do not return to the terminal') do
+    @do_not_detach = true
+  end
+
   opts.on_tail("-h", "--help", "Show this help screen") do |string|
     puts opts
     exit
@@ -36,65 +40,14 @@ if File.exists?(local_ignore_file)
   end
 end
 
-# We fork to give back the shell to the user, like Vim
-fork do
+starting = lambda do
   require File.expand_path( File.join( File.dirname(__FILE__), '..', 'config', 'environment'  ) )
   Thread.abort_on_exception = true
 
-  class VimMateApp < ActiveWindow::Application
-    def initialize(opts={})
-      @excludes = opts.delete(:excludes)
-      super
-    end
-    def file_tree
-      files.file_tree
-    end
-    def files
-      controller[:file_filter]
-    end
-    def vim
-      controller[:vim].vim
-    end
-    def add_path(path)
-      file_tree.initial_adding do
-        file_tree.add_path(path)
-      end
-    end
-
-    def post_setup
-      super
-
-      @excludes.each do |rule|
-        file_tree.exclude! rule
-      end unless @excludes.blank?
-
-      # If there are no files given, add the current directory to the file list.
-      # If files are specified on the command line, use them
-      if ARGV.empty?
-        add_path(File.expand_path('.'))
-        files.expand_first_row
-      else
-        ARGV.each do |file|
-          path = File.expand_path(file)
-          add_path(path)
-          #window.vim.open(path, :tab)
-        end
-      end
-    end
-
-    def run
-      GLib::Timeout.add(23) do
-        vim.start
-        false
-      end
-      super
-    end
-  end
-
   icon_path = File.join(  File.dirname(__FILE__), '..', 'images', 'vimmate48.png'  )
   Gtk::Window.set_default_icon(icon_path)
 
-  app = VimMateApp.new(:title => 'VimMate', :main_window => 'VimMate', :excludes => excludes)
+  app = VimMate::App.new(:title => 'VimMate', :main_window => 'VimMate', :excludes => excludes)
   app.start
 
 
@@ -103,3 +56,8 @@ fork do
 
 end
 
+if @do_not_detach
+  starting.call
+else
+  fork { starting.call }
+end

data/config/environment.rb

@@ -1,25 +1,26 @@
 require 'rubygems'
-require 'activesupport'
-
 
 APP_ROOT = File.expand_path( File.join( File.dirname(__FILE__), '..'  ) )
 PROGRAM_NAME = 'vim_mate'
 
-#ActiveSupport::Dependencies::logger = Logger.new( File.expand_path('log/dependencies.log') )
-#ActiveSupport::Dependencies::log_activity = true
-ActiveSupport::Dependencies::load_paths << File.join(APP_ROOT, "lib")
-ActiveSupport::Dependencies::load_paths << File.join(APP_ROOT, "controllers")
-ActiveSupport::Dependencies::load_paths << File.join(APP_ROOT, "lib/vim_mate")
+require 'gtk2'
+require 'i18n' # activesupport needs this
+require 'active_support'
+require 'active_support/core_ext/object'
+require 'yaml'# for DotFile
 
-VimMate::Requirer.require_exit('gtk2')
-VimMate::Requirer.require_exit('libglade2')
+$:.unshift APP_ROOT
 
+require 'lib/active_window'
+require 'lib/listed_file'
+require 'lib/listed_directory'
+require 'lib/file_tree_store.rb'
+require 'lib/filtered_file_tree_store.rb'
+require 'lib/vim'
+require 'lib/vim_mate'
 
-#require 'vimmatelib/file_tree_view'
-require_dependency 'gtk_thread_helper'
-require_dependency 'plugins'
 
-require_dependency 'active_window'
+require 'gtk_thread_helper'
 
 %w(
   file_created file_modified file_deleted file_opened
@@ -31,5 +32,5 @@ require_dependency 'active_window'
 end
 
 Dir[File.join(APP_ROOT, 'controllers', '*_controller.rb' )].each do |controller_path|
-  require_dependency File.basename(controller_path)
+  require controller_path
 end

data/controllers/config_controller.rb

@@ -0,0 +1,91 @@
+class ConfigController < ActiveWindow::Controller
+
+  attr_reader :boxes, :fields
+
+  def setup
+    @fields = {}
+    @boxes = []
+    with_options(:pack => general_config) do |general|
+      general.create_field(:files_use_search, :label => 'Use Search')
+      general.create_field(:files_use_ellipsis, :label => 'Shorten Filenames')
+    end
+  end
+
+  def save_settings
+    VimMate::Config::DEFAULT_CONFIG.keys.each do |key|
+      unless (new_val = val_of(key)).nil?
+        VimMate::Config.config[key] = new_val
+      end
+    end
+    VimMate::Config.write_config
+    close_window
+  end
+
+  def reset_settings
+    boxes.each(&:destroy)
+    setup
+    config_window.show_all
+  end
+
+  def open_window
+    config_window.show_all
+  end
+
+  def close_window
+    config_window.hide
+  end
+
+  private
+
+  def create_field(key, options = {})
+    val = VimMate::Config[key]
+
+    box = Gtk::HBox.new(true, 10)
+      label = Gtk::Label.new options.delete(:label) || key.to_s.humanize
+      label.xalign = 1
+    box.pack_start label, true, true 
+      field = field_for val
+      fields[key] = field
+    box.pack_start field, true, false
+
+    boxes << box
+
+    container = options.delete(:pack) || general_config
+    container.pack_start box, false, false
+  end
+
+  def val_of(key)
+    return unless field = fields[key]
+    case VimMate::Config::DEFAULT_CONFIG[key]
+    when String
+      field.text
+    when Fixnum
+      field.value.to_i
+    when Float
+      field.value.to_f
+    when FalseClass, TrueClass
+      field.active?
+    end
+  end
+
+  def field_for(val)
+    case val
+    when String
+      # TODO make "textarea" for more than 42 chars
+      e = Gtk::Entry.new
+      e.editable = true
+      e.text = val
+      e
+    when Fixnum, Float
+      Gtk::SpinButton.new(
+        Gtk::Adjustment.new(val,0,10000,1,10,1),
+        1,0)
+    when FalseClass, TrueClass
+      e = Gtk::CheckButton.new
+      e.active = val
+      e
+    else
+     Gtk::Label.new(val.to_s)
+    end
+  end
+end

data/controllers/file_filter_controller.rb

@@ -71,8 +71,7 @@ class FileFilterController < ActiveWindow::Controller
     file_tree_view.expand_row(Gtk::TreePath.new("0"), false)
   end
 
-  def button_pressed(given)
-    event = given[:event]
+  def button_pressed(given, event)
     if event.kind_of? Gdk::EventButton and event.button == 3
       path = file_tree_view.get_path_at_pos(event.x, event.y)
       file_tree_view.selection.select_path(path[0]) if path

data/controllers/vim_mate_controller.rb

@@ -28,8 +28,7 @@ class VimMateController < ActiveWindow::Controller
     #end
   end
 
-  def pressed_key(given)
-    return unless event = given[:event]
+  def pressed_key(given, event)
     if event.state & Gdk::Window::ModifierType::CONTROL_MASK != 0
       if event.state & Gdk::Window::ModifierType::SHIFT_MASK != 0
         case event.keyval

data/lib/active_window/application.rb

@@ -2,19 +2,29 @@ class ActiveWindow::Application
   include ActiveSupport::Callbacks
   define_callbacks :after_initialize
 
-  attr_accessor :controller, :database, :glade, :window
+  attr_accessor :controller, :database, :window
+  attr_reader :builder
+
+  def self.widget(*widgets)
+    widgets.each do |widget|
+      name = widget.to_s.camelize
+      define_method widget do
+        builder[name]
+      end
+    end
+  end
   
   def widget(name)
-    glade[name]
+    builder[name]
   end
   
   def initialize(options = {})
-    @glade = GladeXML.new(find_glade, nil, options[:title] || 'application' )
+    @builder = Gtk::Builder.new
+    @builder.add_from_file(find_view)
     @window = widget(options[:main_window] || 'main_window')
     @window.signal_connect("destroy") { Gtk.main_quit }
-    @dot_file_prefs = DotFile.read
+    @dot_file_prefs = ActiveWindow::DotFile.read
     @database = options[:database]
-    define_widget_readers
     run_callbacks :after_initialize
   end
 
@@ -49,18 +59,11 @@ class ActiveWindow::Application
        name = klass.to_s.sub('Controller','').underscore.to_sym # eg MyFirstController -> :my_first
        controller[name] = ctrl
     end
-    
-    glade.signal_autoconnect_full do |source, target, signal, handler, data|
-      # for example:
-      # source  : instance of Gtk::ImageMenuItem
-      # target  : nil
-      # signal  : activate, clicked, pressed, etc.
-      # handler : window.close, which would call WindowController.close()
-      # data    : nil
-      #puts [source, target, signal, handler, data].inspect
-      source.signal_connect(signal) { |widget,event| self.dispatch(handler, :source => source, :target => target, :signal => signal, :handler => handler, :data => data, :widget => widget, :event => event) }
-      #source.signal_connect(signal) { self.(handler, data) }
+
+    builder.connect_signals do |handler_name|
+      dispatch(handler_name)
     end
+
     post_setup
   end
   
@@ -71,10 +74,10 @@ class ActiveWindow::Application
     end
   end
   
+  ## gets a handler like "config.reset_settings"
+  ## returns the method (reset_settings) of the controller (ConfigController) to use as a callback
   ##
-  ## dispatch a signal to the correct controller
-  ##
-  def dispatch(handler, event)
+  def dispatch(handler)
     controller_name,action = handler.to_s.split('.')
     unless controller_name and action
       return(error "cannot parse handler '%s'" % handler)
@@ -92,12 +95,6 @@ class ActiveWindow::Application
     end
     
     method = ctrl.method(action)
-    #puts "calling %s.%s" % [controller_name.camelize, action]
-    if method.arity == 0
-      method.call
-    else
-      method.call(event)
-    end
   end
 
 
@@ -111,27 +108,16 @@ class ActiveWindow::Application
     puts msg
   end
   
-  def find_glade
-    Dir.glob("#{views_directory}/*.glade") do |f|
+  # TODO find the *.ui file according to app name or whatever
+  def find_view
+    Dir.glob("#{views_directory}/*.ui") do |f|
       return f
     end
-    raise "could not find a .glade file in #{views_directory}"
+    raise "could not find a .ui file in #{views_directory}"
   end
 
   def views_directory
     File.join(APP_ROOT, 'views')
   end
 
-  def define_widget_readers
-    glade.widget_names.each do |widget|
-      meth = widget.underscore
-      instance_eval <<-EOEVAL
-        @#{meth} = glade['#{widget}']
-        def #{meth}
-          @#{meth}
-        end
-      EOEVAL
-    end
-  end
-  
 end

data/lib/active_window/controller.rb

@@ -1,5 +1,4 @@
-# require 'libglade2'
-# require 'gtk2'
+require 'singleton'
 
 class ActiveWindow::Controller
   include Singleton

data/lib/active_window/filtered_active_tree_store.rb

@@ -12,6 +12,16 @@ module ActiveWindow
     define_callbacks :before_filter_applied, :after_filter_applied
     define_callbacks :before_clear_filter, :after_clear_filter
 
+  # BETTER:
+  #
+  # class FilteredFileStore < ActiveTreeStore.filter 
+  #   returns new anonymous class which inherits from Gtk::TreeModelFilter 
+  #  we can inherit from -- like Struct.new
+  #  .filter is a class method the ActiveTreeStore got extended with
+  # end 
+  # the #add stuff down there we could replace with GTK's signals
+  #   =>
+
     def self.inherited(child_class)
       unfiltered_class_name = child_class.name.sub(/^Filtered/,'')
       unfiltered_class = unfiltered_class_name.constantize
@@ -53,6 +63,7 @@ module ActiveWindow
     def clear_filter
       run_callbacks :before_clear_filter
       @filter_string = ''
+      @filtering = false
       @found_count = -1
       refilter
       run_callbacks :after_clear_filter
@@ -65,8 +76,11 @@ module ActiveWindow
 
     # Iterate over child model and set visible column according to #iter_visible?
     def apply_filter
+      @filtering = true
       run_callbacks :before_filter_applied
       @found_count = 0
+      # we could traverse the tree for ourself with #first_iter and TreeIter#next! and #parent,
+      # setting visid to true/false accordingly => less method calls, better control
       child_model.each do |model,path,iter|
         set_visibility_for(iter)
       end
@@ -75,35 +89,41 @@ module ActiveWindow
     end
 
     def filtered?
-      !filter_string.blank?
+      @filtering
     end
     alias_method :filter, :filter_string
     alias_method :filter=, :filter_string=
     alias_method :filtering?, :filtered?
 
     def set_visibility_for(iter)
-      visid = self.class.column_id[:visible]
-      unless filtering?
-        iter[ visid ] = true
-      else
+      visid = visibility_column
+      vis = true
+      if filtering?
         if iter_visible?(iter) # iter matches - mark it and all parents as visible
           @found_count += 1
-          iter[ visid ] = true
+          vis = true
           i = iter
           while i = i.parent
             i[ visid ] = true
           end
         else
-          iter[ visid ] = false
+          vis = false
         end
       end
+      iter[ visid ] = vis
+      iter
+    end
+
+    def visibility_column
+      self.class.column_id[:visible]
     end
 
     private
 
     def setup_filter
+      visid = visibility_column
       set_visible_func do |model, iter|
-        !filtered? || iter[ self.class.column_id[:visible] ]
+        !filtering? || iter[ visid ]
       end
       child_model.filtered_model = self
       clear_filter

data/lib/active_window.rb

@@ -1,8 +1,16 @@
 module ActiveWindow
-
 end
-require_dependency 'active_window/signal'
-require_dependency 'active_window/active_tree_store/columns'
-require_dependency 'active_window/active_tree_store/index'
-require_dependency 'active_window/active_tree_store/extentions'
-require_dependency 'active_window/filtered_active_tree_store'
+
+$:.unshift File.dirname(__FILE__)
+
+require 'active_window/signal'
+require 'active_window/listed_item'
+require 'active_window/controller'
+require 'active_window/dot_file'
+require 'active_window/active_column'
+require 'active_window/active_tree_store/index'
+require 'active_window/active_tree_store/columns'
+require 'active_window/active_tree_store/extentions' # must be _extensions
+require 'active_window/active_tree_store'
+require 'active_window/filtered_active_tree_store'
+require 'active_window/application'

data/lib/vim.rb

@@ -0,0 +1,9 @@
+module Vim
+end
+
+require 'vim/buffers.rb'
+require 'vim/netbeans.rb'
+require 'vim/integration.rb'
+
+
+

data/lib/vim_mate/app.rb

@@ -0,0 +1,56 @@
+module VimMate
+  class App < ActiveWindow::Application
+    def initialize(opts={})
+      @excludes = opts.delete(:excludes)
+      super
+    end
+    def file_tree
+      files.file_tree
+    end
+    def files
+      controller[:file_filter]
+    end
+    def vim
+      controller[:vim].vim
+    end
+
+    widget :file_tree_view
+    widget :tree_scroller
+    widget :main_pane
+    widget :general_config
+    widget :files_filter_button
+    widget :files_pane
+    widget :file_popup
+    widget :files_filter_term
+
+    def add_path(path)
+      file_tree.initial_adding do
+        file_tree.add_path(path)
+      end
+    end
+
+    def post_setup
+      super
+
+      @excludes.each do |rule|
+        file_tree.exclude! rule
+      end unless @excludes.blank?
+
+      # If there are no files given, open an empty window
+      # If files are specified on the command line, use them
+      ARGV.each do |file|
+        path = File.expand_path(file)
+        add_path(path)
+        #window.vim.open(path, :tab)
+      end
+    end
+
+    def run
+      GLib::Timeout.add(23) do
+        vim.start
+        false
+      end
+      super
+    end
+  end
+end

data/lib/vim_mate/plugins/inotify/init.rb

@@ -1,4 +1,4 @@
-require_dependency 'lib/INotify'
-require_dependency 'lib/directory'
+require 'lib/INotify'
+require 'lib/directory'
 ListedDirectory.class_eval { include VimMate::Plugin::INotifyDirectory }
 

data/lib/vim_mate/plugins.rb

@@ -1,6 +1,6 @@
 plugin_dir = File.expand_path File.dirname(__FILE__) + '/plugins'
 
 Dir["#{plugin_dir}/*/init.rb"].each do |plugin_init|
-  ActiveSupport::Dependencies::load_paths << File.dirname(plugin_init)
-  require_dependency plugin_init
+  $: << File.dirname(plugin_init)
+  require plugin_init
 end

data/lib/vim_mate/vim_widget.rb

@@ -97,13 +97,15 @@ module VimMate
 
     # Start Vim's window. This must be called after the window which
     # will contain Vim is visible.
+    # FIXME disabled netbeans, crashes to often
     def start
       return if @vim_started
       return unless @gtk_socket
       @vim_started = true
       listen
       fork do
-        exec %Q[#{Executable} --servername #{@vim_server_name} --socketid #{@gtk_socket.id} -nb:localhost:#{port}:#{Password} -S #{extras_source_path}]
+        #exec %Q[#{Executable} --servername #{@vim_server_name} --socketid #{@gtk_socket.id} -nb:localhost:#{port}:#{Password} -S #{extras_source_path}]
+        exec %Q[#{Executable} --servername #{@vim_server_name} --socketid #{@gtk_socket.id} -S #{extras_source_path}]
       end
       self
     end

data/lib/vim_mate.rb

@@ -0,0 +1,12 @@
+module VimMate
+end
+
+$:.unshift File.dirname(__FILE__)
+
+require 'vim_mate/requirer'
+require 'vim_mate/nice_singleton'
+require 'vim_mate/vim_widget'
+require 'vim_mate/config'
+require 'vim_mate/icons'
+require 'vim_mate/plugins'
+require 'vim_mate/app'

data/tasks/gem.rake

@@ -0,0 +1,31 @@
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name =        %q{vimmate}
+    gemspec.summary =     %q{VimMate is a graphical add-on to Vim with IDE-like features.}
+    gemspec.description = %q{
+      VimMate is a graphical add-on to Vim with IDE-like features: it does more
+      than the plain Vim while still being lightweight. Even with the additional
+      features, it stays out of the way for it's main task: editing files with Vim.
+      VimMate adds functionality to Vim by embedding Vim GTK GUI (gVim) within
+      VimMate.
+    }
+    gemspec.email =       %q{niklas+vimmate@lanpartei.de}
+    gemspec.homepage =    %q{http://github.com/niklas/vimmate/}
+    gemspec.authors =     ["Guillaume Benny", "Niklas Hofer", "Stefan Bethge"]
+    gemspec.executables = %w{vimmate}
+    gemspec.require_paths = ["lib"]
+
+
+    # TODO docs would be nice, indeed
+    gemspec.has_rdoc = false
+
+    gemspec.add_dependency 'gtk2', '>= 0.90.5'
+    gemspec.add_dependency 'i18n', '>= 0.5.0'
+    gemspec.add_dependency 'activesupport', '>= 3.0.3'
+
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+end