xiki 0.5.1a → 0.5.3a

data/etc/www/web_server.rb

@@ -1,249 +1,7 @@
 class WebServer
 
-  def self.htmlify txt, options={}
-
-    return txt if ENV['HTTP_ACCEPT'] !~ /\Atext\/html/   # Only process if request wants html
-
-    # If starts with <foo or @bootstrap, just render it as html or bootstrap...
-
-    if txt =~ /\A<\w/
-      return txt
-    elsif txt =~ /\A@bootstrap\/\n  /
-
-      xiki_dir = File.expand_path "#{File.dirname(__FILE__)}/../.."
-
-      $:.unshift "#{xiki_dir}/lib"
-      ["lib/core_ext", "lib/line", "lib/tree", "menus/bootstrap"].each{|o| require "#{xiki_dir}/#{o}"}
-
-      txt.slice! /.+\n/
-      txt = txt.unindent
-
-      txt = Bootstrap.process txt
-
-      return txt
-    end
-
-    # Turn menu text into html...
-
-    # TODO: should probably maintain indenting?
-    txt.gsub! /^ *\| ?/, ''
-
-    txt.gsub! /^( *)[+-]+ /, "\\1"   # Get rid of bullets
-    txt.gsub! /> (.+)/, "<h1>\\1</h1>"
-
-    path = ENV['REQUEST_URI']# =~ /\/$/ ? "" : "#{ENV['REQUEST_URI']}/"   # Use relative links if path ends in slash, otherwise use absolute
-    path = "#{path}/" if path !~ /\/$/
-
-    txt.gsub!(/^( *)(.+?)(\/?)$/){
-      all = $&
-      indent, item, slash = $1, $2, $3
-      next all if all =~ /<h/ || all !~ /\/$/
-      my_path = path
-      my_path = "/" if item.slice!(/^<< /)
-      my_path = "/" if item.slice!(/^@ ?/)
-      "#{indent}<a href=\"#{my_path}#{item}\">#{item.gsub '_', ' '}</a>"
-    } # no slash
-
-    txt.gsub!(/^ +/){"&nbsp; " * $&.length}   # Get rid of bullets
-
-    txt.gsub!(/.+/){
-      all = $&
-      next all if all =~ /<h/
-      next "<p class='info'>#{all}</p>" if all !~ /^<a/   # Don't end in "/" - just informational
-      all
-    }
-    txt.gsub! /^$/, "<p class='blank'>&nbsp;</p>"
-
-    print %`
-    <style>
-      a {
-        text-decoration: none;
-      }
-
-      .content a.selected {
-        background: -moz-linear-gradient(center top, #58b, #7ad) repeat scroll 0 0 transparent;
-      }
-      .content a {
-        color: #666;
-        display: block;
-
-        border-radius: 2px;
-        border: solid 1px;
-        border-color: #eee #ddd #bbb #ddd;
-        background: -moz-linear-gradient(center top, #fff, #f1f1f1) repeat scroll 0 0 transparent;
-        background: -webkit-gradient(linear,center bottom,center top,from(#f1f1f1),to(#fff));
-        display: block;
-        padding: 10px 16px;
-        text-shadow: 0 1px 0 #fff;
-        font-weight: bold;
-      }
-      a:hover {
-        background: -moz-linear-gradient(center top, #f8f8f8, #e1e1e1) repeat scroll 0 0 transparent;
-        background: -webkit-gradient(linear,center bottom,center top,from(#e1e1e1),to(#f8f8f8));
-      }
-      body {
-        font-family: arial;
-        margin: 50px;
-        font-size: 15px;
-        color: #666;
-        line-height: 21px;
-        background-color: #f8f8f8;
-      }
-      p {
-        margin: 0;
-      }
-      .blank {
-        line-height: 12px;
-      }
-      /* Or type some css here (to run in the browser) */
-      h1 {
-        color: #000;
-        font-family: arial;
-        font-size: 16px;
-        font-weight: bold;
-        margin: 11px 0 7px;
-      }
-      .save {
-        margin: 0 20px 10px 20px;
-        font-size: 15px;
-      }
-      form {
-        margin: 0;
-      }
-      textarea {
-        border: solid #ccc 1px;
-        margin: 2px 20px 13px 20px;
-        padding: 7px;
-        width: 80%;
-        font-size: 15px;
-        color: #555;
-        height: 150px;
-        line-height: 20px;
-      }
-      .toggle {
-        font-size: 13px;
-        margin: 15px 20px 0px 20px;
-        font-weight: bold;
-      }
-      .toggle a {
-        color: #aaa;
-      }
-      .info {
-        margin: 0 0 6px;
-      }
-      pre {
-        font-weight: bold;
-      }
-
-    </style>
-    `
-
-    puts %`<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js"></script>`
-
-    if ! options[:no_keys]
-      print %`
-      <script>
-        filter_pattern = "";
-        started_searching = false;
-        $(function(){
-
-          $(window).focus(function () {
-            filter_pattern = "";
-
-            $('body').css("opacity", 1.0);
-            $('p, h1, a').show();
-            $('a').removeClass("selected");
-          });
-
-          $('body').keypress(function(e){
-            if(e.ctrlKey || e.altKey || e.metaKey) return;
-            var char = e.which;
-            var letter = String.fromCharCode(char).toLowerCase();
-            //console.log(char)
-            if(char == 13){
-              $("a:visible:eq(0)").click();
-              e.stopPropagation();
-              return false;
-            }
-
-            if(letter == " "){
-              if(started_searching) filter_pattern = "";
-              else window.location = "/";
-              e.stopPropagation();
-              return false;
-            }
-
-            if(! letter.match(/[0-9a-z]/)) return true;
-
-            started_searching = true;
-            filter_pattern += letter;
-
-            //console.log(filter_pattern);
-
-            // If more than 100, don't use fade
-            var count = $('p, h1, a').filter(':visible').length;
-            var fade = count < 50;
-
-            $('p, h1, a').each(function(i, e){
-              e = $(e);
-              if(e.is(":hidden")) return;
-              var html = e.html().replace(/<.+?>/g, '');
-              //console.log(html);
-              if(html.toLowerCase().indexOf(filter_pattern) == -1)
-                fade ? e.slideUp(400) : e.hide();
-              // Get content
-                // Remove tags
-                  // Hide if remaining doesn't match regex (/on/)
-            })
-
-          });
-
-          $('a').click(function(e){
-            var target = $(e.target);
-            target.toggleClass("selected");
-
-            $('body').animate({opacity: 0.0}, {easing: 'swing', duration: 150});
-            window.setTimeout(function(){ window.location = target.attr('href'); }, 150);
-            return false;
-          });
-
-        })
-      </script>
-      `
-    end
-
-    "<div class='content'>#{txt}</div>"
-  end
-
-
-  def self.usage
-    txt = "
-      > Summary
-      This url displays xiki menus, which come from simple files found in ~/menus/.
-
-      > Show all menus
-      all/
-
-      > Examples
-      ip/
-      animals/
-      sharks/
-      tables/
-
-      > Create menu
-      Just go to the url of a menu that doesn't exist yet:
-      unicorn/
-
-      > Docs
-      docs/
-      ".sub("\n", '').gsub(/^      /, '')
-
-    print WebServer.htmlify txt
-
-  end
 
   def self.index
-
     no_keys = false
 
     if ENV['REQUEST_METHOD'] == "POST"
@@ -268,16 +26,8 @@ class WebServer
 
     txt = `#{command}`
 
-    #   rescue e=>Exception
-    #     puts "<pre>#{e.message}\n#{e.backtrace}</pre>"
-    #     Ol << "e: #{e.message}"
-    #     Ol << "e: #{e.backtrace}"
-    #     Ol << "If we get the permission problem, provide .notes file that will run command to run xiki command once (message explaining it first)!"
-    #   end
-
     # TODO: return different string when the service is down
 
-    # Ol << "Extract to new method: suggest_creating!!"
     if txt.empty?
       menu = menu.sub /\/$/, ''
 
@@ -339,8 +89,6 @@ class WebServer
     txt = self.htmlify txt, :no_keys=>no_keys
     print txt
 
-    # print "<pre>#{ENV.keys.map{|k| "#{k}: #{ENV[k]}"}.join("\n")}</pre>"
-
   rescue Exception=>e
     puts "<pre>#{e.message}\n#{e.backtrace}</pre>"
   end

data/lib/xiki.rb

@@ -1,33 +1,38 @@
-XIKI_ROOT = File.expand_path "#{File.dirname(__FILE__)}/.."
-Dir.chdir(XIKI_ROOT)
+xiki_dir = File.expand_path "#{File.dirname(__FILE__)}/.."
+Dir.chdir xiki_dir
 
 # Used by a lot of classes
 class Xiki
   @@dir = "#{Dir.pwd}/"   # Store current dir when xiki first launches
 
-  # TODO Just use XIKI_ROOT from above?
+  # TODO Just use XIKI_DIR from above?
 
   def self.dir
     @@dir
   end
-
 end
 
 $el.el4r_lisp_eval '(ignore-errors (kill-buffer "Issues Loading Xiki"))' if $el
+$el.set_process_query_on_exit_flag($el.get_buffer_process("*el4r:process*"), nil) if $el
+
 
+# $LOAD_PATH << "#{xiki_dir}/lib"
 # Require some of the core files
-require 'trouble_shooting'
 require 'rubygems'
-require 'ol'
-require 'requirer'
-require 'text_util'
-Requirer.require_classes ['notes']
-require 'launcher'
-require 'mode'
-require 'menu'
+require 'xiki/trouble_shooting'
+require 'xiki/ol'
+require 'xiki/requirer'
+require 'xiki/text_util'
+Requirer.require_classes ['xiki/notes']
+require 'xiki/launcher'
+require 'xiki/mode'
+require 'xiki/menu'
 
 # Launcher.add_class_launchers classes
 class Xiki
+
+  $el.elvar.xiki_loaded_once = nil if $el && ! $el.boundp(:xiki_loaded_once)
+
   def self.menu
     %`
     - .tests/
@@ -73,6 +78,20 @@ class Xiki
         - start/
         - stop/
         - restart/
+        - log/
+      - el4r/
+        > Configure
+        @#{Xiki.dir}
+          % sudo bash etc/install/el4r_setup.sh
+
+        - docs/
+          | This will create/update files in your home directory, which make el4r
+          | point to the version of ruby currently active.
+          |
+          | You can run this multiple times.
+      - .misc/
+        - .dont show welcome/
+      @web interface/
     - api/
       > Summary
       Here are some functions that will always be available to menu classes,
@@ -92,7 +111,7 @@ class Xiki
 
   def self.install_icon arg
 
-    emacs_dir = "/Applications/Emacs.app"
+    emacs_dir = "/Applications/Aquamacs Emacs.app"
 
     return "- Couldn't find #{emacs_dir}!" if ! File.exists?("#{emacs_dir}")
 
@@ -112,12 +131,42 @@ class Xiki
       # if change was already made, say so
 
     # TODO
-    # icon
-      # copy over
-        # cp "#{Xiki.dir}etc/shark.icns"
 
-
-    "- finish implementing!"
+    # 1. Copy icon into app
+    # cp "#{Xiki.dir}etc/shark.icns" "/Applications/Aquamacs Emacs.app/Contents/Resources/"
+    # - /Applications/Aquamacs Emacs.app/
+    #   - Contents/Resources/
+    #     + shark.icns
+    #     + emacs-document.icns
+
+    # 2. Update Info.plist
+    # /Applications/Aquamacs Emacs.app/Contents/
+    #   - Info.plist
+    #     |+ 		<dict>
+    #     |+ 			<key>CFBundleTypeExtensions</key>
+    #     |+ 			<array>
+    #     |+ 				<string>notes</string>
+    #     |+ 				<string>menu</string>
+    #     |+ 				<string>xiki</string>
+    #     |+ 			</array>
+    #     |+ 			<key>CFBundleTypeIconFile</key>
+    #     |+ 			<string>shark.icns</string>
+    #     |+ 			<key>CFBundleTypeName</key>
+    #     |+ 			<string>Xiki File</string>
+    #     |+ 			<key>CFBundleTypeOSTypes</key>
+    #     |+ 			<array>
+    #     |+ 				<string>TEXT</string>
+    #     |+ 				<string>utxt</string>
+    #     |+ 			</array>
+    #     |+ 			<key>CFBundleTypeRole</key>
+    #     |+ 			<string>Editor</string>
+    #     |+ 		</dict>
+
+    # 3. Tell user to drag the .app icon out of the "Applications" folder and back in
+    #   - Or google to find a command that will do the same thing
+
+
+    "- TODO: finish implementing!"
   end
 
   def self.insert_menu
@@ -341,13 +390,15 @@ class Xiki
   end
 
   def self.init
+
     # Get rest of files to require
 
-    classes = Dir["lib/*.rb"]
-Ol << "classes: #{classes.inspect}"
+    classes = Dir["./lib/xiki/*.rb"]
+
     classes = classes.select{|i|
-      i !~ /xiki.rb$/ &&   # Remove self
-      i !~ /key_bindings.rb$/ &&   # Remove key_bindings
+      i !~ /\/ol.rb$/ &&   # Don't load Ol twice
+      i !~ /\/xiki.rb$/ &&   # Remove self
+      i !~ /\/key_bindings.rb$/ &&   # Remove key_bindings
       i !~ /__/   # Remove __....rb files
     }
 
@@ -362,15 +413,13 @@ Ol << "classes: #{classes.inspect}"
 
     classes.map!{|i| i.sub(/\.rb$/, '')}.sort!
 
-Ol << "classes: #{classes.inspect}"
-
     # Require classes
     Requirer.require_classes classes
 
     # key_bindings has many dependencies, require it last
-    Requirer.require_classes ['lib/key_bindings.rb']
+    Requirer.require_classes ['./lib/xiki/key_bindings.rb']
 
-    Launcher.add_class_launchers classes.map{|o| o[/\/(.+)/, 1]}
+    Launcher.add_class_launchers classes.map{|o| o[/.*\/(.+)/, 1]}
     Launcher.reload_menu_dirs
 
     Launcher.add "xiki"
@@ -380,6 +429,16 @@ Ol << "classes: #{classes.inspect}"
     Mode.define(:xiki, ".xiki") do
       Xiki.on_open
     end
+
+    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")
+        Launcher.open("welcome/", :no_search=>1)
+      end
+
+      $el.elvar.xiki_loaded_once = true
+    end
+
   end
 
   def self.process action
@@ -395,10 +454,19 @@ Ol << "classes: #{classes.inspect}"
       response = `xiki restart`
       response = "apparently it wasn't running" if response.blank?
       response.gsub /^/, '- '
+    when "log"
+      "@/tmp/xiki_process.rb.output"
     when "start"
       result = `xiki`
       "- started!"
     end
   end
 
+  def self.dont_show_welcome
+    Menu.append_line "misc config", "- dont show welcome"
+  end
+
+  def self.finished_loading?
+    @@finished_loading
+  end
 end