xiki 0.5.1a → 0.5.3a

data/menus/address_book.rb

@@ -1,15 +1,17 @@
 class AddressBook
   def self.names
-    names = Applescript.run "address book", "get the name of every person"
-    names.sub! /^\{(.+)\}/, "[\\1]"
-    JSON[names]
+    names = Applescript.run "get the name of every person as string", :app=>"address book", :delimiter=>"|"
+    names.split "|"
   end
 
   def self.menu key=nil
     return self.names.map{|o| "#{o}/"} if key.nil?
 
     # Clean up a bit
-    txt = Applescript.run "address book", "get vcard of people whose name is \"#{key}\""
+    # Broken by crap implementation of (do-applescript in emacs 23 that returns fucking "true" instead of the data)
+      # Emacs 22 implementation returned data structure as text - is there a way to force that in applescript?
+    txt = Applescript.run "get vcard of people whose name is \"#{key}\"", :delimiter=>"|", :app=>"address book"
+
     txt.gsub! /, /, "\n"
     txt.gsub! /:/, ": "
     txt = txt.split("\n").select{|o| o !~ /^"\}|missing value|END: VCARD|VERSION: 3.0|BEGIN: VCARD/}.join("\n")

data/menus/agenda.rb

@@ -1,6 +1,6 @@
-require 'view'
-require 'line'
-require 'effects'
+require 'xiki/view'
+require 'xiki/line'
+require 'xiki/effects'
 
 
 class Agenda

data/menus/amazon.rb

@@ -1,5 +1,5 @@
-require 'view'
-require 'effects'
+require 'xiki/view'
+require 'xiki/effects'
 
 class Amazon
 

data/menus/applescript.rb

@@ -7,13 +7,11 @@ class Applescript
     | tell application "iTunes" to playpause
     - .api/
       | Run applescript
-      @ Applescript.run 'tell application "iTunes" to playpause'
+      @Applescript.run 'tell application "iTunes" to playpause'
       |
       | Shortcut to wrap "tell" in block
-      @ Applescript.run "iTunes", "playpause"
-    - .docs/
-      > Examples
-      | Applescript.run "iTunes", "playpause"
+      @Applescript.run "playpause", :app=>"iTunes"
+      @Applescript.run "get the name of every track of library playlist 1 as string", :app=>"iTunes", :delimiter=>"|"
     `
   end
 
@@ -27,20 +25,33 @@ class Applescript
     ".flash - ran it!"
   end
 
-  def self.run txt, command=nil
+  #
+  # Applescript.run 'tell application "iTunes" to playpause'
+  # Applescript.run "playpause", :app=>"iTunes"
+  # Applescript.run "get the name of every track of library playlist 1 as string", :app=>"iTunes", :delimiter=>"|"
+  #
+  def self.run command, options={}
+
+    # If 2nd arg is string, assume "app", "command"
+    if options.is_a?(String)
+      options, command = {:app=>command}, options
+    end
+
+    extra = "set Applescript's text item delimiters to \"#{options[:delimiter]}\"\n" if options[:delimiter]
 
     # If 2nd arg passed, treat first as app
-    if command.present?
+    if options[:app]
 
       txt = "
-        tell application \"#{txt}\"
-          #{command}
+        tell application \"#{options[:app]}\"
+          #{extra}#{command}
         end tell
         ".unindent
 
       return $el.do_applescript txt
     end
 
-    $el.do_applescript txt
+    $el.do_applescript "#{extra}#{command}"
   end
 end
+

data/menus/black.menu

@@ -0,0 +1 @@
+<< themes/list/Black BG/

data/menus/bootstrap.rb

@@ -488,14 +488,13 @@ class Bootstrap
           <meta charset="utf-8">
           <title>#{@project_name}</title>
           <meta name="viewport" content="width=device-width, initial-scale=1.0">
-          <meta name="description" content="">
-          <meta name="author" content="">
 
           <!-- Le styles -->
           <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet">
           <style>
             body {
               padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+              padding-bottom: 40px;
             }
           </style>
           <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet">
@@ -507,15 +506,11 @@ class Bootstrap
 
           <!-- Le fav and touch icons -->
           <link rel="shortcut icon" href="http://twitter.github.com/bootstrap/assets/ico/favicon.ico">
-          <link rel="apple-touch-icon-precomposed" sizes="144x144" href="http://twitter.github.com/bootstrap/assets/ico/apple-touch-icon-144-precomposed.png">
-          <link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://twitter.github.com/bootstrap/assets/ico/apple-touch-icon-114-precomposed.png">
-          <link rel="apple-touch-icon-precomposed" sizes="72x72" href="http://twitter.github.com/bootstrap/assets/ico/apple-touch-icon-72-precomposed.png">
-          <link rel="apple-touch-icon-precomposed" href="http://twitter.github.com/bootstrap/assets/ico/apple-touch-icon-57-precomposed.png">
         </head>
 
         <body>
 
-          <div class="navbar navbar-fixed-top">
+          <div class="navbar navbar-inverse navbar-fixed-top">
             <div class="navbar-inner">
               <div class="container">
         #{navbar}

data/menus/browser.rb

@@ -29,10 +29,9 @@ class Browser
   end
 
   def self.js txt, options={}
-    Firefox.run txt, options
+    Firefox.exec txt, options
   end
 
-
   def self.open_in_browser
 
     if Keys.prefix_u   # Open as http://xiki/...
@@ -40,9 +39,13 @@ class Browser
       return self.url "http://xiki/#{Tree.path}"
     end
 
-    file = FileTree.tree_path_or_this_file
-
-    return Browser.html Markdown.render(View.txt) if View.extension == "markdown"   # If .markdown, render it
+    if FileTree.handles?
+      file = Tree.construct_path
+    else
+      # Put this somewhere wher it works in file tree as well
+      return Browser.html(Markdown.render(View.txt)) if View.extension == "markdown"   # If .markdown, render it
+      file = View.file
+    end
 
     mappings = Menu.menu_to_hash "/Users/craig/menus/url_mappings.menu"
 

data/menus/cassandra_db.rb

@@ -1,7 +1,7 @@
 gem 'cassandra'
-require 'cassandra'
+require 'xiki/cassandra'
 
-require "launcher"
+require 'xiki/launcher'
 
 # Cassandras structure:
 #   keyspace ->* table family ->* key (->* super column) ->* column

data/menus/chmod.rb

@@ -19,7 +19,7 @@ class Chmod
     # Arg passed, so do chmod
 
     command = "chmod #{mode} \"#{path}\""
-    command = "sudo #{command}" if ! File.writable? path
+    command = "sudo #{command}" # if ! File.writable? path
 
     Console.run command, :dir=>path
 

data/menus/conf.rb

@@ -0,0 +1,5 @@
+class Conf
+  def self.menu *args
+    Launcher.menu_keys.select{|o| o =~ /config/}.map{|o| "<< #{o}/"}.join("\n")
+  end
+end

data/menus/cookies.rb

@@ -1,7 +1,7 @@
 class Cookies
   def self.menu key=nil, val=nil
 
-    txt = Firefox.run "document.cookie"
+    txt = Firefox.exec "document.cookie"
     hash = txt.split('; ').inject({}) do |acc, e|
       k, v = e.match(/(.*?)=(.*)/)[1..2]
       acc[k] = v

data/menus/css.rb

@@ -16,7 +16,7 @@ class Css
         result;
         `.unindent
 
-      result = Firefox.run js
+      result = Firefox.exec js
       return "> No class attributes found!" if result == '""'
       return result
     end
@@ -48,7 +48,7 @@ class Css
     txt.gsub!("\n", '\n')
     txt.gsub!('"', '\"')
     code = "$('head').append(\"<style>#{txt}</style>\")"
-    Firefox.run code  #, :jquery=>1
+    Firefox.exec code
 
     nil
   end

data/menus/deck.rb

@@ -1,4 +1,4 @@
-require "mode"
+require 'xiki/mode'
 
 # Makes text in .deck files huge, and makes left and right arrow keys treat
 # headings as slides.

data/menus/dimensions_config.menu

@@ -0,0 +1,30 @@
+- full/View.dimensions_full; Styles.font_size 110
+- full presentation/View.dimensions_full; Styles.font_size 260
+- medium/Styles.font_size 160
+- right/View.dimensions_set 119, 50, 573, 22; Styles.font_size 110
+- right presentation/View.dimensions_set 53, 28, 274, 22; Styles.font_size 150
+- small/View.dimensions_set 50, 15, 100, 22; Styles.font_size 110
+- half/width = 166; width += 3 if ! View.scroll_bars; View.dimensions_set width, 58, 0, 925; Styles.font_size 110; Window.visibility('full')
+- small/55, 20, 20, 22
+- tiny/20, 10, 40, 22
+- small font/Styles.font_size 110
+- medium font/Styles.font_size 170
+- large font/Styles.font_size 265
+- prompt/left = (View.screen_width / 2) - 117; View.dimensions_set 30, 2, left, 41
+- center/left = (View.screen_width / 2) - 187; View.dimensions_set 46, 15, left, 41
+- large/145, 58, 46, 22
+- website/View.dimensions_set 28, 16, 407, 234; Styles.font_size 110
+
+> Won't be used
+- screencast/View.dimensions_set 77, 21, 281, 418; Styles.font_size 140
+- screencast half/View.dimensions_set 36, 21, 607, 418; Styles.font_size 140
+- screencast window/View.dimensions_set 73, 17, 288, 447; Styles.font_size 140
+- screencast half small/View.dimensions_set 65, 29, 571, 45; Styles.font_size 90
+- skinny bar:
+- right/28, 35, 504, 22
+
+- screencast old:
+- screencast half/View.dimensions_set 46, 24, 574, 39; Styles.font_size 120
+- screencast dev/View.dimensions_set 89, 25, 279, 22; Styles.font_size 110
+- screencast old/View.dimensions_set 77, 21, 281, 22; Styles.font_size 140
+- screencast half old/42, 23, 561, 39

data/menus/dimensions_config.rb

@@ -0,0 +1,5 @@
+class DimensionsConfig
+  def self.menu name, txt
+    Window.dimensions_set txt
+  end
+end

data/menus/docs.rb

@@ -4,55 +4,54 @@ class Docs
     - Introduction/
       | Most of the Xiki documentation is spread out among other menus, under
       | their respective 'docs' menus.
-      |
+
       > Here are some to check out first
       @keys/docs/
       @menu/docs/
       @files/docs/
       @view/docs/
-      |
     - Try typing stuff/
-      > Try just typing a menu
+      > Try just typing a word
       | Think of a menu name that might exist and sounds likely to solve your
       | problem.  For example, if you want to do something with images, try the
       | 'images' menu.  Type it on a blank line and double-click, or use
       | open+menu (type Ctrl-O, Ctrl-M).
-      |
+
       | Help us improve the docs, and contribute back to the Xiki project.  If
       | the menu doesn't exist, create it!  If it exists, but could be improved,
       | edit it!  Many menus exist just to direct you to other menus.  It takes
       | only seconds to create them.
-      |
+
+      > See
       @menu/docs/how_to_create/
-      |
-    - Other places to look/
-      - You may want to check out__
-        __
-        - for developers
-          - code dirs/__
-        > All Commands
-        @all/
-      |
-    - FAQ/
-      > What is Xiki?
-      | Xiki is an environment that can be used in several ways:
-      | - Shell terminal on steroids
-      | - Development environment for coding rails or node.js apps, etc.
-      | - Framework for making lightweight user interfaces
-      |
-      > What does Xiki stand for?
-      | XIKI is short for eXecutable wIKI
-      |
-      > What are Xiki's main dependencies?
-      | - Xiki runs inside of Emacs
-      |   - and takes advantage of many powerful Emacs features
-      |   - but you don't need to know Emacs to use Xiki
-      | - Xiki is implemented mostly in ruby
-      |   - but can use other languages like python, javascript, and coffeescript
-      |
-      > What's the best way to figure out how to do something?
-      - @docs/Try typing stuff/
-      |
+    - faq/
+      - What is Xiki?/
+        Xiki is an environment that can be used in several ways:
+
+        - Shell terminal on steroids
+        - Development environment for coding rails or node.js apps, etc.
+        - Framework for making lightweight user interfaces
+      - What does Xiki stand for?/
+        XIKI is short for eXecutable wIKI.
+      - What are Xiki's main dependencies?/
+        - An editor
+          - Emacs is fully supported
+            - Xiki takes advantage of many powerful Emacs features
+              - but you don't need to know Emacs to use Xiki
+            - El4r is used as a bridge
+          - Vim and support for other editors is on the way
+        - Xiki is implemented mostly in ruby
+          - but can use other languages like python, javascript, and coffeescript
+      - What's the best way to figure out how to do something?/
+        - @docs/Try typing stuff/
+      - How can I keep up to date with the latest Xiki happenings?/
+        - Follow http://twitter.com/xiki
+        - Join http://groups.google.com/group/xiki/
+        - Watch https://github.com/trogdoro/xiki
+
+    > From the shell console, you can type stuff like this:
+    $ xiki docs/Introduction
     `
+
   end
 end

data/menus/dotsies.rb

@@ -23,6 +23,7 @@ class Dotsies
 
     > See
     << dotsies tweets/
+    << youtube/use dotsies in transcript/
     `
   end
 

data/menus/emacs.rb

@@ -1,7 +1,8 @@
 class Emacs
   def self.menu
     "
-    - .info/
+    - .version/
+    - .info pages/
       - Keys/
       - Prefix Keymaps/
       - Keymaps/
@@ -9,7 +10,11 @@ class Emacs
     "
   end
 
-  def self.info name
+  def self.version
+    Tree.quote $el.emacs_version
+  end
+
+  def self.info_pages name
     View.to_upper
     $el.info "(emacs)#{name}"
     nil

data/menus/firefox.rb

@@ -34,7 +34,7 @@ class Firefox
     - api/
       | p Firefox.value "window.title"
       |   "The Title"
-      | Firefox.run "alert('hey')"
+      | Firefox.exec "alert('hey')"
     - docs/
       > Js examples
       @js/p('hi')
@@ -81,7 +81,7 @@ class Firefox
   def self.js txt=nil
     return Tree.<<("| $('div').toggle(1300)  // Type some javascript here (to run in the browser)") if ! txt
 
-    Firefox.run txt  #, :jquery=>1
+    Firefox.exec txt
   end
 
   def self.coffee txt=nil
@@ -89,7 +89,7 @@ class Firefox
 
     txt = CoffeeScript.run_internal txt
 
-    Firefox.run txt  #, :jquery=>1
+    Firefox.exec txt
     ".flash - ran in browser!"
   end
 
@@ -104,17 +104,17 @@ class Firefox
 
     prefix = Keys.prefix_n :clear=>true
     if ! prefix
-      Firefox.run("gBrowser.reload()", :browser=>true)
+      Firefox.exec("gBrowser.reload()", :browser=>true)
     elsif prefix == 0
       # Similar to reload, but field values will reset
-      Firefox.run("document.location = document.location;")
+      Firefox.exec("document.location = document.location;")
     else
 
       tab = prefix - 1
       if tab == -1   # If 0, close tab
         self.close_tab
       else   # If number, switch to tab
-        Firefox.run("gBrowser.tabContainer.selectedIndex = #{tab}", :browser=>true)
+        Firefox.exec("gBrowser.tabContainer.selectedIndex = #{tab}", :browser=>true)
       end
 
     end
@@ -124,14 +124,14 @@ class Firefox
   def self.close_tab
     times = Keys.prefix_n :clear=>true
     (times||1).times do
-      self.run "gBrowser.removeCurrentTab();", :browser=>true
+      self.exec "gBrowser.removeCurrentTab();", :browser=>true
     end
   end
 
   def self.click
     link = Keys.input(:prompt=>'Substring of link to click on: ')
 
-    Firefox.run("
+    Firefox.exec("
       var a = $('a:contains(#{link}):first');
       var url = a.attr('href');
       if(url == '#')
@@ -142,11 +142,11 @@ class Firefox
   end
 
   def self.back
-    Firefox.run "history.back()"
+    Firefox.exec "history.back()"
   end
 
   def self.forward
-    Firefox.run "history.forward()"
+    Firefox.exec "history.forward()"
   end
 
   #     # Copied from here (and modified):
@@ -194,7 +194,7 @@ class Firefox
 
 
 
-  def self.run_block
+  def self.exec_block
 
     prefix = Keys.prefix
 
@@ -224,7 +224,7 @@ class Firefox
     return
   end
 
-  def self.run txt, options={}
+  def self.exec txt, options={}
 
     result = Firefox.mozrepl_command txt, options
 
@@ -249,7 +249,7 @@ class Firefox
   end
 
   def self.value txt
-    self.run(txt).sub(/\A"/, "").sub(/"\z/, "")
+    self.exec(txt).sub(/\A"/, "").sub(/"\z/, "")
   end
 
   def self.url url=nil, options={}
@@ -281,7 +281,7 @@ class Firefox
 
       `.unindent
 
-    result = self.run js, :browser=>true
+    result = self.exec js, :browser=>true
 
     nil
   end
@@ -313,13 +313,13 @@ class Firefox
     html.gsub! "\n", ' '
 
     code = "$('body').append(\"#{html}\")"
-    result = Firefox.run code  #, :jquery=>1
+    result = Firefox.exec code
     nil
   end
 
   def self.jso txt=nil
     return View.prompt("Add some js to output its result") if txt.nil?
-    Firefox.run txt  #, :jquery=>1
+    Firefox.exec txt
   end
 
   def self.enter_log_javascript_line
@@ -354,7 +354,7 @@ class Firefox
 
   def self.include_jquery_and_utils
 
-    Firefox.run "
+    Firefox.exec "
       var s=document.createElement('script');
       s.setAttribute('src', 'http://code.jquery.com/jquery.min.js');
       document.getElementsByTagName('head')[0].appendChild(s);
@@ -369,7 +369,7 @@ class Firefox
 
   def self.enter_as_url
     if Keys.prefix_u
-      self.run "gBrowser.tabContainer.selectedIndex += 1", :browser=>true
+      self.exec "gBrowser.tabContainer.selectedIndex += 1", :browser=>true
     end
 
     url = Firefox.value('document.location.toString()')
@@ -459,7 +459,7 @@ class Firefox
       return nil   # Text without error, so don't load
     end
 
-    self.run "
+    self.exec "
       if(! document.getElementById('jqid')){
         var s=document.createElement('script');
         s.setAttribute('src', 'http://code.jquery.com/jquery.min.js'); s.setAttribute('id', 'jqid');
@@ -510,7 +510,7 @@ class Firefox
       jQuery(\"#{selector}\").blink();
       "
 
-    txt = Firefox.run code  #, :jquery=>1
+    txt = Firefox.exec code
     nil
   end
 
@@ -531,7 +531,7 @@ Launcher.add(/^\.[\w-]+$/) do |line|
 end
 
 Menu.js do |path|
-  Applescript.run("Firefox", "activate") if Keys.prefix_u
+  Applescript.exec("Firefox", "activate") if Keys.prefix_u
   Firefox.js Tree.rest(path)
   nil
 end
@@ -545,7 +545,7 @@ Menu.jsp do |path|
   txt = Tree.leaf path
   txt = txt.strip.sub(/;\z/, '')   # Remove any semicolon at end
   code = "p(#{txt})"
-  result = Firefox.run code  #, :jquery=>1
+  result = Firefox.exec code
   nil
 end
 
@@ -559,7 +559,7 @@ Menu.length do |path|
 
   next View.prompt("Type a jquery selector to show length of result") if txt.nil?
   txt = "$(\"#{txt}\").length"
-  txt = Firefox.run txt  #, :jquery=>1
+  txt = Firefox.exec txt
 
   #   txt = Firefox.jso txt
   Tree.<< txt, :no_slash=>1
@@ -571,7 +571,7 @@ Menu.jsc do |path|   # - (js): js to run in firefox
   return View.prompt("Add some js to run and output to firebug console.") if txt.nil?
   txt = txt.strip.sub(/;\z/, '')   # Remove any semicolon at end
   code = "console.log(#{txt})"
-  Firefox.run code  #, :jquery=>1
+  Firefox.exec code
   nil
 end
 
@@ -598,7 +598,7 @@ end
 Menu.click do |path|
   nth = 0
   txt = Tree.leaf path
-  Firefox.run("$('a, *[onclick]').filter(':contains(#{txt}):eq(#{nth})').click()")  #, :jquery=>1)
+  Firefox.exec("$('a, *[onclick]').filter(':contains(#{txt}):eq(#{nth})').click()")
   nil
 end