hilfer 0.10.0 → 0.10.1

data/ChangeLog

@@ -1,3 +1,35 @@
+2009-08-03 15:52  panic
+
+	* [r4358] History.txt, lib/hilfer/scite_editor.rb,
+	  lib/hilfer/tree_viewer.rb:
+	  Change pipe names. Add some comments.
+
+2009-08-03 15:12  panic
+
+	* [r4357] lib/hilfer/scite_editor.rb:
+	  Fix the process launching and waiting for scite. Change to
+	  debug?. Other debug message tweaks.
+
+2009-08-03 14:32  panic
+
+	* [r4356] lib/hilfer/tree_viewer.rb:
+	  whitespace changes
+
+2009-08-01 18:53  panic
+
+	* [r4355] lib/hilfer/version.rb:
+	  bump version
+
+2009-08-01 18:52  panic
+
+	* [r4353] Manifest.txt, lib/hilfer/window.rb:
+	  Remove debug output. Add files to Manifest.
+
+2009-08-01 18:40  panic
+
+	* [r4352] History.txt, README.txt:
+	  Notes and docs
+
 2009-08-01 18:28  panic
 
 	* [r4351] bin/hilfer, lib/hilfer/extensions.rb,

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.10.1 / 2009-08-03
+
+* Rework process launching and waiting for more robustity (sic)
+* rename pipes for easier manual cleanup when necessary
+
 === 0.10.0 / 2009-08-01
 
 * Use wmctrl to raise SciTE window.

data/lib/hilfer/scite_editor.rb

@@ -5,8 +5,9 @@ class SciteEditor
   # options can contain :debug
   # view is a GtkTreeView
   def initialize( options = {} )
-    @scite_pipe_name = "/tmp/#{ENV['USER']}.#{Process.pid}.scite"
-    @director_pipe_name = "/tmp/#{ENV['USER']}.#{Process.pid}.director"
+    @scite_pipe_name = "/tmp/hilfer.#{ENV['USER']}.#{Process.pid}.scite"
+    @director_pipe_name = "/tmp/hilfer.#{ENV['USER']}.#{Process.pid}.director"
+    @pipe_name_file = "/tmp/hilfer.#{ENV['USER']}.scite"
     
     cleanup
     
@@ -18,11 +19,17 @@ class SciteEditor
   
   attr_reader :options
   attr_reader :scite_pid
+  attr_reader :pipe_name_file
+  
+  def debug?
+    @options[:debug]
+  end
   
   def launched?
     !@scite_pid.nil?
   end
   
+  # return a Window object for the editor.
   def window
     @window ||= Window.pid( @scite_pid )
   end
@@ -49,20 +56,24 @@ class SciteEditor
     launch
     File.open( @scite_pipe_name, 'a' ) do |file|
       file.puts "#{cmd.to_s}:#{arg.to_s}"
-      puts "sending: #{cmd.to_s}:#{arg.to_s}" if @options[:debug]
+      puts "sending: #{cmd.to_s}:#{arg.to_s}" if debug?
     end
   end
   
   # bring the SciTE instance to the current
   # desktop and raise it.
   def activate
-    window.activate unless window.nil?
+    unless window.nil?
+      puts "activating scite" if debug?
+      window.activate
+      puts "finished activating scite" if debug?
+    end
   end
 
   # open files in scite
   def open_action( files )
     files.each { |x| send_cmd "open", x.path }
-    send_cmd :identity, 0
+    #~ send_cmd :identity, 0
     activate
   end
   
@@ -78,6 +89,7 @@ class SciteEditor
   
   # shut down editor, if it's open
   def quit
+    # check for launched?, otherwise send_cmd will attempt to auto-launch.
     send_cmd :quit if launched?
   end
   
@@ -97,6 +109,7 @@ class SciteEditor
     @views.each { |v| v.synchronise_editor_path( fs_path ) }
   end
 
+  # view must respond to synchronise_editor_path( fs_path )
   def register_view( view )
     @views << view
   end
@@ -105,10 +118,6 @@ class SciteEditor
     @views.delete( view )
   end
   
-  def pipe_name_file
-    @pipe_name_file ||= "/tmp/#{ENV['USER']}.hilfer.scite"
-  end
-  
   def write_pipe_name
     File.open( pipe_name_file, 'w' ) do |f|
       f.write @scite_pipe_name
@@ -116,8 +125,10 @@ class SciteEditor
     end
   end
 
-  # start up the editor if there isn't already one
-  # calling it when the editor is already open does nothing
+  # 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?
     
@@ -128,9 +139,23 @@ class SciteEditor
     
     scite_cmd = "/usr/bin/scite"
     
-    # start a process to clean up when scite exits
-    @scite_pid = fork()
-    if @scite_pid.nil?
+    # wait for scite shutdown by SIGCHLD, and clean up fifo files.
+    @handler ||= trap( "CHLD" ) do |signal|
+      child_pid = Process.wait( -1, Process::WNOHANG )
+      # copy this now, before something else grabs it
+      process_status = $?
+      if @scite_pid == child_pid
+        puts "process_status: #{process_status.inspect}" if debug?
+        puts "cleaning pipes" if debug?
+        cleanup
+        reset
+        puts "finished cleaning pipes" if debug?
+      end
+    end
+    
+    # fork and exec scite, so we can get scite's pid
+    if ( @scite_pid = fork() ).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]
@@ -139,43 +164,25 @@ class SciteEditor
         "-ipc.director.name=#{@director_pipe_name}",
         "-ipc.scite.name=#{@scite_pipe_name}"
       )
-    else
-      start_cleanup
     end
     
-    puts "scite launched with pid #{@scite_pid}" if @options[:debug]
+    puts "in parent: scite launched with pid #{@scite_pid}" if debug?
     
-    # start the listener thread
+    # listen for incoming scite events, like file change and open
     start_listener
   end
   
 protected
-
-  def start_cleanup
-    Thread.new do
-      # wait for Scite to end, and cleanup
-      begin
-        puts "waiting for scite(#{@scite_pid})" if @options[:debug]
-        Process.wait( @scite_pid )
-        cleanup
-        reset
-        puts "cleaned up scite pipes" if @options[:debug]
-      rescue Exception => e
-        puts "e: #{e.inspect}"
-        puts e.backtrace
-      end
-    end
-  end
   
   def start_listener
     
     sleep 0.1 while !File.exists? @scite_pipe_name
     
-    Thread.new( self ) do |arg|
+    Thread.new do
       begin
-        arg.listen
+        listen
       rescue Errno::ENOENT
-        break
+        puts "pipe gone away, so stop listening" if debug?
       rescue Exception => e
         print "listener thread ended: ", e.inspect, "\n"
         puts e.backtrace
@@ -189,7 +196,7 @@ protected
     File.open( @director_pipe_name ).each( "\x0" ) do |line|
       begin
         line = line.slice(0...-1) if line[-1] = 0
-        print "heard #{line}\n" if @options[:debug]
+        print "heard #{line}\n" if debug?
         case line
           # scite sends one of these for each file opened
           when /^opened:(.*)$/
@@ -207,13 +214,13 @@ protected
           # TODO could check that it exists and add it if not.
           when /^saved:(.*)$/
           
-          when /^closed$/
+          when /^closing$/
             puts "SciTE closing"
             break
 
           # print it out
           else
-            print "unknown: ", line, "\n" if @options[:debug]
+            print "unknown from scite: ", line, "\n" if debug?
         end
       rescue Exception => e
         print "caught Exception in listen: ", e.inspect, "\n"

data/lib/hilfer/tree_viewer.rb

@@ -396,7 +396,7 @@ class TreeViewer
           @editor.insert paths
           
         # ctrl-c copies current selections as text
-        when event.c? && event.state.control_mask?  && !event.state.shift_mask?
+        when event.c? && event.state.control_mask? && !event.state.shift_mask?
           paths = ""
           
           # fetch all selected items
@@ -438,7 +438,7 @@ class TreeViewer
         when event.r? && event.state.control_mask?
           refresh
           
-        # ctrl-t opens a terminal window on the given directorties.
+        # ctrl-t opens a terminal window on the given directories.
         # Uses gnome-terminal and opens directories in tabs
         when event.t? && event.state.control_mask? && !event.state.shift_mask?
           # collect all unique directories
@@ -527,7 +527,7 @@ class TreeViewer
             end
             break
           end
-
+          
         # ctrl-down means go to next sibling with children
         when event.down? && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|

data/lib/hilfer/version.rb

@@ -1,3 +1,3 @@
 module Hilfer
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hilfer
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - John Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-01 00:00:00 +02:00
+date: 2009-08-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency