xiki 0.5.3a → 0.6.0a

data/etc/command/xiki_command.rb

@@ -138,7 +138,7 @@ class XikiCommand
     txt = %`
       > Summary
       The 'xiki' shell command is mostly meant to be called by programs
-      that want to interface with xiki.  But it is sometimes useful for
+      that want to interface with Xiki.  But it is sometimes useful for
       people to call it directly.  Example usages:
 
       $ xiki ip
@@ -156,7 +156,7 @@ class XikiCommand
 
       > Service
       The 'xiki' shell command automatically runs a service in the
-      backgroundto keep things fast.
+      background to keep things fast.
 
       % xiki status
       % xiki stop
@@ -172,11 +172,12 @@ class XikiCommand
 
       $ xiki docs
 
-      > Google Group
-      Join the google group for help with installing, or just to chat or
-      share your ideas:
+      > Google Group and Twitter
+      Join the google group or follow @xiki on twitter for help with
+      installing and using, or just to chat or share your ideas:
 
       http://groups.google.com/group/xiki/
+      http://twitter.com/xiki
 
       > Troubleshooting
       Be sure to run this command to install required gems:

data/etc/presentations/face.deck

@@ -31,13 +31,13 @@ face/
 
 > Code
 
-- ~/menus/
+- ~/menu/
   + face.menu
 
 
 > Code
 
-- ~/menus/
+- ~/menu/
   + face.menu
   + face.rb
 
@@ -96,7 +96,7 @@ Browser.html ":)"
 
 - dumbed-down version
 
-- ~/menus/
+- ~/menu/
   + mood.menu
 
 
@@ -104,7 +104,7 @@ Browser.html ":)"
 
 - dumbed-down version
 
-- ~/menus/
+- ~/menu/
   + mood.menu
   + mood.rb
 
@@ -113,7 +113,7 @@ Browser.html ":)"
 
 - dumbed-down version
 
-- ~/menus/
+- ~/menu/
   - mood.menu
     | happy/
     | sad/
@@ -124,7 +124,7 @@ Browser.html ":)"
 
 - dumbed-down version
 
-- ~/menus/
+- ~/menu/
   - mood.menu
     | happy/
     | sad/
@@ -151,7 +151,7 @@ mood/
   + happy/
   + sad/
 
-- /Users/craig/menus/
+- /Users/craig/menu/
   - mood.menu
     | - happy/
     | - sad/
@@ -171,7 +171,7 @@ mood/
 
 > Other ways to make menus
 
-- /Users/craig/menus/
+- /Users/craig/menu/
   + mood.menu
   + mood.rb
 
@@ -194,7 +194,7 @@ sleep/
 
 > Other ways to make menus
 
-- /Users/craig/menus/
+- /Users/craig/menu/
   + mood.menu
   + mood.rb
 

data/etc/presentations/menu_directories.deck

@@ -1,21 +1,21 @@
 > Dirs
 
-~/menus/
-/projects/xiki/menus/
+~/menu/
+/projects/xiki/menu/
 
 
 > Dirs
 
-~/menus/
-/projects/xiki/menus/
+~/menu/
+/projects/xiki/menu/
 
 - Home directory over-rides
 
 
 > Dirs
 
-~/menus/
-/projects/xiki/menus/
+~/menu/
+/projects/xiki/menu/
 
 - Home directory over-rides
   - so you can customize

data/etc/presentations/potential/intro.deck

@@ -413,7 +413,7 @@ sharks/
 
 > UI framework
 
-~/menus/
+~/menu/
   - sharks.menu
     | start/
     | url/

data/etc/presentations/potential/intro1.deck

@@ -413,7 +413,7 @@ sharks/
 
 > UI framework
 
-~/menus/
+~/menu/
   - sharks.menu
     | start/
     | url/

data/etc/presentations/potential/make_mysql_menu.deck

@@ -25,7 +25,7 @@
 >> List tables
 tably
 
-/Users/craig/menus/
+/Users/craig/menu/
   - tably.rb
     | class Tably
     |   def self.menu name=nil

data/etc/www/sinatra_server.rb

@@ -27,7 +27,7 @@ def htmlify txt, options={}
     xiki_dir = File.expand_path "#{File.dirname(__FILE__)}/../.."
 
     $:.unshift "#{xiki_dir}/lib"
-    ["xiki/ol", "xiki/core_ext", "xiki/line", "xiki/tree", "../../menus/bootstrap"].each{|o| require o}
+    ["xiki/ol", "xiki/core_ext", "xiki/line", "xiki/tree", "../../menu/bootstrap"].each{|o| require o}
 
     txt.slice! /.+\n/
     txt = txt.unindent
@@ -238,7 +238,7 @@ end
 def usage
   htmlify "
     > Summary
-    This url displays xiki menus, which come from simple files found in ~/menus/.
+    This url displays xiki menus, which come from simple files found in ~/menu/.
 
     > Show all menus
     all/

data/lib/xiki.rb

@@ -432,7 +432,7 @@ class Xiki
 
     if $el
       # If the first time we've loaded
-      if ! $el.elvar.xiki_loaded_once && ! Menu.line_exists?("misc config", /^- dont show welcome$/) && ! View.buffer_visible?("Issues Loading Xiki")
+      if ! $el.elvar.xiki_loaded_once && ! Menu.line_exists?("misc config", /^- don't show welcome$/) && ! View.buffer_visible?("Issues Loading Xiki")
         Launcher.open("welcome/", :no_search=>1)
       end
 
@@ -463,7 +463,7 @@ class Xiki
   end
 
   def self.dont_show_welcome
-    Menu.append_line "misc config", "- dont show welcome"
+    Menu.append_line "misc config", "- don't show welcome"
   end
 
   def self.finished_loading?

data/lib/xiki/code.rb

@@ -705,8 +705,8 @@ class Code
   def self.open_related_file
     file = View.file
 
-    return View.open(file.sub /\.menu$/, '.rb') if file =~ /\/menus\/\w+\.menu$/
-    return View.open(file.sub /\.rb$/, '.menu') if file =~ /\/menus\/\w+\.rb$/
+    return View.open(file.sub /\.menu$/, '.rb') if file =~ /\/menu\/\w+\.menu$/
+    return View.open(file.sub /\.rb$/, '.menu') if file =~ /\/menu\/\w+\.rb$/
 
     View.flash "No matching file known."
 

data/lib/xiki/console.rb

@@ -371,9 +371,6 @@ class Console
       output.sub!(/\A\z/, "\n")   # Add linebreak if blank
       Keys.prefix == 1 ? output.gsub!(/^/, '|') : output.gsub!(/^/, '| ').gsub!(/^\| +$/, '|')
 
-      # Expose "!" and "- label: !" lines as commands
-      output.gsub!(/^\| \$/, '$')
-      output.gsub!(/^\| (- [\w ,-]+: \$)/, "\\1")
       output.sub! /\n*\z/, "\n"   # Guarantee exactly 1 linebreak at end
       Tree.indent(output)
 

data/lib/xiki/file_tree.rb

@@ -1327,7 +1327,7 @@ class FileTree
 
   def self.file_not_found_from_template path
 
-    if path =~ /\/menus\/(.+)\.rb$/   # "
+    if path =~ /\/menu\/(.+)\.rb$/   # "
       name = $1
       View.flash "- File doesn't exist, start with this...", :times=>4
       Xiki.dont_search
@@ -1335,7 +1335,7 @@ class FileTree
       txt.gsub!(/\{\{(.+?)\}\}/) { eval $1 }   # Expand {{these}}
       return Tree.<< txt, :escape=>"| ", :no_slash=>1
 
-    elsif path =~ /^#{File.expand_path("~/menus")}\/(.+)\.menu$/   # "
+    elsif path =~ /^#{File.expand_path("~/menu")}\/(.+)\.menu$/   # "
       View.flash "- File doesn't exist, start with this...", :times=>4
       Xiki.dont_search
       txt = File.read "#{Xiki.dir}/etc/templates/menu_template.menu"

data/lib/xiki/image.rb

@@ -1,4 +1,6 @@
-require 'ftools'
+begin
+  require 'ftools'
+rescue Exception=>e; end
 
 class Image
   def self.menu_before *args

data/lib/xiki/launcher.rb

@@ -20,8 +20,8 @@ class Launcher
     ]
 
   MENU_DIRS = [
-    "#{Xiki.dir}menus",
-    File.expand_path("~/menus"),
+    "#{Xiki.dir}menu",
+    File.expand_path("~/menu"),
     ]
 
   @@log = File.expand_path("~/.emacs.d/menu_log.notes")
@@ -338,7 +338,7 @@ class Launcher
       root = $1
       root.gsub!(/[ -]/, '_') if root
 
-      ["~/menus", Bookmarks["$x/menus"]].each do |dir|
+      ["~/menu", Bookmarks["$x/menu"]].each do |dir|
 
         matches = Dir[File.expand_path("#{dir}/#{root}*")]
 
@@ -423,7 +423,7 @@ class Launcher
       # If .menu file matched but had no output, and no other block to delegate to, say we handled it so it will stop looking
 
       if ! out
-        require_menu File.expand_path("~/menus/#{root}.rb"), :ok_if_not_found=>1
+        require_menu File.expand_path("~/menu/#{root}.rb"), :ok_if_not_found=>1
         if ! @@menus[1][root]
           Tree << "
             | This menu item does nothing yet.  You can update the .menu file to
@@ -816,7 +816,7 @@ class Launcher
     raise "No class '#{clazz || camel}' found in launcher" if clazz.nil?
 
     # reload 'path_to_class'
-    Menu.load_if_changed File.expand_path("~/menus/#{snake}.rb")
+    Menu.load_if_changed File.expand_path("~/menu/#{snake}.rb")
 
     args = path.is_a?(Array) ?
       path : Menu.split(path, :rootless=>1)

data/lib/xiki/menu.rb

@@ -12,7 +12,7 @@ class Menu
     - .install/
       - gem/
     - .setup/
-      - @~/menus/
+      - @~/menu/
       - .reload_menus/
     - .api/
       > Summary
@@ -139,7 +139,7 @@ class Menu
 
     Tree << "
       | Supply a few items here. Then do as+menu (type Ctrl-a Ctrl-m) to create
-      | the '#{menu}' menu. Or, just create '~/menus/#{snake}.menu' yourself.
+      | the '#{menu}' menu. Or, just create '~/menu/#{snake}.menu' yourself.
       - example item/
         - another/
       - and another/
@@ -163,11 +163,11 @@ class Menu
     Tree << %`
       | Update this sample class to your liking. Then do as+update (type
       | Ctrl-a, Ctrl-u) to create the '#{menu}' class file.
-      - @~/menus/
+      - @~/menu/
         - #{menu}.rb
           | class #{TextUtil.camel_case(menu)}
           |   def self.menu *args
-          |     "- Args Passed: \#{args.inspect}\\n- Customize me in) @ ~/menus/#{menu}.rb"
+          |     "- Args Passed: \#{args.inspect}\\n- Customize me in) @ ~/menu/#{menu}.rb"
           |   end
           | end
       - more examples) @menu/api/classes/
@@ -181,11 +181,11 @@ class Menu
     root = TextUtil.snake_case(trunk[-2][/^[\w -]+/]) if trunk.length > 1   # If nested path (due to @), grab root of parent
 
     %`
-    - @~/menus/
+    - @~/menu/
       - #{root}.rb
         | class #{TextUtil.camel_case(root)}
         |   def self.menu *args
-        |     "- args passed: \#{args.inspect}\n- Customize me in) @ ~/menus/#{menu}.rb"
+        |     "- args passed: \#{args.inspect}\n- Customize me in) @ ~/menu/#{menu}.rb"
         |   end
         | end
     `
@@ -197,7 +197,7 @@ class Menu
     root = TextUtil.snake_case(trunk[-2][/^[\w -]+/]) if trunk.length > 1   # If nested path (due to @), grab root of parent
 
     %`
-    - @~/menus/
+    - @~/menu/
       - #{root}.rb
         | class #{TextUtil.camel_case(root)}
         |   def self.menu
@@ -221,7 +221,7 @@ class Menu
     root = TextUtil.snake_case(trunk[-2][/^[\w -]+/]) if trunk.length > 1   # If nested path (due to @), grab root of parent
 
     %`
-    - @~/menus/
+    - @~/menu/
       - #{root}.rb
         | class #{TextUtil.camel_case(root)}
         |   def self.menu
@@ -306,7 +306,7 @@ class Menu
         | "- sammiches/..." etc:
         |
         - TODO: get these to expand out somehow! - maybe pass another arg to Tree.children below? - probably bad idea
-        - ~/menus/
+        - ~/menu/
           - foo.menu
             | - sammiches/
             |   - ham/
@@ -319,7 +319,7 @@ class Menu
         | don't run code themselves, they can delegate to other menus or run code,
         | like:
         |
-        - ~/menus/
+        - ~/menu/
           - foo.menu
             | - @mymenu/
             | - @MyClass.my_method
@@ -373,7 +373,7 @@ class Menu
     # Take best guess, by looking through dirs for root
     trunk = Xiki.trunk
 
-    return View.<<("- You weren't on a menu\n  | To jump to a menu's implementation, put your cursor on it\n  | (or type it on a blank line) and then do as+menu (ctrl-a ctrl-m)\n  | Or, look in one of these dirs:\n  - ~/menus/\n  - $xiki/menus/") if trunk[-1].blank?
+    return View.<<("- You weren't on a menu\n  | To jump to a menu's implementation, put your cursor on it\n  | (or type it on a blank line) and then do as+menu (ctrl-a ctrl-m)\n  | Or, look in one of these dirs:\n  - ~/menu/\n  - $xiki/menu/") if trunk[-1].blank?
 
     root = trunk[0][/^[\w _-]+/]
 
@@ -393,8 +393,8 @@ class Menu
     #     message = "
     #       - No menu found:
     #         | No \"#{root}\" menu or class file found in these dirs:
-    #         @ ~/menus/
-    #         @ $x/menus/
+    #         @ ~/menu/
+    #         @ $x/menu/
     #         ".unindent
 
     # Should be able to get it right from proc
@@ -461,7 +461,7 @@ Ol << "location: #{location.inspect}"
 
     return Tree << "| You must supply something to put under the '#{root}' menu.\n| First, add some lines here, such as these:\n- line/\n- another line/\n" if txt.empty?
 
-    path = File.expand_path "~/menus/#{root}.menu"
+    path = File.expand_path "~/menu/#{root}.menu"
 
     file_existed = File.exists? path
 
@@ -478,7 +478,7 @@ Ol << "location: #{location.inspect}"
 
     require_menu path
 
-    View.flash "- #{file_existed ? 'Updated' : 'Created'} ~/menus/#{root}.menu", :times=>3
+    View.flash "- #{file_existed ? 'Updated' : 'Created'} ~/menu/#{root}.menu", :times=>3
     nil
   end
 
@@ -717,7 +717,7 @@ Ol << "location: #{location.inspect}"
   #
   def self.line_exists? name, pattern #, options={}
     name.gsub! /\W/, '_'
-    dir = File.expand_path "~/menus"
+    dir = File.expand_path "~/menu"
     file = File.expand_path "#{dir}/#{name}.menu"
     txt = File.read(file) rescue ""
     txt =~ pattern ? ($1 || $&) : nil   # Return whole string or group
@@ -732,11 +732,11 @@ Ol << "location: #{location.inspect}"
 
     name.gsub! /\W/, '_'
 
-    # Default to ~/menus
+    # Default to ~/menu
     # If menu there, create, otherwise append
 
     # Get existing
-    dir = File.expand_path "~/menus"
+    dir = File.expand_path "~/menu"
     Dir.mkdir dir if ! File.exists? dir
 
     file = File.expand_path "#{dir}/#{name}.menu"
@@ -753,7 +753,7 @@ Ol << "location: #{location.inspect}"
     # Save
     File.open(file, "w") { |f| f << txt }
 
-    ".flash - updated!"
+    "- saved setting!"
   end
 end
 

data/lib/xiki/notes.rb

@@ -237,12 +237,10 @@ class Notes
     return if ! $el
 
     # - foo (r): <here>
-    Styles.define :notes_light_gray,
-      :fg => "bbb"
+    Styles.define :notes_light_gray, :fg => "bbb"
 
     # - foo (r): <here>
-    Styles.define :variable,
-      :face => 'verdana' #, :size => "+2"
+    Styles.define :variable, :face => 'verdana'
 
     # - foo (r): <here>
     Styles.define :notes_label_parens,