diakonos 0.8.6 → 0.8.7

data/lib/diakonos/list.rb

@@ -0,0 +1,55 @@
+module Diakonos
+  class Diakonos
+    def openListBuffer
+      @list_buffer = openFile( @list_filename )
+    end
+    
+    def closeListBuffer
+      closeFile( @list_buffer )
+      @list_buffer = nil
+    end
+    
+    def showing_list?
+      @list_buffer
+    end
+    
+    def list_item_selected?
+      @list_buffer and @list_buffer.selecting?
+    end
+    
+    def current_list_item
+      if @list_buffer
+        @list_buffer.select_current_line
+      end
+    end
+    
+    def select_list_item
+      if @list_buffer
+        line = @list_buffer.select_current_line
+        @list_buffer.display
+        line
+      end
+    end
+    
+    def previous_list_item
+      if @list_buffer
+        cursorUp
+        @list_buffer[ @list_buffer.currentRow ]
+      end
+    end
+    
+    def next_list_item
+      if @list_buffer
+        cursorDown
+        @list_buffer[ @list_buffer.currentRow ]
+      end
+    end
+    
+    def with_list_file
+      File.open( @list_filename, "w" ) do |f|
+        yield f
+      end
+    end
+    
+  end
+end

data/lib/diakonos/logging.rb

@@ -0,0 +1,24 @@
+module Diakonos
+  class Diakonos
+    def log( string )
+      @log.puts string
+      @log.flush
+    end
+    
+    def debugLog( string )
+      @debug.puts( Time.now.strftime( "[%a %H:%M:%S] #{string}" ) )
+      @debug.flush
+    end
+    
+    def logBacktrace
+      begin
+        raise Exception
+      rescue Exception => e
+        e.backtrace[ 1..-1 ].each do |x|
+          debugLog x
+        end
+      end
+    end
+
+  end
+end

data/lib/diakonos/readline.rb

@@ -1,10 +1,10 @@
 module Diakonos
-  
+
   class Readline
-    
+
     # completion_array is the array of strings that tab completion can use
     # The block returns true if a refresh is needed?
-    def initialize( diakonos, window, prompt, initial_text = "", completion_array = nil, history = [], &block )
+    def initialize( diakonos, window, prompt, initial_text = "", completion_array = nil, history = [], do_complete = Diakonos::DONT_COMPLETE, on_dirs = :go_into_dirs, &block )
       @diakonos = diakonos
       @window = window
       @prompt = prompt
@@ -13,41 +13,48 @@ module Diakonos
       @initial_text = initial_text
       @completion_array = completion_array
       @list_filename = @diakonos.list_filename
-      
+
       @history = history
       @history << initial_text
       @history_index = @history.length - 1
-      
+
+      @do_complete = do_complete
+      @on_dirs = on_dirs
+
       @block = block
     end
-    
+
     def redraw_prompt
       @diakonos.setILine @prompt
     end
-    
+
     def call_block
       if @block
         @block.call( @input )
         @window.refresh
       end
     end
-    
+
     # Returns nil on cancel.
     def readline
       @input = @initial_text
       if not @input.empty?
         call_block
       end
-      
+
       @icurx = @window.curx
       @icury = @window.cury
       @window.addstr @initial_text
       @input_cursor = @initial_text.length
       @opened_list_file = false
-      
+
+      if @do_complete
+        completeInput
+      end
+
       loop do
-        c = @window.getch
-        
+        c = @window.getch.ord
+
         case c
         when Curses::KEY_DC
           if @input_cursor < @input.length
@@ -60,7 +67,7 @@ module Diakonos
           if @input_cursor > 0
             @input_cursor += -1
             @window.setpos( @window.cury, @window.curx - 1 )
-            
+
             # Curses::KEY_DC
             if @input_cursor < @input.length
               @window.delch
@@ -70,7 +77,7 @@ module Diakonos
           end
         when ENTER, Curses::KEY_F3
           item = @diakonos.current_list_item
-          if item and File.directory? item
+          if @on_dirs == :go_into_dirs and item and File.directory? item
             completeInput
           else
             break
@@ -140,6 +147,12 @@ module Diakonos
             @block.call @input
           end
           cursorWriteInput
+        when Curses::KEY_F5
+          @diakonos.decrease_grep_context
+          call_block
+        when Curses::KEY_F6
+          @diakonos.increase_grep_context
+          call_block
         else
           if c > 31 and c < 255 and c != BACKSPACE
             if @input_cursor == @input.length
@@ -157,15 +170,15 @@ module Diakonos
           end
         end
       end
-      
+
       @diakonos.closeListBuffer
-      
+
       @history[ -1 ] = @input
     end
 
     def redrawInput
       input = @input[ 0...Curses::cols ]
-      
+
       curx = @window.curx
       cury = @window.cury
       @window.setpos( @icury, @icurx )
@@ -173,11 +186,11 @@ module Diakonos
       @window.setpos( cury, curx )
       @window.refresh
     end
-    
+
     # Redisplays the input text starting at the start of the user input area,
     # positioning the cursor at the end of the text.
     def cursorWriteInput
-      if @input != nil
+      if @input
         @input_cursor = @input.length
         @window.setpos( @window.cury, @icurx + @input.length )
         redrawInput
@@ -190,8 +203,12 @@ module Diakonos
         matches = @completion_array.find_all { |el| el[ 0...len ] == @input and len <= el.length }
       else
         matches = Dir.glob( ( @input.subHome() + "*" ).gsub( /\*\*/, "*" ) )
+        if @on_dirs == :accept_dirs
+          matches = matches.select { |m| File.directory? m }
+        end
       end
-      
+      matches.sort!
+
       if matches.length == 1
         @input = matches[ 0 ]
         cursorWriteInput
@@ -205,7 +222,9 @@ module Diakonos
         if @completion_array.nil? and FileTest.directory?( @input )
           @input << "/"
           cursorWriteInput
-          completeInput
+          if @on_dirs != :accept_dirs
+            completeInput
+          end
         end
       elsif matches.length > 1
         common = matches[ 0 ]
@@ -219,12 +238,12 @@ module Diakonos
               @diakonos.log "'#{match}' is not a directory"
             end
             f.puts
-            
+
             if match[ 0 ] != common[ 0 ]
               common = nil
               break
             end
-            
+
             up_to = [ common.length - 1, match.length - 1 ].min
             i = 1
             while ( i <= up_to ) and ( match[ 0..i ] == common[ 0..i ] )
@@ -233,7 +252,7 @@ module Diakonos
             common = common[ 0...i ]
           end
         end
-        if common == nil
+        if common.nil?
           File.open( @list_filename, "w" ) do |f|
             f.puts "(no matches)"
           end
@@ -249,7 +268,7 @@ module Diakonos
       @diakonos.openListBuffer
       @window.setpos( @window.cury, @window.curx )
     end
-    
+
   end
 
 end

data/lib/diakonos/regexp.rb

@@ -1,6 +1,6 @@
 class Regexp
     def uses_bos
-        return ( source[ 0 ] == ?^ )
+        source[ 0 ] == ?^
     end
 end
 

data/lib/diakonos/sessions.rb

@@ -0,0 +1,70 @@
+module Diakonos
+  class Diakonos
+
+    def new_session( filepath )
+      basename = File.basename( filepath )
+      if not pid_session?( filepath )
+        name = basename
+      end
+      @session = {
+        'filename' => File.expand_path( filepath ),
+        'settings' => Hash.new,
+        'name' => name,
+        'files' => [],
+        'dir' => Dir.getwd,
+      }
+    end
+
+    def load_session_data( filename )
+      return if not File.exist? filename
+      File.open( filename ) do |f|
+        loaded = YAML::load( f )
+        if loaded
+          if(
+            loaded[ 'filename' ] and
+            loaded[ 'settings' ] and
+            loaded[ 'settings' ].respond_to?( :values ) and
+            loaded[ 'name' ] and
+            loaded[ 'files' ] and
+            loaded[ 'files' ].respond_to?( :each )
+          )
+            @session = loaded
+          end
+        end
+      end
+    end
+
+    def save_session( session_file = @session[ 'filename' ] )
+      return if session_file.nil?
+      @session[ 'files' ] = @buffers.collect { |filepath,buffer|
+        buffer.name ? filepath : nil
+      }.compact
+      File.open( session_file, 'w' ) do |f|
+        f.puts @session.to_yaml
+      end
+    end
+
+    def session_filepath_for( session_id )
+      if session_id and session_id !~ %r{/}
+        "#{@session_dir}/#{session_id}"
+      else
+        session_id
+      end
+    end
+
+    def pid_session?( path = @session[ 'filename' ] )
+      %r{/\d+$} === path
+    end
+
+    def increase_grep_context
+      current = settings[ 'grep.context' ]
+      @session[ 'settings' ][ 'grep.context' ] = current + 1
+    end
+    def decrease_grep_context
+      current = settings[ 'grep.context' ]
+      if current > 0
+        @session[ 'settings' ][ 'grep.context' ] = current - 1
+      end
+    end
+  end
+end

data/lib/diakonos/sized-array.rb

@@ -16,13 +16,13 @@ class SizedArray < Array
     def concat( other_array )
         super( other_array )
         resize
-        return self
+        self
     end
     
     def fill( *args )
         retval = super( *args )
         resize
-        return self
+        self
     end
     
     def <<( item )
@@ -30,7 +30,7 @@ class SizedArray < Array
         if size > @capacity
             retval = shift
         end
-        return retval
+        retval
     end
     
     def push( item )
@@ -42,7 +42,7 @@ class SizedArray < Array
         if size > @capacity
             retval = pop
         end
-        return retval
+        retval
     end
 end
 

data/lib/diakonos/string.rb

@@ -1,6 +1,6 @@
 class String
     def subHome
-        return gsub( /~/, ENV[ "HOME" ] )
+        gsub( /~/, ENV[ "HOME" ] )
     end
 
     def keyCode
@@ -57,22 +57,22 @@ class String
             when /^f(\d\d?)$/
                 retval = Curses::KEY_F0 + $1.to_i
             when /^ctrl\+[a-gi-z]$/
-                retval = downcase[ -1 ] - 96
+                retval = downcase[ -1 ].ord - 96
             when /^ctrl\+h$/
                 retval = Diakonos::CTRL_H
             when /^alt\+(.)$/
-                retval = [ Diakonos::ESCAPE, $1[ 0 ] ]
+                retval = [ Diakonos::ESCAPE, $1[ 0 ].ord ]
             when /^ctrl\+alt\+(.)$/, /^alt\+ctrl\+(.)$/
-                retval = [ Diakonos::ESCAPE, downcase[ -1 ] - 96 ]
+                retval = [ Diakonos::ESCAPE, downcase[ -1 ].ord - 96 ]
             when /^keycode(\d+)$/
                 retval = $1.to_i
             when /^.$/
-                retval = self[ 0 ]
+                retval = self[ 0 ].ord
         end
         if retval.class != Array
             retval = [ retval ]
         end
-        return retval
+        retval
     end
 
     def toFormatting
@@ -115,7 +115,7 @@ class String
                     end
             end
         end
-        return formatting
+        formatting
     end
 
     def toColourConstant
@@ -140,7 +140,7 @@ class String
           to_i
       end
     end
-    
+
     def toDirection( default = :down )
         direction = nil
         case self
@@ -157,24 +157,24 @@ class String
             else
                 direction = default
         end
-        return direction
+        direction
     end
-    
+
     def to_a
-        return [ self ]
+        [ self ]
     end
 
     def to_b
-        retval = false
         case downcase
-            when "true", "t", "1", "yes", "y", "on", "+"
-                retval = true
+        when "true", "t", "1", "yes", "y", "on", "+"
+          true
+        else
+          false
         end
-        return retval
     end
 
     def indentation_level( indent_size, indent_roundup, tab_size = Diakonos::DEFAULT_TAB_SIZE, indent_ignore_charset = nil )
-        if indent_ignore_charset == nil
+        if indent_ignore_charset.nil?
             level = 0
             if self =~ /^([\s]+)/
                 #whitespace = $1.gsub( /\t/, ' ' * tab_size )
@@ -198,10 +198,10 @@ class String
                 level = 0
             end
         end
-        
-        return level
+
+        level
     end
-    
+
     def expandTabs( tab_size = Diakonos::DEFAULT_TAB_SIZE )
         s = dup
         while s.sub!( /\t/ ) { |match_text|
@@ -211,9 +211,9 @@ class String
                 " " * ( tab_size - ( index % tab_size ) )
             }
         end
-        return s
+        s
     end
-    
+
     def newlineSplit
         retval = split( /\\n/ )
         if self =~ /\\n$/
@@ -226,9 +226,9 @@ class String
             end
             retval[ -1 ] = "^" << retval[ -1 ]
         end
-        return retval
+        retval
     end
-    
+
     # Works like normal String#index except returns the index
     # of the first matching regexp group if one or more groups are specified
     # in the regexp. Both the index and the matched text are returned.
@@ -236,7 +236,7 @@ class String
         if regexp.class != Regexp
             return index( regexp, offset )
         end
-        
+
         i = nil
         match_text = nil
         working_offset = 0
@@ -249,14 +249,14 @@ class String
                 if match.length > 1
                     # Find first matching group
                     1.upto( match.length - 1 ) do |match_item_index|
-                        if match[ match_item_index ] != nil
+                        if match[ match_item_index ]
                             i = match.begin( match_item_index )
                             match_text = match[ match_item_index ]
                             break
                         end
                     end
                 end
-                
+
                 break if i >= offset
             else
                 i = nil
@@ -264,10 +264,10 @@ class String
             end
             working_offset += 1
         end
-        
-        return i, match_text
+
+        [ i, match_text ]
     end
-    
+
     # Works like normal String#rindex except returns the index
     # of the first matching regexp group if one or more groups are specified
     # in the regexp. Both the index and the matched text are returned.
@@ -275,7 +275,7 @@ class String
         if regexp.class != Regexp
             return rindex( regexp, offset )
         end
-        
+
         i = nil
         match_text = nil
         working_offset = length
@@ -288,19 +288,19 @@ class String
                 if match.length > 1
                     # Find first matching group
                     1.upto( match.length - 1 ) do |match_item_index|
-                        if match[ match_item_index ] != nil
+                        if match[ match_item_index ]
                             i = match.end( match_item_index ) - 1
                             match_text = match[ match_item_index ]
                             break
                         end
                     end
                 end
-                
+
                 if match_text == ""
                     # Assume that an empty string means that it matched $
                     i += 1
                 end
-                
+
                 break if i <= offset
             else
                 i = nil
@@ -308,12 +308,19 @@ class String
             end
             working_offset -= 1
         end
-        
-        return i, match_text
+
+        [ i, match_text ]
     end
-    
+
     def movement?
-        return ( ( self =~ /^((cursor|page|scroll)(Up|Down|Left|Right)|find)/ ) != nil )
+        self =~ /^((cursor|page|scroll)(Up|Down|Left|Right)|find)/
+    end
+
+    # Backport of Ruby 1.9's String#ord into Ruby 1.8
+    unless method_defined?( :ord )
+      def ord
+        self[ 0 ]
+      end
     end
 end