hilfer 0.11.3 → 0.11.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.11.4 / 2011-08-16
+
+* If a a file path is specified, open its parent
+
 === 0.11.3 / 2011-06-21
 
 * Remove Hoe

data/lib/hilfer/tree_viewer.rb

@@ -50,7 +50,7 @@ which is the root node of the tree, but it's never displayed
 =end
 class TreeViewer
   include SvnColours if HAS_SUBVERSION
-  
+
   attr_reader :view, :editor, :root_item
 
   # Can pass in $options[:terminal] => some_terminal
@@ -65,13 +65,17 @@ class TreeViewer
     # these need to be window-local
     @expecting_synchronize_path = false
     @auto_synchronize_path = $options[:auto_sync]
-    @root_item = HilferItem.new( '', path )
+
+    path = Pathname.new( path )
+    path = path.parent while !path.directory?
+
+    @root_item = HilferItem.new( '', path.to_s )
     # TODO this shuold be in set_root or something like that
     @location.text = @root_item.path
     @location.select_region(0,0)
     @location.position = -1
     @hilfer_items = {}
-    
+
     # locators are things that provide a set of shortcut keys
     # to jump to specific directories, files, or related locations
     @locators = []
@@ -227,10 +231,10 @@ class TreeViewer
       editable && editable.signal_connect("editing-done") do |widget|
         # Fetch the HilferItem
         item = @view.model.get_iter(path)[0]
-        
+
         # make the new file name, in full
         new_path = ( Pathname.new( item.path ).parent + editable.text )
-        
+
         # rename the file if it's renameable
         if editable.text != item.item && !File.exists?( new_path.to_s )
           # rename the file
@@ -246,10 +250,10 @@ class TreeViewer
         end
         true
       end
-      
+
       true
     end
-    
+
     @view.append_column( column )
   end
 
@@ -279,7 +283,7 @@ class TreeViewer
   def confirm_delete_files( iters )
     msg = "Are you sure you want to delete\n"
     iters.each { |it| msg += it[0].path + "\n" }
-    
+
     confirm = Gtk::MessageDialog.new(
       @window,
       Gtk::Dialog::Flags::MODAL,
@@ -299,7 +303,7 @@ class TreeViewer
           true
       end
     end
-    
+
     # actually delete the files
     confirm.run do |response|
       delete_files( iters ) if response == Gtk::Dialog::RESPONSE_YES
@@ -317,32 +321,32 @@ class TreeViewer
       end
     end
   end
-  
+
   # handle keypresses
   # TODO use HandlerDefn
   def init_keys
     @view.signal_connect( 'key-press-event' ) do |widget,event|
       puts "event: #{event.inspect}" if $options[:debug]
-      
+
       retval = true
       case
         # enter - go into directory
         # or open all selected files
         when event.match( /return/i, /enter/i ) && !event.state.control_mask?
           items = []
-          
+
           # fetch all selected items
           widget.selection.selected_each do |model, path, iter|
             items << model.get_value( iter, 0 )
           end
-          
+
           # go into if the first item is a directory
           open_action( items )
-          
+
         # ctrl-enter opens new window with the selected root(s)
         when event.match( /return/i, /enter/i ) && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|
-            new_path = 
+            new_path =
             if !iter[0].dir?
               # open the directory this file lives in
               # unless we're already in that directory
@@ -353,14 +357,14 @@ class TreeViewer
             end
             TreeViewerWindow.new( new_path, @editor ) unless new_path.nil?
           end
-          
+
         # backspace - go up to parent directory
         when event =~ 'BackSpace'
           # go up one directory
           temp = Pathname.new( @root_item.path )
           @root_item.path = temp.parent.realpath.to_s
           go_into( @root_item.path )
-          
+
         # del on main keyboard or keypad deletes a file
         when event =~ /Delete/
           iters = []
@@ -368,7 +372,7 @@ class TreeViewer
             iters << iter
           end
           confirm_delete_files( iters )
-          
+
         # ctrl-e and F2 edits the file name
         when ( event.e? && event.state.control_mask? ) || event.f2?
           # make sure all the files are selected
@@ -382,11 +386,11 @@ class TreeViewer
             # the rest of the work is done in the renderer's handler.
             @text_renderer.editable = false
           end
-        
+
         # ctrl-d sends some debug/info commands to scite
         when event.d? && event.state.control_mask? && !event.state.shift_mask?
           @editor.dump
-          
+
         # ctrl-b sends the current selection to the editor
         when event.b? && event.state.control_mask?  && !event.state.shift_mask?
           paths = []
@@ -395,20 +399,20 @@ class TreeViewer
             paths << model.get_value( iter, 0 ).path
           end
           @editor.insert paths
-          
+
         # ctrl-c copies current selections as text
         when event.c? && event.state.control_mask? && !event.state.shift_mask?
           paths = []
-          
+
           # fetch all selected items
           # don't use a join here so we get a trailing newline
           widget.selection.selected_each do |model, path, iter|
             paths << model.get_value( iter, 0 ).path
           end
-          
+
           Gtk::Clipboard.get( Gdk::Selection::CLIPBOARD ).text = paths.join("\n")
-        
-        # ctrl-v selects the files in the clipboard 
+
+        # ctrl-v selects the files in the clipboard
         when event.v? && event.state.control_mask?  && !event.state.shift_mask?
           text = Gtk::Clipboard.get( Gdk::Selection::CLIPBOARD ).wait_for_text
           paths = text.strip.split( /\s*\n\s*/ )
@@ -419,18 +423,18 @@ class TreeViewer
             ( fullpath.exist? ? fullpath : x ).to_s
           end
           select_fs_paths( paths )
-          
+
         # ctrl-n opens new window with same root
         when event.n? && event.state.control_mask?
           TreeViewerWindow.new( @root_item.path, @editor )
-          
+
         # ctrl-y synchronizes with current editor file
         when event.y? && event.state.control_mask?
           # make sure other windows don't synchronize
           @expecting_synchronize_path = true
           # ask editor for current file and sync
           @editor.synchronize_path
-          
+
         # alt-y toggles automatic synchronization
         when event.y? && event.state.mod1_mask?
           @auto_synchronize_path = !@auto_synchronize_path
@@ -438,7 +442,7 @@ class TreeViewer
         # ctrl-r refreshes from filesystem
         when event.r? && event.state.control_mask?
           refresh
-          
+
         # 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?
@@ -456,22 +460,22 @@ class TreeViewer
             end
           end
           terminal.launch( dirs )
-          
+
         # alt-l toggles the location bar
         when event.l? && event.state.mod1_mask?
           @location.no_show_all = true
           @location.visible = !@location.visible?
-          
+
         # alt-q toggles whether shutdown is automatic or not
         when event.q? && event.state.mod1_mask?
           $options[:quit_editor] = !$options[:quit_editor]
-          
+
         # ctrl-* on keypad means expand the entire tree
         when event =~ 'KP_Multiply' && 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 =~ 'KP_Multiply' && event.state.empty?
           widget.selection.selected_rows.each do |path|
@@ -480,11 +484,11 @@ class TreeViewer
               expand_dir( widget, path, iter )
             end
           end
-          
+
         # shift-/ on keypad means collapse the entire tree
         when event =~ 'KP_Divide' && event.state.shift_mask?
           @view.collapse_all
-          
+
         # ctrl-left means go to parent
         when event =~ /left$/i && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|
@@ -492,11 +496,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.right? && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|
@@ -508,11 +512,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.up? && event.state.control_mask?
           widget.selection.selected_each do |model, path, iter|
@@ -528,7 +532,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|
@@ -581,7 +585,7 @@ class TreeViewer
             # false means don't expand children
             widget.expand_row( path, false )
           end
-          
+
         else
           # indicate signal not handled
           retval = false
@@ -594,7 +598,7 @@ class TreeViewer
       retval
     end
   end
-  
+
   def expand_dir( widget, path, iter )
     # make sure all directories in subtree are populated
     populate( @view.model, iter[0], iter, 100 )
@@ -611,7 +615,7 @@ class TreeViewer
       paths << cur.clone
       cur.up!
     end
-    
+
     # now open the necessary paths from the top down
     # false is don't open all children
     paths.reverse.each do |x|
@@ -619,18 +623,18 @@ class TreeViewer
       @view.selection.unselect_path( x )
     end
   end
-  
+
   def unselect_all
     @view.selection.unselect_all
   end
-  
+
   def select_children( widget, iter )
     widget.expand_row( iter.path, false )
     (0...iter.n_children).each do |index|
       select_iter( iter.nth_child( index ), false, false )
     end
   end
-  
+
   # set selection and cursor to the given GtkTreeModel path
   def select_path( path, unselect = true, set_cursor = true )
     unselect_all if unselect
@@ -650,7 +654,7 @@ class TreeViewer
     # path, column, use_align, row_align, col_align
     @view.scroll_to_cell( iter.path, nil, true, 0.5, 0.0 )
   end
-  
+
   # Set selection to the given filesystem path.
   # TODO could optimise this to select faster if we
   # use directory names. Possibly also use select_iter if it's faster
@@ -678,13 +682,13 @@ class TreeViewer
           @view.set_cursor( iter.path, nil, false )
           cursor_set = true
         end
-        
+
         select_iter( iter, false, false )
       end
     end
-    
+
   end
-  
+
   def select_first
     # set first item as selected
     @view.selection.select_path Gtk::TreePath.new( '0' )
@@ -700,7 +704,7 @@ class TreeViewer
       @expecting_synchronize_path = false
     end
   end
-  
+
   # called from open_action when we don't want the auto-centering
   # to do its thing.
   def no_synchronize
@@ -709,7 +713,7 @@ class TreeViewer
     yield @editor
     @auto_synchronize_path = save
   end
-  
+
   # called from the keyboard handler on enter
   # and the double-click handler to
   # open files or go into a directory
@@ -777,13 +781,13 @@ class TreeViewer
       {}
     end
   end
-  
+
   # populate the model from the filesystem
   # by default populate only 1 level down
   def populate( model, item, parent_iter, levels_to_populate = 1, level = 0 )
     iter = nil
     path_colours = do_compute_colours( item )
-    
+
     Dir.new( item.path ).entries.sort.each do |x|
       begin
         # ignore directory entries

data/lib/hilfer/version.rb

@@ -1,3 +1,3 @@
 module Hilfer
-  VERSION = '0.11.3'
+  VERSION = '0.11.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hilfer
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-21 00:00:00.000000000 +02:00
+date: 2011-08-16 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
-  requirement: &70808530 !ruby/object:Gem::Requirement
+  requirement: &79176550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.90.9
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70808530
+  version_requirements: *79176550
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &70808250 !ruby/object:Gem::Requirement
+  requirement: &79176270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: 3.7.0
   type: :development
   prerelease: false
-  version_requirements: *70808250
+  version_requirements: *79176270
 description: Programmers file browser for SciTE
 email: panic@semiosix.com
 executables: