hilfer 0.9.1 → 0.9.2

data/History.txt

@@ -1,3 +1,51 @@
+2008-04-10 12:27  panic
+
+	* [r3475] trunk/History.txt, trunk/Manifest.txt, trunk/README.txt,
+	  trunk/Rakefile, trunk/TODO, trunk/bin/hilfer, trunk/bin/ssc,
+	  trunk/lib/hilfer/gnome_terminal.rb,
+	  trunk/lib/hilfer/hilfer_config.rb,
+	  trunk/lib/hilfer/hilfer_item.rb,
+	  trunk/lib/hilfer/hilfer_model.rb,
+	  trunk/lib/hilfer/rails_locator.rb,
+	  trunk/lib/hilfer/svn_colours.rb,
+	  trunk/lib/hilfer/tree_viewer.rb,
+	  trunk/lib/hilfer/tree_viewer_window.rb,
+	  trunk/lib/hilfer/version.rb, trunk/lib/hilfer/xterm.rb:
+	  Implement graceful failure for optional dependencies. Move
+	  classes to separate files.
+
+2008-04-02 08:21  panic
+
+	* [r3457] trunk/lib/hilfer/tree_viewer.rb:
+	  alt-q toggles editor shutdown
+
+2008-04-01 21:28  panic
+
+	* [r3456] trunk/Rakefile, trunk/bin/hilfer,
+	  trunk/lib/hilfer/svn_colours.rb,
+	  trunk/lib/hilfer/tree_viewer.rb:
+	  allow loading of svn/client to fail gracefully. output modifier
+	  mask in debug. Don't use -w, because of all the activerecord
+	  verbiage.
+
+2008-04-01 20:21  panic
+
+	* [r3455] trunk/README.txt:
+	  link to RubyForge project from docs pages
+
+2008-04-01 18:37  panic
+
+	* [r3454] trunk/History.txt, trunk/Rakefile:
+	  dependencies were the wrong way round
+
+2008-04-01 18:18  panic
+
+	* [r3453] trunk/Rakefile:
+	  bump version
+	* [r3452] trunk/Rakefile, trunk/bin/hilfer,
+	  trunk/lib/hilfer/tree_viewer.rb:
+	  ruby-gtk is not a gem. find icon properly. fix enter key.
+
 2008-04-01 15:31  panic
 
 	* [r3451] trunk, trunk/History.txt, trunk/Manifest.txt,

data/Manifest.txt

@@ -5,8 +5,15 @@ Rakefile
 TODO
 bin/hilfer
 bin/ssc
+lib/hilfer/gnome_terminal.rb
 lib/hilfer/hilfer-icon.png
+lib/hilfer/hilfer_config.rb
+lib/hilfer/hilfer_item.rb
+lib/hilfer/hilfer_model.rb
 lib/hilfer/rails_locator.rb
 lib/hilfer/scite_editor.rb
 lib/hilfer/svn_colours.rb
 lib/hilfer/tree_viewer.rb
+lib/hilfer/tree_viewer_window.rb
+lib/hilfer/version.rb
+lib/hilfer/xterm.rb

data/README.txt

@@ -1,6 +1,6 @@
 = hilfer
 
-* http://hilfer.rubyforge.org
+Download from RubyForge: http://www.rubyforge.org/projects/hilfer
 
 == DESCRIPTION:
 
@@ -95,7 +95,14 @@ See TODO file
 
 == REQUIREMENTS:
 
-ruby-gtk2, text-format, subversion-ruby
+* ruby-gtk2
+
+=== Optional packages
+
+* text-format for ssc to display extended scite director commands
+* subversion-ruby to display colour highlighted subversion status
+* gnome-terminal executable
+* ActiveSupport to enable rails-specific shortcuts
 
 == INSTALL:
 

data/Rakefile

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'rake/clean'
 require 'hoe'
+require 'lib/hilfer/version.rb'
 
-Hoe.new('hilfer', '0.9.1') do |s|
+Hoe.new('hilfer', Hilfer::VERSION) do |s|
 	s.author     = "John Anderson"
 	s.email      = "john at semiosix dot com"
 	s.extra_deps = [ 'text-format' ]
@@ -11,7 +12,7 @@ end
 desc "Runs Hilfer"
 task :run do |t|
   ARGV.shift()
-  exec "ruby -w -Ilib bin/hilfer -qd #{ARGV.join(' ')}"
+  exec "ruby -Ilib bin/hilfer -dq #{ARGV.join(' ')}"
 end
 
 desc 'Runs irb in this project\'s context'
@@ -21,8 +22,6 @@ task :irb do |t|
   exec "irb -Ilib"
 end
 
-task :svn2cl do |t|
+task :svn2cl => :docs do |t|
   `svn2cl -i --break-before-msg -o History.txt`
 end
-
-task :docs => :svn2cl

data/TODO

@@ -1,6 +1,4 @@
 switch focus to editor when opening files
-check for svn ruby requires
-* and / not working properly - wait for HilferModel in c. Might never happen.
 working sets, like eclipse
 option to connect to existing scite
 Sort by directories, then files. Needs Options.
@@ -14,6 +12,7 @@ HilferWindow < Gtk::Window?
 Separate HilferFileItem and HilferDirItem?
 Auto Refresh from filesystem - FileWatcher
 flatten view
+filter view
 Handle Ctrl-C to save status and options
 move files (drag & drop)
 filters for file types (TreeModelFilter)
@@ -25,6 +24,11 @@ Options dialog
 consolidate model in HilferModel? Not sure if it's worth it.
 use Pathname for HilferItem
 
+Model issues
+------------
+locators don't work unless directories have already been opened.
+* and / not working properly
+
 Maybe
 -----
 

data/bin/hilfer

@@ -1,10 +1,5 @@
 #!/usr/bin/ruby
 
-require 'yaml'
-require 'pathname'
-
-require 'hilfer/tree_viewer.rb'
-
 require 'optparse'
 
 # defaults
@@ -31,229 +26,24 @@ if $options[:debug]
 end
 
 # this must come after options parsing or it tries to eat the options
-require 'gtk2'
+begin
+  require 'gtk2'
+rescue LoadError
+  puts <<EOF
+ruby-gtk2 not available.
+The official site is http://ruby-gnome2.sourceforge.jp
+EOF
+  exit( 1 )
+end
+
+require 'hilfer/tree_viewer_window.rb'
+require 'hilfer/scite_editor.rb'
 
 # NOTE no space after comma, trailing comma is so
 # that bold, italic etc and font size can be specified
 FIXED_FONT = "Lucida Console,Courier New,"
 CONFIG_FILE = File.expand_path( '~/.hilfer' )
 
-=begin rdoc
-HilferItems are stored in the TreeModel
-- item is the display name (ie filename and extension)
-- path is the full pathname, expanded, unqualified etc etc
-- last_child_used is the GtkTreeView path of the last child of a directory
- node that had selection
-- status is either :expanded or :collapsed
-- populated is whether or not this directory node has been populated
-from the filesystem. To aid in recursively populating the tree
-=end
-class HilferItem
-  attr_accessor :item, :path, :last_child_used, :status, :svn_status, :colour
-  attr_writer :populated
-
-  def initialize( item, path )
-    @item = item
-    @path = path
-    @dir = File.directory? path
-    @populated = false
-    @status = :collapsed
-    @colour = '#000'
-  end
-
-  def dir?
-    @dir
-  end
-
-  def to_s
-    @item
-  end
-
-  # always return true for file nodes
-  def populated?
-    if !dir?
-      true
-    else
-      @populated
-    end
-  end
-
-  # always return false for file nodes
-  def expanded?
-    if !dir?
-      false
-    else
-      @status == :expanded
-    end
-  end
-
-end
-
-=begin rdoc
-Knows how to lauch gnome-terminal with mutiple tabs,
-each opened on a different directory
-=end
-class GnomeTerminal
-  def launch( dirs )
-    # construct arguments and launch
-    args = [ "gnome-terminal" ]
-    dirs.uniq.each do |x|
-      # first one will be a window, subsequent ones are tabs
-      args << ( args.size == 1 ? '--window' : '--tab' )
-      args << "--working-directory=#{x}"
-    end
-    system( *args )
-  end
-end
-
-=begin rdoc
-Just launches xterm. I couldn't figure out how to open it in different
-directories.
-
-use it by saying
-
-  $options[:terminal] = Xterm.new
-
-before the call to TreeViewer.new
-=end
-class Xterm
-  def launch( dirs )
-    system( 'xterm &' )
-  end
-end
-
-# yes, this actually does catch method calls polymorphically
-# but you can't change the TreePath or TreeIter that are returned
-class HilferModel < Gtk::TreeStore
-  def initialize( *args )
-    super
-  end
-
-  def ancestor?( iter, descendant )
-    print "testing #{iter[0]} against #{descendant}\n" if $options[:debug]
-    super
-  end
-end
-
-=begin rdoc
-Read and write configuration to ~/.hilfer in yaml.
-Currently only writes window position
-=end
-class HilferConfig
-
-  def initialize( file, window, count )
-    @file, @window = file, window
-
-    if File.file? CONFIG_FILE
-      config = YAML.load_file CONFIG_FILE
-      @window.set_default_size( *config[:size] )
-      @window.show_all
-      # move must be after show_all otherwise it
-      # gets overridden
-      @window.move( *config[:position] ) if count == 1
-    else
-      @window.set_default_size( 300,700 ).show_all
-    end
-  end
-
-  # save config
-  def save
-    config = {
-      :path => @window.title,
-      :position => @window.position,
-      :size => @window.size
-    }
-    File.open( CONFIG_FILE, 'w' ) { |file| file.print config.to_yaml }
-  end
-
-end
-
-=begin rdoc
-Layout of the Tree Viewer Window.
-=end
-class TreeViewerWindow
-  @@window_count = 0
-
-  def initialize( root_fs_path, editor )
-    @window = Gtk::Window.new
-
-    # initialize viewer with a path
-    @editor = editor
-
-    # location bar
-    @location = Gtk::Entry.new
-
-    @tv = TreeViewer.new( root_fs_path, editor, @window, @location )
-
-    # add scrollbars
-    @scroll = Gtk::ScrolledWindow.new( nil, nil )
-    @scroll.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC )
-    @scroll.add( @tv.view )
-
-    # expand and fill
-    @vbox = Gtk::VBox.new( false )
-    @vbox.pack_start( @location, false, false )
-    @vbox.pack_start( @scroll, true, true )
-    @vbox.focus_chain = [@scroll, @location]
-
-    icon_path = find_icon_path
-    if icon_path != nil
-      @window.icon = Gdk::Pixbuf.new( icon_path )
-    end
-    @window.title = 'Hilfer ' + @tv.root_item.path
-    @window.add( @vbox )
-
-    # read config. OK, the last parameter is a hack
-    # but we need it so that new windows aren't show in
-    # exactly the same position and it looks like nothing
-    # has happened
-    @@window_count += 1
-    @hc = HilferConfig.new( CONFIG_FILE, @window, @@window_count )
-
-    # set first line selected
-    @tv.select_first
-
-    # The program will directly end upon 'delete_event', ie window close
-    @window.signal_connect( 'delete_event' ) do
-      # unregister view from editor
-      @editor.unregister_view( @tv )
-      # finish
-      @@window_count -= 1
-      if @@window_count == 0
-        @hc.save
-        # this MUST come before cleanup, otherwise
-        # there will be no pipes to write the command to
-        @editor.quit if $options[:quit_editor]
-        # delete command pipe files
-        @editor.cleanup
-        Gtk.main_quit
-        false
-      end
-    end
-    
-    # to allow the sd command to find the correct editor instance
-    @window.signal_connect 'focus-in-event' do |widget,event|
-      @editor.write_pipe_name
-      false
-    end
-
-    # to allow the sd command to find the correct editor instance
-    @window.signal_connect 'focus-out-event' do |widget,event|
-      @editor.write_pipe_name
-      false
-    end
-  end
-
-  def find_icon_path
-    $LOAD_PATH.each do |path|
-      png_file = Pathname.new( path ) + 'hilfer/hilfer-icon.png'
-      return png_file.to_s if png_file.exist?
-    end
-    nil
-  end
-end
-
-
 ################
 # Main script
 

data/bin/ssc

@@ -1,7 +1,13 @@
 #! /usr/bin/ruby
 
 require 'optparse'
-require 'text/format'
+
+begin
+  require 'text/format'
+  HAS_TEXT_FORMAT = true
+rescue LoadError
+  HAS_TEXT_FORMAT = false
+end
 
 # display help and commands
 oparser = OptionParser.new
@@ -10,10 +16,11 @@ oparser.on( '-h', '-?', '--help' ) do |o|
   puts oparser.to_s
   puts
   puts "Send one or several commands to the current scite"
-  puts
-  puts "Commands are (http://scintilla.sourceforge.net/SciTEDirector.html):"
-  puts
-  st = <<EOF
+  if HAS_TEXT_FORMAT
+    puts
+    puts "Commands are (http://scintilla.sourceforge.net/SciTEDirector.html):"
+    puts
+    st = <<EOF
 askfilename:|Return the name of the file being edited.
 askproperty:<key>|Return the value of a property.
 close:|Close the current file.
@@ -46,15 +53,19 @@ replaceall:<srch>\\000<rep>|Replace all instances of he search string in the doc
 saveas:<path>|Save the document as the indicated file.
 savesession:<path>|Save a session as given by the indicated file.
 EOF
-  cmds = st.split(/\n/)
-  re = /(.*?)\|(.*)/
-	tf = Text::Format.new( :format_style => :fill, :left_margin => 28, :columns => 90 )
-  cmds.each do |ln|
-    cmd, desc = re.match( ln ).to_a[1..-1]
-    desc = tf.format(desc)
-    puts( "%-28s%-52s" % [ cmd, desc.strip ] )
+    cmds = st.split(/\n/)
+    re = /(.*?)\|(.*)/
+    tf = Text::Format.new( :format_style => :fill, :left_margin => 28, :columns => 90 )
+    cmds.each do |ln|
+      cmd, desc = re.match( ln ).to_a[1..-1]
+      desc = tf.format(desc)
+      puts( "%-28s%-52s" % [ cmd, desc.strip ] )
+    end
+  else
+    puts
+    puts "text/format not found. scite director commands not displayed."
   end
-  exit( 0 )
+  exit( 1 )
 end
 
 # parse options

data/lib/hilfer/gnome_terminal.rb

@@ -0,0 +1,22 @@
+# check for existence of gnome-terminal
+unless File.exist?( '/usr/bin/gnome-terminal' )
+  raise 'gnome-terminal not available at /usr/bin/gnome-terminal'
+end
+  
+=begin rdoc
+Knows how to lauch gnome-terminal with mutiple tabs,
+each opened on a different directory
+=end
+class GnomeTerminal
+  def launch( dirs )
+    # construct arguments and launch
+    args = [ "gnome-terminal" ]
+    dirs.uniq.each do |x|
+      # first one will be a window, subsequent ones are tabs
+      args << ( args.size == 1 ? '--window' : '--tab' )
+      args << "--working-directory=#{x}"
+    end
+    system( *args )
+  end
+end
+

data/lib/hilfer/hilfer_config.rb

@@ -0,0 +1,35 @@
+require 'yaml'
+require 'pathname'
+
+=begin rdoc
+Read and write configuration to ~/.hilfer in yaml.
+Currently only writes window position
+=end
+class HilferConfig
+
+  def initialize( file, window, count )
+    @file, @window = file, window
+
+    if File.file? CONFIG_FILE
+      config = YAML.load_file CONFIG_FILE
+      @window.set_default_size( *config[:size] )
+      @window.show_all
+      # move must be after show_all otherwise it
+      # gets overridden
+      @window.move( *config[:position] ) if count == 1
+    else
+      @window.set_default_size( 300,700 ).show_all
+    end
+  end
+
+  # save config
+  def save
+    config = {
+      :path => @window.title,
+      :position => @window.position,
+      :size => @window.size
+    }
+    File.open( CONFIG_FILE, 'w' ) { |file| file.print config.to_yaml }
+  end
+
+end

data/lib/hilfer/hilfer_item.rb

@@ -0,0 +1,50 @@
+=begin rdoc
+HilferItems are stored in the TreeModel
+- item is the display name (ie filename and extension)
+- path is the full pathname, expanded, unqualified etc etc
+- last_child_used is the GtkTreeView path of the last child of a directory
+ node that had selection
+- status is either :expanded or :collapsed
+- populated is whether or not this directory node has been populated
+from the filesystem. To aid in recursively populating the tree
+=end
+class HilferItem
+  attr_accessor :item, :path, :last_child_used, :status, :svn_status, :colour
+  attr_writer :populated
+
+  def initialize( item, path )
+    @item = item
+    @path = path
+    @dir = File.directory? path
+    @populated = false
+    @status = :collapsed
+    @colour = '#000'
+  end
+
+  def dir?
+    @dir
+  end
+
+  def to_s
+    @item
+  end
+
+  # always return true for file nodes
+  def populated?
+    if !dir?
+      true
+    else
+      @populated
+    end
+  end
+
+  # always return false for file nodes
+  def expanded?
+    if !dir?
+      false
+    else
+      @status == :expanded
+    end
+  end
+
+end

data/lib/hilfer/hilfer_model.rb

@@ -0,0 +1,12 @@
+# yes, this actually does catch method calls polymorphically
+# but you can't change the TreePath or TreeIter that are returned
+class HilferModel < Gtk::TreeStore
+  def initialize( *args )
+    super
+  end
+
+  def ancestor?( iter, descendant )
+    print "testing #{iter[0]} against #{descendant}\n" if $options[:debug]
+    super
+  end
+end

data/lib/hilfer/rails_locator.rb

@@ -54,6 +54,7 @@ class RailsLocator
   end
   
   def handle_keypress( widget, event )
+    puts "RailsLocator::event: #{event.inspect}" if $options[:debug]
     retval = true
     case
     # Shift-Ctrl-V - go to view, or view dir

data/lib/hilfer/svn_colours.rb

@@ -1,4 +1,5 @@
 require 'svn/client'
+
 =begin
   This does a simple svn status (not going to the server)
   and returns colouring for various statuses

data/lib/hilfer/tree_viewer.rb

@@ -1,9 +1,45 @@
 # local files
-# local files
-require 'hilfer/scite_editor.rb'
-require 'hilfer/rails_locator.rb'
-require 'hilfer/svn_colours.rb'
 require 'pathname'
+require 'hilfer/hilfer_item.rb'
+require 'hilfer/scite_editor.rb'
+require 'hilfer/hilfer_model.rb'
+
+# try to load Gnome terminal
+begin
+  require 'hilfer/gnome_terminal.rb'
+  HAS_GNOME_TERMINAL = true
+rescue
+  puts "gnome-terminal not available. Defaulting to xterm."
+  HAS_GNOME_TERMINAL = false
+end
+require 'hilfer/xterm.rb'
+
+# try to load rails locator
+begin
+  require 'hilfer/rails_locator.rb'
+  HAS_RAILS_LOCATOR = true
+rescue
+  puts "ActiveSupport not loaded. No rails-specific keystrokes"
+  HAS_RAILS_LOCATOR = false
+end
+
+# try to load subversion bindings
+begin
+  require 'hilfer/svn_colours.rb'
+  HAS_SUBVERSION = true
+rescue
+  puts "svn/client not loaded. Coloured SVN status will not be displayed."
+  HAS_SUBVERSION = false
+end
+
+
+module Gdk
+  class EventKey
+    def inspect
+      "#<Gdk::EventKey keycode=#{hardware_keycode} state=#{state.inspect}"
+    end
+  end
+end
 
 =begin
 This is the tree viewer object. It contains a GtkTreeView
@@ -11,7 +47,7 @@ and references an editor object. It also contains a HilferItem
 which is the root node of the tree, but it's never displayed
 =end
 class TreeViewer
-  include SvnColours
+  include SvnColours if HAS_SUBVERSION
   
   attr_reader :view, :editor, :root_item
 
@@ -37,7 +73,7 @@ class TreeViewer
     # locators are things that provide a set of shortcut keys
     # to jump to specific directories, files, or related locations
     @locators = []
-    @locators << RailsLocator.new( self )
+    @locators << RailsLocator.new( self ) if HAS_RAILS_LOCATOR
 
     # pre-populate model from filesystem, only 1 level deep
     #model = Gtk::TreeStore.new( HilferItem )
@@ -142,10 +178,6 @@ class TreeViewer
 
   def refresh
     go_into( @root_item.path )
-    if $options[:debug]
-      load 'rails_locator.rb'
-      load 'tree_viewer.rb'
-    end
   end
 
   def init_renderers
@@ -288,7 +320,7 @@ class TreeViewer
   def init_keys
     @view.signal_connect( 'key-press-event' ) do
       |widget,event|
-      #puts event.inspect
+      puts event.inspect if $options[:debug]
       retval = true
       case
         # enter - go into directory
@@ -421,18 +453,22 @@ class TreeViewer
             end
           end
           terminal.launch( dirs )
-
+          
         # alt-l toggles the location bar
         when event.hardware_keycode == 46 && event.state.mod1_mask?
           @location.no_show_all = true
           @location.visible = !@location.visible?
-
+          
+        # alt-q toggles whether shutdown is automatic or not
+        when event.hardware_keycode == 24 && event.state.mod1_mask?
+          $options[:quit_editor] = !$options[:quit_editor]
+          
         # ctrl-* on keypad means expand the entire tree
         when event.hardware_keycode == 63 && event.state.control_mask?
           # 100 levels of directories should be enough...
           populate( @view.model, @root_item, nil, 100 )
           @view.expand_all
-
+          
         # * on keypad means expand subtree
         when event.hardware_keycode == 63 && event.state.empty?
           widget.selection.selected_rows.each do |path|
@@ -441,11 +477,11 @@ class TreeViewer
               expand_dir( widget, path, iter )
             end
           end
-
+          
         # shift-/ on keypad means collapse the entire tree
         when event.hardware_keycode == 112 && event.state.shift_mask?
           @view.collapse_all
-
+          
         # ctrl-left means go to parent
         when event.hardware_keycode == 100 && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|
@@ -453,11 +489,11 @@ class TreeViewer
               iter.parent[0].last_child_used = path
               select_iter( iter.parent )
             end
-
+            
             # only do the first one
             break
           end
-
+        
         # ctrl-right means go to last used path, or first child
         when event.hardware_keycode == 102 && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|
@@ -469,11 +505,11 @@ class TreeViewer
                 select_iter( iter.first_child )
               end
             end
-
+            
             # only do the first one
             break
           end
-
+          
         # ctrl-up means go to previous sibling with children
         when event.hardware_keycode == 98 && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|
@@ -544,9 +580,10 @@ class TreeViewer
           end
           
         else
-          # pass keypress to all locators
-          @locators.each {|x| retval &&= x.handle_keypress( widget, event ) }
           # indicate signal not handled
+          retval = false
+          # pass keypress to all locators
+          @locators.each {|x| retval = x.handle_keypress( widget, event ) and retval }
           if $options[:debug] && !retval
             print "hardware_keycode: #{event.hardware_keycode}\n"
           end
@@ -685,7 +722,11 @@ class TreeViewer
   end
 
   def terminal
-    @terminal ||= GnomeTerminal.new
+    if HAS_GNOME_TERMINAL
+      @terminal ||= GnomeTerminal.new
+    else
+      @terminal ||= Xterm.new
+    end
   end
 
   # Move the displayed tree to the given directory

data/lib/hilfer/tree_viewer_window.rb

@@ -0,0 +1,87 @@
+require 'hilfer/tree_viewer.rb'
+require 'hilfer/hilfer_config.rb'
+
+=begin rdoc
+Layout of the Tree Viewer Window.
+=end
+class TreeViewerWindow
+  @@window_count = 0
+
+  def initialize( root_fs_path, editor )
+    @window = Gtk::Window.new
+
+    # initialize viewer with a path
+    @editor = editor
+
+    # location bar
+    @location = Gtk::Entry.new
+
+    @tv = TreeViewer.new( root_fs_path, editor, @window, @location )
+
+    # add scrollbars
+    @scroll = Gtk::ScrolledWindow.new( nil, nil )
+    @scroll.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC )
+    @scroll.add( @tv.view )
+
+    # expand and fill
+    @vbox = Gtk::VBox.new( false )
+    @vbox.pack_start( @location, false, false )
+    @vbox.pack_start( @scroll, true, true )
+    @vbox.focus_chain = [@scroll, @location]
+
+    icon_path = find_icon_path
+    if icon_path != nil
+      @window.icon = Gdk::Pixbuf.new( icon_path )
+    end
+    @window.title = 'Hilfer ' + @tv.root_item.path
+    @window.add( @vbox )
+
+    # read config. OK, the last parameter is a hack
+    # but we need it so that new windows aren't show in
+    # exactly the same position and it looks like nothing
+    # has happened
+    @@window_count += 1
+    @hc = HilferConfig.new( CONFIG_FILE, @window, @@window_count )
+
+    # set first line selected
+    @tv.select_first
+
+    # The program will directly end upon 'delete_event', ie window close
+    @window.signal_connect( 'delete_event' ) do
+      # unregister view from editor
+      @editor.unregister_view( @tv )
+      # finish
+      @@window_count -= 1
+      if @@window_count == 0
+        @hc.save
+        # this MUST come before cleanup, otherwise
+        # there will be no pipes to write the command to
+        @editor.quit if $options[:quit_editor]
+        # delete command pipe files
+        @editor.cleanup
+        Gtk.main_quit
+        false
+      end
+    end
+    
+    # to allow the sd command to find the correct editor instance
+    @window.signal_connect 'focus-in-event' do |widget,event|
+      @editor.write_pipe_name
+      false
+    end
+
+    # to allow the sd command to find the correct editor instance
+    @window.signal_connect 'focus-out-event' do |widget,event|
+      @editor.write_pipe_name
+      false
+    end
+  end
+
+  def find_icon_path
+    $LOAD_PATH.each do |path|
+      png_file = Pathname.new( path ) + 'hilfer/hilfer-icon.png'
+      return png_file.to_s if png_file.exist?
+    end
+    nil
+  end
+end

data/lib/hilfer/version.rb

@@ -0,0 +1,3 @@
+module Hilfer
+  VERSION = '0.9.2'
+end

data/lib/hilfer/xterm.rb

@@ -0,0 +1,15 @@
+=begin rdoc
+Just launches xterm. I couldn't figure out how to open it in different
+directories.
+
+use it by saying
+
+  $options[:terminal] = Xterm.new
+
+before the call to TreeViewer.new
+=end
+class Xterm
+  def launch( dirs )
+    system( 'xterm &' )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hilfer
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - John Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-01 00:00:00 +02:00
+date: 2008-04-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,13 +49,20 @@ files:
 - TODO
 - bin/hilfer
 - bin/ssc
+- lib/hilfer/gnome_terminal.rb
 - lib/hilfer/hilfer-icon.png
+- lib/hilfer/hilfer_config.rb
+- lib/hilfer/hilfer_item.rb
+- lib/hilfer/hilfer_model.rb
 - lib/hilfer/rails_locator.rb
 - lib/hilfer/scite_editor.rb
 - lib/hilfer/svn_colours.rb
 - lib/hilfer/tree_viewer.rb
+- lib/hilfer/tree_viewer_window.rb
+- lib/hilfer/version.rb
+- lib/hilfer/xterm.rb
 has_rdoc: true
-homepage: http://hilfer.rubyforge.org
+homepage: "Download from RubyForge: http://www.rubyforge.org/projects/hilfer"
 post_install_message: 
 rdoc_options: 
 - --main