xiki 0.5.1a → 0.5.3a

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

@@ -181,16 +181,16 @@ class Files
 
   def self.open_edited
     case Keys.prefix
-    when :u, 8:  Launcher.open("- edited/tree/")
+    when :u, 8;  Launcher.open("- edited/tree/")
     else  Launcher.open("- edited/")
     end
   end
 
   def self.open_history
     case Keys.prefix
-    when nil:  Keys.prefix = nil; Launcher.open("- Files.history/")
-    when 0:  Launcher.open("- Files.history_tree/")
-    when :u:  Launcher.open("- Files.history_tree 7/")
+    when nil;  Keys.prefix = nil; Launcher.open("- Files.history/")
+    when 0;  Launcher.open("- Files.history_tree/")
+    when :u;  Launcher.open("- Files.history_tree 7/")
     else  Launcher.open("- Files.history_tree #{Keys.prefix}/")
     end
   end
@@ -308,7 +308,7 @@ class Files
     return View.beep("- There's no file for this buffer!") if ! dest_path
 
     View.beep :times=>3
-    View.flash "- Delete CURRENT file for sure?", :times=>4
+    View.flash "- Delete CURRENT file (#{View.name})?", :times=>4
     answer = Keys.input :chars=>1, :prompt=>"- Delete current file for sure?"   #"
 
     return View.flash("- cancelled!") if answer !~ /y/i
@@ -326,6 +326,16 @@ class Files
 
   end
 
+  if /^1\.9/===RUBY_VERSION
+    def self.encoding_binary
+      [{:encoding => 'binary'}]
+    end
+  else
+    def self.encoding_binary
+      []
+    end
+  end
+
 end
 
 if $el

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

@@ -26,6 +26,7 @@ class History
     elsif options[:prompt_for_bookmark]
       bm = Keys.input(:timed => true, :prompt => "Enter bookmark to show content for: ")
       path = Bookmarks.expand(bm, :just_bookmark => true)
+      return View.beep("- Bookmark '#{bm}' not found!") if ! path
       path = File.expand_path(path)
 
       if ! options[:all] && View.files.member?(path)

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

@@ -163,7 +163,6 @@ class KeyBindings
     Keys.enter_file_path { Files.enter_file }   # Given a bookmark
     Keys.enter_firefox_tabs { Launcher.insert('- Firefox.tabs/') }   # Given a bookmark
     Keys.enter_history { DiffLog.enter_from_difflog }   # Save point and go to difflog to search
-    Keys.enter_insert_1 { Notes.enter_do_bullet }    # insert date string (and time if C-u)
     Keys.enter_insert_date { View.enter_date }
     Keys.enter_insert_comment { Code.enter_insert_comment }    # insert date string (and time if C-u)
     Keys.enter_insert_new { DiffLog.enter_new }   # Enter Old: enter newly-deleted from last save
@@ -195,7 +194,7 @@ class KeyBindings
     Keys.enter_like_variable { insert "\#{#{Clipboard.get(0)}}" }
 
     Keys.enter_menu { Xiki.insert_menu }   # Redundant with C-enter on blank line
-    Keys.enter_note { Notes.enter_do_bullet }   # Redundant with C-enter on blank line
+    Keys.enter_note { Notes.enter_note }   # Redundant with C-enter on blank line
     Keys.enter_outline { Launcher.enter_outline }   # in tree, enter methods or headings
 
     Keys.enter_push { Gito.code_tree_diff(:enter=>true) }   # Commit to repos, push, etc
@@ -639,8 +638,12 @@ class KeyBindings
     $el.el4r_lisp_eval("(require 'dired)")
     $el.define_key :dired_mode_map, $el.kbd("C-o"), nil
     $el.define_key :java_mode_map, $el.kbd("C-d"), nil
-    $el.el_require :php_mode
-    $el.define_key :php_mode_map, $el.kbd("C-d"), nil
+
+    begin
+      $el.el_require :php_mode
+      $el.define_key :php_mode_map, $el.kbd("C-d"), nil
+    rescue Exception=>e
+    end
 
     # C-l in ediff mode
     $el.defun(:ediff_disable_C_l) { $el.define_key(:ediff_mode_map, $el.kbd("C-l"), nil) }

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

@@ -1,7 +1,7 @@
-require 'pause_means_space'
-require 'line'
-require 'text_util'
-require 'launcher'
+require 'xiki/pause_means_space'
+require 'xiki/line'
+require 'xiki/text_util'
+require 'xiki/launcher'
 
 # Methods for defining keyboard shortcuts
 class Keys
@@ -297,40 +297,28 @@ class Keys
   #
   # Sample usages:
   # Keys.input   # Terminated by enter
+  # Keys.input "Type something: "
   # Keys.input :chars=>1   # Just one char
-  # Keys.input :control=>1   # One char if control
   # Keys.input :timed=>1   # Terminated by pause
   # Keys.input :optional=>1   # Terminated by pause
   #   - A pause at the beginning will result in no input (nil)
   #
-  def self.input options={}
+  def self.input *args
+
+    prompt = args.shift if args[0].is_a?(String)
+
+    options = args[0] || {}
 
     return self.input_with_choices(options) if options[:choices]
 
     Cursor.remember :before_input
-    Cursor.green
-    Cursor.hollow
 
-    prompt = options[:prompt] || "Input: "
+    # This is slow in mac emacs 23/24 :(
+    # Cursor.green
 
-    # Not completely implemented
-    if options[:control]
-      prompt = "todo - implement this: "
-
-      $el.elvar.inhibit_quit = true
-      # Maybe use this?
-        # Or call self.char?
-      # char = $el.char_to_string(Keys.remove_control($el.read_char(prompt))).to_s
-      c = read_char(prompt)
-      $el.elvar.inhibit_quit = nil
-      if c == 7
-        Cursor.restore :before_input
-        keyboard_quit
-      end
+    Cursor.hollow
 
-      Cursor.restore :before_input
-      return c
-    end
+    prompt ||= options[:prompt] || "Input: "
 
     if options[:chars]
       char = $el.char_to_string(
@@ -375,7 +363,6 @@ class Keys
     Cursor.restore :before_input
 
     $el.message ""
-
     # If nothing, return nil
     keys == "" ? nil : keys
   end
@@ -392,9 +379,10 @@ class Keys
 
   def self.to_letter ch
     return nil if ch.nil?
-    if ch < 27
+    if ch == 0
+      ch = 32
+    elsif ch < 27
       ch += 96
-
     elsif 67108896 <= ch and ch <= 67108921
       ch -= 67108864
     end
@@ -461,7 +449,7 @@ class Keys
     end
 
     file, line = Code.location_from_proc proc
-    file = "#{XIKI_ROOT}/#{file}" unless file =~ /^\//
+    file = "#{Xiki.dir}#{file}" unless file =~ /^\//
     Location.go(file)
     View.to_line line.to_i
     Effects.blink(:what=>:line)
@@ -496,7 +484,9 @@ class Keys
     end
 
     Cursor.remember :before_q
-    Cursor.green
+    Cursor.box
+    # This is slow in mac emacs 23/24 :(
+    # Cursor.green
 
     # Get first char and insert
     c = $el.read_char("insert text (pause to exit): ").chr
@@ -624,6 +614,7 @@ class Keys
 
   def self.bookmark_as_path options={}
     bm = options[:bm] || Keys.input(:timed=>true, :prompt=>options[:prompt]||"Enter a bookmark: ")
+
     if bm == " "   # If space, return special token
       return :space
     elsif bm == "/"   # If slash, return special token
@@ -674,7 +665,6 @@ class Keys
   end
 
   def self.char
-
     $el.elvar.inhibit_quit = true
     ch_initial = $el.read_event.to_s
     $el.elvar.inhibit_quit = nil
@@ -685,11 +675,17 @@ class Keys
         return ["meta_#{(ch_raw - 134217728).chr}".to_sym, nil]
       end
 
-      # If char is over the elisp max, try to interpret it as Meta
-      ch = $el.char_to_string(ch_raw)
       # Special check for C-. and other sequences
-      ch = :control_period if ch_raw == 67108910
-      ch = :control_slash if ch_raw == 67108911
+      ch = if ch_raw == 67108910
+        :control_period
+      elsif ch_raw >= 67108912 && ch_raw <= 67108921   # If between C-0 and C-9
+        (ch_raw - 67108864).chr
+      elsif ch_raw == 67108911
+        :control_slash
+      else
+        # If char is over the elisp max, try to interpret it as Meta
+        $el.char_to_string(ch_raw)
+      end
       return [ch, ch_raw]
 
     elsif ['left', 'right', 'up', 'down', ].member?(ch_initial)

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

@@ -1,8 +1,11 @@
-require 'effects'
-require 'requirer'
-
+require 'xiki/effects'
+require 'xiki/requirer'
 require 'xiki'
 
+require 'sourcify'
+require 'ruby_parser'
+require 'file-tail'
+
 Requirer.require_gem 'activesupport', :name2=>'active_support/ordered_hash'
 Requirer.require_gem 'httparty', :optional=>1   # Not super-important
 Requirer.require_gem 'haml', :optional=>1
@@ -232,7 +235,9 @@ class Launcher
     # Special case to turn launchers back on
     return self.show_or_launch if line == "launcher/setup/show or launch/"
 
-    @@launchers.each do |regex, block|   # Try each potential regex match
+    # Try each potential regex match...
+
+    @@launchers.each do |regex, block|
       # If we found a match, launch it
       if line =~ regex
         group = $1
@@ -247,7 +252,8 @@ class Launcher
           rescue RelinquishException
             next   # They didn't want to handle it, keep going
           rescue Exception=>e
-            Tree.<< CodeTree.draw_exception(e, block.to_ruby), :no_slash=>true
+            # Show error and sourche of block
+            Tree.<< CodeTree.draw_exception(e, block.to_source), :no_slash=>true
           end
 
         end
@@ -256,7 +262,7 @@ class Launcher
       end
     end
 
-    # If current line is indented and not passed recursively yet, try again, passing tree
+    # If current line is indented and not passed recursively yet, try again, passing tree...
 
     if Line.value =~ /^ / && ! options[:line] && !is_root   # If indented, call .launch recursively
 
@@ -287,7 +293,7 @@ class Launcher
       return View.message "Don't know what to do with this line"
     end
 
-    # See if it matches path launcher
+    # See if it's a menu...
 
     self.set_env_vars line
 
@@ -295,6 +301,8 @@ class Launcher
     self.unset_env_vars
     return if result
 
+    # Do "autocomplete" - show all menus that start with this...
+
     if line =~ /^([\w -]*)$/ || line =~ /^([\w -]*)\.\.\.\/?$/
 
       #     if line =~ /^([\w -]*)(\.\.\.)?\/?$/
@@ -320,7 +328,7 @@ class Launcher
       end
     end
 
-    # If just root line, load any unloaded launchers this completes and relaunch
+    # If just root line, load any unloaded launchers this completes and relaunch...
 
     # Failed attempt to not auto-complete if slash
       # It's tough because we still want to load!
@@ -347,6 +355,7 @@ class Launcher
     end
 
     if root = line[/^[\w -]+/]
+
       Xiki.dont_search
       # Maybe make the following print out optionally, via a 'help_last' block?
       Tree << "
@@ -363,7 +372,6 @@ class Launcher
   end
 
   def self.try_menu_launchers line, options={}
-
     # If there's a /@ in the path, cut it off
     line.sub! /.+\/@/, ''
 
@@ -390,7 +398,7 @@ class Launcher
         # remove file
 
       else   # If doesn't exist
-        View.beep "- Dir doesn't exist: #{closest_dir}"
+        Tree.<< "> Dir doesn't exist.  Create it?\n@mkdir/\n"
         return true
       end
     end
@@ -401,7 +409,7 @@ class Launcher
     if block_dot_menu = @@menus[0][root]
 
       if @@just_show
-        Ol.line "Maps to .menu file, for menu: #{root}\n - #{block_dot_menu}\n - #{block_dot_menu.to_ruby}"
+        Ol.line "Maps to .menu file, for menu: #{root}\n - #{block_dot_menu}\n - #{block_dot_menu.to_source}"
         View.flash "- Showed launcher in $o", :times=>4
         return true   # To make it stop trying to run it
       end
@@ -433,7 +441,7 @@ class Launcher
     if block_other = @@menus[1][root]   # If class menu
 
       if @@just_show
-        Ol.line << "Maps to class or other block, for menu: #{root}\n - #{block_other}\n - #{block_other.to_ruby}"
+        Ol.line << "Maps to class or other block, for menu: #{root}\n - #{block_other}\n - #{block_other.to_source}"
         View.flash "- Showed launcher in $o", :times=>4
         return true   # To make it stop trying to run it
       end
@@ -489,7 +497,7 @@ class Launcher
       condition_proc, block = launcher
       if found = condition_proc.call(list)   # If we found a match, launch it
         if @@just_show
-          Ol << condition_proc.to_ruby
+          Ol << condition_proc.to_source
         else
           block.call list[found..-1]
         end
@@ -538,7 +546,7 @@ class Launcher
       if prefix == "all"
         txt = RestTree.request("GET", url)
         txt = Tree.quote(txt) if txt =~ /\A<\w/
-        Tree.under txt, :no_slash=>1
+        Tree.under Tree.quote(txt), :no_slash=>1
         next
       end
       url.gsub! '%', '%25'
@@ -594,10 +602,20 @@ class Launcher
       line =~ /([$\/.\w\-]+):(\d+)/
       path, line = $1, $2
 
-      # If relative dir, prepend current dir
-      if path =~ /^\w/
-        path = "#{View.dir}/#{path}"
-        path.sub! "//", "/"   # View.dir sometimes ends with slash
+      if path =~ /^(\w.*)/ || path =~ /^\.\/(.+)/
+
+        path = $1
+
+        local_path = "#{View.dir}/#{path}".sub "//", "/"
+        xiki_path = "#{Xiki.dir}/#{path}".sub "//", "/"
+        if File.exists? local_path
+          path = local_path
+        elsif File.exist? xiki_path
+          path = xiki_path
+        end
+
+      else
+        return ".flash - File doesn't exist!" if ! File.exists? path
       end
 
       View.open path
@@ -653,13 +671,14 @@ class Launcher
     end
 
     Launcher.add /^[a-z]+\+[a-z+]+\/?$/ do |path|
-      Tree << %`
+      txt = %`
         | If you were told to "type #{path}", it is meant that you should
-        | "type the acronym" while holding down control. This means Meaning
+        | "type the acronym" while holding down control. This means
         | you should type:
         |
         |   #{Keys.human_readable(path)}
         `
+      Tree.<< txt, :no_slash=>1
     end
 
     # Menu launchers
@@ -948,6 +967,7 @@ class Launcher
   end
 
   def self.add_class_launchers classes
+
     classes.each do |clazz|
       next if clazz =~ /\//
 
@@ -992,7 +1012,7 @@ class Launcher
   #
   # Open new buffer and launch the menu in it
   #
-  # Launcher.open "computer"
+  # Launcher.open "ip"
   #
   def self.open menu, options={}
     return self.insert(menu, options) if options[:inline]
@@ -1188,7 +1208,6 @@ class Launcher
   def self.reload_menu_dirs
     MENU_DIRS.each do |dir|
       next unless File.directory? dir
-
       Files.in_dir(dir).each do |f|
         next if f !~ /^[a-z].*\..*[a-z]$/ || f =~ /__/
         path = "#{dir}/#{f}"
@@ -1335,7 +1354,7 @@ def require_menu file, options={}
     result = Menu.load_if_changed file
   rescue LoadError => e
     gem_name = Requirer.extract_gem_from_exception e.to_s
-    Requirer.show "The file #{file} wants to use the '#{gem_name}' gem.\n% sudo gem install #{gem_name}\n\n"
+    Requirer.show "The file #{file} wants to use the '#{gem_name}' gem.\n% gem install #{gem_name}\n\n"
   rescue Exception=>e
     txt = CodeTree.draw_exception e
     Requirer.show "The file #{file} had this exception:\n#{txt}\n\n"

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

@@ -395,7 +395,7 @@ class Line
     line = Line.value
 
     if line.blank?   # If blank line, prompt for menu
-      return Launcher.like_menu "docs/", :inline=>1
+      return Launcher.insert "docs"
 
     elsif line =~ /^(\w+\.\w+| +([+-] )?\.)/i   # If a method, grab docs from source and insert
       orig = Location.new