xiki 0.5.1a → 0.5.3a

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

@@ -404,8 +404,9 @@ class Menu
     return View.flash "- Menu 'root' doesn't exist!", :times=>4 if ! proc
 
     location = proc.source_location # ["./firefox.rb", 739]
-    location[0].sub! /^\.\//, Xiki.dir
-    View.open location[0]
+Ol << "location: #{location.inspect}"
+    # location[0].sub! /^\.\//, Xiki.dir
+    View.open location[0].sub(/^\.\//, Xiki.dir)
     View.line = location[1]
 
   end
@@ -625,18 +626,25 @@ class Menu
   def self.do_as_menu
     line = Line.value
 
-    # If on ^@... line and there's child on next line...
-
-    on_subtree = line =~ /^[ +-]*@/ && Tree.has_child?
-
-    txt = on_subtree ? Tree.subtree.unindent.sub(/^[ @+-]+/, '') : Tree.path.last
+    do_launch = false
+
+    txt =
+      if line =~ /^ *\|/   # If on quoted line, will grab all quoted siblings and unquote
+        Tree.siblings :string=>1
+      elsif line =~ /^[ +-]*@/ && Tree.has_child?   # If on ^@... line and there's child on next line...
+        # Will grab the whole tree and move it up
+        Tree.subtree.unindent.sub(/^[ @+-]+/, '')
+      elsif
+        do_launch = true
+        Tree.path.last
+      end
 
-    Keys.prefix_u ? Tree.to_root(:highest=>1) : Tree.to_root
+    Keys.prefix_u ? Tree.to_root : Tree.to_root(:highest=>1)
     Tree.kill_under
 
     Line.sub! /^([ @]*).+/, "\\1#{txt}"
 
-    return if on_subtree
+    return if ! do_launch
 
     # replace line with menu
 
@@ -701,9 +709,52 @@ class Menu
     end
   end
 
+  #
+  # Whether line exists in menu
+  #
+  # p Menu.line_exists? "menu name", /^- text to add$/
+  # p Menu.line_exists? "menu name", /^- text to (.+)$/
+  #
+  def self.line_exists? name, pattern #, options={}
+    name.gsub! /\W/, '_'
+    dir = File.expand_path "~/menus"
+    file = File.expand_path "#{dir}/#{name}.menu"
+    txt = File.read(file) rescue ""
+    txt =~ pattern ? ($1 || $&) : nil   # Return whole string or group
+  end
 
-end
+  #
+  # Create simple .menu file if it doesn't exist, otherwise add line to it.
+  #
+  # Menu.append_line "menu name", "- text to add"
+  #
+  def self.append_line name, addition #, options={}
 
-Menu.init   # Define mode
+    name.gsub! /\W/, '_'
+
+    # Default to ~/menus
+    # If menu there, create, otherwise append
 
+    # Get existing
+    dir = File.expand_path "~/menus"
+    Dir.mkdir dir if ! File.exists? dir
 
+    file = File.expand_path "#{dir}/#{name}.menu"
+    txt = File.read(file) rescue ""
+
+    if txt =~ /^#{Regexp.escape addition}$/
+      return ".flash - was already there!"
+    end
+
+    # Append to end (might be blank)
+
+    txt << "#{addition}\n"
+
+    # Save
+    File.open(file, "w") { |f| f << txt }
+
+    ".flash - updated!"
+  end
+end
+
+Menu.init   # Define mode

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

@@ -1,4 +1,4 @@
-require "launcher"
+require 'xiki/launcher'
 
 class Merb
 

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

@@ -1,4 +1,4 @@
-require 'keys'
+require 'xiki/keys'
 
 # Provides different ways of moving cursor.
 class Move

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

@@ -1,9 +1,9 @@
-require 'styles'
-require 'line'
-require 'effects'
-require 'view'
-require 'keys'
-require 'clipboard'
+require 'xiki/styles'
+require 'xiki/line'
+require 'xiki/effects'
+require 'xiki/view'
+require 'xiki/keys'
+require 'xiki/clipboard'
 
 class Notes
 
@@ -254,7 +254,7 @@ class Notes
     h1_size = "+3"
 
     # Colors of "| ..." headings
-    if Styles.inverse   # If black bg
+    if Styles.dark_bg?   # If black bg
       @@h1_styles = {
         :notes_h1 =>"333",
         :notes_h1r=>"611",   # | r This will be red
@@ -316,7 +316,7 @@ class Notes
       :fg => '224'
 
 
-    if Styles.inverse   # If black and white
+    if Styles.dark_bg?   # If black and white
       label_color = "e70"
     else
       label_color = "f70"
@@ -348,28 +348,28 @@ class Notes
     Styles.define :notes_green, :fg=>"3C3", :face=>'arial black', :size=>"0", :bold=>true
 
 
-    if Styles.inverse   # If black bg
+    if Styles.dark_bg?   # If black bg
       # >>...
-      Styles.define :notes_h2, :face=>'arial', :size=>"-1", :fg=>'fff', :bg=>"333", :bold=>false
+      Styles.define :notes_h2, :face=>'arial', :size=>"-1", :fg=>'fff', :bg=>"333", :bold=>true
       Styles.define :notes_h2_pipe, :face=>'arial', :size=>"-1", :fg=>'555555', :bg=>"333333", :bold=> true
     else
       Styles.define :notes_h2, :face=>'arial', :size=>"-1", :fg=>'fff', :bg=>"999", :bold=>true
       Styles.define :notes_h2_pipe, :face=>'arial', :size=>"-1", :fg=>'bbb', :bg=>"999", :bold=>true
     end
 
-    if Styles.inverse   # If black bg
+    if Styles.dark_bg?   # If black bg
       Styles.dotted :bg=>'080808', :fg=>'111', :strike=>nil, :underline=>nil, :border=>['111', -1]
     else
       Styles.dotted :bg=>'eee', :fg=>'ddd', :strike=>nil, :underline=>nil, :border=>['ddd', -1]
     end
 
-    notes_exclamation_color = Styles.inverse ? "7c4" : "5a0"
+    notes_exclamation_color = Styles.dark_bg? ? "7c4" : "5a0"
 
     Styles.define :notes_exclamation,  # Green bold text
       :face=>'arial black', :size=>"0",
       :fg=>notes_exclamation_color, :bold=>true
 
-    Styles.notes_link :fg=>(Styles.inverse ? "9ce" : "08f")
+    Styles.notes_link :fg=>(Styles.dark_bg? ? "9ce" : "08f")
 
     Styles.shell_prompt :fg=>'#888', :bold=>1
 
@@ -440,7 +440,7 @@ class Notes
 
     Styles.apply "^hint/.+", :fade6
 
-    Styles.apply "^ *@? ?\\([%$&]\\) ", nil, :shell_prompt   # Colorize shell prompts
+    Styles.apply "^[< ]*@? ?\\([%$&]\\) ", nil, :shell_prompt   # Colorize shell prompts
 
     Styles.apply("^ *\\(|`\\)\\(.*\n\\)", nil, :quote_heading_pipe, :dotsies_experimental)
     Styles.apply("^ *\\(|~\\)\\([^\n~]+\\)\\(~?\\)", nil, :quote_heading_pipe, :dotsies, :quote_heading_pipe)
@@ -708,7 +708,7 @@ class Notes
 
     buffer_name = $el.buffer_name
     file_name = View.file_name
-    trunk = Xiki.trunk
+    path = Xiki.path rescue nil
 
     if prefix.nil?   # So 1+ or numeric prefix just grab normally
       if buffer_name == "*ol"   # Make it into "foo = bar" format
@@ -716,7 +716,7 @@ class Notes
         txt.sub!(": ", " = ") if txt
         txt ||= line[/ *- (.+?) /, 1]
 
-      elsif trunk.last =~ /(\w+)\.rb\/\| *def ([\w\.?]+)/
+      elsif path && path.last =~ /(\w+)\.rb\/\| *def ([\w\.?]+)/
         clazz = $1
         method = $2
         clazz = TextUtil.camel_case clazz if method.slice! /^self\./
@@ -734,7 +734,7 @@ class Notes
       elsif FileTree.handles?
         txt = Tree.dir
       elsif line =~ /(^ *[+-] |\/$)/   # Make it into Foo.bar format
-        txt = Xiki.trunk.last
+        txt = Xiki.path.last
       end
     end
 
@@ -814,29 +814,31 @@ class Notes
     end
   end
 
-  def self.enter_do_bullet
-
-    txt = Keys.input :chars=>1, :prompt=>'Enter a character: '
-    expanded = Notes.expand_if_action_abbrev txt
-
+  def self.enter_note
     # If on blank line, just insert it
+    indent = ""
     if ! Line.blank?
       line = Line.value
       indent, first_char = line.match(/^( *)(.)/)[1..2]
 
       Move.to_axis
-      $el.open_line(1)
+      $el.open_line 1
     end
 
-    if txt == " "
-      View << "#{indent}- !"
-      ControlLock.disable
-      return View.column = -1
-    end
+    Line << "#{indent}- !"
+    Move.backward
+
+    txt = Keys.input :timed=>1, :prompt=>'Enter a character: '
+
+    expanded = Notes.expand_if_action_abbrev txt
+
+    View << (expanded || txt)
+
+    # If wasn't expanded prepare to edit
+    ControlLock.disable if expanded == txt
 
     if expanded
-      View << "#{indent}- #{expanded}!"
-      Line.to_beginning
+      # Do nothing
     else
       View << "#{indent}- !"
       Move.backward
@@ -881,25 +883,24 @@ class Notes
         "
     end
 
-    txt = File.read file
+    txt = File.open(file, 'rb') {|f| f.read}
 
-    # If just file passed, headings
+    # If just file passed, headings...
 
     if ! heading
 
       return View.open file if prefix == "open"   # If as+open, just jump there
 
+      txt = txt.split("\n")
       txt = txt.grep /^\>( .+)/
       return "| This file has no '>...' headings:\n@ #{file}" if txt.empty?
-      return txt.join('')  #.gsub /^> /, '| '
+      return txt.join("\n")  #.gsub /^> /, '| '
     end
 
-    # If just heading passed, show text under heading
-
+    # If just heading passed, show text under heading...
     heading.sub!(/^\| /, '> ')
     escaped_heading = Regexp.escape heading
     if ! content
-
       if prefix == :u || prefix == "open"   # If C-u on a heading, just jump there
         View.open file
         View.to_highest
@@ -909,6 +910,7 @@ class Notes
       end
 
       txt = self.extract_block txt, heading
+      ENV['no_slash'] = "1"
       return txt.gsub(/^/, '| ').gsub(/^\| $/, '|')
     end
 
@@ -972,10 +974,12 @@ class Notes
     "f"=>"fix",
     "b"=>"borrow",
     "i"=>"implement",
-    "d"=>"delete",
+    "d"=>"do",
+    "de"=>"delete",
     "r"=>"rename",
     "t"=>"todo",
     "e"=>"extract",
+    "er"=>"error",
     }
 
   # If the string is "t" or "i", or a few others, return "todo" or "imprement" etc. respectively.

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

@@ -82,7 +82,8 @@ class Ol
     time ||= @@last
     difference = Time.now - time[0]
     time[0] = Time.now unless no_reset
-    difference > 3
+
+    difference > 5
   end
 
   def self.<< txt
@@ -97,8 +98,6 @@ class Ol
     @@timed_last = now
   end
 
-
-
   def self.line txt=nil, l=nil, indent="", name=nil, time=nil
     l ||= caller(0)[1]
 

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

@@ -1,10 +1,10 @@
-require 'keys'
+require 'xiki/keys'
 
 class PauseMeansSpace
 
   def self.go
     Cursor.remember :before_q
-    Cursor.green
+    Cursor.box
 
     while(inserted = insert_until_pause)
       next if inserted == 127

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

@@ -1,4 +1,11 @@
 class Projects
+  def self.before_menu
+    nil
+  end
+  def self.after_menu
+    nil
+  end
+
   def self.menu
     "
     - This will never be called, because of projects.menu...
@@ -7,7 +14,7 @@ class Projects
     "
   end
 
-  def self.current
+  def self.default
     # If parent is dir, return it, else return first project
     dir = FileTree.handles?(Xiki.trunk[-2]) ? "#{Dir.pwd}/" : self.default_project
   end

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

@@ -2,7 +2,7 @@ gem 'net-ssh'
 require 'net/ssh'
 require 'net/sftp'
 require 'timeout'
-require 'ol'
+require 'xiki/ol'
 
 class Remote
 
@@ -47,7 +47,7 @@ class Remote
       if path =~ /\/$/   # If a dir
         out = connection.exec!("ls -pa #{path}")
         out ||= ""
-        out = out.grep(/^[^#]+$/).join("")   # Weed out #...#
+        out = out.split("\n").grep(/^[^#]+$/).join("\n")   # Weed out #...#
         out.gsub!(/@/, '/')   # Change @ to /
 
         # Get rid of . and ..

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

@@ -1,4 +1,4 @@
-require 'core_ext'
+require 'xiki/core_ext'
 
 class Requirer
   def self.show txt
@@ -17,7 +17,7 @@ class Requirer
       gem name
       require options[:name2] || name
     rescue Exception=>e
-      self.show "Xiki #{options[:optional] ? 'optionally uses' : 'requires'} the '#{name}' gem.\n% sudo gem install #{name}\n\n"
+      self.show "Xiki #{options[:optional] ? 'optionally uses' : 'requires'} the '#{name}' gem.\n% gem install #{name}\n\n"
       raise e if options[:raise]
     end
   end
@@ -38,7 +38,7 @@ class Requirer
       rescue LoadError => e
         self.show "#{e.to_s}\n"
         gem_name = self.extract_gem_from_exception e.to_s
-        self.show "_Xiki requires the '#{gem_name}' gem.\n% sudo gem install #{gem_name}\n\n"
+        self.show "_Xiki requires the '#{gem_name}' gem.\n% gem install #{gem_name}\n\n"
       end
     end
 

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

@@ -1,7 +1,7 @@
-require "hide"
-require 'control_lock'
-require 'line'
-require 'text_util'
+require 'xiki/hide'
+require 'xiki/control_lock'
+require 'xiki/line'
+require 'xiki/text_util'
 
 class Search
 
@@ -657,7 +657,6 @@ class Search
   # Search.open_file_and_method "View.path"
   #
   def self.open_file_and_method match
-
     match.sub!(/^[+-] /, '')
     match.sub!(/ .+/, '')
 
@@ -923,7 +922,7 @@ class Search
   def self.isearch_just_adjust
     self.stop
     Move.forward
-    transpose_chars 1
+    $el.transpose_chars 1
     self.to_start
   end
 
@@ -1113,7 +1112,7 @@ class Search
 
     char = Keys.input(:chars=>1, :prompt=>"Enter one char: ")
     if char == "m"
-      Launcher.open("- $x/\n  - ##\\bdef /")
+      Launcher.open("- #{Xiki.dir}/\n  - ##\\bdef /")
     elsif char == "k"
       Launcher.open("- $x/key_bindings.rb\n  - ##\\bKeys\\./")
     elsif char == "l"
@@ -1283,7 +1282,7 @@ class Search
     Tree.to_parent   # Go to parent
     Tree.to_parent if Line[/^ *- ##/]
 
-    Tree.under "- \#\##{match}/", :escape=>'', :no_search=>true
+    Tree.under "- \#\##{match}/", :escape=>'', :no_search=>1, :no_slash=>1
     Launcher.launch
   end