hilfer 0.11.8 → 0.13.0

data/{History.txt → History.rdoc}

@@ -1,3 +1,9 @@
+=== 0.12.0 / 09-Dec-11
+* make ssc use SciteEditor
+* SciteEditor uses Pathname
+* wmctrl dependency removed, so to work this must use a scite which
+  support the focus: command
+
 === 0.11.8 / 15-Oct-2011
 * do locators for test and lib, whether or not rails is found
 * fix ssc pipe name, so it works again

data/Manifest.txt

@@ -1,6 +1,6 @@
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 TODO
 bin/hilfer
@@ -11,6 +11,7 @@ lib/hilfer/hilfer-icon.png
 lib/hilfer/hilfer_config.rb
 lib/hilfer/hilfer_item.rb
 lib/hilfer/hilfer_model.rb
+lib/hilfer/module_extensions.rb
 lib/hilfer/standard_locator.rb
 lib/hilfer/rails_locator.rb
 lib/hilfer/scite_editor.rb
@@ -18,6 +19,5 @@ lib/hilfer/svn_colours.rb
 lib/hilfer/tree_viewer.rb
 lib/hilfer/tree_viewer_window.rb
 lib/hilfer/version.rb
-lib/hilfer/window.rb
 lib/hilfer/xterm.rb
 lib/hilfer/xfce_terminal.rb

data/{README.txt → README.rdoc}

@@ -1,8 +1,8 @@
 = hilfer
 
-http://www.rubyforge.org/projects/hilfer
+http://rubygems.org/gems/hilfer
 
-== DESCRIPTION:
+== Description:
 
 Gtk2 directory browser for SciTE with plenty of keyboard shortcuts for directory
 and file navigation. It understands some of the Rails directory structure.
@@ -12,7 +12,7 @@ Once upon a time there was a directory browser called jaffm (Just a File Manager
 I liked the idea of an ultra simple file browser, but jaffm went extinct. So
 I wrote hilfer.
 
-== FEATURES
+== Features
 
 === Main UI
 
@@ -41,9 +41,9 @@ I wrote hilfer.
 - ctrl-r refreshes from filesystem
 - ctrl-t opens a terminal window on the given directorties.
 - alt-l toggles the location bar
-- alt-q toggles whether shutdown is automatic or not
+- alt-q toggles whether scite shutdown is automatic or not
 - ctrl-* on keypad means expand the entire tree
-- * on keypad expands subtrees
+- '*' on keypad expands subtrees
 - shift-/ on keypad means collapse the entire tree
 - ctrl-left means go to parent
 - ctrl-right means go to last used path, or first child
@@ -75,16 +75,13 @@ I wrote hilfer.
 === SciTE director commands
 
 Use ssc to send commands directly to the instance of scite that was opened by
-hilfer.
+hilfer. For example:
 
-  ssc find:pipe
+- to find the string 'pipe' in the current editor window:
+    ssc find:pipe
 
-will find the string 'pipe' in the current editor window.
-
-
-  find . -name *widge*.rb -exec grep open -Hn | ssc
-
-will send a F4 traversable list of file search results to scite's output window
+- to send a F4 traversable list of file search results to scite's output window
+    find . -name *widge*.rb -exec grep open -Hn | ssc
 
 === Subversion colour highlighting
 
@@ -115,11 +112,11 @@ See TODO file
 == SYNOPSIS
 
 	Usage: hilfer [options]
-		 -y, --auto-sync                  track editor current file changes
-		 -s, --show-hidden                Show hidden files
-		 -D, -d, -v, --debug					 Debug output
-		 -q, --quit-editor                close editor on shutdown
-		 -h, -?, --help                   Show this help
+		 -y, --auto-sync           track editor current file changes
+		 -s, --show-hidden         Show hidden files
+		 -D, -d, -v, --debug       Debug output
+		 -q, --quit-editor         close editor on shutdown
+		 -h, -?, --help            Show this help
 
 == REQUIREMENTS:
 
@@ -127,7 +124,6 @@ See TODO file
 
 === Optional packages
 
-* wmctrl to raise SciTE editor window when files are opened
 * text-format for ssc to display extended scite director commands
 * subversion-ruby to display colour highlighted subversion status
 * gnome-terminal or Xfce Terminal executable
@@ -141,7 +137,7 @@ sudo gem install
 
 (The MIT License)
 
-Copyright (c) John Anderson 2006 - 2009
+Copyright (c) John Anderson 2006 - 2011
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -4,7 +4,8 @@ rescue LoadError
   abort '### Please install the "bones" gem ###'
 end
 
-require 'rake/clean'
+require 'rdoc/task'
+
 ensure_in_path 'lib'
 require 'hilfer/version.rb'
 
@@ -12,29 +13,24 @@ Bones do
   name  'hilfer'
   authors  'John Anderson'
   email  'panic@semiosix.com'
-  url  'http://hilfer.rubyforge.org/hilfer'
+  url  'http://rubygems.org/gems/hilfer'
   version  Hilfer::VERSION
   description "Programmers file browser for SciTE"
 
   gem.need_tar false
 
-  depend_on 'gtk2', '~> 1.0.0'
+  depend_on 'gtk2', '>= 1.0.0'
 
   # read file list from Manifest.txt
   gem.files File.new('Manifest.txt').to_a.map( &:chomp )
 
-  # List of files to generate rdoc from
-  # Not the same as the rdoc -i which is list of files
-  # to search for include directives
-  rdoc.include %w{README.txt ^lib/clevic/.*\.rb$ models/examples.rb History.txt TODO}
-
   # List of Regexs to exclude from rdoc processing
-  rdoc.exclude %w{^pkg.*}
+  rdoc.exclude %w{^pkg ^model ^test png$}
 
   # Include URL for git browser in rdoc output
-  rdoc.opts %W{-W http://gitweb.semiosix.com/hilfer.cgi?p=clevic;a=blob;f=%s;hb=HEAD} #--template=#{Gem.required_location("allison", "allison.rb")}}
+  rdoc.opts %W{-W http://gitweb.semiosix.com/hilfer.cgi?p=hilfer;a=blob;f=%s;hb=HEAD}
 
-  rdoc.main 'README.txt'
+  rdoc.main 'README.rdoc'
 end
 
 CLEAN.include %w[ChangeLog **/.DS_Store tmp *.log doc website/doc]

data/TODO

@@ -1,4 +1,3 @@
-use focus: instead of wmctrl
 menu
 working sets, like eclipse
 option to connect to existing scite, by pid?
@@ -31,15 +30,6 @@ Model issues
 locators don't work unless directories have already been opened.
 * and / not working properly
 
-Maybe
------
-
-multi column view? Like Mac OS X finder?
-svn integration, as a second "Mode". CVS?
-gnome-vfs integration
-vim/gvim integration
-other terminal program integration eg xfce-terminal
-
 Done
 ====
 

data/bin/hilfer

@@ -1,35 +1,49 @@
 #!/usr/bin/ruby
 
 require 'optparse'
+require 'hilfer/module_extensions.rb'
 
 # defaults
-$options = { :debug => false, :hidden => false, :auto_sync => false, :quit_editor => false }
 
-oparser = OptionParser.new
-oparser.on( '-y', '--auto-sync', 'track editor current file changes') { |o| $options[:host] = true }
-oparser.on( '-s', '--show-hidden', 'Show hidden files' ) { |o| $options[:user] = true }
-oparser.on( '-D', '-d', '--debug' ) { |o| $options[:debug] = $options[:verbose] = true }
-oparser.on( '-v', '--verbose' ) { |o| $options[:verbose] = true }
-oparser.on( '-q', '--quit-editor', 'close editor on shutdown' ) { |o| $options[:quit_editor] = true }
+$options = OptionParser.new do |oparser|
+  class << oparser
+    attr_boolean :debug, false
+    attr_boolean :hidden, false
+    attr_boolean :auto_sync, false
+    attr_boolean :verbose, false
+    attr_boolean :terminal, false
+    attr_boolean :quit_editor, false
 
-oparser.on( '-V', '--version', 'show version' ) do |o|
-  require 'hilfer/version.rb'
-  puts <<EOF
+    def [](key)
+      self.send( "#{key}?" )
+    end
+  end
+
+  oparser.on( '-y', '--auto-sync', 'track editor current file changes') { |o| $options.host = true }
+  oparser.on( '-s', '--show-hidden', 'Show hidden files' ) { |o| $options.user = true }
+  oparser.on( '-D', '-d', '--debug' ) { |o| $options.debug = $options.verbose = true }
+  oparser.on( '-v', '--verbose' ) { |o| $options.verbose = true }
+  oparser.on( '-q', '--quit-editor', 'close editor on shutdown' ) { |o| $options.quit_editor = true }
+
+  oparser.on( '-V', '--version', 'show version' ) do |o|
+    require 'hilfer/version.rb'
+    puts <<EOF
 Hilfer #{Hilfer::VERSION}
 EOF
-  exit(0)
-end
+    exit(0)
+  end
 
-oparser.on( '-h', '-?', '--help' ) do |o|
-  puts oparser.to_s
-  exit(1)
+  oparser.on( '-h', '-?', '--help' ) do |o|
+    puts oparser.to_s
+    exit(1)
+  end
 end
 
 # parse options, and make sure Gtk doesn't get them
-args = oparser.parse( ARGV )
+args = $options.parse( ARGV )
 
 # output options on debug
-if $options[:debug]
+if $options.debug?
   require 'pp'
   pp $options
 end
@@ -58,7 +72,7 @@ CONFIG_FILE = File.expand_path( '~/.hilfer' )
 
 tvw = TreeViewerWindow.new(
   File.expand_path( args[0] || '.' ),
-  SciteEditor.new( $options )
+  SciteEditor.new( debug: $options.debug? )
 )
 
 # and off we go...

data/bin/ssc

@@ -1,6 +1,9 @@
 #! /usr/bin/ruby
 
 require 'optparse'
+require 'pathname'
+
+require 'hilfer/scite_editor.rb'
 
 begin
   require 'text/format'
@@ -9,89 +12,144 @@ rescue LoadError
   HAS_TEXT_FORMAT = false
 end
 
-$options = {}
-
 # display help and commands
-oparser = OptionParser.new
-oparser.banner = <<EOF
+$options = OptionParser.new do |oparser|
+  class << oparser
+    attr_boolean :debug, false
+    attr_boolean :pipe_to_output
+    attr_accessor :scite_pipe_name
+    attr_boolean :file, false
+    attr_boolean :line, false
+    attr_accessor :goto
+  end
+
+  oparser.banner = <<EOF
 Usage: ssc [options] | [ cmd] [...]" | STDIN
 
 if STDIN is given, pipe to the current scites output window
 
 EOF
-oparser.on( '-o', '--to-output', "Send stdin to scite's output pane") do |o|
-  $options[:pipe_to_output] = true
-end
 
-oparser.on( '-g', '--goto N[,N]', "go to the given line and column number") do |val|
-  $options[:goto] = val
-end
+  oparser.on( '-o', '--to-output', "Send stdin to scite's output pane") do |o|
+    oparser.pipe_to_output = true
+  end
 
-oparser.on( '-h', '-?', '--help' ) do |o|
-  puts oparser.to_s
-end
+  oparser.on( '-p', '--pipe-name [S]', String, "The name of the scite pipe to hook into") do |val|
+    oparser.scite_pipe_name = val
+  end
+
+  oparser.on( '-f', '--file', "fetch current file") do |val|
+    oparser.file = true
+  end
+
+  oparser.on( '-l', '--line', "fetch current line") do |val|
+    oparser.line = true
+  end
+
+  oparser.on( '-g', '--goto N[,N]', "go to the given line and column number") do |val|
+    oparser.goto = val
+  end
+
+  oparser.on( '-d', '--debug' ) do |o|
+    oparser.debug = true
+  end
 
-oparser.on( '--help-commands' ) do |o|
-  puts "Send one or several commands to the current scite"
-  if HAS_TEXT_FORMAT
-    puts
-    puts "Commands are (http://scintilla.sourceforge.net/SciTEDirector.html):"
-    puts
-    st = DATA.read
-    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 ] )
+  oparser.on( '-h', '-?', '--help' ) do |o|
+    puts oparser.to_s
+  end
+
+  oparser.on( '--help-commands' ) do |o|
+    puts "Send one or several commands to the current scite"
+    if HAS_TEXT_FORMAT
+      puts
+      puts "Commands are (http://scintilla.sourceforge.net/SciTEDirector.html):"
+      puts
+      st = DATA.read
+      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 DATA.read
+      puts
+      puts "text/format not found. scite director commands uglified"
     end
-  else
-    puts DATA.read
-    puts
-    puts "text/format not found. scite director commands uglified"
+    exit( 1 )
   end
-  exit( 1 )
 end
 
 # parse options
-args = oparser.parse( ARGV )
-
-# which is the pipe file
-pipe_name_file_name = "/tmp/hilfer.#{ENV['USER']}.scite"
-if !File.exists?( pipe_name_file_name )
-  puts "#{pipe_name_file_name} does not exist"
-  exit(1)
-end
+@args = $options.parse( ARGV )
 
 if ARGV.empty? && STDIN.tty?
-  puts oparser
+  puts $options
   exit 1
 end
 
-# open pipe and write commands
-pipe_name = IO.read( pipe_name_file_name ).chomp
-if File.exists? pipe_name
-  # responses go to the director pipe
-  File.open( pipe_name, 'w+' ) do |file|
-    for cmd in ARGV
-      cmd += ':' unless cmd.include?(':') || cmd[-1] == ':'
-      file.puts cmd
-    end
+def default_scite_pipe_name
+  File.read( "/tmp/hilfer.#{ENV['USER']}.scite" ).chomp
+end
 
-    if $options[:pipe_to_output] || !STDIN.tty?
-      text = STDIN.read
-      # send IDM_CLEAROUTPUT
-      file.puts "menucommand:420"
-      file.puts "output:#{text.gsub "\n", '\n'}"
-    end
+editor = SciteEditor.new(
+  debug: $options.debug?,
+  scite_pipe_name: $options.scite_pipe_name || default_scite_pipe_name,
+  director_pipe_name: "/tmp/ssc.#{Process.pid}",
+  launched: true
+)
+
+# make sure the director pipe exists to get return values
+editor.director_pipe
+
+for cmd in @args
+  case cmd
+    when /:[0-9]+$/
+      # open a file with a line number
+      file_name, line_number = cmd.split(':')
+      editor.send_cmd :open, Pathname.new( file_name ).realpath.to_s
+      editor.send_cmd :goto, line_number
+
+    when /:/
+      # another scite command
+      editor.send_cmd *cmd.split(':')
+
+    else
+      # a plain file
+      editor.send_cmd :open, Pathname.new( cmd ).realpath.to_s
+  end
+  puts editor.response
+end
 
-    if $options[:goto]
-      file.puts "goto:#{$options[:goto]}"
-    end
+if @args.empty? && ( $options.pipe_to_output? || !STDIN.tty? )
+  puts "reading stdin" if $options.debug?
+  # send IDM_CLEAROUTPUT
+  editor.send_cmd :menucommand, 420
+  STDIN.each_line do |line|
+    editor.send_cmd :output,  line
+    editor.send_cmd :output, '\n'
+    sleep 0.005
   end
 end
 
+if $options.goto
+  editor.send_cmd :goto, $options.goto
+end
+
+if $options.file?
+  editor.synchronize_path
+  puts editor.response[/^filename:(.+)$/,1]
+end
+
+if $options.line?
+  editor.send_cmd :askproperty, :SelectionStartLine
+  puts editor.response[/^macro:stringinfo:(\d+)$/,1]
+end
+
+editor.director_pipe.unlink
+
 __END__
 askfilename:|Return the name of the file being edited.
 askproperty:<key>|Return the value of a property.

data/lib/hilfer/extensions.rb

@@ -11,18 +11,18 @@ module Gdk
       @lookup[keyval]
     end
   end
-  
+
   # mainly for testing Gdk::EventKey, cos they're hard to
   # instantiate
   module KeyMatcher
     def key_name
       self.gdk_symbol[4..-1]
     end
-    
+
     def gdk_symbol
       Gdk::Keyval.symbol( keyval )
     end
-    
+
     def match( *args )
       bools = args.map do |arg|
         case arg
@@ -36,14 +36,14 @@ module Gdk
       end
       return bools.include?( true )
     end
-    
+
     def =~( arg )
       match( arg )
     end
-    
+
     def method_missing( meth, *args, &block )
       if meth.to_s[-1] == "?"[0]
-        possible_key = meth.to_s[0..-2] 
+        possible_key = meth.to_s[0..-2]
         if possible_key.size == 1
           key_name == possible_key || key_name == possible_key.upcase
         else

data/lib/hilfer/module_extensions.rb

@@ -0,0 +1,19 @@
+class Module
+  # define this for the OptionParse singletons
+  def attr_boolean( name, default = true )
+    # define getter
+    define_method( "#{name}?" ) do
+      instvar = instance_variable_get( "@#{name}" )
+      if instvar.nil?
+        instance_variable_set( "@#{name}", default )
+        instvar = default
+      end
+      instvar
+    end
+
+    # define setter
+    define_method( "#{name}=" ) do |rhs|
+      instance_variable_set( "@#{name}", rhs )
+    end
+  end
+end

data/lib/hilfer/scite_editor.rb

@@ -1,10 +1,12 @@
+require 'pathname'
 require 'fileutils'
-require 'hilfer/window.rb'
+require 'hilfer/module_extensions.rb'
 
 # handle director interface to scite
 class SciteEditor
-  # options can contain :debug
-  # view is a GtkTreeView
+  # options can contain anything with a setter
+  # No options will create a new scite instance
+  # specifying scite_pipe_name will hook into an existing instance
   def initialize( options = {} )
     # commands to scite are sent here
     @scite_pipe_name = "/tmp/hilfer.#{ENV['USER']}.#{Process.pid}.scite"
@@ -13,76 +15,97 @@ class SciteEditor
     @director_pipe_name = "/tmp/hilfer.#{ENV['USER']}.#{Process.pid}.director"
     @pipe_name_file = "/tmp/hilfer.#{ENV['USER']}.scite"
 
-    cleanup
-
-    # this is an array of TreeViewer objects
+    # this is an array of objects which respond to synchronise_editor_path
     @views = []
+
     # the command-line options
-    @options = options
+    puts "options: #{options.inspect}" if options[:debug]
+    options.each do |key,value|
+      self.send( "#{key}=", value )
+    end
   end
 
-  attr_reader :options
+  attr_boolean :debug, false
+  attr_boolean :launched
   attr_reader :scite_pid
   attr_reader :pipe_name_file
+  attr_accessor :scite_pipe_name
+  attr_accessor :director_pipe_name
 
-  def debug?
-    @options[:debug]
+  def scite_pipe
+    @scite_pipe ||= Pathname.new( scite_pipe_name )
   end
 
-  def launched?
-    !@scite_pid.nil?
+  def director_pipe
+    unless @director_pipe
+      puts "set director pipe" if debug?
+      @director_pipe = Pathname.new( director_pipe_name )
+
+      # create the director pipe if it isn't there already
+      puts "director pipe #{@director_pipe} exist?" if debug?
+      unless @director_pipe.exist?
+        puts "creating director pipe" if debug?
+        system( "mkfifo #{@director_pipe_name}" )
+      end
+    end
+    @director_pipe
   end
 
-  # return a Window object for the editor.
-  def window
-    @window ||= Window.pid( @scite_pid )
+  def launched?
+    @launched || scite_pid
   end
 
   def reset
     @scite_pid = nil
-    @window = nil
   end
 
   def kill
-    `kill #{@scite_pid}`
+    Process.kill 'TERM', scite_pid
     reset
     cleanup
   end
 
   def cleanup
-    FileUtils.rm @scite_pipe_name if File.exist? @scite_pipe_name
-    FileUtils.rm @director_pipe_name if File.exist? @director_pipe_name
+    scite_pipe.unlink if scite_pipe.exist?
+    director_pipe.unlink if director_pipe.exist?
     FileUtils.rm pipe_name_file if File.exist? pipe_name_file
   end
 
   # send a command to SciTE
-  def send_cmd( cmd, arg = '' )
+  def send_cmd( cmd, *args )
+    # open scite if necessary
     launch
-    File.open( @scite_pipe_name, 'a' ) do |file|
-      puts "sending: #{cmd.to_s}:#{arg.to_s}" if debug?
-      file.puts "#{cmd.to_s}:#{arg.to_s}"
+
+    # make sure the pipe is open for  returns
+    director_pipe
+
+    # send the command
+    scite_pipe.open('a') do |file|
+      args = args.map( &:to_s) * ':'
+      puts "args: #{args.inspect}" if debug?
+      full = ":#{director_pipe}:#{cmd.to_s}:#{args}"
+      puts "sending: #{full} to #{scite_pipe}" if debug?
+      file.puts full
+      puts "finished sending" if debug?
     end
   end
 
   # bring the SciTE instance to the current
   # desktop and raise it.
   def activate
-    unless window.nil?
-      puts "activating scite" if debug?
-      window.activate
-      puts "finished activating scite" if debug?
-    end
+    send_cmd :focus
   end
 
   # open files in scite
   def open_action( files )
     files.each { |x| send_cmd "open", x.path }
-    #~ send_cmd :identity, 0
     activate
   end
 
   def dump
-    %w{dyn local user base embed}.each {|x| send_cmd 'enumproperties', x}
+    %w{dyn local user base embed}.each do |ptype|
+      send_cmd 'enumproperties', ptype
+    end
     #~ send_cmd 'askproperty','dyn:CurrentWord'
   end
 
@@ -124,22 +147,18 @@ class SciteEditor
 
   def write_pipe_name
     File.open( pipe_name_file, 'w' ) do |f|
-      f.write @scite_pipe_name
+      f.write scite_pipe
       f.write "\n"
     end
   end
 
   # Start up the editor if there isn't already one.
   # Calling it when the editor is already open does nothing.
-  # Store a Window object for raising, and store the pid for
   # other things. Will also install a handler for SIGCHLD
   def launch
     return if launched?
 
-    # create the director pipe if it isn't there already
-    unless File.exists?( @director_pipe_name )
-      system( "mkfifo #{@director_pipe_name}" )
-    end
+    cleanup
 
     scite_cmd = "/usr/bin/scite"
 
@@ -148,7 +167,7 @@ class SciteEditor
       child_pid = Process.wait( -1, Process::WNOHANG )
       # copy this now, before something else grabs it
       process_status = $?
-      if @scite_pid == child_pid
+      if scite_pid == child_pid
         puts "process_status: #{process_status.inspect}" if debug?
         puts "cleaning pipes" if debug?
         cleanup
@@ -158,47 +177,72 @@ class SciteEditor
     end
 
     # fork and exec scite, so we can get scite's pid
-    if ( @scite_pid = fork() ).nil?
+    unless @scite_pid = fork
+      # these seem to be deactivated by the fork, so
+      # so recreate the Pathname instances
+      @director_pipe = nil
+      @scite_pipe = nil
+
       puts "in child" if debug?
       # in child, so exec scite from here, so this pid will become scite's pid
       # not passing the first arg as a 2 element array doesn't work. So
       # use the same value for the command and as argv[0]
       exec(
         [ scite_cmd ] *2,
-        "-ipc.director.name=#{@director_pipe_name}",
-        "-ipc.scite.name=#{@scite_pipe_name}"
+        "-ipc.director.name=#{director_pipe}",
+        "-ipc.scite.name=#{scite_pipe}"
       )
     end
 
-    puts "in parent: scite launched with pid #{@scite_pid}" if debug?
+    puts "in parent: scite launched with pid #{scite_pid}" if debug?
 
     # listen for incoming scite events, like file change and open
     start_listener
   end
 
+  # works with scite 1.x and 2.x
+  def response
+    rv = ''
+    puts "get response" if debug?
+    director_pipe.open do |dpio|
+      puts "checking for result" if debug?
+      if IO.select( [dpio] )
+        puts "reading line" if debug?
+        line = dpio.read_nonblock( 4096 )
+        puts "got line: #{line}" if debug?
+        rv << line.gsub( /[\0\n]+$/, '' )
+      end
+    end
+    rv
+  rescue EOFError
+    puts "eof error" if debug?
+    # just return empty
+    ''
+  end
+
 protected
 
   def start_listener
     # wait for scite pipe otherwise scite sometimes hangs and
     # doesn't receive open requests
-    sleep 0.1 while !File.exists? @scite_pipe_name
-    puts "#{@scite_pipe_name} exists" if debug?
+    sleep 0.1 while !scite_pipe.exist?
+    puts "scite_pipe #{scite_pipe} exists" if debug?
 
     # wait for director pipe as well
-    sleep 0.1 while !File.exists? @director_pipe_name
-    puts "#{@director_pipe_name} exists" if debug?
+    puts "director_pipe.exist?: #{director_pipe.exist?.inspect}" if debug?
+    sleep 0.1 while !director_pipe.exist?
+    puts "director_pipe #{director_pipe} exists" if debug?
 
     Thread.new do
       begin
         listen
       rescue Errno::ENOENT
-        puts "pipe gone away, so stop listening" if debug?
+        puts "pipe gone away, so stop listening"
       rescue Exception => e
         puts "listener thread ended: #{e.message}"
         puts e.backtrace
       end
     end
-
   end
 
   def react( line )
@@ -235,12 +279,13 @@ protected
   def listen
     select_listen do |line|
       puts "read line: #{line.inspect}" if debug?
-      line.gsub!( /[\0\n]+$/, '' )
-      next if line.empty?
-      react( line )
+      unless line.nil? || line.empty?
+        react line
+      end
     end
   rescue EOFError
     # just exit quietly, because scite has closed down
+    puts "EOFError in listen. Maybe scite closed down?" if debug?
   rescue Exception => e
     puts "caught Exception in listen: #{e.inspect}"
     puts e.backtrace
@@ -248,17 +293,17 @@ protected
 
   # doesn't work with scite 2.x
   def block_listen
-    File.open( @director_pipe_name ).each( "\x0" ) do |line|
+    director_pipe.each_line( "\x0" ) do |line|
       yield line
     end
   end
 
   # works with scite 1.x and 2.x
   def select_listen
-    File.open( @director_pipe_name ) do |director_pipe|
-      while IO.select( [director_pipe] )
-        line = director_pipe.read_nonblock( 4096 )
-        yield line
+    director_pipe.open do |dpio|
+      while IO.select( [dpio] )
+        line = dpio.read_nonblock( 4096 )
+        yield line.gsub( /[\0\n]+$/, '' )
       end
     end
   end

data/lib/hilfer/tree_viewer.rb

@@ -472,7 +472,7 @@ class TreeViewer
 
         # alt-q toggles whether shutdown is automatic or not
         when event.q? && event.state.mod1_mask?
-          $options[:quit_editor] = !$options[:quit_editor]
+          $options.quit_editor = !$options.quit_editor?
 
         # ctrl-* on keypad means expand the entire tree
         when event =~ 'KP_Multiply' && event.state.control_mask?

data/lib/hilfer/version.rb

@@ -1,3 +1,3 @@
 module Hilfer
-  VERSION = '0.11.8'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hilfer
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-15 00:00:00.000000000 Z
+date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
-  requirement: &78167250 !ruby/object:Gem::Requirement
+  requirement: &76124550 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *78167250
+  version_requirements: *76124550
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &78166110 !ruby/object:Gem::Requirement
+  requirement: &76124210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *78166110
+  version_requirements: *76124210
 description: Programmers file browser for SciTE
 email: panic@semiosix.com
 executables:
@@ -40,13 +40,15 @@ executables:
 - ssc
 extensions: []
 extra_rdoc_files:
-- History.txt
-- README.txt
-- TODO
+- History.rdoc
+- Manifest.txt
+- README.rdoc
+- bin/hilfer
+- bin/ssc
 files:
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - bin/hilfer
@@ -57,6 +59,7 @@ files:
 - lib/hilfer/hilfer_config.rb
 - lib/hilfer/hilfer_item.rb
 - lib/hilfer/hilfer_model.rb
+- lib/hilfer/module_extensions.rb
 - lib/hilfer/standard_locator.rb
 - lib/hilfer/rails_locator.rb
 - lib/hilfer/scite_editor.rb
@@ -64,18 +67,17 @@ files:
 - lib/hilfer/tree_viewer.rb
 - lib/hilfer/tree_viewer_window.rb
 - lib/hilfer/version.rb
-- lib/hilfer/window.rb
 - lib/hilfer/xterm.rb
 - lib/hilfer/xfce_terminal.rb
 - test/test_key_matcher.rb
-homepage: http://hilfer.rubyforge.org/hilfer
+homepage: http://rubygems.org/gems/hilfer
 licenses: []
 post_install_message: 
 rdoc_options:
 - -W
-- http://gitweb.semiosix.com/hilfer.cgi?p=clevic;a=blob;f=%s;hb=HEAD
+- http://gitweb.semiosix.com/hilfer.cgi?p=hilfer;a=blob;f=%s;hb=HEAD
 - --main
-- README.txt
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -92,9 +94,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: hilfer
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: http://www.
+summary: http://rubygems.
 test_files:
 - test/test_key_matcher.rb

data/lib/hilfer/window.rb

@@ -1,40 +0,0 @@
-# Currently only offers activate, which raises the window and give it focus
-class Window
-  attr_accessor :window_id, :desktop, :pid, :title
-
-  def initialize( window_id, desktop, pid, title )
-    @window_id, @desktop, @pid, @title = window_id, desktop, pid, title
-  end
-
-  # create a new Window instance from the pid
-  def self.pid( pid )
-    list.find {|x| x.pid == pid.to_s }
-  end
-
-  def self.wmctrl( *args )
-    unless `which wmctrl` == ''
-      `wmctrl #{args * ' '}`
-    else
-      ''
-    end
-  rescue
-    ''
-  end
-
-  def wmctrl( *args )
-    self.class.wmctrl( *args )
-  end
-
-  # window is the Window ID
-  def activate
-    wmctrl "-i -R 0x#{window_id}"
-    $?
-  end
-
-  def self.list
-    wmctrl( '-lp' ).split("\n").map do |line|
-      line =~ /^(0x[[:xdigit:]]+)\s+(-?\d+)\s+(\d+)\s+(.*)/i
-      Window.new( $1, $2, $3, $4 )
-    end
-  end
-end