xiki 0.5.1a → 0.5.3a

data/lib/{bookmarks.rb → xiki/bookmarks.rb}

@@ -1,5 +1,5 @@
-require 'location'
-require 'keys'
+require 'xiki/location'
+require 'xiki/keys'
 require 'yaml'
 
 class Bookmarks
@@ -61,9 +61,9 @@ class Bookmarks
 
     # If arg is a symbol, use it as the prefix
     prefix = ""
-    if arg && arg.type == Symbol
+    if arg && arg.class == Symbol
       prefix = arg.to_s
-    elsif arg && arg.type == String
+    elsif arg && arg.class == String
       self.set(arg.sub(/^\$/, ""))
       return
     end
@@ -158,9 +158,9 @@ class Bookmarks
     #el4r_lisp_eval "(require 'bookmark)(bookmark-maybe-load-default-file)"
     # If arg is a symbol, use it as the prefix
     prefix_to_bm = ""
-    if bookmark && bookmark.type == Symbol
+    if bookmark && bookmark.class == Symbol
       prefix_to_bm = bookmark.to_s
-    elsif bookmark && bookmark.type == String
+    elsif bookmark && bookmark.class == String
       keys = bookmark
       #       return self.jump(bookmark.sub(/^\$/, ""))
     end
@@ -228,7 +228,6 @@ class Bookmarks
           end
       end
       return path if bm.nil?
-
       # If a slash, cut off filename if there is one (only dir is wanted)
       if options[:file_ok]   # Put slash back if there was one
         bm << "/" if bm !~ /\/$/ && slash.any?
@@ -301,13 +300,15 @@ class Bookmarks
     if ! path   # Print all bookmarks
       all = $el.elvar.bookmark_alist.collect { |bm|
         item = bm.to_a
-        [item[0], item[1].to_a[0][1]]
+
+        second = item[1]   # Either (filename . "/path") or ((filename . "/path") ...)
+        second = second[1].is_a?(String) ? second[1] : second[0][1]
+
+        [item[0], second]
       }
       all.each do |l|
         n, p = l
         result << "- #{n}) @#{p.sub(/\/$/,'')}\n"
-        #         puts "- #{n.ljust(7)} #{p.sub(/\/$/,'')}"
-        #puts "- #{n}: #{p}"
       end
       return result
     end

data/lib/{buffers.rb → xiki/buffers.rb}

@@ -21,19 +21,19 @@ class Buffers
       case Keys.prefix :clear=>true
 
       # Show all by default
-      when nil, "all":  return list.map{ |b| $el.buffer_name(b) }.map{ |o| "| #{o}\n" }.join('')
+      when nil, "all";  return list.map{ |b| $el.buffer_name(b) }.map{ |o| "| #{o}\n" }.join('')
 
       # Only files (no buffers)
-      when :u:  return list.select{ |b| $el.buffer_file_name(b) }.map{ |b| "| #{$el.buffer_name(b)}\n" }.join('')
+      when :u;  return list.select{ |b| $el.buffer_file_name(b) }.map{ |b| "| #{$el.buffer_name(b)}\n" }.join('')
 
       # Only buffer without files
-      when 0:  return list.select{ |b| ! $el.buffer_file_name(b) }.map{ |b| "| #{$el.buffer_name(b)}\n" }[1..-1].join('')
+      when 0;  return list.select{ |b| ! $el.buffer_file_name(b) }.map{ |b| "| #{$el.buffer_name(b)}\n" }[1..-1].join('')
 
-      when 1:  return list.select{ |b| $el.buffer_file_name(b) }.map{ |b| $el.buffer_name(b) }[1..-1]
-      when 3:  return list.select{ |b| ! $el.buffer_file_name(b) && $el.buffer_name(b) =~ /^#/ }.map{ |b| $el.buffer_name(b) }
-      when 4:  return list.select{ |b| ! $el.buffer_file_name(b) && $el.buffer_name(b) =~ /^\*console / }.map{ |b| $el.buffer_name(b) }
-      when 6:  return list.select{ |b| $el.buffer_file_name(b) =~ /\.rb$/ }.map{ |b| $el.buffer_name(b) }
-      when 7:  return list.select{ |b| $el.buffer_file_name(b) =~ /\.notes$/ }.map{ |b| $el.buffer_name(b) }
+      when 1;  return list.select{ |b| $el.buffer_file_name(b) }.map{ |b| $el.buffer_name(b) }[1..-1]
+      when 3;  return list.select{ |b| ! $el.buffer_file_name(b) && $el.buffer_name(b) =~ /^#/ }.map{ |b| $el.buffer_name(b) }
+      when 4;  return list.select{ |b| ! $el.buffer_file_name(b) && $el.buffer_name(b) =~ /^\*console / }.map{ |b| $el.buffer_name(b) }
+      when 6;  return list.select{ |b| $el.buffer_file_name(b) =~ /\.rb$/ }.map{ |b| $el.buffer_name(b) }
+      when 7;  return list.select{ |b| $el.buffer_file_name(b) =~ /\.notes$/ }.map{ |b| $el.buffer_name(b) }
 
       end
       return
@@ -132,8 +132,8 @@ class Buffers
 
   def self.open_viewing
     case Keys.prefix
-    when nil:  Launcher.open("- Buffers.tree 25/")
-    when 0:  Launcher.open("- Buffers.tree/")
+    when nil;  Launcher.open("- Buffers.tree 25/")
+    when 0;  Launcher.open("- Buffers.tree/")
     else  Launcher.open("- Buffers.tree #{Keys.prefix}/")
     end
   end

data/lib/{clipboard.rb → xiki/clipboard.rb}

@@ -1,5 +1,5 @@
-require 'keys'
-require 'file_tree'
+require 'xiki/keys'
+require 'xiki/file_tree'
 
 # Provides copy and paste functionality
 class Clipboard

data/lib/{code.rb → xiki/code.rb}

@@ -1,10 +1,6 @@
-require 'block'
+require 'xiki/block'
 require 'stringio'
-gem 'ruby2ruby'
-require 'ruby2ruby'
-gem 'ParseTree'
-require 'parse_tree'
-require 'parse_tree_extensions'   # required for .to_ruby
+
 class Code
 
   def self.menu
@@ -643,7 +639,7 @@ class Code
   end
 
   def self.to_ruby o
-    o.to_ruby
+    o.to_source
   end
 
   def self.isearch_just_should

data/lib/{code_tree.rb → xiki/code_tree.rb}

@@ -1,5 +1,5 @@
-require 'line'
-require 'ol'
+require 'xiki/line'
+require 'xiki/ol'
 
 class CodeTree
 
@@ -104,7 +104,7 @@ class CodeTree
     if ! stdout.nonempty? and ! returned.nil?
       stdout = self.returned_to_s returned
     else
-      message(returned.to_s) if returned and (!returned.is_a?(String) or returned.size < 500)
+      $el.message(returned.to_s) if returned and (!returned.is_a?(String) or returned.size < 500)
     end
 
     stdout = self.draw_exception(e, code) if e

data/lib/{color.rb → xiki/color.rb}

@@ -1,5 +1,5 @@
-require 'effects'
-require 'styles'
+require 'xiki/effects'
+require 'xiki/styles'
 
 # Colors lines, and shows only colored lines
 class Color
@@ -175,21 +175,13 @@ class Color
 
     return if ! $el
 
-    # Orange path in mode line
-    # Blue path in mode line
-    #     Styles.define :mode_line_dir, :fg=>"7ce", :size=>"0", :face=>"arial", :bold=>false
-
-    Styles.define :mode_line_file, :fg=>"fff", :size=>"0", :face=>"arial", :bold=>false
-
-    if Styles.inverse
-      Styles.define :mode_line_dir, :fg=>"d93", :size=>"0", :face=>"arial", :bold=>false   # Brighter
+    if Styles.dark_bg?
 
       Styles.define :color_rb_red, :bg => "500"
       Styles.define :color_rb_orange, :bg => "442500"
       Styles.define :color_rb_yellow, :bg => "440"
       Styles.define :color_rb_green, :bg => "131"
       Styles.define :color_rb_white, :fg=>'222', :bg=>'fff', :border=>['fff', -1]
-
       Styles.define :color_rb_light, :bg => "252525"
 
       Styles.define :color_rb_blue, :bg => "005"
@@ -197,14 +189,12 @@ class Color
 
     else
 
-      Styles.define :mode_line_dir, :fg=>"ea4", :size=>"0", :face=>"arial", :bold=>false   # Brighter
-
       Styles.define :color_rb_red, :bg => "ffd5d5"
       Styles.define :color_rb_orange, :bg => "ffe5bb"
       Styles.define :color_rb_yellow, :bg => "f9f9aa"
       Styles.define :color_rb_green, :bg => "e0ffcc"
-      Styles.define :color_rb_light, :bg => "ddd"
       Styles.define :color_rb_white, :fg=>'222', :bg=>'666', :border=>['666', -1]
+      Styles.define :color_rb_light, :bg => "ddd"
 
       Styles.define :color_rb_blue, :bg => "dde5ff"
       Styles.define :color_rb_purple, :bg => "f2ddff"

data/lib/{console.rb → xiki/console.rb}

@@ -106,6 +106,8 @@ class Console
       result = ""
       result << stdout.readlines.join('')
       result << stderr.readlines.join('')
+
+      result.force_encoding("binary") if result.respond_to? :force_encoding
       result.gsub!("\c@", '.')   # Replace out characters that el4r can't handle
       return result
 
@@ -122,6 +124,10 @@ class Console
       $el.erase_buffer if reuse_buffer
       $el.elvar.default_directory = dir if dir
       $el.shell $el.current_buffer
+
+      # Don't prompt with "buffer has a running process" when closing
+      $el.set_process_query_on_exit_flag $el.get_buffer_process($el.current_buffer), nil
+
       Move.bottom
       if command  # If nil, just open console
         $el.insert command

data/lib/{control_lock.rb → xiki/control_lock.rb}

@@ -4,6 +4,10 @@
 class ControlLock
 
   def self.disable
-    $el.control_lock_enable if $el.boundp(:control_lock_mode_p) and $el.elvar.control_lock_mode_p
+    $el.control_lock_enable if self.enabled?
+  end
+
+  def self.enabled?
+    $el.boundp(:control_lock_mode_p) and $el.elvar.control_lock_mode_p
   end
 end

data/lib/{control_tab.rb → xiki/control_tab.rb}

@@ -29,11 +29,13 @@ class ControlTab
       View.layout_output :dont_highlight=>1
 
       Move.to_end
-      Search.forward "^-", :go_anyway=>1
+      Search.forward "^ *-", :go_anyway=>1
       if View.cursor == View.bottom
         Move.to_previous_paragraph
         Line.next
       end
+
+      Line.to_beginning
       Effects.blink
       Launcher.launch
       @@nine_prefix = true

data/lib/{core_ext.rb → xiki/core_ext.rb}

@@ -1,4 +1,4 @@
-require 'text_util'
+require 'xiki/text_util'
 
 class Array
   def blank?
@@ -18,11 +18,15 @@ end
 
 class String
   def blank?
-    self.nil? || self.empty?
+    empty?
   end
 
   def present?
-    ! self.nil?
+    ! empty?
+  end
+
+  def any?
+    ! empty?
   end
 
   def unindent

data/lib/{cursor.rb → xiki/cursor.rb}

@@ -7,23 +7,23 @@ class Cursor
     > Summary
     | Api for changing the cursor
     |
-    - Colors/
+    - colors/
       @Cursor.white
       @Cursor.red
       @Cursor.green
       @Cursor.blue
       @Cursor.color "#80f"
-    - Shapes/
+    - shapes/
       @Cursor.bar
       @Cursor.underscore
       @Cursor.hollow
       @Cursor.box
-    - Colors and Shapes/
+    - colors and shapes/
       @Cursor.red_bar
       @Cursor.green_underscore
       @Cursor.blue_hollow
       @Cursor.black_box
-    - Remembering and restoring cursor/
+    - remembering and restoring cursor/
       @Cursor.remember :a
       @Cursor.restore :a
     `
@@ -103,7 +103,6 @@ class Cursor
     before = @@remember[symbol]
     return Cursor.black_box unless before  # Black if not found
     type, color = before
-    $el.set_face_background :cursor, color
     $el.customize_set_variable :cursor_type, type
   end
 

data/lib/{diff_log.rb → xiki/diff_log.rb}

@@ -1,4 +1,4 @@
-require 'hide'
+require 'xiki/hide'
 
 # Will store a diff each time a file is saved.
 class DiffLog
@@ -41,7 +41,7 @@ class DiffLog
 
   def self.diffs path=nil
 
-    txt = File.read @@log
+    txt = File.open(@@log, 'rb') {|f| f.read}
     txt = txt.sub(/\A- /, '').split(/^- /).reverse.uniq
 
     path ||= Tree.dir   # Pull from tree if there
@@ -201,8 +201,8 @@ class DiffLog
     diff = Console.sync "diff -U 0 \"#{patha}\" \"#{@@temp_path}\""
     return if diff.empty? || diff =~ /: No such file or directory\n/   # Fail quietly if file didn't exist
 
-    diff = self.format diff
-    return diff if options[:dont_log]
+    diff = self.format(diff) rescue nil
+    return diff if diff.nil? || options[:dont_log]
 
     File.open(@@log, "a") { |f| f << diff } unless diff.count("\n") <= 2
   end

data/lib/{effects.rb → xiki/effects.rb}

@@ -1,4 +1,4 @@
-require 'styles'
+require 'xiki/styles'
 
 # Makes visual things happen
 class Effects
@@ -43,6 +43,9 @@ class Effects
     "
   end
 
+  #
+  # Effects.glow :color=>:forest
+  #
   def self.glow options={}
 
     what = options[:what]
@@ -91,7 +94,7 @@ class Effects
 
     sequence.each do |i|
       $el.overlay_put over, :face, (faces[i-1] || faces[0])
-      $el.sit_for 0.02
+      $el.sit_for 0.0005
     end
 
     $el.delete_overlay over

data/lib/{file_tree.rb → xiki/file_tree.rb}

@@ -1,9 +1,11 @@
-require 'styles'
-require 'line'
-require 'view'
+# -*- coding: utf-8 -*-
+
+require 'xiki/styles'
+require 'xiki/line'
+require 'xiki/view'
 require 'net/http'
 require 'uri'
-require 'cursor'
+require 'xiki/cursor'
 
 # Draws a tree from a dir structure and lets you incrementally search in the tree.
 # Usage (user):
@@ -164,8 +166,12 @@ class FileTree
 
   def self.grep_one_file(f, regex, indent)
     result = []
-    IO.foreach(f) do |line|
-      line.gsub!(/[\r\n\c@]+/, '')
+
+    return result if f =~ /\.(ai|icns|png|gif|jpg|gem)$/
+
+    IO.foreach(f, *Files.encoding_binary) do |line|
+      #       line.gsub!(/[\r\n\c@]+/, '')
+      line.chomp!
       if regex
         next unless line =~ regex
       end
@@ -178,7 +184,7 @@ class FileTree
     result = []
     current_line = Search.outline_goto_once   # If search_outline, we want to put cursor on that line when done
     line_found, matches_count, i = nil, 0, 0
-    IO.foreach(f) do |line|
+    IO.foreach(f, *Files.encoding_binary) do |line|
       i+=1
       line.gsub!(/[\r\n\c@]+/, '')
 
@@ -267,7 +273,7 @@ class FileTree
 
     return if ! $el
 
-    if Styles.inverse   # Bullets
+    if Styles.dark_bg?   # Bullets
       Styles.define :ls_bullet,
         :face => 'courier', :size => "+2",  # Mac
         :fg => "dd7700", :bold => true
@@ -278,9 +284,9 @@ class FileTree
     end
 
 
-    if Styles.inverse
-      Styles.define :quote_heading, :fg=>"fff", :size=>"0", :face=>"arial", :bold=>false
-      Styles.define :quote_heading2, :fg=>"fff", :size=>"-2", :face=>"arial", :bold=>false
+    if Styles.dark_bg?
+      Styles.define :quote_heading, :fg=>"fff", :size=>"0", :face=>"arial", :bold=>true
+      Styles.define :quote_heading2, :fg=>"fff", :size=>"-2", :face=>"arial", :bold=>true
       Styles.define :quote_heading_pipe, :fg=>"333", :size=>"0", :face => "verdana", :bold=>true
       Styles.define :quote_heading_bracket, :fg=>"4c4c4c", :size=>"-2", :face => "Monaco", :bold=>true
       Styles.define :quote_heading_small, :fg=>"fff", :size=>"-2", :face => "arial black", :bold=>true
@@ -297,8 +303,8 @@ class FileTree
       #       Styles.define :ls_dir, :fg => "bbb", :face => "verdana", :size => "-2", :bold => true
 
     else
-      Styles.define :quote_heading, :fg=>"444", :size=>"0", :face=>"arial", :bold=>false
-      Styles.define :quote_heading2, :fg=>"aaa", :size=>"-2", :face=>"arial", :bold=>false
+      Styles.define :quote_heading, :fg=>"444", :size=>"0", :face=>"arial", :bold=>true
+      Styles.define :quote_heading2, :fg=>"aaa", :size=>"-2", :face=>"arial", :bold=>true
       Styles.define :quote_heading_pipe, :fg=>"bbb", :size=>"0", :face => "verdana", :bold=>true
       Styles.define :quote_heading_bracket, :fg=>"bbb", :size=>"-2", :face => "Monaco", :bold=>true
       Styles.define :quote_heading_small, :fg=>"fff", :size=>"-2", :face => "arial black", :bold=>true
@@ -322,7 +328,7 @@ class FileTree
       :size => "-2",
       :bold => true
 
-    if Styles.inverse   #   | Quoted text
+    if Styles.dark_bg?   #   | Quoted text
       Styles.define :ls_quote,
         :size => "-1",
         :fg => "aaa"
@@ -425,12 +431,14 @@ class FileTree
   end
 
   def self.handles? list=nil
-    begin
-      list ||= Tree.construct_path(:list=>true)   # Use current line by default
-    rescue Exception=>e
-      return nil
+
+    if list.nil?
+      list ||= Tree.construct_path(:list=>true) rescue nil   # Use current line by default
     end
-    return 0 if self.matches_root_pattern?(Line.without_label :line=>list.first)
+
+    list = list.first if list.is_a?(Array)
+
+    return 0 if self.matches_root_pattern?(Line.without_label :line=>list)
     nil
   end
 
@@ -1103,7 +1111,7 @@ class FileTree
     if Line.blank?
 
       if prefix == :u || txt =~ /\A  +[-+]?\|[-+ ]/   # If C-u or whole thing is quoted already, unquote
-        txt = txt.grep(/\|/).join()
+        txt = txt.split("\n").grep(/\|/).join("\n")
         return $el.insert(txt.gsub(/^ *[-+]?\|([-+ ]|$)/, ""))   # Remove | ..., |+...., |<blank>, etc
       end
 
@@ -1276,7 +1284,7 @@ class FileTree
       return
     end
 
-    IO.foreach(path) do |line|
+    IO.foreach(path, *Files.encoding_binary) do |line|
       i+=1
       line.sub!(/[\r\n]+$/, '')
 
@@ -1479,9 +1487,8 @@ class FileTree
 
   def self.copy_path options={}
     Effects.blink :what=>:line
-
     # Return dir of view's file if at left margin, U, or not ^[|@-]
-    if Line !~ /^ +[|@+-]/ || Keys.prefix_u
+    if Line !~ /^ +[|@+-]/  # || Keys.prefix_u# It will never be :u, because the prefix is cleared before this is called
       path = View.file
     else
       path = Xiki.trunk.last   # Grab from wiki tree
@@ -1634,6 +1641,9 @@ class FileTree
     Effects.glow :fade_out=>1
     Line.delete
     Line.to_beginning
+
+    View.message "File deleted"
+
   end
 
   def self.move_latest_screenshot_to dest_path, dest_dir
@@ -1854,7 +1864,7 @@ class FileTree
     when 0
       # Just show path if 0+...
     when :-   # Just show # foo... comments...
-      self.enter_lines(/(^ *def |(^| )# .+\.\.\.$)/, :current_line=>current_line)
+      self.enter_lines(/(^ *def |(^| )(#|"|\/\/) .+\.\.\.$)/, :current_line=>current_line)
     when 6   # Just show # foo... comments...
       self.enter_lines(/(^ *def |self\.)/, :current_line=>current_line)
     when :u