- container/
- row/
- span4/
- h2/
- - icon/051_eye_open
+ - icon/eye-open
- Screencasts
- p/
Check out the
- to see Xiki in action.
+ to see Xiki in action. This is the best way to get a feel for it.
- span4/
- h2/
+ icon/
- - 154_show_big_thumbnails
- - Other Tools
+ - th
+ - Creating
- p/
| Create menus to access other tools just by typing.
| If the menu doesn't exist, xiki guides you through creating it.
- span4/
- h2/
- - icon/160_imac
+ - icon/desktop
Shell + GUI
- p/
Xiki merges shell and GUI concepts.
@@ -79,7 +111,7 @@ bootstrap/
- row/
- span4/
- h2/
- - icon/012_heart
+ - icon/heart
- Code
- p/
Go to
@@ -87,7 +119,7 @@ bootstrap/
to check out the code and install Xiki.
- span4/
- h2/
- - icon/043_group
+ - icon/group
- Mailing list
- p/
See the
@@ -95,7 +127,7 @@ bootstrap/
for help getting Xiki installed, or to ask other questions or share ideas.
- span4/
- h2/
- - icon/108_left_indent
+ - icon/twitter
Twitter
-
Follow
@@ -131,6 +163,48 @@ bootstrap/
| })();
+> 2. Deploy
+:p/xiki.org/www/
+/projects/xiki.org/www/
+ - 1) Expand the above 'xiki loc' command
+ - 2) Copy to the server
+ $ scp index.html xiki@xiki.org:/var/www/xiki.org/index.html
+ - 3) Verify
+ =http://xiki.com
+
+
+ + index.html
+
+ + screencasts/
+ + index.shtml
+ $ scp index.shtml xiki@xiki.org:/var/www/xiki.org/screencasts/index.shtml
+/tmp/
+ $ scp tmp.html xiki@xiki.org:/var/www/xiki.org/screencasts/index.shtml
+
+http://xiki.org/screencasts
+
+
+/xiki@xiki.org/var/www/xiki.org/
+
+
+- old
+ | /tmp/
+ | - tmp.html
+ | $ scp tmp.html xiki@xiki.org:/var/www/xiki.org/index.html
+ | $ scp tmp.html xiki@xiki.org:/var/www/xiki.org/screencasts/index.shtml
+
+> old header > "Xiki is a UI Language."
+ |
+ |
+ | Xiki is a UI Language.
+ |
+ | The shell console reimagined. Type notes, prototype, and program.
+ |
+ | Donate to Xiki:
+
+
>> Old swimming shark
- move to bottom!
@@ -161,11 +235,24 @@ bootstrap/
- p/In Xiki, text is always editable. Command output is inserted underneath the command, nested two spaces.
+> Old wording
+ |
+ |
+ |
+ |
+
+
+
+
+> local url
+http://xiki.loc
+
+
> Screencasts: index
bootstrap/
- project name/Xiki
- navbar/
- |
+ |
+ |
+ |
+ |
+ - jquery mobile example/
+ - Replace "trogdoro" with your username (see preparation/).
+ - Then double-click to run.
+ @html/
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ | Nothing loaded yet. Maybe you haven't added a record to your "/books" collection yet?
+ |
+ |
+ |
+- docs/
+ @learn/
+ > Terms
+ | main 3 terms : collection, Data Explorer, usergrid
+ | collection : database table
+ | Data Explorer : web interface to create collection
+ | usergrid : url for Data Explorer
+
+ > Code
+ | Sign in : apigee = new Usergrid.Client({orgName:'my username', appName:'sandbox'})
+ | make collection : my_books = new Usergrid.Collection({ "client":apigee, "type":"books" })
+ | query all : my_books.fetch(success_callback, failure_callback)
+ | functions to use in fetch() : .hasNextEntity(), .getNextEntity()
+ | read value : book.get('title')
diff --git a/roots/append.rb b/roots/append.rb
new file mode 100644
index 00000000..42c66546
--- /dev/null
+++ b/roots/append.rb
@@ -0,0 +1,10 @@
+Applescript.exec("Firefox", "activate") if Keys.prefix_u
+
+return "
+ |
Type html here
+ |
To append to the browser
+ " if args.blank?
+
+return "=beg/quoted/" if args[0] !~ /\n/
+
+Firefox.append args[0]
diff --git a/roots/applescript.rb b/roots/applescript.rb
new file mode 100644
index 00000000..e7b4f23b
--- /dev/null
+++ b/roots/applescript.rb
@@ -0,0 +1,50 @@
+module Menu
+ class Applescript
+
+ MENU = %`
+ > Pass in applescript to run
+ | tell application "iTunes" to playpause
+ - docs/
+ - examples/
+ - one line/
+ =applescript/iTunes/playpause
+ - multiple lines/
+ =applescript/
+ | tell application "iTunes"
+ | playpause
+ | end
+ - terminal/
+ =applescript/Terminal/do script "pwd" in window 1
+ - api/
+ - run applescript/
+ =code/
+ | Applescript.run 'tell application "iTunes" to playpause'
+ - shortcut to wrap 'tell' in block/
+ =code/
+ | Applescript.run "playpause", :app=>"iTunes"
+ | Applescript.run "get the name of every track of library playlist 1 as string", :app=>"iTunes", :delimiter=>"|"
+ `
+
+ def self.menu_after output, *args
+
+ return output if output # MENU handled it, so don't interfere
+
+ command = args[0]
+
+ # /Application/script, so send specific app...
+
+ app, command = args if args[1]
+
+ # If only 1 line, remove colon
+ command.sub! /^: /, '' if command !~ /\n/
+
+ # /script, so run it...
+
+ result = Xiki::Applescript.run command, :app=>app
+
+ "<*"
+ end
+
+ end
+end
+
diff --git a/menu/app.rb b/roots/applications.rb
similarity index 77%
rename from menu/app.rb
rename to roots/applications.rb
index 6bf56c77..76510874 100644
--- a/menu/app.rb
+++ b/roots/applications.rb
@@ -1,7 +1,7 @@
#
# Shows each OS X app, and lets you launch them.
#
-class App
+class Applications
def self.menu name=nil
if ! name
@@ -9,7 +9,7 @@ def self.menu name=nil
return txt
end
- Console.sync "open \"/Applications/#{name}.app\""
+ Shell.sync "open \"/Applications/#{name}.app\""
nil
end
end
diff --git a/roots/args.rb b/roots/args.rb
new file mode 100644
index 00000000..78279526
--- /dev/null
+++ b/roots/args.rb
@@ -0,0 +1,66 @@
+class Xiki::Args
+
+ MENU = %`
+ - docs/
+ - summary/
+ | This menu helps you when creating your own menus. It
+ | lets you try different ways of passing stuff into the
+ | menu and see how it gets passed in as args to the menu.
+ - more/
+ | Usually only menus that have code need to worry about
+ | args. Nonetheless, trying out the examples below can
+ | be instructive regarding how items are passed into all
+ | menus.
+ - examples/
+ @args/a/
+ @args/a/b/
+ - more/
+ - items underneath/
+ @args/
+ - a/
+ @args/
+ - a/
+ - b/
+ @args/
+ - a/b/
+ - multiple lines/
+ @args/
+ : Colons mean to pass the lines in
+ : together, with the colons removed.
+ @args/
+ | Pipes mean to pass the line in individually. Unless the
+ | menu begs for all the lines by returning "=beg/siblings/".
+ | See the docs for the "beg" menu for more information.
+ - other types of items/
+ @args/
+ > Headings
+ @args/
+ | When a nested menu starts with "@", it doesn't invoke
+ | the parent menu at all.
+ @ip/
+ - slashes/
+ @args/
+ > Headings
+ @args/
+ | When a nested menu starts with "@", it doesn't invoke
+ | the parent menu at all.
+ @ip/
+ - see/
+ @options/
+ `
+
+
+ def self.menu_after output, *args
+
+ # /, so show args and docs
+ return "#{Tree.quote args.inspect}#{output}" if args == []
+
+ # /docs/..., so it was already handled
+ return nil if output
+
+ # /foo/bar..., so show user what the args are
+ Tree.quote args.inspect
+ end
+
+
+end
diff --git a/roots/bash.rb b/roots/bash.rb
new file mode 100644
index 00000000..8506d07a
--- /dev/null
+++ b/roots/bash.rb
@@ -0,0 +1,34 @@
+# /, so tell them to run stuff
+
+if args == []
+ return "
+ | # Put some bash code here to run it
+ | echo 'something'
+ | echo 'something else'
+ "
+end
+
+# tasks+, so show items
+
+return "
+ * run as script
+ * run in bash
+ " if task == []
+
+return DiffLog.quit_and_run args[0] if task == ["run in bash"]
+
+txt = args[0]
+txt.gsub!(/^\$ /, '')
+
+if task == ["run as script"]
+ # Save to script and run
+ File.open("/tmp/tmp.bash", "w") { |f| f << txt }
+ DiffLog.quit_and_run "bash /tmp/tmp.bash"
+end
+
+# /code, so run it
+
+File.open("/tmp/bash.sh", "w") { |f| f << txt }
+txt = Shell.command "bash /tmp/bash.sh"#, :stdin=>"foo"
+Tree.quote txt
+
diff --git a/roots/beg.menu b/roots/beg.menu
new file mode 100644
index 00000000..7f474d20
--- /dev/null
+++ b/roots/beg.menu
@@ -0,0 +1,101 @@
+> Things menus can return to request more info
+- docs/
+ - summary/
+ | Menus can return "=beg/siblings/" and similar things to indicate
+ | they want the Xiki client to re-invoke them with more
+ | information. Normally when you launch a menu only the path is
+ | sent as input (and a few other pieces of info).
+ |
+ | Returning something like this makes Xiki re-invoke the menu,
+ | passing in the additional information (unless there's a reason
+ | not to).
+ |
+ | See the items below for examples.
+ - source/
+ | Here's the start of the code that handles this:
+ =/projects/xiki/lib/xiki/core/launcher.rb
+ + ##if\ beg\ ==/
+ - future todo maybe/
+ - when colons, way to beg multiple lines, but with colons, to distinguish/
+ - example/
+ - when...
+ : multiple
+ : lines
+ - would return
+ ": multiple\n: lines\n"
+ - have character equivalants/
+ | So maybe these will be equivalent
+ | =beg/quoted/
+ | must be defined in code, so get path
+ path = Bookmarks["%#{args[0]}"]
+ # Make new bookmark
+ Bookmarks.set args[0], :file=>path
+ end
+
+ return "<* - will be at top next time"
+
+end
+
+# /foo, so jump to bookmark...
+
+View.open "%#{args[0]}"
+
+""
diff --git a/menu/bootstrap.rb b/roots/bootstrap.rb
similarity index 52%
rename from menu/bootstrap.rb
rename to roots/bootstrap.rb
index 3ba60377..68ad0921 100644
--- a/menu/bootstrap.rb
+++ b/roots/bootstrap.rb
@@ -14,108 +14,122 @@ def self.menu_after *args
self.content *args[1..-1]
end
- MENU = %`
- <= .make a page/
+ # Called when MENU set, so subclasses can use it to make
+ # MENU have their name.
+ def self.menu_constant
+# <= .make a page/
+ txt = %`
- examples/
- layouts/
- hello world/
- - @#{self.to_s.downcase}/
- - project name/Sharkathon
- - h2/Sharks
- - p/They have fins and other cool stuff.
+ = bootstrap/
+ > A heading
+ You can just use a greater than sign for a heading.
+ - columns/
+ = bootstrap/
+ > Hi
+ Since these two sections are right next to each other, they'll show up side by side (as columns).
+ > Snails
+ Cool swirly shell but creepy antennae things.
- hero unit/
- - @#{self.to_s.downcase}/
- - project name/Sharkathon
+ = bootstrap/
- hero/
- - h1/Sharks
- - p/They have fins and other cool stuff.
-
- > Do you?
- Lorem Ipsum Dolor...
- - 2 columns/
- - @#{self.to_s.downcase}/
- - row/
- - span6/
- - h2/random
- - p/lorem ipsum...
- - span6/
- - h2/random
- - p/ipsum dolor...
- - 3 columns/
- - @#{self.to_s.downcase}/
- - row/
- - span4/
- - h2/random
- - p/lorem ipsum...
- - span4/
- - h2/random
- - p/ipsum dolor...
- - span4/
- - h2/random
- - p/dolor sit...
- - with icons/
- - @#{self.to_s.downcase}/
- - hero/
- - h1/Sharks
- - p/lorem...
- - row/
- - span6/
- - h2 icon/random
- - p/ipsum dolor sit...
- - span6/
- - h2 icon/random
- - p/dolor sit lorem...
- - row/
- - span4/
- - h2 icon/random
- - p/lorem ipsum...
- - span4/
- - h2 icon/random
- - p/ipsum dolor...
- - span4/
- - h2 icon/random
- - p/sit lorem...
- - shorthand/
- - @#{self.to_s.downcase}/
- - hero/
- > Shorthand
- p/Lines starting with ">" at left margin will have rows and spans auto-wrapped around them.
-
- > o random
- lorem...
- > o random
- lorem...
-
- > o random
- lorem...
- > o random
- lorem...
- > o random
- lorem...
- - with styled hero/
- - @#{self.to_s.downcase}/
- - hero/
- - h1/Sharks
- - p/lorem...
- - h2/random
- - p/sit lorem ipsum dolor...
- - style/
- | .hero-unit {
- | background-color: #9D261D;
- | color: #fff;
- | text-shadow: 2px 2px 2px #333;
- | border-radius: 20px;
- | }
- - modified navbar/
- - @#{self.to_s.downcase}/
- - navbar/
- |
- |
- - h2/random
- - p/sit lorem ipsum dolor...
+ h1/Sharks
+ p/They have fins and other cool stuff.
+ > Colors?
+ Each time you generate the page, it uses a different background color for the hero, just to give you ideas. Under "more control" there's an example of using a style to set it to a fixed color or gradient.
+ - rows/
+ = bootstrap/
+ > Snails
+ Cool swirly shell but creepy antennae things.
+ > random
+ This heading is random since we used the special heading "random".
+
+ > Another
+ This div is a underneath because of the blank line separating it. If you removed the blank line, it would be a third column.
+ - icons/
+ = bootstrap/
+ > $ Snails
+ The "$" is replaced with a random icon.
+ When you have "Lorem..." or "Ipsum Dolor..." or something like that, it uses sample text.
+ > $ Sample text
+ Lorem...
+ - html/
+ = bootstrap/
+ > You can put html pretty much anywhere
+
Here's me using some html.
+
+ - more control/
+ - 2 columns/
+ = bootstrap/
+ - project name/Sharks
+ - row/
+ - span5/
+ > random
+ lorem ipsum...
+ - span7/
+ > random
+ ipsum dolor...
+ - 3 columns/
+ = bootstrap/
+ - project name/Sharks
+ - row/
+ - span3/
+ > random
+ lorem ipsum...
+ - span6/
+ > random
+ ipsum dolor...
+ - span3/
+ > random
+ dolor sit...
+ - hero and icons/
+ = bootstrap/
+ - project name/Sharks
+ - hero/
+ h1/Sharks
+ p/lorem...
+ - row/
+ - span6/
+ h2 icon/random
+ ipsum dolor sit...
+ - span6/
+ h2 icon/random
+ dolor sit lorem...
+ - row/
+ - span4/
+ h2 icon/random
+ lorem ipsum...
+ - span4/
+ h2 icon/random
+ ipsum dolor...
+ - span4/
+ h2 icon/random
+ sit lorem...
+ - with styled hero/
+ = bootstrap/
+ - hero/
+ h1/Sharks
+ p/lorem...
+ - h2/random
+ - p/sit lorem ipsum dolor...
+ - style/
+ | .hero-unit {
+ | background-color: #9D261D;
+ | color: #fff;
+ | text-shadow: 2px 2px 2px #333;
+ | border-radius: 20px;
+ | }
+ - modified navbar/
+ = bootstrap/
+ navbar/
+ |
+ |
+ h2/random
+ p/sit lorem ipsum dolor...
- components/
- buttons/
- - @#{self.to_s.downcase}/
+ = bootstrap/
- h2/Buttons
- p/
Hi
@@ -133,7 +147,7 @@ def self.menu_after *args
Hi
- icons/
- with headings/
- - @#{self.to_s.downcase}/
+ = bootstrap/
p/
- h3/random
- h2 icon/Info
@@ -167,7 +181,7 @@ def self.menu_after *args
- forms/
- basics/
- - @#{self.to_s.downcase}/
+ = bootstrap/
|
- search/
- - @#{self.to_s.downcase}/
+ = bootstrap/
|
- inline/
- - @#{self.to_s.downcase}/
+ = bootstrap/
|
- horizontal/
- - @#{self.to_s.downcase}/
+ = bootstrap/
|
- code/
- - @#{self.to_s.downcase}/
+ = bootstrap/
- pre/
| class Clam
| def hi
@@ -217,7 +231,7 @@ def self.menu_after *args
| end
- p/Hey
you there.
- carousel/
- - @#{self.to_s.downcase}/
+ = bootstrap/
-
-
@@ -240,19 +254,32 @@ def self.menu_after *args
| Expand the 'container' menu to build, or start with the
| 'example' menu.
|
- | @#{self.to_s.downcase}/
+ | =bootstrap/
| h2/Example Heading
> Bootstrap site
- @http://twitter.github.com/bootstrap/
+ =http://twitter.github.com/bootstrap/
- javascript.html
- base-css.html
- getting-started.html#examples
- see/
- @fontawesome/
+ =fontawesome/
`
+ name = self.name.to_s.downcase.sub(/.+:/, '')
+ txt.gsub!("=bootstrap/", "=#{name}/") if name != "bootstrap"
+
+ txt
+
+ end
+
+ MENU = self.menu_constant
+
+ # @@bg = ['#eee', '#555', '#999', '#9D261D', '#369', '#096']
+
+
+ # Temp >>> Hard-coded > because tomato color is the best!
+ @@bg = ['#9D261D']
- @@bg = ['#eee', '#555', '#999', '#9D261D', '#369', '#096']
@@tags = {
"container"=>"div class='container'",
@@ -269,7 +296,7 @@ def self.menu_after *args
}
@@icons = [
- 'expand-alt', 'frown', 'meh', 'gamepad', 'keyboard', 'flag-alt', 'flag-checkered', 'mail-forward', 'mail-reply', 'reply-all', 'mail-reply-all', 'star-half-empty', 'star-half-full', 'location-arrow', 'rotate-left', 'rotate-right', 'crop', 'unlink', 'question', 'info', 'superscript', 'subscript', 'puzzle-piece', 'microphone', 'microphone-off', 'shield', 'calendar-empty', 'fire-extinguisher', 'rocket', 'maxcdn', 'html5', 'css3', 'anchor', 'unlock-alt', 'bullseye', 'rss-sign', 'play-sign', 'ticket', 'minus-sign-alt', 'check-minus', 'level-up', 'level-down', 'check-sign', 'edit-sign', 'external-link-sign', 'share-sign', 'adjust', 'asterisk', 'ban-circle', 'bar-chart', 'barcode', 'beaker', 'beer', 'bell-alt', 'bell', 'bolt', 'book', 'bookmark-empty', 'bookmark', 'briefcase', 'bullhorn', 'calendar', 'camera-retro', 'camera', 'certificate', 'check-empty', 'check', 'circle-blank', 'circle', 'cloud-download', 'cloud-upload', 'cloud', 'code-fork', 'code', 'coffee', 'cog', 'cogs', 'collapse-alt', 'comment-alt', 'comment', 'comments-alt', 'comments', 'credit-card', 'crop', 'dashboard', 'desktop', 'download-alt', 'download', 'edit', 'ellipsis-horizontal', 'ellipsis-vertical', 'envelope-alt', 'envelope', 'eraser', 'exchange', 'exclamation-sign', 'exclamation', 'external-link-sign', 'external-link', 'eye-close', 'eye-open', 'facetime-video', 'fighter-jet', 'film', 'filter', 'fire-extinguisher', 'fire', 'flag-alt', 'flag-checkered', 'flag', 'folder-close-alt', 'folder-close', 'folder-open-alt', 'folder-open', 'food', 'frown', 'gamepad', 'gift', 'glass', 'globe', 'group', 'hdd', 'headphones', 'heart-empty', 'heart', 'home', 'inbox', 'info-sign', 'info', 'key', 'keyboard', 'laptop', 'leaf', 'legal', 'lemon', 'level-down', 'level-up', 'lightbulb', 'location-arrow', 'lock', 'magic', 'magnet', 'mail-forward', 'mail-reply', 'mail-reply-all', 'map-marker', 'minus-sign-alt', 'minus-sign', 'minus', 'mobile-phone', 'money', 'move', 'music', 'off', 'ok-circle', 'ok-sign', 'ok', 'pencil', 'phone-sign', 'phone', 'picture', 'plane', 'plus-sign', 'plus', 'print', 'pushpin', 'puzzle-piece', 'qrcode', 'question-sign', 'question', 'quote-left', 'quote-right', 'random', 'refresh', 'remove-circle', 'remove-sign', 'remove', 'reorder', 'reply-all', 'reply', 'resize-horizontal', 'resize-vertical', 'retweet', 'road', 'rocket', 'rotate-left', 'rotate-right', 'rss-sign', 'rss', 'screenshot', 'search', 'share-alt', 'share-sign', 'share', 'shopping-cart', 'sign-blank', 'signal', 'signin', 'signout', 'sitemap', 'smile', 'sort-down', 'sort-up', 'sort', 'spinner', 'star-empty', 'star-half-full', 'star-half-empty', 'star-half', 'star', 'tablet', 'tag', 'tags', 'tasks', 'terminal', 'thumbs-down', 'thumbs-up', 'ticket', 'time', 'tint', 'trash', 'trophy', 'truck', 'umbrella', 'unlock-alt', 'unlock', 'upload-alt', 'upload', 'user-md', 'user', 'volume-down', 'volume-off', 'volume-up', 'warning-sign', 'wrench', 'zoom-in', 'zoom-out', 'file', 'file-alt', 'cut', 'copy', 'paste', 'save', 'undo', 'repeat', 'text-height', 'text-width', 'align-left', 'align-center', 'align-right', 'align-justify', 'indent-left', 'indent-right', 'font', 'bold', 'italic', 'strikethrough', 'underline', 'superscript', 'subscript', 'link', 'unlink', 'paper-clip', 'columns', 'table', 'th-large', 'th', 'th-list', 'list', 'list-ol', 'list-ul', 'list-alt', 'angle-left', 'angle-right', 'angle-up', 'angle-down', 'arrow-down', 'arrow-left', 'arrow-right', 'arrow-up', 'caret-down', 'caret-left', 'caret-right', 'caret-up', 'chevron-down', 'chevron-left', 'chevron-right', 'chevron-up', 'chevron-sign-left', 'chevron-sign-right', 'chevron-sign-up', 'chevron-sign-down', 'circle-arrow-down', 'circle-arrow-left', 'circle-arrow-right', 'circle-arrow-up', 'double-angle-left', 'double-angle-right', 'double-angle-up', 'double-angle-down', 'hand-down', 'hand-left', 'hand-right', 'hand-up', 'play-circle', 'play-sign', 'play', 'pause', 'stop', 'eject', 'backward', 'forward', 'fast-backward', 'fast-forward', 'step-backward', 'step-forward', 'fullscreen', 'resize-full', 'resize-small', 'facebook', 'facebook-sign', 'twitter', 'twitter-sign', 'github', 'github-sign', 'html5', 'linkedin', 'linkedin-sign', 'maxcdn', 'pinterest', 'pinterest-sign', 'google-plus', 'google-plus-sign', 'ambulance', 'h-sign', 'hospital', 'medkit', 'plus-sign-alt', 'stethoscope', 'user-md',
+ 'expand-alt', 'meh', 'keyboard', 'microphone', 'microphone-off', 'shield', 'calendar-empty', 'css3', 'anchor', 'bullseye', 'check-minus', 'check-sign', 'edit-sign', 'adjust', 'asterisk', 'ban-circle', 'bar-chart', 'barcode', 'beaker', 'beer', 'bell-alt', 'bell', 'bolt', 'book', 'bookmark-empty', 'bookmark', 'briefcase', 'bullhorn', 'calendar', 'camera-retro', 'camera', 'certificate', 'check-empty', 'check', 'circle-blank', 'circle', 'cloud-download', 'cloud-upload', 'cloud', 'code-fork', 'code', 'coffee', 'cog', 'cogs', 'collapse-alt', 'comment-alt', 'comment', 'comments-alt', 'comments', 'credit-card', 'crop', 'dashboard', 'desktop', 'download-alt', 'download', 'edit', 'ellipsis-horizontal', 'ellipsis-vertical', 'envelope-alt', 'envelope', 'eraser', 'exchange', 'exclamation-sign', 'exclamation', 'external-link-sign', 'external-link', 'eye-close', 'eye-open', 'facetime-video', 'fighter-jet', 'film', 'filter', 'fire-extinguisher', 'fire', 'flag-alt', 'flag-checkered', 'flag', 'folder-close-alt', 'folder-close', 'folder-open-alt', 'folder-open', 'food', 'frown', 'gamepad', 'gift', 'glass', 'globe', 'group', 'hdd', 'headphones', 'heart-empty', 'heart', 'home', 'inbox', 'info-sign', 'info', 'key', 'laptop', 'leaf', 'legal', 'lemon', 'level-down', 'level-up', 'lightbulb', 'location-arrow', 'lock', 'magic', 'magnet', 'mail-forward', 'mail-reply', 'mail-reply-all', 'map-marker', 'minus-sign-alt', 'minus-sign', 'minus', 'mobile-phone', 'money', 'move', 'music', 'off', 'ok-circle', 'ok-sign', 'ok', 'pencil', 'phone-sign', 'phone', 'picture', 'plane', 'plus-sign', 'plus', 'print', 'pushpin', 'puzzle-piece', 'qrcode', 'question-sign', 'question', 'quote-left', 'quote-right', 'random', 'refresh', 'remove-circle', 'remove-sign', 'remove', 'reorder', 'reply-all', 'reply', 'resize-horizontal', 'resize-vertical', 'retweet', 'road', 'rocket', 'rotate-left', 'rotate-right', 'rss-sign', 'rss', 'screenshot', 'search', 'share-alt', 'share-sign', 'share', 'shopping-cart', 'sign-blank', 'signal', 'signin', 'signout', 'sitemap', 'smile', 'sort-down', 'sort-up', 'sort', 'spinner', 'star-empty', 'star-half-full', 'star-half-empty', 'star-half', 'star', 'tablet', 'tag', 'tags', 'tasks', 'terminal', 'thumbs-down', 'thumbs-up', 'ticket', 'time', 'tint', 'trash', 'trophy', 'truck', 'umbrella', 'unlock-alt', 'unlock', 'upload-alt', 'upload', 'user', 'volume-down', 'volume-off', 'volume-up', 'warning-sign', 'wrench', 'zoom-in', 'zoom-out', 'file', 'file-alt', 'cut', 'copy', 'paste', 'save', 'undo', 'repeat', 'text-height', 'text-width', 'align-left', 'align-center', 'align-right', 'align-justify', 'indent-left', 'indent-right', 'font', 'bold', 'italic', 'strikethrough', 'underline', 'superscript', 'subscript', 'link', 'unlink', 'paper-clip', 'columns', 'table', 'th-large', 'th', 'th-list', 'list', 'list-ol', 'list-ul', 'list-alt', 'angle-left', 'angle-right', 'angle-up', 'angle-down', 'arrow-down', 'arrow-left', 'arrow-right', 'arrow-up', 'caret-down', 'caret-left', 'caret-right', 'caret-up', 'chevron-down', 'chevron-left', 'chevron-right', 'chevron-up', 'chevron-sign-left', 'chevron-sign-right', 'chevron-sign-up', 'chevron-sign-down', 'circle-arrow-down', 'circle-arrow-left', 'circle-arrow-right', 'circle-arrow-up', 'double-angle-left', 'double-angle-right', 'double-angle-up', 'double-angle-down', 'hand-down', 'hand-left', 'hand-right', 'hand-up', 'play-circle', 'play-sign', 'play', 'pause', 'stop', 'eject', 'backward', 'forward', 'fast-backward', 'fast-forward', 'step-backward', 'step-forward', 'fullscreen', 'resize-full', 'resize-small', 'facebook', 'facebook-sign', 'twitter', 'twitter-sign', 'github', 'github-sign', 'html5', 'linkedin', 'linkedin-sign', 'maxcdn', 'pinterest', 'pinterest-sign', 'google-plus', 'google-plus-sign', 'ambulance', 'h-sign', 'hospital', 'medkit', 'plus-sign-alt', 'stethoscope', 'user-md',
]
@@random = ["Info", "Facts", "B. S.", "Why?", "History", "Traits", "Story", "What?", "Happy"]
@@ -278,8 +305,11 @@ def self.menu_after *args
# Render txt as html.
# Bootstrap.render "h1/foo"
def self.render txt
+
+ txt.gsub! /^ *\|-.*\n/, '' # Delete |-... "comments"
+
bootstrap = Bootstrap.new txt
- bootstrap.to_html
+ bootstrap.to_html #> |||
bootstrap.wrap_html_page
end
@@ -290,36 +320,121 @@ def self.make_a_page
# If more siblings
"
- - project name/Foo
- hero/
- row/
- icon/
- style/
+ - project name/
"
end
+ def self.simplified_render txt
+
+ snippet = txt.unindent
+
+ html = %`
+
+
+
+
+
+
+
+
+
+
+
+
Bootstrap
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#{snippet}
+
+
+
+
+
+
+
+
+
+
+ `
+
+
+ return Browser.html html
+
+
+
+ end
+
+
def self.content *args
prefix = Keys.prefix :clear=>1
# If not expandable or open+, render in browser
if prefix == "open" || Line !~ /\/$/ || Line =~ /^ *\|/
- orig = Location.new
+ return self.simplified_render args[0]
- Tree.to_root
+ Ol "Todo > clean up unused stuff below here!"
- txt = Tree.children :cross_blank_lines=>1
- orig.go
+ txt = args[0]
txt = txt.unindent
+ txt = "
#{txt}
"
- txt = self.render txt
-
+ txt = self.render txt #> ||
return Browser.html txt
end
last = args.last
if filler = @@filler[last]
- Line.add_slash :txt=>filler, :left=>1
+ Line.add_slash :txt=>filler, :no_move=>1
elsif last == "icon"
@@icons.map{|o| "- #{o}\n"}.join('')
elsif last == 'style'
@@ -363,7 +478,9 @@ def initialize txt
def self.expand_wiki_headings txt
# Always simply wrap >... lines that are indented...
- txt.gsub! /( +)> /, "\\1h2/"
+ txt.gsub! /^( *hero\/\n *)> /, "\\1h1/" # If under "hero/" make h1
+
+ txt.gsub! /^( +)> /, "\\1h2/"
return if txt !~ /^> / # If no >... lines at left margin, we're done (because only they have are meant to be wrapped)
@@ -395,12 +512,12 @@ def self.expand_wiki_headings txt
no_h2_yet = true
row_i = 0
lines.each do |l|
- if l =~ /^> (\w )?(.+)/ # If >..., increase count in hash
+ if l =~ /^> (\$ )?(.+)/ # If >..., increase count in hash
icon, heading = $1, $2
width = 12 / row_hash[row_i]
txt << "row/\n" if no_h2_yet # If first unindented >..., add initial row
no_h2_yet = false
- next txt.<< " span#{width}/\n h2 #{icon.strip}/#{heading}\n" if icon
+ next txt.<< " span#{width}/\n h2 icon/#{heading}\n" if icon
txt << " span#{width}/\n h2/#{heading}\n"
elsif no_h2_yet # Leave items before first >... alone
txt << "#{l}\n"
@@ -426,8 +543,6 @@ def to_html
# Remove |#... comments
@txt.gsub! /^ *\|# .+\n/, ''
- Bootstrap.expand_wiki_headings @txt
-
# Wrap "- container/" around all, unless already a container
if @txt !~ /^ *([+-] )?container\// && @txt !~ /^ *([+-] )?
tags.
- @html.gsub!(//) { |o| " #{Bootstrap.icon_tag @@icons[rand(93)]}" }
+ @html.gsub!("") { |o| " #{Bootstrap.icon_tag @@icons[rand(93)]}" }
# Make all lines within tags become icons.
@@ -496,7 +611,7 @@ def to_html
end
def self.icon_tag name
- " Install clojure via leiningen
+ | How to install on the mac:
+ @% brew install leiningen
+ =conf/
+ `
+
+ def self.remote path=nil
+
+ # /remote/, so list them...
+
+ conf = yield[:conf]
+ conf.sub(/\A> .+\n/, '').gsub(/.+/, "- \\0/")
+
+ # /remote/foo.com, so connect or start...
+
+ "TODO: not implemented yet. Here's the path: #{path}"
+ end
+
+ def self.repl
+ Shell.run "lein repl"
+ ""
+ end
+
+ def self.menu_before *args
+
+ return if args.blank? # Do nothing if just "clojure/"
+
+ # If clojure jar not set, error out...
+
+ conf = yield[:conf]
+ return "
+ > Expand this and add your clojure jar here first
+ =clojure/=conf/
+ |
+ | Hint, it's probably somewhere under here:
+ @~/.m2/repository/org/clojure/clojure/
+ " if conf !~ /\.jar/
+ end
+
+ def self.menu_after output, *args
+ return if args[0] !~ /\n/ # Only continue if :... lines passed in
+
+ self.run args[0], yield # Eval them
+ end
+
+ def self.run txt, options
+
+ file = "/tmp/tmp.clj"
+ File.open(file, "w") { |f| f << txt }
+
+ conf = options[:conf]
+ clojure_jar = conf[/.+\.jar$/]
+
+ command = "java -cp #{clojure_jar} clojure.main -i #{file}"
+ output = Shell.sync command
+
+ Tree.quote output
+ end
+
+ end
+end
diff --git a/roots/clojure/default.conf b/roots/clojure/default.conf
new file mode 100644
index 00000000..b542feb9
--- /dev/null
+++ b/roots/clojure/default.conf
@@ -0,0 +1,5 @@
+> Clojure jar
+
+
+> Put your remote repl paths here
+foo.com:8001
diff --git a/roots/close.rb b/roots/close.rb
new file mode 100644
index 00000000..55cdfca2
--- /dev/null
+++ b/roots/close.rb
@@ -0,0 +1 @@
+View.kill
diff --git a/roots/close_view.rb b/roots/close_view.rb
new file mode 100644
index 00000000..55cdfca2
--- /dev/null
+++ b/roots/close_view.rb
@@ -0,0 +1 @@
+View.kill
diff --git a/roots/code.rb b/roots/code.rb
new file mode 100644
index 00000000..6e700937
--- /dev/null
+++ b/roots/code.rb
@@ -0,0 +1 @@
+Xiki["ruby/", options]
diff --git a/roots/coffee.rb b/roots/coffee.rb
new file mode 100644
index 00000000..817d47a6
--- /dev/null
+++ b/roots/coffee.rb
@@ -0,0 +1,25 @@
+# Handle tasks
+
+return "* compile" if task == []
+if task == ["compile"]
+ return Tree.quote Shell.command "coffee -c --stdio", :stdin=>args[0]
+end
+
+# /, so show message...
+
+return "
+ | # Type some coffeescript here
+ | console.log 'hi'
+ " if args == []
+
+# /code, so execute it...
+
+# If coffeescript not installed, give them "gem install" command...
+
+return "
+ > First install coffeescript
+ % gem install coffeescript
+ " if `which coffee` == ""
+
+Tree.quote CoffeeHandler.eval args[0]
+
diff --git a/roots/computer.menu b/roots/computer.menu
new file mode 100644
index 00000000..fc63ec35
--- /dev/null
+++ b/roots/computer.menu
@@ -0,0 +1,5 @@
+= ip/
+= disk/
+= cpu/
+= processes/
+= network/
diff --git a/menu/conf/index.rb b/roots/conf/conf_index.rb
similarity index 50%
rename from menu/conf/index.rb
rename to roots/conf/conf_index.rb
index 14483882..aa62de68 100644
--- a/menu/conf/index.rb
+++ b/roots/conf/conf_index.rb
@@ -3,18 +3,12 @@ class Conf
include Xiki
- MENU = "
- > options
- - docs/
- > Whatevs
- "
-
# Can be called 2 ways, nested or not:
# conf/
# - foo/
# | content
# foo/
- # @conf/
+ # =conf/
# | content
# - docs/
def self.menu_after output=nil, *args # arg1=nil, arg2=nil
@@ -22,22 +16,30 @@ def self.menu_after output=nil, *args # arg1=nil, arg2=nil
return if output && args.any? # MENU handled everything, if there was a path and autput
options = yield
- # Use parent as menu name if foo/@conf...
+ # Use ancestor (or ancestor) as menu name if foo/=conf...
+
+ if ancestors = options[:ancestors]
+ menuish_ancestor = ancestors[-1][/[\w ]+/]
+ end
- menuish_parent = Xiki.menuish_parent options
+ # menuish_ancestor = Xiki.menuish_parent options
- # Don't use parent if there's a foo/@conf/bar item that overrides
- args.unshift menuish_parent if menuish_parent && (args.blank? || args[0] =~ /^\|/)
+ # Don't use ancestor it's a herring/=conf/legit situation (if child is item-ish, use it)
+ args.unshift menuish_ancestor if menuish_ancestor && (args.blank? || args[0] =~ /\n/)
name, content = args
# /..., so list all conf-able menus...
return self.menus(output) if ! name
- # /foo/... or /foo/|content...
+ # /foo/... or /foo/|content, so show conf or save...
- # TODO: remove Tree.txt editor dependency
- ConfHandler.txt name, content ? Tree.txt : nil
+ options[:no_search] = 1
+
+ item = args[-1]
+
+ # Content seems sufficient
+ ConfHandler.txt name, content, item, options
end
@@ -45,20 +47,18 @@ def self.menus output
menus = []
- Xiki.menu_path_dirs.each do |path_dir|
+ Xiki.xiki_path_dirs.each do |path_dir|
Dir["#{path_dir}/*"].each do |menu_dir|
- #Ol "menu_dir", menu_dir
conf_path = "#{menu_dir}/default.conf"
next unless File.exists? conf_path
- menus << "- #{File.basename menu_dir}/"
+ menus << "+ #{File.basename menu_dir}/"
end
end
- Dir["#{Xiki.menu_path_custom_dir}/conf/*.conf"].each do |conf_file|
- menus << "- #{File.basename(conf_file, ".*")}/"
-
+ Dir["#{Xiki.xiki_path_custom_dir}/conf/*.conf"].each do |conf_file|
+ menus << "+ #{File.basename(conf_file, ".*")}/"
end
menus.sort!
diff --git a/roots/copy.rb b/roots/copy.rb
new file mode 100644
index 00000000..5cb897ca
--- /dev/null
+++ b/roots/copy.rb
@@ -0,0 +1 @@
+Xiki["`rename/", options.merge(:copy=>1)]
diff --git a/lib/xiki/tools/couch.rb b/roots/couch.rb
similarity index 73%
rename from lib/xiki/tools/couch.rb
rename to roots/couch.rb
index ab14e307..cfc7d124 100644
--- a/lib/xiki/tools/couch.rb
+++ b/roots/couch.rb
@@ -1,26 +1,28 @@
gem 'couchrest'
require 'couchrest'
+require 'httparty'
module Xiki
class Couch
- @@server = 'http://localhost:5984'
+ @@server = 'http://memorize.loc:5984'
- def self.menu
- "
+ MENU = "
- .start/
- - @db/
- - .admin url/
+ - =db/
+ - .web admin/
+ - whether running/
+ =kill/couchdb/
+ =notes/
"
- end
def self.start
buffer = '*couchdb'
- return ".flash - *couchdb already open!" if View.buffer_open? buffer
+ return "<* *couchdb already open!" if View.buffer_open? buffer
- Console.run('sudo couchdb', :buffer=>buffer)
+ Shell.run('sudo couchdb', :buffer=>buffer)
end
- def self.admin_url
+ def self.web_admin
View.url "#{@@server}/_utils"
nil
end
@@ -69,35 +71,45 @@ def self.delete db, id=nil
# If no id, show all id's
if id.nil?
- all = RestTree.request 'GET', "#{@@server}/#{db}_all_docs", nil
+ all = HTTParty.get "#{@@server}/#{db}_all_docs"
rows = JSON[all]['rows']
return rows.map{|i| "#{i['id']}/"}
end
- self.escape_slashes id
+ self.escape_slashes! id
# If id, look it up to get rev
- record = RestTree.request 'GET', "#{@@server}/#{db}#{id}", nil
+ record = HTTParty.get "#{@@server}/#{db}#{id}"
rev = JSON[record]['_rev']
# Delete it
RestTree.request 'DELETE', "#{@@server}/#{db}#{id}?rev=#{rev}", nil
end
- def self.escape_slashes id
- # If id has multiple slashes, escape all but the last
- if id =~ /\/.+\/$/
- id.sub! /\/$/, '' # Remove last slash
- id.gsub!('/', '%2F') unless id =~ /^_design/ # Escape slashes
- id.sub! /$/, '/' # Put last back
- end
+ def self.escape_slashes! key
+
+ return if key =~ /^_design/ # Escape slashes
+
+ # Escape all slashes
+
+ key.gsub!('/', '%2F') unless
+
+ # Unescape the last
+
+ key.sub!(/%2F$/, '/')
end
- def self.docs db, id=nil, doc=nil
+ def self.docs db, *args
+ doc = args.pop if args[-1] =~ /\n/
+ key = args.join("/")
+ key = nil if key == ""
+
db.sub! /\/$/, ''
- # If no id, show all id's
- if id.nil?
- all = RestTree.request 'GET', "#{@@server}/#{db}/_all_docs", nil
+ # /db/, so show all key's...
+
+ if key.nil?
+
+ all = HTTParty.get "#{@@server}/#{db}/_all_docs"
if all =~ /no_db_file/
return "| DB not found, create it?\n- .create/"
@@ -114,25 +126,22 @@ def self.docs db, id=nil, doc=nil
return rows.map{|i| "#{i['id']}/"}
end
- self.escape_slashes id
+ self.escape_slashes! key
- # If just id, show doc
+ # /db/key/, so show doc...
if doc.nil?
-
- record = RestTree.request 'GET', "#{@@server}/#{db}/#{id}", nil
+ record = HTTParty.get "#{@@server}/#{db}/#{key}"
record = JSON[record]
record = record.to_yaml
record.sub! /.+\n/, ''
return record.gsub("\\n", "\n").gsub(/^/, '| ').gsub(/^\| $/, '|')
end
- # Doc passed, so save it
-
- doc = ENV['txt'].dup
+ # /db/key/doc, so save it...
# If a record is found, add rev
- record = RestTree.request 'GET', "#{@@server}/#{db}/#{id}", nil
+ record = HTTParty.get "#{@@server}/#{db}/#{key}"
if record !~ /404 /
rev = JSON[record]['_rev']
@@ -147,8 +156,8 @@ def self.docs db, id=nil, doc=nil
doc = YAML::load doc
doc = doc.to_json
# Update it
- res = RestTree.request 'PUT', "#{@@server}/#{db}/#{id}", doc
- ".flash - Updated!"
+ res = HTTParty.put "#{@@server}/#{db}/#{key}", :body=>doc
+ "<* updated!"
end
def self.views db
@@ -169,7 +178,7 @@ def self.all_docs db
def self.create db
RestTree.request 'PUT', "#{@@server}/#{db}", nil
- ".flash - created!"
+ "<* created!"
end
def self.crud db
diff --git a/roots/cpu.menu b/roots/cpu.menu
new file mode 100644
index 00000000..0e627a3c
--- /dev/null
+++ b/roots/cpu.menu
@@ -0,0 +1,2 @@
+- processes taking up cpu/
+ ! Tree.quote `ps -eo pcpu,pid,user,args | sort -k 1 -r | head -10`
diff --git a/menu/create_menus_manually.menu b/roots/create_menus_manually.menu
similarity index 78%
rename from menu/create_menus_manually.menu
rename to roots/create_menus_manually.menu
index d2f00287..0a5b3ece 100644
--- a/menu/create_menus_manually.menu
+++ b/roots/create_menus_manually.menu
@@ -1,26 +1,26 @@
> Summary
-| You can creating menus using any text editor, and use them via the web interface.
+| You can create menus using any text editor, and use them via the web interface.
| Later, after you set up a Xiki-enabled text editor, you'll be able to use the menus directly from the editor.
> Simplest way to make a menu
- txt file/
> Make a simple menu that is a .txt file
- 1. Using any text editor, make a new file and type "Hello World" as its contents.
- - 2. Save it with the name "foo.txt" in the "menu" directory in your home directory.
- - Create the "menu" directory if there isn't one.
+ - 2. Save it with the name "foo.txt" in a "menu" directory in your home directory.
+ - Create a "menu" directory if there isn't one.
- Be sure to save it as plain text (most editors do this by default).
- - 3. Go to http://localhost:8161/foo or click this...
+ - 3. Go to http://localhost:8163/foo or click this...
@foo/
| You'll see that the menu simply shows "Hello World".
-
> More ways to make menus
- ruby file/
> Make a simple menu that is a .rb file
- 1. Using any text editor, make a new file and type "2 + 3" as its contents.
- - 2. Save it with the name "bar.rb" in the "menu" directory in your home directory.
- - 3. Go to http://localhost:8161/bar or click this...
+ - Create a "menu" directory if there isn't one.
+ - 2. Save it with the name "bar.rb" in a "menu" directory in your home directory.
+ - 3. Go to http://localhost:8163/bar or click this...
@bar/
| You'll see that the menu simply shows "5".
@@ -28,7 +28,7 @@
> Make a simple menu that is a .menu file
- 1. Using any text editor, make a new file and type the following as its contents.
| snacks/
- - 2. Save it with the name "food.menu" in the "menu" directory in your home directory.
+ - 2. Save it with the name "food.menu" in a "menu" directory in your home directory.
- 3. Go to http://localhost:8161/food or click this...
@food/
@@ -37,7 +37,7 @@
> Make a simple menu with some visual elements
- 1. Using any text editor, make a new file and type the following as its contents.
| > Heading
- - 2. Save it with the name "baz.menu" in the "menu" directory in your home directory.
+ - 2. Save it with the name "baz.menu" in a "menu" directory in your home directory.
- 3. Go to http://localhost:8161/baz or click this...
@baz/
@@ -46,7 +46,7 @@
> Make a simple menu with items that run code
- 1. Using any text editor, make a new file and type the following as its contents.
| wind/
- - 2. Save it with the name "weather.menu" in the "menu" directory in your home directory.
+ - 2. Save it with the name "weather.menu" in a "menu" directory in your home directory.
- 3. Go to http://localhost:8161/weather or click this...
@weather/
@@ -55,7 +55,7 @@
> Make a simple menu with items that run code
- 1. Using any text editor, make a new file and type the following as its contents.
| class Hello
- - 2. Save it with the name "hello.rb" in the "menu" directory in your home directory.
+ - 2. Save it with the name "hello.rb" in a "menu" directory in your home directory.
- 3. Go to http://localhost:8161/hello or click this...
@hello/
@@ -64,7 +64,7 @@
> Make a simple menu with items that run code
- 1. Using any text editor, make a new file and type the following as its contents.
| > Heading
- - 2. Save it with the name "hey.bootstrap" in the "menu" directory in your home directory.
+ - 2. Save it with the name "hey.bootstrap" in a "menu" directory in your home directory.
- 3. Go to http://localhost:8161/hey or click this...
@hey/
diff --git a/roots/cs.rb b/roots/cs.rb
new file mode 100644
index 00000000..9dfe80f0
--- /dev/null
+++ b/roots/cs.rb
@@ -0,0 +1,14 @@
+return "
+ | # Type some coffeescript here, to run in the browser
+ | alert 'hi'
+
+ > See
+ << coffee/
+ " if args.empty?
+
+return "=beg/quoted/" if args[0] !~ /\n/
+
+txt = CoffeeScript.to_js args[0]
+Browser.js txt
+
+"<* ran in browser!"
diff --git a/lib/xiki/tools/css.rb b/roots/css.rb
similarity index 73%
rename from lib/xiki/tools/css.rb
rename to roots/css.rb
index 6462bf87..1ec524b7 100644
--- a/lib/xiki/tools/css.rb
+++ b/roots/css.rb
@@ -1,3 +1,5 @@
+require "#{Xiki.dir}roots/dom"
+
module Xiki
class Css
def self.menu_before *args
@@ -6,13 +8,13 @@ def self.menu_before *args
return self.list args[1..-1] if args[0] == "list"
+ # Make this start with dot now?
# If css/foo, treat as style
- if args[0] && args[0] =~ /^[a-z]/i
+ if args[0] && args[0] =~ /^[a-z]/i && args[0] !~ /\n/
return self.list args
end
-
nil
end
@@ -30,17 +32,17 @@ def self.list args
result;
`.unindent
- result = Firefox.exec js
+ result = Browser.js js
# When dups, make foo,foo be foo,foo:2, etc.
result = self.add_nth_to_dups result
- return "> No class attributes found!" if result == '""'
- return result
+ return "> No class attributes found in page!" if result == '""'
+ return result.gsub /^\+ /, '+ .'
end
# Add "." to beginning of first (it was removed due to it meaning a method call)
- args.first.sub! /^/, '.'
+ # args.first.sub! /^/, '.'
Dom.dom *args
end
@@ -55,29 +57,35 @@ def self.menu *args
| font-family: arial;
| font-size: 15px;
| color: #333;
- | background-color: #fff;
+ | background-color: #eee;
| margin: 30px;
| }
- + list/
"
end
- txt = ENV['txt'].dup
+ txt = args[0]
+ return "=beg/quoted/" if txt !~ /\n/
+
+ # =extract
+
+ self.send_to_browser txt
+
+ nil
+ end
+ def self.send_to_browser txt
txt.gsub!("\n", '\n')
txt.gsub!('"', '\"')
code = "$('head').append(\"\")"
- Firefox.exec code
-
+ # Firefox.exec code
+ Browser.js code
nil
end
+
# When dups, make foo,foo be foo,foo:2 etc.
def self.add_nth_to_dups txt
- # Why hard-coded?
- # txt = "+ navbar navbar-inverse navbar-fixed-top/\n+ navbar-inner/\n+ container/\n+ container/\n+ hero-unit/\n"
-
dups = {}
txt = txt.split("\n")
txt.each do |line|
diff --git a/roots/curl.menu b/roots/curl.menu
new file mode 100644
index 00000000..1a30db06
--- /dev/null
+++ b/roots/curl.menu
@@ -0,0 +1,18 @@
+- headers/
+ =$ curl -i http://google.com
+ | only headers
+ =$ curl -I http://google.com
+- write to a file/
+ =$ curl http://www.yahoo.com -o y.txt
+ | Use file from url as filename
+ =$ curl http://www.yahoo.com -O
+- browser useragent/
+ =$ curl -A "Mozilla/5.0" http://microsoft.com
+ - more/
+ - Chrome 12 in OSX 10.6/
+ =$ curl -A "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.112 Safari/534.30" http://microsoft.com
+ - iPhone/
+ =$ curl -A "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5" http://www.apple.com
+ - IE 7/
+ =$ curl -A "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)" http://www.apple.com
+ =google/"curl -A" useragent
diff --git a/menu/current.rb b/roots/current.rb
similarity index 75%
rename from menu/current.rb
rename to roots/current.rb
index 87290086..3d9f5617 100644
--- a/menu/current.rb
+++ b/roots/current.rb
@@ -1,5 +1,6 @@
class Current
def self.menu *name
+ return "<< views/"
Buffers.current *name
end
end
diff --git a/roots/d3.rb b/roots/d3.rb
new file mode 100644
index 00000000..cfc2bbf0
--- /dev/null
+++ b/roots/d3.rb
@@ -0,0 +1,90 @@
+class D3
+
+ # v3 makes this not show the movement
+ # @d3/examples/movement/position/
+ # We're at .v2 now - go back to .v3 when this is fixed?
+ #
+ #
+
+ MENU = %`
+ | // Sample d3 code to modify and run
+ | svg.append("rect").attr("x", 40).attr("y", 40).attr("width", 60).attr("height", 60);
+ - docs/
+ - summary/
+ | This menu helps you use the d3 library, which renders
+ | awesome graphs and charts etc. in your browser.
+ - getting started/
+ | Expand the root "svg" menu and check out the one-line
+ | example. Try modifying the numbers and re-running it.
+ | Then look through the "examples" menu and do the same.
+ - urls/
+ - reference/
+ @https://github.com/mbostock/d3/wiki/API-Reference
+ - tutorials/
+ @https://github.com/mbostock/d3/wiki/Tutorials
+ - cool examples/
+ @http://blog.visual.ly/creating-animations-and-transitions-with-d3-js/
+ - see/
+ << @d3/
+ `
+
+ def self.render txt
+
+ html = ""
+ # html
+
+ # replace/
+ # |-http://d3js.org/d3.v2.min.js
+ # |+http://d3js.org/d3.v2.min.js
+ if txt !~ /
+
+ `.unindent
+ end
+
+ # If html...
+
+ if txt =~ /\A
+ var svg = d3.select("svg");
+ `.unindent
+ else
+
+ # If javascript...
+
+ html << %`
+
+ "
+ end
+
+ # if html = options[:html]
+ # html << html
+ # end
+ # if svg = options[:svg]
+ # html << "#{svg} "
+ # end
+
+ Xiki::Browser.html html, :name=>"d3", :via_os=>1
+ end
+
+ def self.menu_after output, *args
+
+ # Whenever there's no output, interject
+
+ # If it's quoted, run it in the browser (wrapping in d3 html if no there yet)
+ txt = args[-1]
+
+ return "=beg/quoted/" if txt =~ /^\|/ # If |..., ask for quote
+
+ return if txt !~ /\n/ # Return if not multi-line
+
+ self.render txt
+
+ "<* opened in browser!"
+ end
+end
diff --git a/lib/xiki/tools/databases.menu b/roots/databases.menu
similarity index 100%
rename from lib/xiki/tools/databases.menu
rename to roots/databases.menu
diff --git a/roots/date.rb b/roots/date.rb
new file mode 100644
index 00000000..146a9072
--- /dev/null
+++ b/roots/date.rb
@@ -0,0 +1,43 @@
+module Menu
+ class Date
+
+ MENU = %`
+ - .short/
+ - see/
+ =calendar/
+ =time/
+ `
+
+ def self.menu_after out, *args
+
+ if args == []
+ return "#{::Time.now.strftime("%B %-m, %Y")}\n#{out}"
+ end
+
+ # /..., so prepend time to top
+
+ nil
+ end
+
+ def self.short
+ "#{::Time.now.strftime("%Y-%m-%d")}"
+ end
+
+
+ end
+end
+
+
+# - local/
+# ! Time.now.strftime("%l:%M:%S %p %Z")
+# - time zone/
+# ! zone = args[0]
+# ! if ! zone
+# ! return ActiveSupport::TimeZone.us_zones.map(&:name).map{|o| "- #{o}/\n"}.join('')
+# ! end
+# !
+# ! zone.sub! /^\| /, ''
+# ! t = Time.now.in_time_zone ActiveSupport::TimeZone.new(zone)
+# ! t.strftime("%l:%M:%S %p %Z")
+# - city/
+# @google/what time is it in Chicago?
diff --git a/roots/db.rb b/roots/db.rb
new file mode 100644
index 00000000..07e2fb0b
--- /dev/null
+++ b/roots/db.rb
@@ -0,0 +1,14 @@
+require "#{Xiki.dir}roots/couch.rb"
+
+class Db
+ def self.create db
+ Couch.create db
+ end
+
+ def self.menu db=nil, *args
+ # If no args, output list
+ return Couch.databases if db.nil?
+
+ return Couch.docs db, *args
+ end
+end
diff --git a/roots/dbs.rb b/roots/dbs.rb
new file mode 100644
index 00000000..2edcfddc
--- /dev/null
+++ b/roots/dbs.rb
@@ -0,0 +1 @@
+Xiki['.mysql/dbs', args]
diff --git a/roots/deck.menu b/roots/deck.menu
new file mode 100644
index 00000000..f6a8e066
--- /dev/null
+++ b/roots/deck.menu
@@ -0,0 +1,25 @@
+- enable arrow keys/
+ ! Deck.enable_arrow_keys
+- docs/
+ - summary/
+ | Create a file with a ".deck" extension to create a lightweight
+ | presentation. The left and right arrow keys will go back and forth
+ | between the "slides".
+ |
+ | Make .deck files just like you make .xiki files, with sections divided
+ | by headings ("> foo" lines). The sections behave like slides. Only one
+ | section is shown at a time.
+ - keys/
+ | Use these keys to go back and forth between slides:
+ | - right+arrow+key: show next slide (hiding everything else)
+ | - left+arrow+key: show next slide
+ | - custom+reminder: jump to corresponding heading at end
+ - hints/
+ | To create and show hints that correspond to a section, create a section
+ | near the bottom of the file with the same heading but starting with
+ | ">>" instead of ">"
+ |
+ | Then, type custom+reminder to jump back and forth.
+ - to enable the deck keys in a .xiki file/
+ - type: do+keys+deck
+ - or use) @deck/enable arrow keys/
diff --git a/menu/def.rb b/roots/def.rb
similarity index 100%
rename from menu/def.rb
rename to roots/def.rb
diff --git a/menu/defs.rb b/roots/defs.rb
similarity index 85%
rename from menu/defs.rb
rename to roots/defs.rb
index f909056b..167bb01f 100644
--- a/menu/defs.rb
+++ b/roots/defs.rb
@@ -7,6 +7,8 @@ class Defs
@menu_path/
- .menus/
- .patterns/
+ - global/
+ - pre/
- .keys/
- docs/
- todo: pull menus from...!
@@ -65,23 +67,25 @@ def self.menus key=nil, source=nil
# /, so list menus...
if ! key
- keys = Menu.defs.keys.sort.map{|o| "+ #{o}/"}
+ keys = Command.defs.keys.sort.map{|o| "+ #{o}/"}
return keys.join "\n"
end
# /key/, so show def...
- implementation = Menu.defs[key]
+ implementation = Command.defs[key]
self.defs implementation, source
end
- def self.patterns key=nil, source=nil
+ def self.patterns category=nil, key=nil, source=nil
# /, so list menus...
+ hash = category == "pre" ? PrePattern.defs : Pattern.defs[:global]
+
if ! key
- keys = Pattern.defs[:global].keys.map{|o| "| #{o.source}"}
+ keys = hash.keys.map{|o| "| #{o.source rescue o}"}
return keys.join "\n"
end
@@ -89,8 +93,8 @@ def self.patterns key=nil, source=nil
regex = key[/^\| ?(.+)/, 1]
- found = Pattern.defs[:global].find{|k, v| k.source == regex}
- implementation = Pattern.defs[:global][found[0]]
+ found = hash.find{|k, v| k.source == regex}
+ implementation = hash[found[0]]
self.defs implementation, source
@@ -124,8 +128,8 @@ def self.defs implementation, source=nil
def self.clear
Pattern.defs.clear
- Menu.defs.clear
- ".flash - cleared!"
+ Command.defs.clear
+ "<* cleared!"
end
end
diff --git a/roots/deploy_el4r_gem.menu b/roots/deploy_el4r_gem.menu
new file mode 100644
index 00000000..6d8cc900
--- /dev/null
+++ b/roots/deploy_el4r_gem.menu
@@ -0,0 +1,13 @@
+- rubygems.org page/
+ @http://rubygems.org/gems/trogdoro-el4r
+- 1. update version/
+ @/projects/trogdoro-el4r/
+ $ git stash
+ - trogdoro-el4r.gemspec
+ | version: 1.0.
+ | date: 2012-
+- 2. build and deploy/
+ @/projects/trogdoro-el4r/
+ $ gem build trogdoro-el4r.gemspec
+ % gem push trogdoro-el4r-1.
+ $ git stash pop
diff --git a/roots/deploy_xiki_gem.menu b/roots/deploy_xiki_gem.menu
new file mode 100644
index 00000000..7e3d3fde
--- /dev/null
+++ b/roots/deploy_xiki_gem.menu
@@ -0,0 +1,14 @@
+- gemcutter page/
+ @http://gemcutter.org/gems/xiki
+- 1. update version/
+ =%xiki/
+ $ git stash
+ - xiki.gemspec
+ | s.version = "0.
+ | s.date = "
+ | s.add_dependency('trogdoro-el4r', [">= 1.0.
+- 2. build and deploy/
+ =%xiki/
+ $ gem build xiki.gemspec
+ % gem push xiki-0.
+ $ git stash pop
diff --git a/menu/des.rb b/roots/des.rb
similarity index 100%
rename from menu/des.rb
rename to roots/des.rb
diff --git a/roots/desktop_image.rb b/roots/desktop_image.rb
new file mode 100644
index 00000000..60a80974
--- /dev/null
+++ b/roots/desktop_image.rb
@@ -0,0 +1,38 @@
+# /, so give example...
+
+if args == []
+ return '
+ > Edit this svg and expand to set your desktop image
+ |
+ #{txt}
+
+ `.strip
+
+tmp_path = "/tmp/tmp.svg"
+File.open(tmp_path, "w") { |f| f << xml }
+
+png = "/tmp/desktop#{rand 99999}.png"
+
+`convert #{tmp_path} #{png}`
+
+Applescript.run %`
+ tell application "System Events" to set picture of every desktop to "#{png}"
+`.strip
+
+"<* set desktop"
diff --git a/lib/xiki/tools/dictionary.rb b/roots/dictionary.rb
similarity index 100%
rename from lib/xiki/tools/dictionary.rb
rename to roots/dictionary.rb
diff --git a/menu/dimensions/default.conf b/roots/dimensions/default.conf
similarity index 100%
rename from menu/dimensions/default.conf
rename to roots/dimensions/default.conf
diff --git a/roots/dimensions/dimensions_index.menu b/roots/dimensions/dimensions_index.menu
new file mode 100644
index 00000000..4a1dc124
--- /dev/null
+++ b/roots/dimensions/dimensions_index.menu
@@ -0,0 +1,17 @@
++ full
+ ! # Normal
+ ! View.dimensions_full
++ small
+ ! View.dimensions_set 100, 22, 60, 20
+ ! Styles.default_font_size
+ ! nil
++ new window
+ ! $el.new_frame
+ ! X"themes/list/Default"
+ ! View.dimensions_set 100, 22, 60, 20
+ ! #Cursor.white
++ current/
+ ! "
+ ! ! Styles.font_size #{Styles.get_font_size}
+ ! ! View.dimensions_set #{$el.frame_parameter(nil, :left)}, #{$el.frame_parameter(nil, :top)}, #{View.frame_width}, #{View.frame_height}
+ ! "
diff --git a/roots/dimensions/dimensions_index.rb b/roots/dimensions/dimensions_index.rb
new file mode 100644
index 00000000..4d4997bf
--- /dev/null
+++ b/roots/dimensions/dimensions_index.rb
@@ -0,0 +1,94 @@
+class Dimensions
+
+ def self.menu_before *args
+
+ options = yield
+ prefix = options[:prefix]
+
+ conf_file = File.expand_path "~/.xiki/roots/conf/dimensions.conf"
+
+ options[:no_search] = 1 if args[0] == "current"
+
+ # as+open...
+
+ if prefix == "open"
+
+ item = args[-1]
+
+ # It's open+...
+
+ raise "- dimensions.conf doesn't exist yet!" if ! File.exists? conf_file
+ View.open conf_file, :to=>"^[ +-]*#{$el.regexp_quote item}/?$" # "
+
+ return ""
+ end
+
+ # enter+all...
+
+ if prefix == "all" # enter+all
+ options[:no_search] = 1
+ return Tree.children File.read(conf_file), args
+ end
+
+ # if !..., eval it, or open
+
+ if args[-1] =~ /^! /
+
+ # If !..., we want all the lines
+ return "=beg/neighbors/" if args[-1] !~ /\n/
+
+ if prefix == "update" # as+open
+ self.update conf_file, *args
+ return ""
+ end
+
+ code = args[-1]
+ code.gsub! /^! /, ''
+ eval args[-1]
+ return ""
+ end
+
+ nil # Don't interject
+ end
+
+ def self.update conf_file, name, code
+ txt = File.read conf_file
+ txt = Tree.update txt, [name, code.strip]
+ File.open(conf_file, "w") { |f| f << txt }
+ end
+
+ def self.menu_after output, *args
+
+Ol "output", output
+ # /, so prepend user conf if there, and append =conf...
+
+ if args.blank?
+ conf = yield[:conf]
+ if conf # If conf, add item names defined by user
+ # conf.gsub! /^-/, '+'
+ items = conf.scan(/^[+-] .+/) # Just pull out items
+ items += output.split "\n" # Split into arrays and merge, so we can remove duplicates
+ items.uniq!
+ output = items.join "\n"
+ end
+
+ return "#{output}\n=conf/"
+ end
+
+ View.kill(:force_recent=>1) if View.name == "dimensions/" && args != ["current"]
+
+ # Run it through =conf output if matched...
+
+ # output is "" if it used a built-in item
+
+ if ! output
+ conf = yield[:conf]
+ txt = Tree.children conf, args
+ MenuHandler.eval_exclamations txt
+ return txt
+ end
+
+ # Do nothing
+ nil
+ end
+end
diff --git a/roots/dir.rb b/roots/dir.rb
new file mode 100644
index 00000000..666196f2
--- /dev/null
+++ b/roots/dir.rb
@@ -0,0 +1 @@
+"=" + Xiki.dir
diff --git a/menu/directions.menu b/roots/directions.menu
similarity index 100%
rename from menu/directions.menu
rename to roots/directions.menu
diff --git a/menu/directory.rb b/roots/directory.rb
similarity index 100%
rename from menu/directory.rb
rename to roots/directory.rb
diff --git a/roots/docs.menu b/roots/docs.menu
new file mode 100644
index 00000000..3086b2fc
--- /dev/null
+++ b/roots/docs.menu
@@ -0,0 +1 @@
+<< help/
diff --git a/roots/dom.rb b/roots/dom.rb
new file mode 100644
index 00000000..05f05878
--- /dev/null
+++ b/roots/dom.rb
@@ -0,0 +1,198 @@
+module Xiki
+ class Dom
+
+ def self.menu *args
+
+ # MENU string couldn't handle it, so delegate to dom path...
+
+ task = yield[:task]
+ return "* html\n* tidy\n* element\n* attributes\n* all divs" if task == []
+
+ options = {}
+
+ options[:tidy_html] = 1 if task && task == ["tidy"]
+ options[:element_html] = 1 if task && task == ["element"]
+ options[:attributes] = 1 if task && task == ["attributes"]
+
+ options[:html] = 1 if task && ["html", "all divs"].member?(task[0])
+
+ txt = self.dom *args, options
+
+ if task == ["all divs"]
+ txt = txt.split("\n").grep(/"
+ args = args.join ' > '
+
+ js = %`
+ $.fn.blink = function(times) {
+ console.log(times)
+
+ var el = $(this);
+ if(! times) times = 2;
+ for(x=1;x<=times;x++) {
+ el.animate({opacity: 0.0}, {easing: 'swing', duration: 200});
+ el.animate({opacity: 1.0}, {easing: 'swing', duration: 200});
+ }
+ return this;
+ };
+
+ var kids = [];
+ `.unindent
+
+ # dom/foo/, so blink and show children...
+
+ if options[:html]
+ result = Tree.pipe Browser.js("return $(\"#{args}\").html()")
+ return result
+ elsif options[:tidy_html]
+ result = Browser.js("return $(\"#{args}\").html()")
+ result = Html.tidy result
+ return Tree.pipe result
+ elsif options[:element_html]
+ result = Browser.js("return $(\"#{args}\")[0].outerHTML")
+ result = Html.tidy result
+ return Tree.pipe result
+ elsif options[:attributes]
+ result = Browser.js("return $(\"#{args}\")[0].outerHTML")
+ result = Html.tidy result, :wrap_attributes=>1
+ return Tree.pipe result
+ end
+
+ if ! save
+
+ # Otherwise, just blink and show children...
+
+ if prefix == :-
+ Browser.js "$(\"#{args}\").blink()"
+ return
+ end
+ if prefix != "all" && prefix != "outline"
+ js << %`
+ $("#{args}").blink().children().each(function(n, e){
+ var tag = e.nodeName.toLowerCase();
+ var id = $(e).attr('id');
+ if(id) tag += "#"+id
+ kids.push(tag);
+ })
+ `
+ end
+
+ js << %`
+ if(kids.length){
+ // return "yes";
+ return String(kids);
+ }else{
+ // return "no";
+ return "html::"+$("#{args}").html();
+ }
+ `.unindent
+
+ kids = Browser.js js #, :jquery=>1
+
+ kids = kids.sub(/\A"/, '').sub(/"\z/, '') if kids =~ /\A"/
+ if kids =~ /\Ahtml::/
+ kids = kids.sub(/\Ahtml::/, '').strip
+ return prefix == "all" ?
+ Tree.quote(kids) :
+ Html.tidy(kids, :tag=>raw_args).snippet
+ end
+
+ kids = kids.split ','
+
+ counts = {}
+ kids.each do |k| # Add on counts
+ k_raw = k.sub /#.+/, ''
+ counts[k] ||= 0
+ counts[k] += 1
+ k.replace "#{k}:#{counts[k]}" unless k =~ /#/ || counts[k] == 1
+ end
+ return kids.map{|o| "- #{o}/"}.join("\n")
+ end
+
+
+
+
+
+
+ # dom/foo/| quoted, so save to page...
+
+ save.gsub! "\n", "\\n"
+ save.gsub! '"', '\\"'
+
+ js << %`
+ var e = $(\"#{args}\");
+ if(e.length)
+ e.blink(1).html(\"#{save}\");
+ `.unindent
+
+ if args =~ /(.+) > (.+)/
+ parent, child = $1, $2.sub!(/:.+/, '')
+ js << %`
+ else
+ $(\"#{parent}\").blink(1).append(\"<#{child}>#{save}\");
+ `.unindent
+ end
+
+ Browser.js js
+ Effects.glow :fade_in=>1
+
+ ""
+
+ end
+
+
+ def self.search txt=nil
+
+ if txt.nil?
+ return View.prompt "Enter a string to search for on the page"
+ end
+
+ js = %`
+ var result="", depth=-1;
+ $('*:contains(#{txt})').each(function(i, e){
+ var tag = e.tagName.toLowerCase();
+ e = $(e);
+ var current_depth = e.parents().length; // Only climb downward
+ if(current_depth <= depth) return depth = 9999; // Don't grab any more
+ depth = current_depth;
+ var prev_count = $(e).prevAll(tag).length;
+ result += tag;
+ if(prev_count > 0) result += ':'+(prev_count+1);
+ result += '/';
+ })
+ return result;
+ `.unindent
+
+ result = Browser.js js #, :jquery=>1
+
+ result.sub "html/", "= dom/"
+ end
+
+ end
+end
diff --git a/lib/xiki/tools/dotsies.rb b/roots/dotsies.rb
similarity index 84%
rename from lib/xiki/tools/dotsies.rb
rename to roots/dotsies.rb
index b2c378b7..0400a2f9 100644
--- a/lib/xiki/tools/dotsies.rb
+++ b/roots/dotsies.rb
@@ -1,6 +1,6 @@
module Xiki
class Dotsies
- def self.menu
+ MENU =
%`
|~this is an example
- .apply/
@@ -28,11 +28,10 @@ def self.menu
<< dotsies tweets/
<< youtube/use dotsies in transcript/
`
- end
def self.all_views
- View.kill if View.name == "menu" || View.name =~ /^@/
+ View.kill if View.name == "menu" || View.name =~ /^=/
faces = {
:default=>"monaco",
@@ -59,7 +58,7 @@ def self.all_views
end
def self.one_view
- View.kill if View.name == "menu" || View.name =~ /^@/
+ View.kill if View.name == "menu" || View.name =~ /^=/
$el.make_local_variable :dotsies_enabled
dotsies_enabled = $el.boundp(:dotsies_enabled) && $el.elvar.dotsies_enabled
@@ -84,13 +83,19 @@ def self.web_browser
end
def self.browse txt=nil
- return ".flash - Type some text" if txt.nil?
+ return "<* Type some text" if txt.nil?
"do"
end
def self.define_styles
+ # Styles.define :fontawesome, :size => '+10', :face => "FontAwesome"
+
Styles.define :dotsies, :size => '+2', :face => "Dotsies"
- Styles.define :dotsies_white, :size => '+2', :face => "Dotsies", :fg=>"fff"
+ # Styles.define :dotsies_white, :size => '+2', :face => "Dotsies", :fg=>"fff"
+
+ # Styles.define :dotsies_white, :size => '-2', :face => "Dotsies", :fg=>"bce"
+ Styles.define :dotsies_white, :size => '-2', :face => "Dotsies", :fg=>"cdf"
+
Styles.define :dotsies_experimental, :size => '+2', :face => "Dotsies Experimental"
Styles.define :dotsies_roman, :size => '+2', :face => "Dotsies Roman"
Styles.define :dotsies_mono, :size => '+2', :face => "Dotsies Mono"
diff --git a/roots/echo.rb b/roots/echo.rb
new file mode 100644
index 00000000..9b1cc879
--- /dev/null
+++ b/roots/echo.rb
@@ -0,0 +1,31 @@
+ancestors = options[:ancestors]
+menu_steps = ancestors && ancestors[-1] == "menu steps/"
+ancestors.pop if menu_steps
+
+options[:no_slash] = 1
+
+# / and no ancestors, so display message...
+
+if ! ancestors && args == []
+ return %`
+ : The 'echo' menu is just for experimenting with how
+ : paths work. Put some stuff underneath and expand them
+ : to see the path. You'll see the value that's passed
+ : into menus as the "path" variable.
+ - a/
+ - b/
+ :
+ <= options/
+ <= source/
+ `
+end
+
+# =echo/foo, so use foo as the path...
+
+path = args.any? ?
+ args.inspect :
+ options[:ancestors].inspect
+
+# ancestors/=echo, so use ancestors...
+
+"| #{path}"
diff --git a/roots/edited.rb b/roots/edited.rb
new file mode 100644
index 00000000..39047159
--- /dev/null
+++ b/roots/edited.rb
@@ -0,0 +1,6 @@
+# /, so show the list...
+
+files = DiffLog.file_list :tree_format=>1
+return "- No files edited recently in xsh" if files == []
+
+txt = files.join "\n"
diff --git a/menu/edits.rb b/roots/edits.rb
similarity index 100%
rename from menu/edits.rb
rename to roots/edits.rb
diff --git a/roots/effects.rb b/roots/effects.rb
new file mode 100644
index 00000000..b8014359
--- /dev/null
+++ b/roots/effects.rb
@@ -0,0 +1 @@
+Xiki[Xiki::Effects, args, options]
diff --git a/roots/elisp.rb b/roots/elisp.rb
new file mode 100644
index 00000000..77fb7064
--- /dev/null
+++ b/roots/elisp.rb
@@ -0,0 +1,26 @@
+# ~ or ~ manual, so handle
+
+return "* manual" if task == []
+if task == ["manual"]
+ $el.info "elisp"
+ return ""
+end
+
+# /, so give sample lisp...
+
+return "
+ | ; Provide some elisp to eval, like this
+ | (set 'a 2)
+ | (+ 1 a)
+ " if args == []
+
+# /code, so eval it...
+
+# Try inspecting by default
+result = $el.eval $el.read "(progn #{args[0]})"
+
+return if ! result
+
+result = $el.pp_to_string result
+
+Tree.quote result.to_s
diff --git a/menu/emacs/index.menu b/roots/emacs/index.menu
similarity index 70%
rename from menu/emacs/index.menu
rename to roots/emacs/index.menu
index 19bdc008..a982397e 100644
--- a/menu/emacs/index.menu
+++ b/roots/emacs/index.menu
@@ -7,5 +7,5 @@
- Prefix Keymaps/
- modes/
! Tree.quote $el.pp_to_string($el.elvar.auto_mode_alist)
-- lisp dirs/
- ! $el.elvar.load_path.to_a.map{|o| "@#{FileTree.add_slash_maybe o}\n"}.join('')
+- lisp load-path dirs/
+ ! $el.elvar.load_path.to_a.map{|o| "=#{FileTree.add_slash_maybe o}\n"}.join('')
diff --git a/menu/emacs/index.rb b/roots/emacs/index.rb
similarity index 100%
rename from menu/emacs/index.rb
rename to roots/emacs/index.rb
diff --git a/menu/emacs_config_tweaks/index.menu b/roots/emacs_config_tweaks/index.menu
similarity index 83%
rename from menu/emacs_config_tweaks/index.menu
rename to roots/emacs_config_tweaks/index.menu
index e06362ac..3684cc9c 100644
--- a/menu/emacs_config_tweaks/index.menu
+++ b/roots/emacs_config_tweaks/index.menu
@@ -1,6 +1,13 @@
> Summary
+- This file is out of date!
+ - as of > 2015-01-30
+
| Some miscellaneous emacs configuration. Expand items to see
-| what they do. Expand code to add to .emacs.
+| what they do. Then expand the code to add it to your .emacs.
+- make escape cancel things/
+ | ; Map escape to cancel (like C-g)...
+ | (define-key isearch-mode-map [escape] 'isearch-abort) ;; isearch
+ | (global-set-key [escape] 'keyboard-escape-quit) ;; everywhere else
- y shortcut for yes/
| ; Let me press "y", instead of type "yes"
| (fset 'yes-or-no-p 'y-or-n-p)
@@ -46,8 +53,3 @@
- emacsclient/
| ; Enable emacsclient (for telling emacs to view source, etc)
| (server-start)
-- control lock/
- | ; Like caps lock but for the control key. Use C-, to toggle it on and off.
- | (add-to-list 'load-path "~/.emacs.d/")
- | (require 'control-lock)
- | (control-lock-keys)
diff --git a/menu/emacs_config_tweaks/index.rb b/roots/emacs_config_tweaks/index.rb
similarity index 66%
rename from menu/emacs_config_tweaks/index.rb
rename to roots/emacs_config_tweaks/index.rb
index dcd703b0..0f47c306 100644
--- a/menu/emacs_config_tweaks/index.rb
+++ b/roots/emacs_config_tweaks/index.rb
@@ -24,13 +24,13 @@ def self.menu_after output, item=nil, content=nil
File.open(File.expand_path("~/.emacs"), "w") { |f| f << txt }
- # If it was the "control lock" item, copy config file over as well
- if item == "control lock"
- emacs_d = File.expand_path("~/.emacs.d")
- Dir.mkdir(emacs_d) if ! File.exists?(emacs_d)
- FileUtils.cp "#{Xiki.dir}menu/emacs_config_tweaks/control-lock.el", emacs_d
- end
-
- "@flash/- added this to your .emacs!"
+ # # If it was the "control lock" item, copy config file over as well
+ # if item == "control lock"
+ # emacs_d = File.expand_path("~/.emacs.d")
+ # Dir.mkdir(emacs_d) if ! File.exists?(emacs_d)
+ # FileUtils.cp "#{Xiki.dir}menu/emacs_config_tweaks/control-lock.el", emacs_d
+ # end
+
+ "<* added this to your .emacs!"
end
end
diff --git a/roots/emacs_setup/initrb_default.txt b/roots/emacs_setup/initrb_default.txt
new file mode 100644
index 00000000..f69780e0
--- /dev/null
+++ b/roots/emacs_setup/initrb_default.txt
@@ -0,0 +1,10 @@
+$LOAD_PATH << "{{xiki_dir}}lib/"
+require 'xiki'
+Xiki.init
+Xiki::KeyShortcuts.keys # Use default key shortcuts
+Xiki::Themes.use "Default" # Use xiki theme
+
+# Alternate configuration to just map Control+Return
+# (Comment out the KeyShortcuts.keys line above)
+# Xiki::KeyShortcuts.map_control_return
+
diff --git a/lib/xiki/tools/encoding.rb b/roots/encoding.rb
similarity index 67%
rename from lib/xiki/tools/encoding.rb
rename to roots/encoding.rb
index 302f8eb0..631e0d0e 100644
--- a/lib/xiki/tools/encoding.rb
+++ b/roots/encoding.rb
@@ -1,8 +1,6 @@
module Xiki
class Encoding
- def self.menu
- "
- - current: #{$el.elvar.buffer_file_coding_system.to_s}
+ MENU = "
- .dos/
- .raw unix/
- .iso unix/
@@ -10,26 +8,30 @@ def self.menu
- see/
<@ specials/
"
+
+ def self.menu_after out, *args
+ return if args.any?
+ "- current: #{$el.elvar.buffer_file_coding_system.to_s}\n#{out}"
end
def self.dos
$el.set_buffer_file_coding_system :dos
- ".flash - updated!"
+ "<* updated!"
end
def self.raw_unix
$el.set_buffer_file_coding_system :unix
- ".flash - updated!"
+ "<* updated!"
end
def self.iso_unix
$el.set_buffer_file_coding_system :iso_latin_1_unix
- ".flash - updated!"
+ "<* updated!"
end
def self.utf8
$el.set_buffer_file_coding_system :mule_utf_8_unix
- ".flash - updated!"
+ "<* updated!"
end
end
diff --git a/lib/xiki/tools/example.rb b/roots/example.rb
similarity index 51%
rename from lib/xiki/tools/example.rb
rename to roots/example.rb
index a48f4a52..d0e7a1f2 100644
--- a/lib/xiki/tools/example.rb
+++ b/roots/example.rb
@@ -7,7 +7,10 @@ module Xiki
# | p "123"
class Example
def self.menu *args
- Eval.menu *args
+ return "=beg/neighbors/" if args[-1] !~ /\n/
+ txt, out, exception = Code.eval args[-1].gsub(/^\| ?/, ''), :pretty_exception=>1
+ return exception if exception
+ Tree.quote out || txt
end
end
end
diff --git a/roots/expanders.rb b/roots/expanders.rb
new file mode 100644
index 00000000..e2a0c2e9
--- /dev/null
+++ b/roots/expanders.rb
@@ -0,0 +1,33 @@
+module Xiki
+ class Expanders
+
+ def self.menu *args
+
+ # Grab parent subpath to parse and pre-expand
+
+ options = yield
+ ancestors = options[:ancestors]
+ menu_steps = ancestors[-1] == "menu steps/"
+ ancestors.pop if menu_steps
+
+ path = ancestors.any? ? ancestors : options[:path]
+
+ expanders_result = Expander.expanders path
+
+ txt = self.ap expanders_result
+ txt.gsub! /^ /, ""
+ txt.sub! "[\n [", "[["
+ txt = Tree.quote txt, :char=>"|"
+
+ txt
+ end
+
+ def self.ap txt
+ txt = txt.ai
+ txt.sub! /\A{\n/, ''
+ txt.sub! /\n}\z/, ''
+ txt
+ end
+
+ end
+end
diff --git a/roots/f.xiki b/roots/f.xiki
new file mode 100644
index 00000000..6dfc9dd5
--- /dev/null
+++ b/roots/f.xiki
@@ -0,0 +1 @@
+<< files/
diff --git a/roots/face/face_index.menu b/roots/face/face_index.menu
new file mode 100644
index 00000000..cfd3d207
--- /dev/null
+++ b/roots/face/face_index.menu
@@ -0,0 +1,12 @@
++ complexion/
+ + light
+ + medium
+ + dark
++ eyes/
+ + brown
+ + blue
++ hair/
+ + conservative
+ + futuristic
+ + unicorn
++ reset
diff --git a/lib/xiki/tools/face.rb b/roots/face/face_index.rb
similarity index 84%
rename from lib/xiki/tools/face.rb
rename to roots/face/face_index.rb
index 15a4b31d..22cf919f 100644
--- a/lib/xiki/tools/face.rb
+++ b/roots/face/face_index.rb
@@ -9,13 +9,14 @@ def self.menu part, value=nil
File.open("/tmp/face.yml", "w") { |f| f << hash.to_yaml }
html = "
-
+
".unindent
hash.keys.sort.each{|key| html << "
\n"}
html << ""
Browser.html html
+ ""
end
end
end
diff --git a/roots/facts.rb b/roots/facts.rb
new file mode 100644
index 00000000..e15f2903
--- /dev/null
+++ b/roots/facts.rb
@@ -0,0 +1 @@
+Xiki["memorize", args, options]
diff --git a/roots/faq.menu b/roots/faq.menu
new file mode 100644
index 00000000..a442cc36
--- /dev/null
+++ b/roots/faq.menu
@@ -0,0 +1,27 @@
+: What key shortcuts are like Ctrl+A, Ctrl+E and Ctrl+K in bash?
+ | ^A ^A : Beginning of line
+ | ^E ^E : End of line
+ | ^K ^K : Kill line
+ |
+ : If the alt or option key is configured in your terminal...
+ | You can do Alt+A, Alt+E, and Alt+K ("option" instead of "alt"
+ | on the mac).
+ |
+ | You may need to configure your keyboard preferences in your
+ | console app to make alt (or option) behave in the standard way.
+ | The preference will be called something like "make alt behave
+ | like escape+".
+ |
+ |
+: Why aren't there more questions in this faq?
+ | It's a work in progress. More will be added later!
+ |
+: How can I contribute to this faq?
+ | Edit
/roots/faq.menu, commit, and send a pull
+ | request.
+ |
+: What are the next steps for this readme file, to make it more accessible?
+ | 1. Mirror to a markdown file
+ | 2. Link to it from the README, so it'll be more visible
+ | - https://help.github.com/articles/relative-links-in-readmes
+ |
diff --git a/roots/files.rb b/roots/files.rb
new file mode 100644
index 00000000..919325c1
--- /dev/null
+++ b/roots/files.rb
@@ -0,0 +1,87 @@
+file = Bookmarks["%links"]
+
+# Grab first few files from :n, regardless of how we proceed...
+
+limit = 100
+list, dir = [], []
+IO.foreach(file) do |line|
+
+ indent = Tree.indent_size line
+
+ # .../, so append as dir...
+
+ if line =~ /^[^:|#]*\/$/
+ dir = dir[0..indent]
+ next dir[indent] = line
+ end
+
+ filename = line[/^ *[+-] (.+\w)$/, 1]
+ next if ! filename
+
+ # It's a filename, so add dir/file to output...
+
+ dir.compact!
+
+ dir.map!{|o| Line.without_label :line=>o.strip}
+ dir = dir[0..indent]
+ full = dir
+ full[indent] = filename
+ full = full.join
+ full = Bookmarks[full]
+
+ next if list.member? full # Skip if we've already added this one
+
+ list << full
+ limit -= 1
+ break if limit < 1
+end
+
+# /, so list most recent files from :n...
+
+if args == []
+ # Do hotkeys if launched by key shortcut (which we can tell because of the view name)
+ options[:hotkey] = 1 if View.name == "files/"
+
+ return list.map{|o| "+ #{o.sub(/.+\//, '')}"}.join "\n"
+end
+
+# /foo.txt, so find file path from list and go to it...
+
+# Handle tasks
+
+return "* show in links\n* to top" if task == []
+
+if task == ["show in links"]
+ View.open "%links"
+ Search.forward "^[ +-]* #{Search.quote_elisp_regex args[0]}", :from_top=>1
+ return ""
+
+elsif task == ["to top"]
+
+ # Jump to this file in the nav
+ View.open "%links"
+ Search.forward "^[ +-]* #{Search.quote_elisp_regex args[0]}", :from_top=>1
+
+ # Jump up to the heading
+ Notes.to_block :up=>1
+
+ # Move heading to the top
+ modified = View.modified? # Remember if nav was modified
+ Notes.move_block_to_top :no_fade=>1
+ DiffLog.save :no_diffs=>1 if ! modified # Save changes (unless it was modified)
+
+ # Re-display the list (so it'll be at the top)
+ Launcher.open("files/")
+
+ return "" #"- todo > implement . ~ to top"
+
+end
+
+found = list.find{|o| o =~ /\/#{Regexp.escape args[0]}$/}
+
+# /file, so find file from :n and open it...
+
+View.open found
+
+nil
+
diff --git a/roots/filter.rb b/roots/filter.rb
new file mode 100644
index 00000000..4663435a
--- /dev/null
+++ b/roots/filter.rb
@@ -0,0 +1,26 @@
+# First, maybe find code that does "##"
+# and use =f instead?
+# (Make launcher use @f as special case if file tree.)
+class Filter
+ def self.menu *args
+ options = yield
+ ancestors = options[:ancestors]
+
+ # Stitch our args onto the ancestor before calling!
+ ancestors[-1] << "#{args[1..-1].join('/')}/" if args.length > 1
+
+ txt = Expander.expand ancestors
+
+ return txt if args.length > 1 # If there were args, just echo through (filtering happened at higher level
+
+ txt = txt.split("\n").select{|o|
+ o.sub(/\A[ +-]+/, '') =~ /#{args[0]}/ ||
+ o =~ /#{args[0]}/i
+ }.join("\n")
+
+ txt
+
+ # TODO > handle multiple filter args?
+
+ end
+end
diff --git a/roots/font.menu b/roots/font.menu
new file mode 100644
index 00000000..35213a9b
--- /dev/null
+++ b/roots/font.menu
@@ -0,0 +1 @@
+<< styles/
diff --git a/menu/fontawesome.menu b/roots/fontawesome.menu
similarity index 97%
rename from menu/fontawesome.menu
rename to roots/fontawesome.menu
index 2fc04ab4..ab3fabe1 100644
--- a/menu/fontawesome.menu
+++ b/roots/fontawesome.menu
@@ -1,5 +1,5 @@
- all/
- @bootstrap/
+ =bootstrap/
+ icon/
- expand-alt
- smile
@@ -343,7 +343,7 @@
- stethoscope
- user-md
- category/
- @bootstrap/
+ =bootstrap/
- project name/all fontawesome icons
h4/New Icons
icon/
@@ -727,7 +727,7 @@
stethoscope
user-md
- sizes/
- @bootstrap/
+ =bootstrap/
- project name/fontawesome icon sizes
> star-empty
.new
+ @r/.last
+ @r/.all
+ - .more/
+ - one record/
+ @r/.find 1
+ - certain fields/
+ @r/.all.map{|o| o.name}
+ - sort/
+ @r/.order("name")
+ @r/.order("name").map{|o| o.name}
+ - columns/
+ @r/.columns
+ - .delete/
+ - one record/
+ - all records/
+ - model/
+ `
+ MENU = %`
+ - .relationships/
+ `
+
+ def self.delete_records name
+ "- Unfinished!"
+ end
+
+ def self.delete name, kind
+
+ dir = Rails.running_dir
+ name = TextUtil.camel_case name
+
+ if kind == "one record"
+ "@r/#{name}.delete 1"
+ elsif kind == "all records"
+ "@r/#{name}.delete_all"
+ elsif kind == "model files"
+ "
+ @#{dir}/
+ % rails destroy model #{name}
+ "
+ end
+
+ end
+
+ def self.menu_after output, *path
+
+ # /, so show list...
+
+ if path.blank?
+ txt = Rails.run_in_app 'Dir.new("#{Rails.root.to_s}/app/models").entries.grep /\.rb$/'
+
+ return txt if txt =~ /\A\|/
+ txt = YAML::load txt
+ # txt = txt.map{|o| "#{o[/(.+)\.rb$/, 1]}/\n"}.join("")
+ txt = txt.map{|o| "+ #{o[/[\w ]+/]}/\n"}.join("")
+ return "#{txt}#{output}"
+ end
+
+ return self.relationships(yield) if path == ["relationships"]
+
+ # /foo/, so populate in output...
+
+ model = TextUtil.camel_case path[0]
+ output.gsub "", model
+
+ end
+
+ def self.relationships options # name=nil
+
+ options[:no_search] = 1
+
+ dir = Rails.running_dir
+ models_dir = "#{dir}/app/models/"
+ txt = "
+ @#{models_dir}
+ - ##^ *(has_|belongs_to )/
+ "
+ end
+
+ end
+end
diff --git a/lib/xiki/tools/mongo.rb b/roots/mongo.rb
similarity index 51%
rename from lib/xiki/tools/mongo.rb
rename to roots/mongo.rb
index a28da2fa..acb1d2f7 100644
--- a/lib/xiki/tools/mongo.rb
+++ b/roots/mongo.rb
@@ -1,37 +1,68 @@
module Xiki
class Mongo
- def self.menu # bucket=nil
- %`
- - .collections/
+
+ # Move into notes?
+ MENU = %`
- docs/
- > Create
- @foo.save({_id:"a", txt:"b"})
+ - create/
+ =foo.save({_id:"a", txt:"b"})
+ - show/
+ =foo.find()
+ =foo.find({_id:"a"})
+ - update/
+ =foo.update({_id:"a"}, {txt:"bbb"})
+ - delete/
+ =foo.remove({_id:"a"})
+ `
+
+ def self.menu_after output, *items
+
+Ol "items", items
+
+ # /, so prepend the collections...
- > Show
- @foo.find()
- @foo.find({_id:"a"})
+ return "#{self.collections.map{|o| "+ #{o}\n"}.join("")}#{output}" if items.blank?
- > Update
- @foo.update({_id:"a"}, {txt:"bbb"})
+ # MENU handled output, so do nothing
+
+ return if output
+Ol()
+ # No output, so we have to handle
+ # "#{self.collections(*items).map{|o| "+ #{o}\n"}.join("")}"
+ "#{self.collections(*items)}"
- > Delete
- @foo.remove({_id:"a"})
- `.unindent
end
- def self.collections collection=nil
+
+ def self.collections collection=nil, doc=nil
collection.sub!(/\/$/, '') if collection
- # If /, list databases
+ # /, so list databases
- if collection.nil?
+ if ! collection
json = self.run 'printjson(db._adminCommand("listDatabases"))'
o = JSON[json]
return o["databases"].map{|d| "#{d['name']}/"}
end
- self.run("db.#{collection}.find()").gsub(/^/, '| ')
+ # /db/, so list records
+
+ if ! doc
+ txt = self.run("db.#{collection}.find()")
+ txt = %Q`> No documents yet. Create one?\n{ "_id":"id", "name":"Steve", "description":"whatever"}` if txt == ""
+ return txt.gsub(/^/, '| ')
+ end
+
+ # /db/doc, so save
+
+ doc.sub!(/^\| /, '')
+ command = "db.#{collection}.save(#{doc})"
+
+ txt = self.run command # .gsub(/^/, '| ')
+
+ "<* - saved!"
+
end
def self.run command
@@ -46,11 +77,14 @@ def self.run command
end
txt.sub /(.+\n){2}/, '' # Delete first 2 lines
-
end
def self.init
+ # - Is this being called anywhere?
+ # - Maybe have item in menu that saves it to startup
+ # - maybe just shows file syntax for adding to a file!
+
Launcher.add(/^db\./) do |l| # General db... lines
l.strip!
txt = self.run l
diff --git a/roots/mysql/default.conf b/roots/mysql/default.conf
new file mode 100644
index 00000000..66a97bf9
--- /dev/null
+++ b/roots/mysql/default.conf
@@ -0,0 +1,9 @@
+> The db to use when none is specified
+- default db/
+ foo
+- user/
+ root
+#- password/
+# p@ssw0rd
+# - host/
+# localhost
diff --git a/menu/mysql/index.rb b/roots/mysql/mysql_index.rb
similarity index 56%
rename from menu/mysql/index.rb
rename to roots/mysql/mysql_index.rb
index 5e908d8b..444ff8a4 100644
--- a/menu/mysql/index.rb
+++ b/roots/mysql/mysql_index.rb
@@ -7,14 +7,14 @@ class Mysql
"
MENU = "
- - @tables/
- - @dbs/
+ =tables/
+ =dbs/
- .setup/
- .start/
- .start in background/
- stop/
- @ $ ps -eo pcpu,pid,user,args | grep mysql | grep -v grep
- @ $ kill _
+ =$ ps -eo pcpu,pid,user,args | grep mysql | grep -v grep
+ =$ kill _
- db/
- .create/
- .drop/
@@ -24,81 +24,80 @@ class Mysql
- .install/
- config/
> Main config file
- @ /etc/my.cnf
+ =/etc/my.cnf
> Example config files
- @ /usr/local/Cellar/mysql/5.5.25/support-files/
+ =/usr/local/Cellar/mysql/5.5.25/support-files/
- **cnf/
- docs/
- misc commands/
> Drop db
- @ % mysqladmin -u root drop foo
+ =% mysqladmin -u root drop foo
|
> Others
- @ technologies/mysql/
+ =technologies/mysql/
- old/
- - @columns/
+ =columns/
> Or just type some sql here
| show tables
- @conf/
+ =conf/
"
def self.menu_before *args
- return if args[0] !~ /^select /
+ return if args[0] !~ /^(select|delete|update|show|create|describe|insert) /
- # select..., so take control
+ # Not |... or :..., so don't handle...
+
+ # sql statement, so take control...
options = yield
+ args[0].sub! /^: /, ''
+
self.select options, args
end
def self.install
- if Environment.os == :unix
+ if Environment.os == "linix"
"
> Installing Mysql
- @% sudo apt-get install mysql-server
+ =% sudo apt-get install mysql-server
"
- elsif Environment.os == :osx
+ elsif Environment.os == "osx"
"
> Installing Mysql
For now, this just has the mac / homebrew instructions. Fork xiki on github to add docs for other platforms.
> Install using homebrew
- - 1. double-click to install) @ % brew install mysql
+ - 1. double-click to install) =% brew install mysql
- 2. look at the output) and run the commands it tells you to run
> More
See this link for more info on installing:
- @http://www.mysql.com/downloads/mysql/
+ =http://www.mysql.com/downloads/mysql/
"
end
end
- # def self.menu_after txt, *args
- # return nil if txt
- # ENV['no_slash'] = "1"
- # Tree.quote self.run(nil, ENV['txt'])
- # end
-
def self.start
- Console.sync "mysql.server start", :dir=>"/tmp/"
- "@flash/- started!"
+ Shell.sync "mysql.server start", :dir=>"/tmp/"
+ "<* started!"
end
- # def self.start_in_background
- # Console.run "mysql.server start"
- # end
+ def self.conf options
+ Xi.new options[:conf]
+ end
def self.default_db options
- conf = Xi.new options[:conf]
+ conf = self.conf options
if(! conf || ! conf["default db"])
raise "
- > No default db defined. Define it?
- @conf/mysql/
+ > You haven't set up your db config yet
+ | Expand this:
+ =conf/mysql/
"
end
@@ -106,11 +105,20 @@ def self.default_db options
end
def self.tables *args
+ options = yield
db = self.default_db yield
- self.dbs db, *args
+ self.dbs_internal options, db, *args
end
def self.dbs db=nil, table=nil, *row
+
+ options = yield
+ self.dbs_internal options, db, table, *row
+
+ end
+
+ def self.dbs_internal options=nil, db=nil, table=nil, *row
+
key, row = row[0] =~ /^\d+$/ ?
row : [nil, row[0]]
@@ -121,16 +129,16 @@ def self.dbs db=nil, table=nil, *row
# /, so list db's...
if db.nil?
- txt = self.run('', 'show databases')
+ txt = self.run(options, '', 'show databases')
return txt.split[1..-1].map{|o| "#{o}/"}
end
# /db/..., so just list the tables...
if table.nil?
- txt = self.run(db, 'show tables')
+ txt = self.run(options, db, 'show tables')
if txt.blank?
- return "> No tables exist. Create one?\n- @mysql/setup/table/create/#{db}/"
+ return "> No tables exist. Create one?\n=mysql/setup/table/create/#{db}/"
end
return txt.split[1..-1].map{|o| "#{o}/"}
end
@@ -144,16 +152,16 @@ def self.dbs db=nil, table=nil, *row
if row.nil?
sql = "select * from #{table} limit 400"
- out = self.run(db, sql)
+ out = self.run(options, db, sql)
- out = "No records, create one?\n#{self.dummy_row(db, table)}" if out.blank?
+ out = "No records, create one?\n#{self.dummy_row(options, db, table)}" if out.blank?
return Tree.quote out #.gsub(/^/, '| ')
end
# /db/table/row, so save...
- self.save db, table, row
- "@flash/- saved record!"
+ self.save options, db, table, row
+ "<* saved record!"
end
@@ -164,16 +172,19 @@ def self.db_by_key db, table, key, row
if ! row
# /db/table/row, so save...
sql = "select * from #{table} where id = #{key}"
- row = self.run(db, sql)
+ row = self.run(db, sql, options)
row = self.record_hash row
- return row.to_yaml.split("\n")[1..-1].join("\n").gsub(/^/, ': ')
+
+ # =commit/colons
+
+ return row.to_yaml.split("\n")[1..-1].join("\n").gsub(/^/, '| ')
end
# /db/table/key/row, so save...
self.save db, table, row
- "@flash/- todo: save!"
+ "<* save!"
end
# Returns key:value string to show record to the user
@@ -184,8 +195,8 @@ def self.record_hash row
hash
end
- def self.dummy_row db=nil, table=nil
- fields = self.fields db, table
+ def self.dummy_row options, db=nil, table=nil
+ fields = self.fields options, db, table
examples = {
"int"=>"1",
"varchar"=>"foo",
@@ -197,8 +208,8 @@ def self.dummy_row db=nil, table=nil
fields.join("\t")
end
- def self.fields db, table=nil
- txt = self.run db, "desc #{table}"
+ def self.fields options, db, table=nil
+ txt = self.run options, db, "desc #{table}"
txt.sub(/^.+\n/, '').split("\n").map{|o|
l = o.split("\t")
[l[0], l[1].sub(/\(.+/, '')] }
@@ -211,8 +222,8 @@ def self.create what, db=nil, name=nil, columns=nil
end
if what == "db"
- txt = Console.run "mysqladmin -u root create #{db}", :sync=>true
- return ".flash - created db!"
+ txt = Shell.run "mysqladmin -u root create #{db}", :sync=>true
+ return "<* created db!"
end
if name.nil?
@@ -222,11 +233,11 @@ def self.create what, db=nil, name=nil, columns=nil
if columns.nil?
return "
- : id int not null auto_increment primary key,
- : name VARCHAR(20),
- : details text,
- : datestamp DATE,
- : timestamp TIME,
+ | id int not null auto_increment primary key,
+ | name VARCHAR(20),
+ | details text,
+ | datestamp DATE,
+ | timestamp TIME,
"
end
@@ -236,44 +247,39 @@ def self.create what, db=nil, name=nil, columns=nil
);
"
- out = self.run(db, txt)
+ options = yield
+ out = self.run(options, db, txt)
- ".flash - created table!"
+ "<* created table!"
end
- # def self.drop what, name=nil
- # if name.nil?
- # return what == "db" ? self.dbs : self.tables
- # end
-
- # if what == "db"
- # txt = Console.run "mysqladmin -u root drop #{name}" #, :sync=>true
- # return
- # end
- # out = self.run(@default_db, "drop table #{name}")
+ def self.run options, db, sql
- # ".flash - dropped table!"
- # end
+ db ||= self.default_db options
- def self.run db, sql
+ conf = self.conf options
+ user, password, host = conf["user"], conf["password"], conf["host"]
- db ||= self.default_db
+ user = user ? "-u #{user}" : "-u root"
+ password = password ? "-p #{password}" : ""
+ host = host ? "-h #{host}" : ""
File.open("/tmp/tmp.sql", "w") { |f| f << sql }
- out = Console.run "mysql -u root #{db} < /tmp/tmp.sql", :sync=>true
+ command = "mysql #{user} #{db} #{password} #{host} < /tmp/tmp.sql"
+ out = Shell.command command
- raise "> Mysql doesn't appear to be installed. Install it?\n- @mysql/setup/install/" if out == "sh: 1: mysql: not found\n"
- raise "> Mysql doesn't appear to be running. Start it?\n- @mysql/setup/start/" if out =~ /^ERROR.+Can't connect/
- raise "| Database '#{db}' doesn't exist. Create it?\n- @mysql/setup/db/create/#{$1}/" if out =~ /^ERROR.+Unknown database '(.+)'/
- raise "| Table doesn't exist. Create it?\n- @mysql/setup/table/create/#{$1}/" if out =~ /^ERROR.+Table '.+\.(.+)' doesn't exist/
+ raise "> Mysql doesn't appear to be installed. Install it?\n= mysql/setup/install/" if out == "sh: 1: mysql: not found\n"
+ raise "> Mysql doesn't appear to be running. Start it?\n= mysql/setup/start/" if out =~ /^ERROR.+Can't connect/
+ raise "| Database '#{db}' doesn't exist. Create it?\n= mysql/setup/db/create/#{$1}/" if out =~ /^ERROR.+Unknown database '(.+)'/
+ raise "| Table doesn't exist. Create it?\n= mysql/setup/table/create/#{db}/#{$1}/" if out =~ /^ERROR.+Table '.+\.(.+)' doesn't exist/
raise Tree.quote(out) if out =~ /^ERROR/
out
end
- def self.save db, table, row
+ def self.save options, db, table, row
if row =~ /\n/
# Inspect row (k=>v\n...)...
@@ -281,37 +287,37 @@ def self.save db, table, row
hash = YAML::load row
txt = hash.map{|k, v| "#{k}=\"#{v}\"" }.join(", ")
else
- fields = self.fields db, table
+ fields = self.fields options, db, table
# Normal row (tabs and no linebreaks)...
- row = row.sub(/^\| /, '').split("\t")
+ # row = row.sub(/^\| /, '').split("\t")
+ row = row.sub(/^: /, '').split("\t")
txt = fields.map{|o| o[0]}.each_with_index.map{|o, i| "#{o}='#{row[i]}'"}.join(", ")
end
sql = "INSERT INTO #{table} SET #{txt} ON DUPLICATE KEY UPDATE #{txt}"
- self.run db, sql
+ self.run options, db, sql
end
def self.select options, args
sql, row = args
options[:no_slash] = 1
- default_db = self.default_db(options)
+ default_db = self.default_db options
# select..., so run and return results
if ! row
txt = self.run default_db, args[0]
- return txt.gsub /^/, '| '
+ return txt.gsub /^/, ': '
end
table = sql[/from (.+?)( |$)/i, 1]
- Ol "table", table
self.save default_db, table, row
- ".flash - TODO saved!"
+ "<* - saved!"
end
# Launcher.add "columns" do |path|
@@ -323,18 +329,15 @@ def self.select options, args
# end
def self.def_patterns
- Xiki.def(/^select /) do |path, options|
+
+ Xiki.def(/\A(select [^\/]+ from |delete from |show table |create table |describe table |insert into )/) do |path, options|
+
+ # Removed for now > was interjecting when
+ # - command named "update xikihub/"
+
Xiki["mysql/#{options[:path]}"]
end
- end
- # Maybe make the "default_conf" menu item be where it gets the
- # default conf
- def self.default_conf
- "
- > The db to use when none is specifed
- - default db: ?
- "
end
end; end
diff --git a/menu/nav_history.rb b/roots/nav_history.rb
similarity index 100%
rename from menu/nav_history.rb
rename to roots/nav_history.rb
diff --git a/roots/network.menu b/roots/network.menu
new file mode 100644
index 00000000..cfca7ebf
--- /dev/null
+++ b/roots/network.menu
@@ -0,0 +1,5 @@
+= ip/
+= curl/
+= ports/
++ pairing location/
+ ! `scselect pairing`
diff --git a/roots/node.rb b/roots/node.rb
new file mode 100644
index 00000000..095f916a
--- /dev/null
+++ b/roots/node.rb
@@ -0,0 +1,89 @@
+module Command
+ class Node
+ MENU = %`
+ | txt = "Some node code"
+ | console.log(txt)
+ - .controller/
+ - docs/
+ - headers/
+ | console.log(JSON.stringify(req.headers, null, 2));
+ - env vars/
+ | res.write(JSON.stringify(process.env, null, 2));
+ - method/
+ | console.log(req.method);
+ - url/
+ | console.log(req.url);
+ - request params/
+ | var url = require("url");
+ | var _url = url.parse(req.url, true);
+ | console.log(JSON.stringify(_url, null, 2));
+ - read a file sync/
+ | var fs = require('fs');
+ | var txt = fs.readFileSync('./recipe.txt', 'utf8');
+ | console.log(txt);
+ - run in prod mode/
+ % export NODE_ENV=production
+ `
+
+ def self.menu_after output, *args
+ return output if output
+
+ if args.empty?
+ View.prompt("Enter some code to run in node.js")
+ return "| "
+ end
+
+ return self.block if args == ['block']
+ Tree.quote JavascriptHandler.eval(args[0])
+
+ end
+
+ def self.wrap_controller code
+
+ %`
+ var http = require('http');
+ http.createServer(function (req, res) {
+ res.writeHead(200, {"Content-Type": "text/plain"});
+
+ #{code}
+ }).listen(1338, '127.0.0.1');
+ console.log('Server running at http://127.0.0.1:1338/');
+
+ end
+
+ def self.controller *args
+
+ return "
+ | // This is a sample controller. Edit and expand to run it.
+ | console.log('got one request');
+ | res.end('Hello Node World!');
+ " if args.empty?
+
+ code = self.wrap_controller args[0]
+ self.run_controller code
+ end
+
+ def self.run_controller code
+ File.open("/tmp/controller.js", "w") { |f| f << code }
+
+ Buffers.delete "node" if View.buffer_open? "node"
+
+ Shell.run "node controller.js", :dir=>"/tmp/", :buffer=>"node", :dont_move=>1
+ $el.sit_for 0.2
+ Browser.url "http://localhost:1338"
+
+ "<* showing in browser!"
+ end
+
+ def self.block
+ left = Line.right + 1
+ ignore, ignore, right = View.block_positions "^>"
+
+ txt = Xiki::Node.run View.txt(right, left)
+ Block >> txt
+
+ nil
+ end
+
+ end
+end
diff --git a/roots/node_js.menu b/roots/node_js.menu
new file mode 100644
index 00000000..75de0f75
--- /dev/null
+++ b/roots/node_js.menu
@@ -0,0 +1 @@
+<< node/
diff --git a/roots/note_markers.rb b/roots/note_markers.rb
new file mode 100644
index 00000000..7ad14d8a
--- /dev/null
+++ b/roots/note_markers.rb
@@ -0,0 +1,44 @@
+# No path, so show all labels from :t...
+
+prefix = Keys.prefix
+
+if args == []
+
+ # Get latest "notes.notes" and "links.notes" contents...
+
+ todo = Notes.extract_markers :file=>"%n", :limit=>100
+
+ # Remove dups
+ todo = todo.split("\n", -1).uniq.join("\n")
+
+ txt = todo
+
+ options[:hotkey] = 1
+ options[:omit_slashes] = 1
+
+ return txt
+end
+
+# Item passed, so navigate or open...
+
+task = options[:task]
+
+# Root task, so show items...
+
+return "* navigate\n* run" if task == []
+
+# Open or run, so navigate to it...
+
+View.kill if ! task && View.name == "run labels/"
+
+# files/..., so pull it off
+launch_options = {}
+if args.length == 2 and args[0] == "files"
+ args.shift
+ launch_options[:bookmark] = "%links"
+end
+
+launch_options[:label] = args[0]
+launch_options[:go] = 1 if task == ["navigate"]
+
+Launcher.do_last_launch launch_options
diff --git a/roots/notes.rb b/roots/notes.rb
new file mode 100644
index 00000000..9b1f8abd
--- /dev/null
+++ b/roots/notes.rb
@@ -0,0 +1,114 @@
+class Xiki::Menu::Notes
+
+ MENU = %`
+ - docs/
+ - summary/
+ | This menu lists out the notes in ~/xiki/. It lets you drill
+ | into them and navigate to individual notes and update.
+ |
+ | It can be used two different ways, by using @notes by itself,
+ | or nesting @notes under another menu.
+ - nesting/
+ - intro/
+ | You can nest @notes under other menus, like so:
+ = foo/
+ = notes/
+
+ | It will use ~/xiki/foo.xiki. This is a convenience mechanism
+ | for you to create notes that are associated with menus.
+ - example/
+ > 1. if you have a file like this
+ =~/xiki/foo.xiki
+ | > Bar
+ | Some notes about bar.
+ |
+ | > Baz
+ | Some notes about baz.
+
+ > 2. When you expand, it will look like this
+ = foo/
+ = notes/
+ > Bar
+ > Baz
+
+ | Then you can expand the headings and edit inline.
+ - keys/
+ > open+menu
+ | Prompts for a key or two, and opens the matching note from ~/xiki/
+ > as+update
+ | Save the note instead of navigating to it
+ - api/
+ > Turn notes wiki text into html
+ =Notes.to_html "> Heading\\njust text\\n"
+ `
+
+ def self.menu_after output, *path
+
+ options = yield
+
+ # Prepend parent to items if foo/=menu...
+
+ items, task = options[:items], options[:task]
+
+ # foo/=notes/, so use foo as name...
+
+ if path[0] !~ /\A\w/ # Only if there's not a menu-ish item underneath.
+
+ if parent = Xiki.menuish_parent(options)
+
+ # We're nested under a menu-like item, so use it as the name
+ (items||=[]).unshift parent
+ output = nil # Blank out output so we won't get mislead below
+
+ # $ foo/=notes/, so use foo as name...
+
+ elsif parent = options[:ancestors] && options[:ancestors][-1][/\A\$ (\w+)/, 1]
+
+ # We're nested under a menu-like item, so use it as the name
+ (items||=[]).unshift parent
+ output = nil # Blank out output so we won't get mislead below
+ end
+
+ end
+
+ # /, so list notes at top...
+
+ if ! items
+ if task == ["source"]
+ Launcher.open "~/xiki/\n + **\.xiki$/"
+ return ""
+ end
+
+ # In future, should probably look in all XIKI_PATH dirs > borrow from > =all
+
+
+ # List .xiki files in ~/xiki/ sorted by date...
+
+ files = FileTree.files_in_dir(File.expand_path("~/xiki/"), :date_sort=>1)[1]
+
+ files.each{|o| o.sub! /.+\//, ''}
+
+ return files.select{|o| o =~ /^\w.*\.xiki$/}.map{|o| "+ #{o.sub(/\.xiki$/, '').gsub(/_/, ' ')}/\n"}.join('')
+
+ end
+
+ # /foo and output output from MENU, so just show it...
+
+ return output if output
+
+ # /foo, so delegate to ~/commands dir...
+
+ name = items.slice!(0)
+ path = name.gsub(' ', '_')
+
+ # Call .drill directly
+
+ txt = Notes.drill path, *items, options
+
+ Ol "items", items # => []
+
+ return txt if txt
+
+ end
+
+end
diff --git a/roots/ok.rb b/roots/ok.rb
new file mode 100644
index 00000000..5f7dc103
--- /dev/null
+++ b/roots/ok.rb
@@ -0,0 +1,32 @@
+# At left margin, so close this view
+
+if Line.indent == ""
+ View.close
+end
+
+# Indented under something, so jump to parent and collapse
+
+# Go to parent
+Tree.to_parent
+
+# Collapse
+Tree.collapse
+
+
+# "* task", so collapse
+if Line.value =~ /^ *\*/
+
+ indent = Line.indent
+
+ # Delete option item
+ Line.delete
+ # "~ option item" at left margin, so leave cursor there
+ if indent == ""
+ View >> "\n"
+ else
+ Line.previous
+ end
+end
+
+
+""
diff --git a/roots/options.rb b/roots/options.rb
new file mode 100644
index 00000000..d5b2bcdd
--- /dev/null
+++ b/roots/options.rb
@@ -0,0 +1,45 @@
+module Xiki
+ class Options
+
+ def self.menu *args
+
+ # Grab parent subpath to parse and pre-expand...
+
+ options = yield
+
+ ancestors = options[:ancestors]
+ menu_steps = ancestors.any? && ancestors[-1] == "menu steps/"
+ ancestors.pop if menu_steps
+
+ # Normally, this is more complicated than just using this menu
+
+
+ path = ancestors.any? ? ancestors : options[:path]
+
+ options_result = Expander.expanders path
+
+ if options_result[:menufied]
+ Command.climb_sources options_result
+ end
+
+ options_propigate = options.dup
+ options_result = options.merge! options_result # Merge in original options, so editor and prefix vars etc vars are there (might cause problems?)
+
+ # /, so show options_result...
+
+ txt = TextUtil.ap options_result
+ txt = Tree.quote txt, :char=>"|"
+
+ txt
+
+ end
+
+ def self.yaml txt
+ txt = txt.to_yaml
+ txt.sub! /\A--- \n/, ''
+ txt.gsub!(/ $/, '')
+ txt
+ end
+
+ end
+end
diff --git a/roots/os.rb b/roots/os.rb
new file mode 100644
index 00000000..751aa66d
--- /dev/null
+++ b/roots/os.rb
@@ -0,0 +1,23 @@
+#
+# Shows your operating system and version.
+#
+
+# /etc/os-release exists, so use it (probably linux)...
+
+if txt = File.read("/etc/os-release") rescue nil
+ return Tree.pipe txt[/.+\n.+\n/] # Show the 1st 2 lines
+end
+
+# sw_vers command exists, so use it (probably mac)...
+
+if txt = Shell.command("sw_vers", :raise_error=>1) rescue nil
+ return Tree.pipe txt[/.+\n.+\n/] # Show the 1st 2 lines
+end
+
+"
+| Sorry, your OS was unrecognized, because neither
+| the /etc/os-release file nor the 'sw_vers' shell
+| command could be found to give clues about your
+| OS and its version.
+|
+"
diff --git a/roots/os_path.rb b/roots/os_path.rb
new file mode 100644
index 00000000..7b88a554
--- /dev/null
+++ b/roots/os_path.rb
@@ -0,0 +1,4 @@
+ENV['PATH'].
+ split(":").
+ map{|o| "=#{FileTree.add_slash_maybe o}"}.
+ join("\n")
diff --git a/roots/overflow.rb b/roots/overflow.rb
new file mode 100644
index 00000000..fb2a3b83
--- /dev/null
+++ b/roots/overflow.rb
@@ -0,0 +1,24 @@
+txt = args.join("/").strip
+
+# If no arg, prompt to type something
+
+return "=prompt/Type something to search on stack overflow" if txt.blank?
+
+
+# Words not quoted, so grab siblings (if it's not on the same line)...
+
+if txt !~ /\n/ && txt !~ /^:/ && Line !~ /google\//
+ txt = Tree.siblings.join(" ")
+end
+
+txt.sub! /^: /, ''
+txt.gsub! "\n", ' '
+
+
+
+# If arg, look it up
+
+txt = CGI.escape txt
+
+Browser.url "http://stackoverflow.com/search?q=#{txt}"
+nil
diff --git a/roots/parse.rb b/roots/parse.rb
new file mode 100644
index 00000000..233e063e
--- /dev/null
+++ b/roots/parse.rb
@@ -0,0 +1,33 @@
+module Xiki
+ class Parse
+
+ def self.menu *args
+
+ # Grab parent subpath to parse and pre-expand
+
+ options = yield
+ ancestors = options[:ancestors]
+ menu_steps = ancestors[-1] == "menu steps/"
+ ancestors.pop if menu_steps
+
+ path = ancestors.any? ? ancestors : options[:path]
+
+ parse_result = Expander.parse path
+
+ txt = self.ap parse_result
+ txt.gsub! /^ /, ""
+ txt.sub! "[\n [", "[["
+ txt = Tree.quote txt, :char=>"|"
+
+ txt
+ end
+
+ def self.ap txt
+ txt = txt.ai
+ txt.sub! /\A{\n/, ''
+ txt.sub! /\n}\z/, ''
+ txt
+ end
+
+ end
+end
diff --git a/roots/path.menu b/roots/path.menu
new file mode 100644
index 00000000..d750ea2f
--- /dev/null
+++ b/roots/path.menu
@@ -0,0 +1,5 @@
+<< os path/
+<< echo/
+<< menu path/
+<< ruby load path/
+<< emacs/lisp load-path dirs/
diff --git a/lib/xiki/tools/piano.rb b/roots/piano.rb
similarity index 64%
rename from lib/xiki/tools/piano.rb
rename to roots/piano.rb
index 794587f6..4e4c4607 100644
--- a/lib/xiki/tools/piano.rb
+++ b/roots/piano.rb
@@ -1,33 +1,28 @@
-Xiki::Requirer.require_gem 'unimidi', :optional=>1
-
require 'xiki/core/mode'
-
module Xiki
class Piano
- include MIDIator::Notes rescue nil
- include MIDIator::Drums rescue nil
-
- @@unimidi = nil
+ @@fluidsynth = nil
@@held_down = []
@@midi = nil
@@velocity = 100
- @@tempo = 120
- @@probability = 100
- @@melodic = 0
- @@melodic_accumulator = []
- @@climb = 0
- @@pentatonic = false
- @@variation = 0
- @@consistency = 0
- @@mode = 0
- @@octave = 0
- @@program = 1
- @@repeat = 1
- @@names = ['Acoustic Grand Piano', 'Bright Acoustic Piano', 'Electric Grand Piano', 'Honky-tonk Piano', 'Electric Piano 1', 'Electric Piano 2', 'Harpsichord', 'Clavinet', 'Celesta', 'Glockenspiel', 'Music Box', 'Vibraphone', 'Marimba', 'Xylophone', 'Tubular Bells', 'Dulcimer', 'Drawbar Organ', 'Percussive Organ', 'Rock Organ', 'Church Organ', 'Reed Organ', 'Accordion', 'Harmonica', 'Tango Accordion', 'Acoustic Guitar (nylon)', 'Acoustic Guitar (steel)', 'Electric Guitar (jazz)', 'Electric Guitar (clean)', 'Electric Guitar (muted)', 'Overdriven Guitar', 'Distortion Guitar', 'Guitar harmonics', 'Acoustic Bass', 'Electric Bass (finger)', 'Electric Bass (pick)', 'Fretless Bass', 'Slap Bass 1', 'Slap Bass 2', 'Synth Bass 1', 'Synth Bass 2', 'Violin', 'Viola', 'Cello', 'Contrabass', 'Tremolo Strings', 'Pizzicato Strings', 'Orchestral Harp', 'Timpani', 'String Ensemble 1', 'String Ensemble 2', 'Synth Strings 1', 'Synth Strings 2', 'Choir Aahs', 'Voice Oohs', 'Synth Choir', 'Orchestra Hit', 'Trumpet', 'Trombone', 'Tuba', 'Muted Trumpet', 'French Horn', 'Brass Section', 'Synth Brass 1', 'Synth Brass 2', 'Soprano Sax', 'Alto Sax', 'Tenor Sax', 'Baritone Sax', 'Oboe', 'English Horn', 'Bassoon', 'Clarinet', 'Piccolo', 'Flute', 'Recorder', 'Pan Flute', 'Blown Bottle', 'Shakuhachi', 'Whistle', 'Ocarina', 'Lead 1 (square)', 'Lead 2 (sawtooth)', 'Lead 3 (calliope)', 'Lead 4 (chiff)', 'Lead 5 (charang)', 'Lead 6 (voice)', 'Lead 7 (fifths)', 'Lead 8 (bass + lead)', 'Pad 1 (new age)', 'Pad 2 (warm)', 'Pad 3 (polysynth)', 'Pad 4 (choir)', 'Pad 5 (bowed)', 'Pad 6 (metallic)', 'Pad 7 (halo)', 'Pad 8 (sweep)', 'FX 1 (rain)', 'FX 2 (soundtrack)', 'FX 3 (crystal)', 'FX 4 (atmosphere)', 'FX 5 (brightness)', 'FX 6 (goblins)', 'FX 7 (echoes)', 'FX 8 (sci-fi)', 'Sitar', 'Banjo', 'Shamisen', 'Koto', 'Kalimba', 'Bag pipe', 'Fiddle', 'Shanai', 'Tinkle Bell', 'Agogo', 'Steel Drums', 'Woodblock', 'Taiko Drum', 'Melodic Tom', 'Synth Drum', 'Reverse Cymbal', 'Guitar Fret Noise', 'Breath Noise', 'Seashore', 'Bird Tweet', 'Telephone Ring', 'Helicopter', 'Applause', 'Gunshot']
+ @@tempo ||= 120
+ @@probability ||= 100
+ @@melodic ||= 0
+ @@melodic_accumulator ||= []
+ @@climb ||= 0
+ @@pentatonic ||= false
+ @@variation ||= 0
+ @@consistency ||= 0
+ @@mode ||= 0
+ @@octave ||= 0
+ @@program ||= 1
+ @@repeat ||= 1
+ @@names ||= ['Acoustic Grand Piano', 'Bright Acoustic Piano', 'Electric Grand Piano', 'Honky-tonk Piano', 'Electric Piano 1', 'Electric Piano 2', 'Harpsichord', 'Clavinet', 'Celesta', 'Glockenspiel', 'Music Box', 'Vibraphone', 'Marimba', 'Xylophone', 'Tubular Bells', 'Dulcimer', 'Drawbar Organ', 'Percussive Organ', 'Rock Organ', 'Church Organ', 'Reed Organ', 'Accordion', 'Harmonica', 'Tango Accordion', 'Acoustic Guitar (nylon)', 'Acoustic Guitar (steel)', 'Electric Guitar (jazz)', 'Electric Guitar (clean)', 'Electric Guitar (muted)', 'Overdriven Guitar', 'Distortion Guitar', 'Guitar harmonics', 'Acoustic Bass', 'Electric Bass (finger)', 'Electric Bass (pick)', 'Fretless Bass', 'Slap Bass 1', 'Slap Bass 2', 'Synth Bass 1', 'Synth Bass 2', 'Violin', 'Viola', 'Cello', 'Contrabass', 'Tremolo Strings', 'Pizzicato Strings', 'Orchestral Harp', 'Timpani', 'String Ensemble 1', 'String Ensemble 2', 'Synth Strings 1', 'Synth Strings 2', 'Choir Aahs', 'Voice Oohs', 'Synth Choir', 'Orchestra Hit', 'Trumpet', 'Trombone', 'Tuba', 'Muted Trumpet', 'French Horn', 'Brass Section', 'Synth Brass 1', 'Synth Brass 2', 'Soprano Sax', 'Alto Sax', 'Tenor Sax', 'Baritone Sax', 'Oboe', 'English Horn', 'Bassoon', 'Clarinet', 'Piccolo', 'Flute', 'Recorder', 'Pan Flute', 'Blown Bottle', 'Shakuhachi', 'Whistle', 'Ocarina', 'Lead 1 (square)', 'Lead 2 (sawtooth)', 'Lead 3 (calliope)', 'Lead 4 (chiff)', 'Lead 5 (charang)', 'Lead 6 (voice)', 'Lead 7 (fifths)', 'Lead 8 (bass + lead)', 'Pad 1 (new age)', 'Pad 2 (warm)', 'Pad 3 (polysynth)', 'Pad 4 (choir)', 'Pad 5 (bowed)', 'Pad 6 (metallic)', 'Pad 7 (halo)', 'Pad 8 (sweep)', 'FX 1 (rain)', 'FX 2 (soundtrack)', 'FX 3 (crystal)', 'FX 4 (atmosphere)', 'FX 5 (brightness)', 'FX 6 (goblins)', 'FX 7 (echoes)', 'FX 8 (sci-fi)', 'Sitar', 'Banjo', 'Shamisen', 'Koto', 'Kalimba', 'Bag pipe', 'Fiddle', 'Shanai', 'Tinkle Bell', 'Agogo', 'Steel Drums', 'Woodblock', 'Taiko Drum', 'Melodic Tom', 'Synth Drum', 'Reverse Cymbal', 'Guitar Fret Noise', 'Breath Noise', 'Seashore', 'Bird Tweet', 'Telephone Ring', 'Helicopter', 'Applause', 'Gunshot']
+ @@seed ||= Random.new rand
begin
@@map = {
@@ -40,51 +35,10 @@ class Piano
rescue Exception=>e
end
- def self.menu
-
- %`
- > Pass in notes (start GarageBand first)
- | g cdefg c c
+ # > Pass in notes (start GarageBand first)
+ MENU = %`
+ | g cdefg c c
- .setup/
- - .instrument/
- - most common/
- - Acoustic Grand Piano/
- - Electric Piano 1/
- - Glockenspiel/
- - Vibraphone/
- - Xylophone/
- - Drawbar Organ/
- - Church Organ/
- - Accordion/
- - Acoustic Guitar (nylon)/
- - Distortion Guitar/
- - Electric Bass (finger)/
- - Violin/
- - Tremolo Strings/
- - Pizzicato Strings/
- - Orchestral Harp/
- - Timpani/
- - String Ensemble 2/
- - Synth Strings 2/
- - Choir Aahs/
- - Synth Choir/
- - Orchestra Hit/
- - Trumpet/
- - Flute/
- - Pan Flute/
- - Lead 1 (square)/
- - Lead 2 (sawtooth)/
- - Pad 1 (new age)/
- - Pad 2 (warm)/
- - Pad 4 (choir)/
- - Pad 7 (halo)/
- - Pad 8 (sweep)/
- - FX 3 (crystal)/
- - FX 6 (goblins)/
- - Steel Drums/
- - Woodblock/
- - Taiko Drum/
- - all/
- .tempo/
- 60
- 120
@@ -140,73 +94,81 @@ def self.menu
- 100%
- 75%
- 50%
- - .reset/
+ - .sustain/
+ + on
+ + off
+ - .seed/
+ + 1
+ + 2
+ + 3
+ + foo
+ + .reset
- .random notes/
- examples/
- basics/
- chords/
- @piano/
+ = piano
| A A A B A
| C C D D C
| E F F F E
- two parts/
- @piano/
+ = piano
| CGcCGc C GaCGa CGcCGc C GaCGa
| cde edc d c c de e
- three parts/
- @piano/
+ = piano
| ABCDEFGabcdefghijklmnopqrstuv
| B C D E F G a b c d e f g h
| B C D E F G a
- sharps/
- @piano/
+ = piano
| # # # # #
| ce ecbca Gb baGbG G G a
| #
| C E C A C L B E B N B L H
- drums/
- @piano/
+ = piano
| ' ' ' ' ' '* '
| =@@= @@@=@@= @@@
- unofficial xiki theme song/
- @piano/
+ = piano
| xiki is so great
| P Q P Q P Q P Q P Q P Q P Q P Q
| < < < < < < < < < < < < < < < <
| @ = @@= @ = @@= @ = @@= @ = @@=
- generation/
- variation/
- @piano/
+ = piano
| reset()
| variation()
| aaaaaaaa
- probability/
- @piano/
+ = piano
| reset()
| variation()
| probability(50)
| aaaaaaaaaaaa
- melodic/
- @piano/
+ = piano
| reset()
| variation(1)
| melodic()
| aaaaaaaaaaaa
- climb/
- @piano/
+ = piano
| reset()
| variation(1)
| melodic()
| climb()
| aaaaaaaaaaaa
- consistency/
- @piano/
+ = piano
| reset()
| variation()
| consistency(80)
| aaaaaaaaaaaa
- solo/
- @piano/
+ = piano
| reset()
| repeat(8)
| tempo(55)
@@ -217,7 +179,7 @@ def self.menu
| probability(80)
| abcdefgh
- duet/
- @piano/
+ = piano
| reset()
| repeat(8)
| tempo(35)
@@ -228,7 +190,7 @@ def self.menu
| A A A A
| h h h h
- all together/
- @piano/
+ = piano
| reset()
| repeat(8)
| tempo(45)
@@ -241,10 +203,10 @@ def self.menu
| AAAAAAAA
| H H
- everything random/
- @piano/
+ = piano
| reset()
| repeat(16)
- | tempo(rand(60) + 40)
+ | tempo(rand(80) + 70)
| mode(rand 200)
| variation(rand(6) + 1)
| consistency(rand(50))
@@ -255,10 +217,10 @@ def self.menu
| AAAAAAAAAAAAAAAA
| H H H H
- cool instruments/
- @piano/
+ = piano
| reset()
| repeat(32)
- | tempo(rand(60) + 40)
+ | tempo(rand(80) + 70)
| mode(rand 200)
| variation(rand(6) + 1)
| instrument([112, 108, 107, 102, 101, 100, 98, 97, 96, 95, 89, 88, 87, 86, 80, 54, 50, 49, 46, 45, 34, 12, 11, 10, 9, 8, 4][rand 27])
@@ -271,15 +233,15 @@ def self.menu
| H H H H
- .api/
| Play some notes
- @ Piano.song "abc"
+ =Piano.song "abc"
- .docs/
> Single notes
- - @piano/a/
- - @piano/55/
+ = piano/a
+ = piano/55
> Multiple notes
- - @piano/cde edc d c c de e
- - @piano/some words for fun
+ = piano/cde edc d c c de e
+ = piano/some words for fun
> Modes
modes/
@@ -294,7 +256,6 @@ def self.menu
| - Oo o o oo o O: phrygian
| - Oo o oo o o O: locrian
`
- end
def self.names
@@names
@@ -306,6 +267,22 @@ def self.menu_after menu_output, *args
# Don't interfere if menu did something
return menu_output if menu_output
+ options = yield
+
+ # right-click, so delegate to setup...
+
+
+ if task = options[:task]
+ menu = Xik.new(Tree.children(MENU, "setup", :include_subitems=>1))
+
+ return menu.txt if task == [] && options[:mouse] # Show all if mouse
+
+ return Xiki.expand "piano/setup/#{Path.join task}"
+
+ return menu
+ end
+
+
# If just number, intercept
if args.length == 1 && args[0] =~ /^\d+$/
self.note args[0].to_i
@@ -318,54 +295,88 @@ def self.menu_after menu_output, *args
Move.to_end
Search.forward("^[^(\n]+$")
end
- txt = ENV['txt']
+ txt = args[0]
+ return "=beg/quoted/" if txt !~ /\n/
else
txt = args[0]
end
- self.song txt, :move=>1
+ self.song txt, :move=>1, :dont_raise=>1
nil
end
+ # Piano.jingo "foo"
+ # Piano.jingo "bar"
+ def self.jingo seed, options={}
+ self.song %`
+ aaaaaaaa
+ reset/
+ sustain/on
+ repeat/4
+ tempo/80
+ seed/m#{seed}
+ mode/@@seed.rand(100) - 100
+ vary/3
+ probable/75
+ `.unindent, options
+ self.sustain "off"
+ end
+
def self.song txt, options={}
+
+ txt.gsub!(/\/(.*)/, "(\\1)") # Change foo/1 to foo(1)
+ txt.gsub!(/\(([a-z].*[a-z])\)/i, "(\"\\1\")") # Change foo/bar to foo("bar")
+
@@lines = txt.split("\n")#.reverse
self.extract_functions
- # If only config, just run first ones
- # if @@lines.empty?
- # return self.run_functions @@functions_by_index[0], :include_all
- # end
self.run_functions @@functions_by_index[0], :include_all
repeat = (@@functions_by_index[0]||[]).find{|o| o =~ /^rep(eat)?\(/}
@@repeat = (repeat[/\d+/]||"4").to_i if repeat
- @@repeat.times do |i|
-
- # Start at where cursor is
- if $el
- View.column = Line.value[/.+(\/|\| ?)/].length if options[:move]
- end
-
- longest = @@lines.inject(0){|acc, e| e.length > acc ? e.length : acc}
- longest.times do |j|
- # self.run_functions @@functions_by_index[j] # unless j == 0
- self.run_functions @@functions_by_index[j] unless i == 0
+ begin
+ @@repeat.times do |i|
- sharp = false
- @@lines.each_with_index do |line, track|
- char = line[j] ? line[j].chr : nil
- self.note char, :no_sit=>1, :sharp=>sharp, :track=>track
- sharp = char == "#"
- end
+ # Start at where cursor is
if $el
- Move.forward if options[:move] && View.cursor != Line.right
+ # Comment out for demo?
+ View.column = (Line.value[/^ +(\| )?/] || "").length+1 if options[:move]
+ if Line =~ /piano\//
+ Move.to_axis
+ Search.forward("piano/")
+ end
+ end
+
+ longest = @@lines.inject(0){|acc, e| e.length > acc ? e.length : acc}
+
+ longest.times do |j|
+ self.run_functions @@functions_by_index[j] unless i == 0
+
+ sharp = false
+ @@lines.each_with_index do |line, track| #> |
+ char = line[j] ? line[j].chr : nil
+ self.note char, :no_sit=>1, :sharp=>sharp, :track=>track #> in song:386) ||
+ sharp = char == "#"
+ end
+ if $el
+ # Comment out for demo?
+ Move.forward if options[:move] && View.cursor != Line.right
+ end
+ self.pause #> in song:394) |
end
- self.pause
end
+
+ rescue RuntimeError=>e
+
+ raise e if ! options[:dont_raise] # Unless alternate flag passed in, always raise
+
+ raise e if e.message != "stopped" # :dont_raise, so don't raise if user stopped
+
+ # Swallowed exception, because the user stopped it by typing something
end
self.clear
@@ -426,12 +437,12 @@ def self.letter_to_number letter, options={}
end
def self.apply_variation number, options={}
- return number if rand(100) > (100 - @@consistency) # Do nothing if consistency says to stop
+ return number if @@seed.rand(100) > (100 - @@consistency) # Do nothing if consistency says to stop
- random = rand(@@variation+1)
+ random = @@seed.rand(@@variation+1)
if @@climb == 0
- random *= ((-1) ** rand(2)) # Half of the time, make it decrease note
+ random *= ((-1) ** @@seed.rand(2)) # Half of the time, make it decrease note
end
if @@melodic == 1
@@ -449,7 +460,7 @@ def self.apply_variation number, options={}
end
def self.apply_probability number
- return 0 if rand(100) > @@probability
+ return 0 if @@seed.rand(100) > @@probability
number
end
@@ -489,9 +500,18 @@ def self.note letter='a', options={}
number += 1 if options[:sharp]
number += (@@octave * 12)
- channel = 143 + channel
+ channel = 1
+
@@held_down << number
- self.unimidi.puts(channel, number, velocity) # note on message
+
+ # Temp
+ # channel = 158
+
+ # 144 : note on message
+ # 128 : note off message
+
+
+ self.noteon(channel, number, velocity) # note on message #> |||
return if options[:no_sit] # Don't sit if other tracks have same beat
@@ -499,33 +519,53 @@ def self.note letter='a', options={}
nil
end
- def self.unimidi
- @@unimidi ||= UniMIDI::Output.open(0).open
+ def self.fluidsynth_process
+
+ # Best
+ Open3.popen3('fluidsynth ~/projects/soundfonts/acoustic_grand_piano_ydp_20080910.sf2')
+
+ # Decent
+ # Open3.popen3 'fluidsynth ~/projects/soundfonts/25-piano-sf/Giga-Piano.sf2'
+ # Open3.popen3 'fluidsynth ~/projects/soundfonts/25-piano-sf/Fazioli-Grand-Piano-.SF2'
+ # Open3.popen3 'fluidsynth ~/projects/soundfonts/25-piano-sf/Grand-Piano.sf2'
+ # Open3.popen3 'fluidsynth ~/projects/soundfonts/25-piano-sf/Motif-ES6-Concert-Piano.SF2'
+ # Open3.popen3 'fluidsynth ~/projects/soundfonts/25-piano-sf/Fantasy-Piano.sf2'
+
end
- def self.send channel, number, value
+ def self.noteoff channel, number, velocity
+ if ! @@fluidsynth
+ sleep 0.25
+ @@fluidsynth = self.fluidsynth_process
+ end
+ @@fluidsynth[0].puts("noteoff #{channel} #{number} #{velocity}\n")
+ end
- output = UniMIDI::Output.open(0)
- output.open do |output|
- output.puts(channel, number, 90) # note on message
+ def self.noteon channel, number, velocity
+ if ! @@fluidsynth
+ @@fluidsynth = self.fluidsynth_process
+ sleep 0.25
end
+ @@fluidsynth[0].puts("noteon #{channel} #{number} #{velocity}\n")
end
def self.pause
- # Ol << "!"
pause = @@tempo * 4
pause = pause / 60.0
pause = 1 / pause
$el ? $el.sit_for(pause) : sleep(pause)
- Piano.clear
+
+
+ input = $el.read_char_exclusive "", nil, pause
+ self.clear #> ||
+ raise "stopped" if input
end
def self.clear chan=1
- chan = (chan + 143) - 16
while number = @@held_down.shift do
- self.unimidi.puts(chan, number, 90) # note on message
+ self.noteoff(chan, number, 90) # note on message #> |||
end
end
@@ -536,6 +576,7 @@ def self.keydef letter, note, channel=1, velocity=126
end
def self.midi
+ raise "not used?"
@@midi || self.connect
end
@@ -661,9 +702,8 @@ def self.reset
@@octave = 0
@@program = 1
@@repeat = 1
- # @@seed = nil
- ".flash - success!"
+ "<*"
end
#
@@ -674,6 +714,7 @@ def self.control_change a, b, c
end
def self.connect
+ raise "not used?"
@@midi = MIDIator::Interface.new
@@midi.use :dls_synth
# This doesn't work in Lion :(
@@ -682,40 +723,57 @@ def self.connect
@@midi
end
- def self.velocity txt="126"; @@velocity = txt.to_i; ".flash - updated!"; end
- def self.tempo txt="120"; @@tempo = txt.to_i; ".flash - updated!"; end
- def self.probability txt="50"; @@probability = txt.to_s.sub('%', '').to_i; ".flash - updated!"; end
+ def self.velocity txt="126"; @@velocity = txt.to_i; "<*"; end
+ def self.tempo txt="120"
+ @@tempo = txt.to_i
+ "<*"
+ end
+ def self.probable txt="50"; self.probability txt; end
+ def self.probability txt="50"; @@probability = txt.to_s.sub('%', '').to_i; "<*"; end
+ def self.sustain txt="on"
+ if txt == "on" # Sustain petal on
+ self.noteon(0xB0, 0x40, 1)
+ return ""
+ end
+ self.noteon(0xB0, 0x40, 0) # Sustain petal off
+ "<*"
+ end
+ def self.vary txt="2"
+ self.variation txt
+ end
def self.variation txt="2"
@@variation = txt.to_i
- # if @@seed # If seed set manually, just use it
- # seed = @@seed
- # else # Else auto-generate seed
- # seed = rand 999_999_999_999_999_999_999
- # end
# srand seed
- ".flash - updated!"
+ "<*"
+ end
+ def self.melodic txt="1"; @@melodic = txt.to_i; "<*"; end
+ def self.climb txt="1"; @@climb = txt.to_i; "<*"; end
+ def self.pentatonic txt="1"; Ol.<<(txt); @@pentatonic = [true, "on", 1].member?(txt); "<*"; end
+ def self.consistency txt="50"; @@consistency = txt.to_s.sub('%', '').to_i; "<*"; end
+ def self.octave txt="0"; @@octave = txt.to_i; "<*"; end
+ def self.repeat txt="4"; @@repeat = txt.to_i; "<*"; end
+ # def self.seed txt; @@seed = txt.to_i; "<*"; end
+
+ def self.seed i
+ i = i.to_i if i =~ /\A\d+\z/
+ i = i.hash if ! i.is_a? Fixnum
+ @@seed = Random.new i
+ "<*"
end
- def self.melodic txt="1"; @@melodic = txt.to_i; ".flash - updated!"; end
- def self.climb txt="1"; @@climb = txt.to_i; ".flash - updated!"; end
- def self.pentatonic txt="1"; Ol.<<(txt); @@pentatonic = [true, "on", 1].member?(txt); ".flash - updated!"; end
- def self.consistency txt="50"; @@consistency = txt.to_s.sub('%', '').to_i; ".flash - updated!"; end
- def self.octave txt="0"; @@octave = txt.to_i; ".flash - updated!"; end
- def self.repeat txt="4"; @@repeat = txt.to_i; ".flash - updated!"; end
- # def self.seed txt; @@seed = txt.to_i; ".flash - updated!"; end
def self.mode txt=nil
return @@mode if txt.nil?
if txt.to_s == "random"
- random = (-2..9).to_a[rand 7]
+ random = (-2..9).to_a[@@seed.rand 7]
@@mode = random
- return ".flash - updated to #{random}!"
+ return "<* updated to #{random}!"
end
@@mode = txt.to_i
- ".flash - updated!"
+ "<*"
end
class << self
@@ -735,6 +793,7 @@ class << self
end
def self.driver
+ raise "not used?"
@@midi ||= self.connect
end
@@ -756,11 +815,12 @@ def self.random_notes range=nil, notes=nil
txt = ""
8.times do
- txt << range[rand range.length]
+ txt << range[@seed.rand range.length]
end
return "| #{txt}"
end
+ # Todo > Do this the right way
self.song ENV['txt']
nil
end
@@ -768,5 +828,5 @@ def self.random_notes range=nil, notes=nil
end
Piano.init # Define mode
- Menu.drums :menu=>'piano'
+
end
diff --git a/roots/ports.menu b/roots/ports.menu
new file mode 100644
index 00000000..dbc1d074
--- /dev/null
+++ b/roots/ports.menu
@@ -0,0 +1,10 @@
+- all ports/
+ ! Tree.quote `lsof -i | grep LISTEN`
+- single port/
+ ! return "=prompt/Type a port" if args.empty?
+ ! Tree.quote `lsof -i :#{args[0]}`
+- all connections/
+ ! Tree.quote `netstat -p tcp`
+- examples/
+ - processes listening on a port/
+ =$ lsof -i :8161 | grep LISTEN
\ No newline at end of file
diff --git a/roots/preferences.menu b/roots/preferences.menu
new file mode 100644
index 00000000..8874c5f7
--- /dev/null
+++ b/roots/preferences.menu
@@ -0,0 +1 @@
+<< conf/
diff --git a/roots/processes.menu b/roots/processes.menu
new file mode 100644
index 00000000..f8dae7a6
--- /dev/null
+++ b/roots/processes.menu
@@ -0,0 +1,6 @@
+- all/
+ ! Tree.quote `ps -eo pcpu,pid,user,args | sort -k 1 -r`
+- Mac Activity Monitor/
+ @app/Utilities/Activity Monitor
+<< cpu/
+<< kill/
diff --git a/roots/questions.rb b/roots/questions.rb
new file mode 100644
index 00000000..a67faf94
--- /dev/null
+++ b/roots/questions.rb
@@ -0,0 +1 @@
+Xiki[:memorize, args, options]
diff --git a/roots/quick_topics.rb b/roots/quick_topics.rb
new file mode 100644
index 00000000..14fbf9ad
--- /dev/null
+++ b/roots/quick_topics.rb
@@ -0,0 +1,23 @@
+# /, so return favorite topics...
+
+if args == []
+
+ return "* edit" if task == []
+ return View.open("~/.xiki/misc/favorite/topics.xiki") if task == ["edit"]
+
+ file = File.expand_path "~/.xiki/misc/favorite/topics.xiki"
+ txt = File.read(file) rescue nil
+
+ if txt
+ options[:hotkey] = 1
+ end
+
+ txt ||= "<* - No favorites yet!"
+ return txt
+end
+
+
+# /topic, so replace parent and expand...
+
+"<< #{args[0]}"
+
diff --git a/roots/quit.menu b/roots/quit.menu
new file mode 100644
index 00000000..9205dc7a
--- /dev/null
+++ b/roots/quit.menu
@@ -0,0 +1 @@
+<< unsaved/just quit
diff --git a/roots/r.rb b/roots/r.rb
new file mode 100644
index 00000000..d2d9384c
--- /dev/null
+++ b/roots/r.rb
@@ -0,0 +1,47 @@
+# Require 'rails' menu if not yet loaded
+load "#{Xiki.dir}roots/rails.rb" if ! defined?(Xiki::Rails)
+
+module Xiki
+
+ # Runs code in a rails app. Implants xikidev_controller.rb into the
+ # app? > actually currently suggests installing xiki plugin
+ # ...so it can pass messages to it to eval.
+ #
+ # For security it only works in dev mode, only accepts local requests,
+ # and reads input from a file on disk.
+ class R
+
+ def self.menu *args
+ code, yaml = args
+
+ return "=beg/quoted/" if args[-1] && args[-1] !~ /\n/
+
+ # /, so show last r/... commands...
+
+ if ! code
+ Ol["This should get just r/, not all r... menu roots!"]
+ txt = Launcher.last "r", :exclude_path=>1
+ txt.gsub! /^- (\| )?/, '| '
+ txt = txt.split("\n").uniq.join("\n")
+ return txt
+ end
+
+ # ENV['no_slash'] = "1"
+
+
+ # /code/, so run it in app...
+
+ if ! yaml
+ txt = Rails.run_in_app code
+ txt = Tree.quote(txt) if txt !~ /^\s+(>|\|)/
+ return txt
+ end
+
+ # /code/yaml, so save the yaml (assuming it's an active record object)...
+Ol "yaml", yaml
+
+ Rails.run_in_app yaml, :yaml=>1
+ end
+
+ end
+end
diff --git a/roots/rails.rb b/roots/rails.rb
new file mode 100644
index 00000000..c85c33d6
--- /dev/null
+++ b/roots/rails.rb
@@ -0,0 +1,381 @@
+require 'xiki/core/ruby_console'
+
+module Xiki
+ class Rails
+
+ CODE_SAMPLES = %q<
+ # Show options to help create new rails app
+ - Show options: Rails.menu
+ >
+
+ MENU_HIDDEN = "
+ .running dir/
+ .nest/
+ "
+
+ MENU = "
+ - .start/
+ - .generate/
+ - app/
+ - plugin/
+ - model/
+ - resource/
+ - controller/
+ - scaffold/
+ - .inspect/
+ - .routes/
+ - .interact/
+ - .rails console/
+ - .sqlite console/
+ - =models/
+ - .setup/
+ - .db/
+ - .migrate/
+ - .use rspec/
+ - .rails version/
+ "
+
+ def self.nest
+ Tree.to_parent
+ Tree.collapse
+ Line.delete
+ txt = "
+ /tmp/rails1/
+ =rails/
+ ".unindent
+
+ View.<< txt, :dont_move=>1
+ Line.next
+ Line.to_beginning
+ ""
+ end
+
+
+ def self.menu_before *path
+
+ dir = Tree.closest_dir yield[:ancestors]
+
+
+ return self.eval_in_app(path[0]) if path.length == 1 && path[0] =~ /\n/
+
+ # Don't intercede if already rails app or trying to generate
+ return nil if ["generate", "nest"].member?(path[0]) || File.exists?("#{dir}/app")
+
+ # Not nested, so offer to nest...
+
+ # Not a rails dir, so offer to nest under a dir...
+
+ return "
+ > Rails app doesn't exist. Generate it?
+ - generate/app/
+ "
+ end
+
+
+ def self.eval_in_app code
+
+ Ol "continue here!!"
+ # Call localhost:3000/xikidev > to eval the code in the app
+
+ txt = Rails.run_in_app code
+
+ end
+
+
+ def self.rails_version
+ "| #{`rails --version`}"
+ end
+
+ def self.use_rspec
+ dir = Tree.closest_dir yield[:ancestors]
+
+ txt = "
+ =#{dir}
+ - 1. Add these lines:
+ - Gemfile
+ |+group :development, :test do
+ |+ gem 'rspec-rails'
+ |+end
+ |
+ - 2. Run these commands:
+ % bundle
+ % rails g rspec:install
+ |
+ - 3. Delete the test/ dir:
+ % rm -r test/
+ "
+ end
+
+ def self.sqlite_console
+ Shell.run "sqlite3 db/development.sqlite3", :dir=>self.dir(yield), :buffer=>"sqlite console", :dont_move=>1
+ "<* opened console in other view!"
+ end
+
+ def self.rails_console
+ Shell.run "rails c", :dir=>self.dir(yield), :buffer=>"rails console", :dont_move=>1
+ "<* opened console in other view!"
+ end
+
+ def self.generate what, name=nil, detail=nil
+
+ examples = "
+ > 1. Example fields
+ | name:string
+ | details:text
+ | summary:text
+ | quantity:integer
+ | price:decimal
+ | delivery:boolean
+ | purchased_at:datetime
+ | user:references
+ | --no-timestamps
+ ".unindent
+
+ dir = self.dir(yield)
+
+ options = yield
+
+ case what
+ when "app"
+ dir, stem = File.dirname(dir), File.basename(dir)
+
+ Shell.run "rails new \"#{stem}\" --skip-bundle", :dir=>dir, :dont_move=>1
+ return "- generating rails app in other view..."
+ when "plugin"
+ Shell.run "rails plugin new . --skip-bundle --full", :dir=>dir, :dont_move=>1
+ return "- generating rails app in other view..."
+ when "model", "resource", "scaffold"
+ return View.prompt "Enter a name" if ! name
+ return examples if ! detail
+ fields = Tree.txt.gsub("\n", ' ').strip
+ Shell.run "rails g #{what} #{name} #{fields}", :dir=>dir, :dont_move=>1
+ dir = options[:ancestors][-1]
+ return "
+ | Generating #{what} in other view. Now run the migrations:
+ =#{dir}% rake db:migrate
+ | Then restart the server
+ =current/rails server
+ | The url
+ =http://localhost:3000/#{name}
+ "
+ when "controller"
+ return View.prompt "Enter a name" if ! name
+ return View.prompt "Enter an action" if ! detail
+ Shell.run "rails g controller #{name} #{detail}", :dir=>dir, :dont_move=>1
+ return "
+ - Generating controller in other view...
+ =http://localhost:3000/#{name}/#{detail}
+ =#{dir}app/
+ - controllers/#{name}_controller.rb
+ - views/#{name}/#{detail}.html.erb
+ "
+ end
+
+ "- Don't know how to generate a '#{what}'!"
+ end
+
+ def self.dir options={}
+
+ # Nevermind > If no args, hit :3000 to get dir
+
+ Tree.closest_dir options[:ancestors]
+ end
+
+ def self.start *args
+
+ # If 1st arg is number, assume it's the port
+ port = args[0] =~ /^\d+$/ ? args.shift : nil
+
+ # If 'browse', just bring up in browser
+ if args == ['browse']
+ Firefox.url "http://localhost:#{port || 3000}/"
+ return "<* opened in browser!"
+ end
+
+ command = "rails s"
+ command << " -p #{port}" if port
+
+ Shell.run command, :dir=>self.dir(yield), :buffer=>"rails server", :dont_move=>1
+
+ # Check whether it's already running
+ "| Rails app was already running\n- browse/"
+ "| Starting rails app in other view...\n- browse/"
+
+ end
+
+ def self.command txt, options
+ Shell.run txt, :dir=>self.dir(options)
+ end
+
+ def self.migrate
+ self.command "rake db:migrate", yield
+ end
+
+ def self.routes
+ self.command "rake routes", yield
+ end
+
+ def self.eval *args
+
+ if args.blank?
+ return "
+ > Put some code here, to run it in the context of a controller
+ | request.methods
+ "
+ end
+
+ # Text passed, so run put in controller method and call
+
+ # Start server if necessary
+ # And install the dev controller?
+
+ txt = Tree.txt
+
+ "- TODO) implement calling dev_controller"
+ end
+
+ def self.run_in_app txt, options={}
+
+ # If just code passed, run it...
+
+ if options[:yaml]
+ # If yaml passed, deduce code to save model, and run...
+
+ txt = %`
+ txt = #{txt.inspect}
+ mods = YAML::load(txt)
+
+ mods = [mods] if ! mods.is_a?(Array)
+ mods.each do |mod|
+ mod.instance_variable_set('@partial_writes', false)
+
+ existing = mod.class.where :id=>mod.id
+ mod.instance_variable_set('@new_record', true) if existing.empty?
+
+ mod.save
+ end
+ `
+ end
+
+ # Tmp > Hard-coded
+ file = File.expand_path "/Users/craig/Dropbox/xikihub_rails/tmp/rails_run_tmp.txt"
+
+ FileUtils.mkdir_p File.dirname(file) # Create dir if it doesn't exist
+ File.open(file, "w") { |f| f << txt }
+
+ # Temp > Hard-coded > !!!!!!!
+ uri = URI("http://docker.loc/_xikidev")
+
+
+
+ response = Net::HTTP.get_response(uri)
+
+ return "| The rails server doesn't appear to be running. Start default server?\n=rails/start/" if response == :exception
+
+ if response.response.is_a?(Net::HTTPNotFound)
+
+ return self.suggest_installing_dev_controller if response.body =~ / "]
# end
# end
@@ -46,7 +46,7 @@
# | dotsies.org : /xiki@xiki.org/var/www/dotsies.org/
# ".unindent
-# Menu.menu_to_hash(input).should == {
+# Command.menu_to_hash(input).should == {
# "dotsies.loc"=>"/projects/dotsies.org/www/",
# "dotsies.org"=>"/xiki@xiki.org/var/www/dotsies.org/",
# }
@@ -62,9 +62,9 @@
it "finds source for simple menu" do
options = {:name=>"path", :path=>"path/"}
- Menu.root_sources_from_path_env options
+ Command.root_sources_from_path_env options
options.should == {
- :menufied => "/projects/xiki/menu/path",
+ :menufied => "/projects/xiki/roots/path",
:name => "path",
:path => "path/",
:sources => [["path.menu"], :incomplete]
@@ -72,13 +72,13 @@
end
it "finds source for menu with space" do
- options = {:name=>"menu_path", :path=>"menu path/"}
- Menu.root_sources_from_path_env options
+ options = {:name=>"command_path", :path=>"command path/"}
+ Command.root_sources_from_path_env options
options.should == {
- :menufied => "/projects/xiki/menu/menu_path",
- :name => "menu_path",
- :path => "menu path/",
- :sources => [["menu_path.rb"], :incomplete]
+ :menufied => "/projects/xiki/roots/commands_path",
+ :name => "command_path",
+ :path => "command path/",
+ :sources => [["command_path.rb"], :incomplete]
}
end
end
@@ -90,14 +90,21 @@
it "recognizes a menu" do
options = {:name=>"path", :path=>"path/"}
- Menu.expands?(options)
+ Command.expands?(options)
options.should == {
:name => "path",
:path => "path/",
- :sources => [["path.menu"], :incomplete ],
- :menufied => "/projects/xiki/menu/path",
+ :sources => [["path.rb"], :incomplete ],
+ :menufied => "/projects/xiki/roots/path",
:expanders => [Menu]
}
end
+
+ it "doesn't try to handle when extension" do
+ options = {:name=>"path", :path=>"path.txt/", :extension=>".txt"}
+ Command.expands?(options)
+ options[:expanders].should == [MenuSource]
+ end
+
end
diff --git a/spec/conf_handler_spec.rb b/spec/conf_handler_spec.rb
index 18c2164c..dacb002b 100644
--- a/spec/conf_handler_spec.rb
+++ b/spec/conf_handler_spec.rb
@@ -6,45 +6,5 @@
%w"xiki/core/tree".each {|o| require o}
-describe ConfHandler, "#parse" do
- it "makes a hash of one line" do
- txt = "- password: BaaRamEwe"
- ConfHandler.parse(txt).should == {"password"=>"BaaRamEwe"}
- end
+# No longer used - Xik.new now is used instead
- it "makes a hash of two lines" do
- txt = "
- - password: BaaRamEwe
- - motto: Baa
- ".unindent
- ConfHandler.parse(txt).should == {"password"=>"BaaRamEwe", "motto"=>"Baa"}
- end
-
- it "ignores headings and blank lines" do
- txt = "
- > Ignore headings
- - password: BaaRamEwe
-
- - motto: Baa
- ".unindent
- ConfHandler.parse(txt).should == {"password"=>"BaaRamEwe", "motto"=>"Baa"}
- end
-
- it "doesn't require dashes" do
- txt = "password: BaaRamEwe"
- ConfHandler.parse(txt).should == {"password"=>"BaaRamEwe"}
- end
-
- # it "handles nesting" do
- #
- # - What about the "- motto: Baa" vs "- motto/Baa" question?
- # - For the xi syntax
- #
- # txt = "
- # - sheep password: Baa Ram Ewe
- # - sheep mottos
- # - Just keep baa'ing
- # - Curlyness is next to godliness
- # ".unindent
-
-end
diff --git a/spec/conf_loading_handler_spec.rb b/spec/conf_loading_handler_spec.rb
index ea87dbd7..dc93e4be 100644
--- a/spec/conf_loading_handler_spec.rb
+++ b/spec/conf_loading_handler_spec.rb
@@ -6,46 +6,55 @@
%w"xiki/core/tree".each {|o| require o}
-describe ConfLoadingHandler, "#parse" do
- it "makes a hash of one line" do
- txt = "- password: BaaRamEwe"
- ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe"}
- end
-
- it "makes a hash of two lines" do
- txt = "
- - password: BaaRamEwe
- - motto: Baa
- ".unindent
- ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe", "motto"=>"Baa"}
- end
-
- it "ignores headings and blank lines" do
- txt = "
- > Ignore headings
- - password: BaaRamEwe
-
- - motto: Baa
- ".unindent
- ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe", "motto"=>"Baa"}
- end
-
- it "doesn't require dashes" do
- txt = "password: BaaRamEwe"
- ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe"}
- end
-
-
- # it "handles nesting" do
- #
- # - What about the "- motto: Baa" vs "- motto/Baa" question?
- # - For the xi syntax
- #
- # txt = "
- # - sheep password: Baa Ram Ewe
- # - sheep mottos
- # - Just keep baa'ing
- # - Curlyness is next to godliness
- # ".unindent
-
-end
+
+
+# Menus should use Xik.new, to parse.
+# - or whatever else they want, like YAML::load
+
+
+
+
+
+# describe ConfLoadingHandler, "#parse" do
+# it "makes a hash of one line" do
+# txt = "- password: BaaRamEwe"
+# ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe"}
+# end
+
+# it "makes a hash of two lines" do
+# txt = "
+# - password: BaaRamEwe
+# - motto: Baa
+# ".unindent
+# ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe", "motto"=>"Baa"}
+# end
+
+# it "ignores headings and blank lines" do
+# txt = "
+# > Ignore headings
+# - password: BaaRamEwe
+
+# - motto: Baa
+# ".unindent
+# ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe", "motto"=>"Baa"}
+# end
+
+# it "doesn't require dashes" do
+# txt = "password: BaaRamEwe"
+# ConfLoadingHandler.parse(txt).should == {"password"=>"BaaRamEwe"}
+# end
+
+
+# # it "handles nesting" do
+# #
+# # - What about the "- motto: Baa" vs "- motto/Baa" question?
+# # - For the xi syntax
+# #
+# # txt = "
+# # - sheep password: Baa Ram Ewe
+# # - sheep mottos
+# # - Just keep baa'ing
+# # - Curlyness is next to godliness
+# # ".unindent
+
+# end
diff --git a/spec/expander_spec.rb b/spec/expander_spec.rb
index 96311dc0..e2edbeb0 100644
--- a/spec/expander_spec.rb
+++ b/spec/expander_spec.rb
@@ -1,20 +1,21 @@
$:.unshift "spec/"
require './spec/spec_helper'
-
-Dir["./lib/xiki/*_handler.rb"].each{|o|
+require "xiki/core/launcher"
+require "xiki/core/xik"
+Dir["./lib/xiki/handlers/*_handler.rb"].each{|o|
require o.sub("./lib/", "")
}
-
-%w"path code tree menu menu_suggester pre_pattern pattern file_tree bookmarks".each {|o| require "xiki/core/#{o}"}
+%w"path code tree menu command_suggester pre_pattern pattern file_tree bookmarks".each {|o| require "xiki/core/#{o}"}
require 'xiki/core/expander'
require 'xiki/core/pattern'
+require 'xiki/core/control_tab'
# describe Expander, "#expand" do
describe Expander, "#extract_ancestors" do
it "pulls out one path" do
- args = "a/@b/", {}
+ args = "a/=b/", {}
Expander.extract_ancestors *args
args.should == ["b/", {:ancestors=>["a/"]}]
end
@@ -26,7 +27,7 @@
end
it "ignores quoted path" do
- args = "a/| a/@b/", {}
+ args = "a/| a/=b/", {}
Expander.extract_ancestors *args
args.should == ["b/", {:ancestors=>["a/| a/"]}]
end
@@ -43,10 +44,10 @@
end
it "expands bookmarks" do
- stub(Bookmarks).[]("$d") {"/tmp/dir/"}
- Expander.expand_file_path("$d/a//b").should == "/tmp/dir/a//b"
- Expander.expand_file_path("$d").should == "/tmp/dir"
- Expander.expand_file_path("$d/").should == "/tmp/dir/"
+ stub(Bookmarks).[]("%d") {"/tmp/dir/"}
+ Expander.expand_file_path("%d/a//b").should == "/tmp/dir/a//b"
+ Expander.expand_file_path("%d").should == "/tmp/dir"
+ Expander.expand_file_path("%d/").should == "/tmp/dir/"
end
it "doesn't remove double slashes for home and current dir" do
@@ -55,8 +56,8 @@
end
it "doesn't remove double slashes for bookmarks" do
- stub(Bookmarks).[]("$f") {"/tmp/file.txt"}
- Expander.expand_file_path("$f//").should == "/tmp/file.txt//"
+ stub(Bookmarks).[]("%links") {"/tmp/file.txt"}
+ Expander.expand_file_path("%links//").should == "/tmp/file.txt//"
end
end
@@ -84,17 +85,17 @@
it "handles menufied paths" do
Expander.parse("/tmp/a//").should ==
- {:menufied=>"/tmp/a"}
+ {:menufied=>"/tmp/a", :path=>"/tmp/a//"}
end
it "handles menufied path with items" do
Expander.parse("/tmp/a//b/").should ==
- {:menufied=>"/tmp/a", :items=>["b"]}
+ {:menufied=>"/tmp/a", :items=>["b"], :path=>"/tmp/a//b/"}
end
it "handles filesystem root menufied path" do
Expander.parse("//").should ==
- {:menufied=>"/"}
+ {:menufied=>"/", :path=>"//"}
end
it "handles name that looks kind of menufied" do
@@ -155,12 +156,12 @@
end
it "handles ancestors in string" do
- Expander.parse("z/@a/").should ==
+ Expander.parse("z/=a/").should ==
{:name=>"a", :ancestors=>["z/"], :path => "a/"}
end
it "handles ancestors with path in string" do
- Expander.parse("x/y/@a/b/").should ==
+ Expander.parse("x/y/=a/b/").should ==
{:name=>"a", :items=>["b"], :ancestors=>["x/y/"], :path => "a/b/"}
end
@@ -183,6 +184,83 @@
:path => "echo/a;/b"
}
end
+
+
+ it "pulls out extension" do
+ Expander.parse("echo.txt").should == {
+ :name=>"echo",
+ :extension=>".txt",
+ :path=>"echo.txt"
+ }
+ end
+
+ it "pulls out path and extension" do
+ Expander.parse("echo.txt/a/b").should == {
+ :items=>["a", "b"],
+ :name=>"echo",
+ :extension=>".txt",
+ :path=>"echo.txt/a/b"
+ }
+ end
+
+ it "pulls out period-only extension" do
+ Expander.parse("echo.").should == {
+ :name=>"echo",
+ :extension=>".",
+ :path=>"echo."
+ }
+ end
+
+
+
+
+
+ it "moves task items into :task" do
+ options = Expander.parse("hi/* delete")
+ options.should == {
+ :task=>"delete",
+ :name=>"hi",
+ :path=>"hi",
+ }
+ end
+
+ # Also test these...
+ # options = Expander.parse("select * from/* delete")
+ # options = Expander.parse("/tmp/* delete")
+
+ it "moves pattern task items into :task" do
+ options = Expander.parse("select * from hi/* delete")
+ options.should == {
+ :task=>"delete",
+ :path=>"select * from hi"
+ }
+ end
+
+ it "moves file task items into :task" do
+ options = Expander.parse("/tmp/* delete")
+ options.should == {
+ :task=>"delete",
+ :file_path=>"/tmp"
+ }
+ end
+
+
+end
+
+describe Expander, "#expand_literal_command method" do
+ before(:each) do
+ stub_menu_path_dirs # Has to be before each for some reason
+ end
+
+ it "expands command text with path" do
+ txt = Expander.expand_literal_command "a/\n b", :path=>"a"
+ txt.should == 'b'
+ end
+
+ it "expands when embedded code" do
+ txt = Expander.expand_literal_command "a/\n ! 1 + 1", :path=>"a"
+ txt.should == '2'
+ end
end
describe Expander, "#expand method" do
@@ -201,13 +279,12 @@
end
it "takes a path list as 2nd arg" do
- Ol["Maybe pull 'echo' out as its own menu - and pass options to make it cached?!"]
Expander.def(:echo) { |path| path.inspect }
Expander.expand("echo", ["a", "b"]).should == '["a", "b"]'
end
- it "expands menu in MENU_PATH" do
+ it "expands menu in XIKI_PATH" do
Expander.expand("dd").should == "+ a/\n+ b/\n+ cccc/\n+ craig/\n+ keith/\n"
end
@@ -218,4 +295,24 @@
it "expands menufied path" do
Expander.expand("#{Xiki.dir}spec/fixtures/menu/dr//").should == "+ a/\n+ b/\n"
end
+
+ # it "expands when literal text of command passed" do
+ # Expander.expand(["a"], :command_text=>"a/\n b").should == "b"
+ # end
+
+ # it "expands when literal text of command with path" do
+ # Expander.expand(["a/b"], :command_text=>"a/\n b/\n c").should == "c"
+ # end
+
+end
+
+describe Expander, ".extract_task_items" do
+ before(:each) do
+ stub_menu_path_dirs # Has to be before each for some reason
+ end
+
+ it "extracts when normal" do
+ # Expander.def(:echo) { |path| path.inspect }
+ # Expander.expand("echo").should == '[]'
+ end
end
diff --git a/spec/file_tree_spec.rb b/spec/file_tree_spec.rb
index bb07b765..60f2c1f6 100644
--- a/spec/file_tree_spec.rb
+++ b/spec/file_tree_spec.rb
@@ -26,8 +26,8 @@
end
it "handles bookmarks" do
- (!!FileTree.matches_root_pattern?("$aa")).should == true
- (!!FileTree.matches_root_pattern?("$..")).should == false
+ (!!FileTree.matches_root_pattern?(":aa")).should == true
+ (!!FileTree.matches_root_pattern?(":..")).should == false
end
it "declines non-file paths" do
diff --git a/spec/fixtures/menu/m.menu b/spec/fixtures/menu/m.menu
deleted file mode 100644
index 183b6618..00000000
--- a/spec/fixtures/menu/m.menu
+++ /dev/null
@@ -1,9 +0,0 @@
-- a/
- - ay/
- > Ay
- - Nothing, just that
- - eh/
- - aye/
-- b/
- - bee/
- - be/
diff --git a/spec/fixtures/menu/no.notes b/spec/fixtures/menu/no.notes
deleted file mode 100644
index e7caaa5b..00000000
--- a/spec/fixtures/menu/no.notes
+++ /dev/null
@@ -1,6 +0,0 @@
-> Hey from n
-- Should notes files just be shown verbatim
-
-> Hoo from n
-- Should notes files just be shown verbatim
- - or, should they be expanded per headings
diff --git a/spec/fixtures/menu/r.rb b/spec/fixtures/menu/r.rb
deleted file mode 100644
index 150f606e..00000000
--- a/spec/fixtures/menu/r.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class R
- def self.menu
- "
- - r1/
- - r11/
- "
- end
-end
diff --git a/tests/git_test.rb b/spec/git_spec.rb
similarity index 69%
rename from tests/git_test.rb
rename to spec/git_spec.rb
index ddbcdbfb..da4b88e6 100644
--- a/tests/git_test.rb
+++ b/spec/git_spec.rb
@@ -1,5 +1,45 @@
-require 'test/unit'
-$:.unshift "../"
+$:.unshift "spec/"
+require './spec/spec_helper'
+
+require 'xiki/core/git'
+
+describe Git, "#status_to_hash_new" do
+ it "Populates untracked key" do
+ txt = "
+ ?? a.txt
+ ?? b.txt
+ ".unindent
+ Git.status_to_hash(txt).should == {:untracked=>[["untracked", "a.txt"], ["untracked", "b.txt"]], :unadded=>[], :added=>[]}
+ end
+
+ it "Populates unadded key" do
+ txt = "
+ AM a.txt
+ M committed.txt
+ D deleteme.txt
+ ".unindent
+ Git.status_to_hash(txt).should == {:unadded=>[["modified", "a.txt"], ["modified", "committed.txt"], ["deleted", "deleteme.txt"]], :untracked=>[], :added=>[["new file", "a.txt"]]}
+ end
+
+ it "Populates added keys" do
+ txt = "
+ AM a.txt
+ A d/d.txt
+ R rename.txt -> renamed.txt
+ ".unindent
+ Git.status_to_hash(txt)[:added].should == [["new file", "a.txt"], ["new file", "d/d.txt"], ["renamed", "rename.txt -> renamed.txt"]]
+ end
+
+end
+
+
+
+__END__
+
+# Old test before moving to rspec:
+
+#require 'test/unit'
+#$:.unshift "../"
require 'ol'
require 'core_ext'
require 'yaml'
diff --git a/spec/html_spec.rb b/spec/html_spec.rb
new file mode 100644
index 00000000..e33609f6
--- /dev/null
+++ b/spec/html_spec.rb
@@ -0,0 +1,59 @@
+$:.unshift "spec/"
+module Xiki; end
+require 'xiki/core/tree'
+require 'xiki/core/html'
+require './spec/spec_helper'
+
+describe Html, "#to_html_tags" do
+ it "handles one tag" do
+ Html.to_html_tags("
+ p/
+ hi
+ ".unindent).should == "
+
+ hi
+
+ ".unindent
+ end
+
+ it "handles single with no contents" do
+ Html.to_html_tags("
+ p/
+ ".unindent).should == "
+
+
+ ".unindent
+ end
+
+ it "doesn't confuse comments" do
+ Html.to_html_tags("
+ p/
+ /* hey */
+ ".unindent).should == "
+
+ /* hey */
+
+ ".unindent
+ end
+
+ it "adds closing tags to html" do
+ Html.to_html_tags("
+
+ hi
+ ".unindent).should == "
+
+ hi
+
+ ".unindent
+ end
+
+ it "doesn't close comment tags" do
+ Html.to_html_tags("
+
+ hi
+ ".unindent).should == "
+
+ hi
+ ".unindent
+ end
+end
diff --git a/spec/invoker_spec.rb b/spec/invoker_spec.rb
index e0f8f7f0..1ae11ede 100644
--- a/spec/invoker_spec.rb
+++ b/spec/invoker_spec.rb
@@ -21,18 +21,24 @@
it "two actions" do
Invoker.actionify(["act", "act2", "b"], [true, true, nil]).should == ["act2", ["b"]]
end
+
+ it "doesn't mess up the args" do
+ args = ["Hey you"]
+ Invoker.actionify(args, [true, true, nil]).should == ["hey_you", []]
+ args.should == ["Hey you"]
+ end
end
-describe Invoker, "#extract_ruby_package" do
+describe Invoker, "#extract_ruby_module" do
it "no module" do
- Invoker.extract_ruby_package("
+ Invoker.extract_ruby_module("
class Foo
end
".unindent).should == nil
end
it "extracts one module" do
- Invoker.extract_ruby_package("
+ Invoker.extract_ruby_module("
module Modern
class Foo
end
@@ -41,7 +47,7 @@ class Foo
end
it "extracts two modules" do
- Invoker.extract_ruby_package("
+ Invoker.extract_ruby_module("
module Modern
module Modest
class Foo
@@ -52,7 +58,7 @@ class Foo
end
it "isn't confused by stuff after start of class" do
- Invoker.extract_ruby_package("
+ Invoker.extract_ruby_module("
module Modern
# stuff
class Foo
@@ -63,4 +69,12 @@ module Herring
".unindent).should == "Modern"
end
+ it "handles when all on one line" do
+ Invoker.extract_ruby_module("
+ class Modern::Foo
+ # stuff
+ end
+ ".unindent).should == "Modern"
+ end
+
end
diff --git a/spec/keys_spec.rb b/spec/keys_spec.rb
index 6c4b6d1e..fda78c43 100644
--- a/spec/keys_spec.rb
+++ b/spec/keys_spec.rb
@@ -1,8 +1,22 @@
# $:.unshift "spec/"
-# require 'keys'
-# require 'ol'
+require './spec/spec_helper'
+require 'xiki/core/keys'
+
+describe Keys, "#filter" do
+ it "matches when one letter" do
+ Keys.fuzzy_filter(["javascript", "ruby"], "r").should == "ruby"
+ end
+
+ it "matches when two letters" do
+ Keys.fuzzy_filter(["javascript", "ruby"], "rb").should == "ruby"
+ end
+
+ it "matching first few letters takes prescedence" do
+ Keys.fuzzy_filter(["rebuild", "ruby"], "ru").should == "ruby"
+ end
+
+end
-# describe Keys, "#input" do
# before(:each) do
# View = mock 'View'
diff --git a/spec/memorize_spec.rb b/spec/memorize_spec.rb
new file mode 100644
index 00000000..5b48360b
--- /dev/null
+++ b/spec/memorize_spec.rb
@@ -0,0 +1,47 @@
+# $:.unshift "spec/"
+# require './spec/spec_helper'
+# require 'json'
+
+# %w"path tree".each {|o| require "xiki/core/#{o}"}
+# # %w"path code tree menu menu_suggester pre_pattern pattern file_tree bookmarks".each {|o| require "xiki/core/#{o}"}
+
+# require_relative '../menu/memorize.rb'
+
+# # describe Memorize, "#expand" do
+# describe Memorize, "#propagate_edits" do
+# it "updates when just question" do
+
+# txt = Tree.children(Memorize::MENU_HIDDEN.unindent, "test/deserialize/").gsub /^: /, ''
+# o = Memorize.new txt
+
+# o.propagate_edits
+# o.pending[3].should == "Japana : Tokyo"
+
+# end
+
+# it "updates when just question and answer" do
+# txt = Tree.children(Memorize::MENU_HIDDEN.unindent, "test/deserialize/").gsub /^: /, ''
+
+# txt.sub! "___", "Tokistan"
+
+# o = Memorize.new txt
+
+# o.propagate_edits
+# o.pending[3].should == "Japana : Tokistan"
+# end
+# end
+
+# describe Memorize, "#deserialize" do
+# it "works" do
+
+# txt = Tree.children(Memorize::MENU_HIDDEN.unindent, "test/deserialize/").gsub /^: /, ''
+# Ol.a txt
+
+# o = Memorize.new
+
+# o.deserialize txt
+# o.heading.should == ["> Example"]
+# o.completed.length.should == 3
+# o.progress.should == [[3, 1, 2], []]
+# end
+# end
diff --git a/spec/notes_spec.rb b/spec/notes_spec.rb
index aad7e4e1..eea3ec9e 100644
--- a/spec/notes_spec.rb
+++ b/spec/notes_spec.rb
@@ -2,10 +2,41 @@
require './spec/spec_helper'
-%w"path code tree menu menu_suggester pre_pattern pattern file_tree bookmarks".each {|o| require "xiki/core/#{o}"}
+Dir["./lib/xiki/handlers/*_handler.rb"].each{|o| require o.sub("./lib/", "") }
+%w"xik expander command code_tree path code tree topic notes xikihub_client menu command_suggester pre_pattern pattern file_tree bookmarks topic_expander".each {|o| require "xiki/core/#{o}"}
+
+%w"path code tree menu command_suggester pre_pattern pattern file_tree bookmarks".each {|o| require "xiki/core/#{o}"}
require 'xiki/core/notes'
+describe Notes, "#replace_section" do
+ it "add wiki section" do
+ txt = Expander.expand "xiki api/add wiki section"
+ txt.should == %`
+ | > Foo
+ | New
+ | section prepended!
+ |
+ |
+ | > Herring
+ | Unrelated heading
+ `.unindent
+ end
+
+ it "update existing wiki section replace" do
+ txt = Expander.expand "xiki api/update existing wiki section replace"
+ txt.should == %`
+ | > Foo
+ | New
+ | section replaced old!
+ |
+ |
+ `.unindent
+ end
+
+end
+
+
describe Notes, "#drill_split" do
it "pulls out head ang quote" do
Notes.drill_split(["> head", "| quote"]).should == [[], ["> head"], ["| quote"]]
diff --git a/spec/ol_spec.rb b/spec/ol_spec.rb
index 3a0fc60b..3ac7106c 100644
--- a/spec/ol_spec.rb
+++ b/spec/ol_spec.rb
@@ -68,14 +68,6 @@ def define_vars
before(:each) do
@line = "/projects/foo/controllers/accounts.rb:24:in `check'"
end
-
- it "writes line to log with label like - class.method (line):" do
- Ol.should_receive(:pause_since_last?).and_return false
- Ol.should_receive(:write_to_file).with('/tmp/ds_ol.notes', "- Accounts.check:24) hi\n")
- Ol.should_receive(:write_to_file_lines).with("/tmp/ds_ol.notes", "/projects/foo/controllers/accounts.rb:24\n")
-
- Ol.line "hi", @line, "", "ds"#, @@last_log
- end
end
describe Ol, "#log" do
diff --git a/spec/path_spec.rb b/spec/path_spec.rb
index c49ea00b..5272bc18 100644
--- a/spec/path_spec.rb
+++ b/spec/path_spec.rb
@@ -58,13 +58,27 @@
end
it "splits ancestors when :outer" do
- Path.split("a/b/@c/d/", :outer=>1).should == ["a/b/", "c/d/"]
+ Path.split("a/b/=c/d/", :outer=>1).should == ["a/b/", "c/d/"]
end
it "doesn't get confused by escaped slashes before ats" do
- Path.split("a/b;/@c/d/", :outer=>1).should == ["a/b;/@c/d/"]
+ Path.split("a/b;/=c/d/", :outer=>1).should == ["a/b;/=c/d/"]
end
it "doesn't get confused by escaped slashes ats" do
- Path.split("a/b;/@c/d/", :outer=>1).should == ["a/b;/@c/d/"]
+ Path.split("a/b;/=c/d/", :outer=>1).should == ["a/b;/=c/d/"]
+ end
+
+ it "splits on dollar signs when command" do
+ Path.split("a/$ f", :outer=>1).should == ["a/", "$ f"]
+ end
+ it "splits on dollar signs when blank prompt in middle" do
+ Path.split("a/$/b", :outer=>1).should == ["a/", "$/b"]
+ end
+ it "splits on dollar signs when blank prompt at end" do
+ Path.split("a/$", :outer=>1).should == ["a/", "$"]
+ end
+
+ it "doesn't split when dollar whitout space after it" do
+ Path.split("a/$f", :outer=>1).should == ["a/$f"]
end
@@ -88,11 +102,34 @@
# #Path.split("aa/|b/b/|c/c").should == ["aa", "|b/b", "|c/c"]
# end
+ it "turns ;l into linebreaks" do
+ Path.split("a;lb").should == ["a\nb"]
+ end
+ # Todo > remove this > ;o is the new way
it "turns ;0 into linebreaks" do
Path.split("a;0b").should == ["a\nb"]
end
+
+ it "splits ancestors when spaces" do
+ Path.split("a/b/= c/d/", :outer=>1).should == ["a/b/", "c/d/"]
+ end
+
+
+
+
+ it "splits on colon space" do
+ Path.split("aa/bb: cc").should == ["aa", "bb", "cc"]
+ end
+
+ it "only escapes unescaped colons" do
+ Path.split("aa/bb;: cc").should == ["aa", "bb: cc"]
+ end
+
+
+
+
# it "handles :return_path with pipes" do
# Path.split("dom/|
", :return_path=>1).should == ["|
"]
# end
diff --git a/spec/rest_tree_spec.rb b/spec/rest_tree_spec.rb
new file mode 100644
index 00000000..df07faec
--- /dev/null
+++ b/spec/rest_tree_spec.rb
@@ -0,0 +1,36 @@
+$:.unshift "spec/"
+require './spec/spec_helper'
+
+require 'xiki/core/tree'
+require 'xiki/core/rest_tree'
+
+describe RestTree, "#comment_embedded_menu" do
+
+ it "returns unaltered when no comment" do
+ RestTree.comment_embedded_menu("foo", "foo").should == nil
+ end
+
+ it "uses a menu" do
+ txt = "
+ Hey
+
+ "
+ RestTree.comment_embedded_menu(txt, "").should == "+ foo/\n+ bar/\n"
+ end
+
+ it "uses menu when path" do
+ txt = "
+ Hey
+
+ "
+ RestTree.comment_embedded_menu(txt, "xiki://localhost/foo").should == "- XX\n"
+ end
+
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 135d180b..8e26ffa7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1,14 @@
require 'rr'
require 'awesome_print'
+XIKI_SERVER_MODE = false if ! defined?(XIKI_SERVER_MODE)
+
%w"xiki/core/core_ext xiki/core/ol".each {|o| require o}
# RSpec::Runner.configure do |config|
RSpec.configure do |config|
config.mock_with :rr
+ config.expect_with(:rspec) { |c| c.syntax = :should }
end
module Xiki
@@ -17,8 +20,8 @@ def self.dir
def stub_menu_path_dirs
xiki_dir = Xiki.dir
- list = ["#{xiki_dir}spec/fixtures/menu", "#{xiki_dir}menu"]
- stub(Xiki).menu_path_dirs {list}
+ list = ["#{xiki_dir}spec/fixtures/menu", "#{xiki_dir}commands"]
+ stub(Xiki).xiki_path_dirs {list}
end
diff --git a/spec/text_util_spec.rb b/spec/text_util_spec.rb
index 1f21331f..83532de3 100644
--- a/spec/text_util_spec.rb
+++ b/spec/text_util_spec.rb
@@ -1,9 +1,9 @@
$:.unshift "spec/"
+require './spec/spec_helper'
require 'xiki/core/text_util'
describe TextUtil, "#unindent" do
-
it "indents to the left" do
TextUtil.unindent(
" hey
@@ -71,15 +71,29 @@
".gsub(/^ /, '')
end
- it "does nothing when subsequent line not indented" do
- shouldnt_change = "[
+ it "doesn't change indent when any subsequent line not indented" do
+ shouldnt_change = " [
1,
- 2,
- 3
- ]
+ 2
+ not indented
".gsub(/^ /, '')
TextUtil.unindent(shouldnt_change).should == shouldnt_change
end
+
+ it "adds linebreak for consistency when any subsequent line not indented" do
+ TextUtil.unindent(" a\nnot indented").should == " a\nnot indented\n"
+ end
+
+ it "Doesn't remove trailing spaces on last line" do
+ TextUtil.unindent(
+ "
+ hey
+ you
+ ".gsub(/^ /, '')).
+ should == "hey \nyou \n"
+ end
+
+
end
describe TextUtil, "#snake_case" do
@@ -120,3 +134,13 @@
TextUtil.title_case("core-platform").should == "Core Platform"
end
end
+
+describe TextUtil, "#word_wrap" do
+ it "wraps to 5 chars" do
+ TextUtil.word_wrap("hi hi hi", 5).should == "hi hi\nhi"
+ end
+
+ it "wraps to 4 chars" do
+ TextUtil.word_wrap("hi hi hi", 4).should == "hi\nhi\nhi"
+ end
+end
diff --git a/spec/tree_spec.rb b/spec/tree_spec.rb
index bff3fb01..9b2c5bc4 100644
--- a/spec/tree_spec.rb
+++ b/spec/tree_spec.rb
@@ -1,7 +1,7 @@
$:.unshift "spec/"
require './spec/spec_helper'
-%w"tree path".each {|o| require "xiki/core/#{o}"}
+%w"tree path view xik".each {|o| require "xiki/core/#{o}"}
describe Tree, "#traverse" do
@@ -16,7 +16,11 @@
Tree.traverse tree do |array|
paths << array
end
- paths.should == [[["- a/"], "a/"], [["- a/", "- b/"], "a/b/"], [["- c/"], "c/"]]
+ paths.should == [
+ [["- a/"], "a/", 1],
+ [["- a/", "- b/"], "a/b/", 2],
+ [["- c/"], "c/", 3],
+ ]
end
it "handles two-level dropoff and no dropoff" do
@@ -34,11 +38,11 @@
end
paths.should ==[
- [["- a/"], "a/"],
- [["- a/", "- aa/"], "a/aa/"],
- [["- a/", "- aa2/"], "a/aa2/"],
- [["- a/", "- aa2/", "- aaa/"], "a/aa2/aaa/"],
- [["- c/"], "c/"]
+ [["- a/"], "a/", 1],
+ [["- a/", "- aa/"], "a/aa/", 2],
+ [["- a/", "- aa2/"], "a/aa2/", 3],
+ [["- a/", "- aa2/", "- aaa/"], "a/aa2/aaa/", 4],
+ [["- c/"], "c/", 5],
]
end
@@ -55,9 +59,9 @@
paths << array
end
paths.should == [
- [["- hey) a/"], "hey) a/"],
- [["- hey) a/", "- you) b/"], "hey) a/you) b/"],
- [["- c/"], "c/"]
+ [["- hey) a/"], "hey) a/", 1],
+ [["- hey) a/", "- you) b/"], "hey) a/you) b/", 2],
+ [["- c/"], "c/", 3],
]
end
@@ -72,7 +76,8 @@
paths << array
end
paths.should == [
- [["a/"], "a/"], [["a/", "b/"], "a/b/"]
+ [["a/"], "a/", 1],
+ [["a/", "b/"], "a/b/", 2],
]
end
@@ -89,9 +94,9 @@
end
paths.should == [
- [["a/"], "a/"],
- [[nil], ""],
- [["b/"], "b/"],
+ [["a/"], "a/", 1],
+ [[nil], "", 2],
+ [["b/"], "b/", 3],
]
end
@@ -108,10 +113,10 @@
paths << array
end
paths.should == [
- [["a/"], "a/"],
- [["a/", "aa/"], "a/aa/"],
- [["a/", nil], "a/"],
- [["a/", "ab/"], "a/ab/"],
+ [["a/"], "a/", 1],
+ [["a/", "aa/"], "a/aa/", 2],
+ [["a/", nil], "a/", 3],
+ [["a/", "ab/"], "a/ab/", 4],
]
end
@@ -134,16 +139,16 @@
paths << array
end
paths.should == [
- [["a/"], "a/"],
- [["a/", "aa/"], "a/aa/"],
- [["a/", "aa/", "aaa/"], "a/aa/aaa/"],
- [["a/", "aa/", nil], "a/aa/"],
- [["a/", "aa/", "aab/"], "a/aa/aab/"],
- [["a/", nil], "a/"],
- [["a/", "ab/"], "a/ab/"],
- [["a/", "ab/", "aba/"], "a/ab/aba/"],
- [[nil], ""],
- [["b/"], "b/"],
+ [["a/"], "a/", 1],
+ [["a/", "aa/"], "a/aa/", 2],
+ [["a/", "aa/", "aaa/"], "a/aa/aaa/", 3],
+ [["a/", "aa/", nil], "a/aa/", 4],
+ [["a/", "aa/", "aab/"], "a/aa/aab/", 5],
+ [["a/", nil], "a/", 6],
+ [["a/", "ab/"], "a/ab/", 7],
+ [["a/", "ab/", "aba/"], "a/ab/aba/", 8],
+ [[nil], "", 9],
+ [["b/"], "b/", 10],
]
end
@@ -171,6 +176,27 @@
}.should raise_error(RuntimeError)
end
+
+ it "adds slashes when none" do
+ paths = []
+ tree = "
+ a
+ b
+ c
+ ".unindent
+
+ Tree.traverse tree do |array|
+ paths << array
+ end
+ paths.should == [
+ [["a"], "a", 1],
+ [["a", "b"], "a/b", 2],
+ [["c"], "c", 3],
+ ]
+ end
+
+
+
end
@@ -337,8 +363,42 @@
Tree.dotify(tree, path).should == [true]
end
- # TODO: also work when they erroneously put "_" in the menu?
+ it "works when in reverse and a underscore and space" do
+ tree = "
+ - .delete it/
+ ".unindent
+
+ path = ["delete_it"]
+ Tree.dotify(tree, path).should == [true]
+ end
+
+ it "works when a case is different" do
+ tree = "
+ - .Delete it/
+ ".unindent
+
+ path = ["delete_it"]
+ Tree.dotify(tree, path).should == [true]
+ end
+
+ it "works when a hyphen and space" do
+ tree = "
+ - hey-you there/
+ ".unindent
+ path = ["hey-you-there"]
+ Tree.dotify(tree, path).should == [true]
+ end
+
+ it "matches when star" do
+ tree = "
+ - */
+ - .bb/
+ ".unindent
+
+ path = ["aa/bb/"]
+ Tree.dotify(tree, path).should == [nil, true]
+ end
end
@@ -353,7 +413,7 @@
it "grabs siblings when pipe" do
mock(Line).value {"| bb"}
stub(Tree).siblings {["| aa", "| bb"]}
- Tree.leaf("| bb").should == "aa\nbb\n"
+ Tree.leaf("| bb").should == "aa\nbb\n-----"
end
it "grabs siblings when pipe" do
@@ -380,15 +440,15 @@
describe Tree, "#quote" do
it "quotes normal lines" do
- Tree.quote("hey\nyou\n").should == "| hey\n| you\n".unindent
+ Tree.quote("hey\nyou\n").should == ": hey\n: you\n".unindent
end
it "quotes blank lines" do
- Tree.quote("hey\n\nyou\n").should == "| hey\n|\n| you\n".unindent
+ Tree.quote("hey\n\nyou\n").should == ": hey\n:\n: you\n".unindent
end
it "quotes when indented" do
- Tree.quote("hey\n you\n").should == "| hey\n| you\n".unindent
+ Tree.quote("hey\n you\n").should == ": hey\n: you\n".unindent
end
# it "leaves menus unquoted" do
@@ -415,7 +475,7 @@
describe Tree, "#clear_empty_dirs!" do
- it "removes one empty dir" do
+ it "removes one empty dir when no bullets" do
result = Tree.clear_empty_dirs!("
/projects/
empty/
@@ -443,8 +503,8 @@
- /projects/trunk/app/views/assets/details/
+ hey/
- _database.rhtml
- |Database Type
- |Database Name/
+ : Database Type
+ : Database Name/
".unindent).join("\n")
result.should =~ /Database Type/
@@ -456,13 +516,24 @@
- /projects/trunk/
- hey.html
- you.html
- | Database Type
+ : Database Type
".unindent, :quotes=>true).join("\n")
result.should =~ /trunk/
result.should =~ /you/
result.should_not =~ /hey/
end
+
+ it "leaves paths starting with equals" do
+ result = Tree.clear_empty_dirs!("
+ nav history//xiki/search.rb/
+ =/projects/xiki/lib/xiki/core/
+ =/projects/xiki/lib/xiki/core/
+ - search.rb
+ : def self.enter txt=nil
+ ".unindent, :quotes=>true).join("\n")
+
+ end
end
@@ -623,15 +694,15 @@
# assert_equal true, Tree.is_root?(" /hey")
# assert_equal true, Tree.is_root?(" ./hey")
# assert_equal false, Tree.is_root?(" .you")
-# assert_equal true, Tree.is_root?(" $tr/")
-# assert_equal true, Tree.is_root?(" $tr/##abc/")
-# # assert_equal false, Tree.is_root?(" $tr")
+# assert_equal true, Tree.is_root?(" :tr/")
+# assert_equal true, Tree.is_root?(" :tr/##abc/")
+# # assert_equal false, Tree.is_root?(" :tr")
# end
describe Tree, "#children" do
- it "shows 2nd-level items when blank path" do
+ it "shows top items when blank path" do
Tree.children("
- a/
- .b/
@@ -653,6 +724,18 @@
".unindent
end
+ it "converts dashes to pluses for items ending in slash" do
+ Tree.children("
+ - a/
+ - aa/
+ - ab
+ - b/
+ ", "a").should == "
+ + aa/
+ - ab
+ ".unindent
+ end
+
it "returns nil when no match" do
Tree.children("
- a/
@@ -735,32 +818,37 @@
", "a/z").should == "+ aaa/\n"
end
- it "includes all sub-items of items under at sign" do
+ it "matches when root is star" do
Tree.children("
- - @a/
+ - */
+ - bb/
+ ", "a/").should == "+ bb/\n"
+ end
+
+ it "includes all sub-items of items under equals sign" do
+ Tree.children("
+ - =a/
- .b/
- c/
", "").should == "
- + @a/
+ + =a/
+ b/
+ c/
".unindent
+ end
+
+ it "includes all sub-items of items under equals" do
Tree.children("
- - a/
- - @b/
+ - =a/
+ - .b/
- c/
- - d/
- ", "a").should == "
- + @b/
- + c/
- + d/
+ ", "").should == "
+ + =a/
+ + b/
+ + c/
".unindent
end
- # it "doesn't include items under item with at sign" do
- # Tree.children("docs/\n @red/\n - herr/\n", "docs").should == "@red/\n"
- # end
-
it "includes all sub-items when :include_subitems option" do
Tree.children("
- a/
@@ -771,7 +859,7 @@
".unindent
end
- it "includes all sub-items when no slashes" do
+ it "includes all items when no slashes and getting root" do
Tree.children("
- a
- b
@@ -785,6 +873,31 @@
".unindent
end
+ it "includes all sub-items when no slashes" do
+ Tree.children("
+ - a
+ - b
+ - c
+
+ - d
+ ", "a").should == "
+ - b
+ - c
+
+ - d
+ ".unindent
+ end
+
+ it "doesn't include sub-items of children with plus at beginning" do
+ Tree.children("
+ + a
+ + b
+ - c
+
+ - d
+ ", "a").should == "+ b".unindent
+ end
+
it "doesn't misinterpret blank lines as children" do
result = Tree.children "
- a/
@@ -885,6 +998,42 @@
options[:exclamations_args].should == nil
end
+ it "doesn't mess up when subpath and exclamations" do
+ Tree.children("
+ - right presentation/
+ ! aa
+ - right/
+ ! bb
+ ", ["right presentation"]).should == "! aa\n"
+ end
+
+
+
+ it "returns child of colon quoted items" do
+ Tree.children("
+ : a
+ : aa
+ : b
+ : ba
+ ", [": a"]).should == ": aa\n"
+ end
+
+ it "returns just one level of colon quoted items" do
+ Tree.children("
+ : a
+ : aa
+ : aaa
+ : b
+ ", [": a"]).should == ": aa\n"
+ end
+
+ it "finds child when hyphens" do
+ - what about when > file paths?"
+ Tree.children("
+ - foo-bar bah/
+ - ram/
+ ", "foo-bar-bah").should == "+ ram/\n"
+ end
end
@@ -1018,6 +1167,10 @@
Tree.target_match("a/b/c/", "a/b/z/").should == 2
end
+ it "doesn't confuse when partial match" do
+ Tree.target_match("right/! bb", "right presentation").should == 0
+ end
+
end
@@ -1037,68 +1190,6 @@
end
-describe Tree, "#to_html" do
- it "handles one tag" do
- Tree.to_html("
- p/
- hi
- ".unindent).should == "
-
- hi
-
- ".unindent
- end
-
- it "handles single with no contents" do
- Tree.to_html("
- p/
- ".unindent).should == "
-
-
- ".unindent
- end
-
- # it "doesn't close certain tags" do
- # Tree.to_html("
- # hr/
- # ".unindent).should == "
- #
- #
- # ".unindent
- # end
-
- it "doesn't confuse comments" do
- Tree.to_html("
- p/
- /* hey */
- ".unindent).should == "
-
- /* hey */
-
- ".unindent
- end
-
- it "adds closing tags to html" do
- Tree.to_html("
-
- hi
- ".unindent).should == "
-
- hi
-
- ".unindent
- end
-
- it "doesn't close comment tags" do
- Tree.to_html("
-
- hi
- ".unindent).should == "
-
- hi
- ".unindent
- end
-end
describe Tree, "#construct_path" do
before :each do
@@ -1129,12 +1220,26 @@
Tree.construct_path.should == "a/b/"
end
+ it "adds slash when last slash is escaped" do
+ # Simulates:
+ # a/
+ # b/
+
+ mock(Line).value.times(1) {" b/"}
+ mock(Line).value.times(1) {": a/"}
+ mock($el).search_backward_regexp(anything)
+
+ mock($el).goto_char(100)
+ Tree.construct_path.should == "a/b/"
+ end
+
+
it "stops when stop sign" do
# Simulates:
# a/
- # @b/
+ # =b/
- mock(Line).value.times(1) {" @b/"}
+ mock(Line).value.times(1) {" =b/"}
mock($el).goto_char(100)
Tree.construct_path.should == "b/"
end
@@ -1155,40 +1260,40 @@
it "returns a list when stop" do
# Simulates:
# a/
- # @b/
+ # =b/
- mock(Line).value.times(1) {" @b/"}
+ mock(Line).value.times(1) {" =b/"}
mock($el).search_backward_regexp(anything)
mock(Line).value.times(1) {"a/"}
mock($el).goto_char(100)
- Tree.construct_path(:all=>1, :list=>1).should == ["a/", "@b/"]
+ Tree.construct_path(:all=>1, :list=>1).should == ["a/", "=b/"]
end
it "handles when stop, slashes and list" do
# Simulates:
# a/
- # @b/
+ # =b/
- mock(Line).value.times(1) {" @b/"}
+ mock(Line).value.times(1) {" =b/"}
mock($el).search_backward_regexp(anything)
mock(Line).value.times(1) {"a/"}
mock($el).goto_char(100)
- Tree.construct_path(:all=>1, :slashes=>1).should == "a/@b/"
+ Tree.construct_path(:all=>1, :slashes=>1).should == "a/=b/"
end
it "leaves double slashes" do
# What should it return when this?...
# a//
- # @b/
+ # =b/
- mock(Line).value.times(1) {" @b/"}
+ mock(Line).value.times(1) {" =b/"}
mock($el).search_backward_regexp(anything)
mock(Line).value.times(1) {"a//"}
mock($el).goto_char(100)
- Tree.construct_path(:all=>1, :slashes=>1).should == "a//@b/"
+ Tree.construct_path(:all=>1, :slashes=>1).should == "a//=b/"
end
@@ -1202,22 +1307,77 @@
# b/@c/
# d/
end
+
+
+
+
+
+
+
+
+ it "appends hyphen to root when no slash" do
+ # Simulates:
+ # a
+
+ mock(Line).value.times(1) {"a"}
+ mock($el).goto_char(100)
+
+ Tree.construct_path.should == "a-"
+ end
+
+ it "appends hyphen to multiple roots when no slash" do
+ # Simulates:
+ # a
+ # = b
+
+ mock(Line).value.times(1) {" =b"}
+ mock($el).search_backward_regexp(anything)
+ mock(Line).value.times(1) {"a"}
+ mock($el).goto_char(100)
+
+ Tree.construct_path(:all=>1, :list=>1).should == ["a-", "=b-"]
+ end
+
+
+
+
end
describe Tree, "#join_to_subpaths" do
- it "leaves list boundaries only for at signs" do
- Tree.join_to_subpaths(["a/", "@b/", "c/"]).should == ["a/", "b/c/"]
+
+ it "leaves list boundaries only for equals signs" do
+ Tree.join_to_subpaths(["a/", "=b/", "c/"]).should == ["a/", "b/c/"]
+ end
+
+ it "doesn't split escaped equals sign" do
+ Tree.join_to_subpaths(["a/", "b/;=ip/"]).should == ["a/b/;=ip/"]
end
- it "it doesn't split escaped at sign" do
- Tree.join_to_subpaths(["a/", "b/;@ip/"]).should == ["a/b/;@ip/"]
+ it "doesn't split equals sign after escaped slash" do
+ Tree.join_to_subpaths(["a/", "b;/=ip/"]).should == ["a/b;/=ip/"]
end
- it "it doesn't split at sign after escaped slash" do
- Tree.join_to_subpaths(["a/", "b;/@ip/"]).should == ["a/b;/@ip/"]
+ it "doesn't split equals sign after escaped slash" do
+ Tree.join_to_subpaths(["a/", "b;/=ip/"]).should == ["a/b;/=ip/"]
end
- it "tests a bunch of other stuff, once we're comfortable with making this the official way of delimiting @'s and dealing with trailing slashes"
+ it "handles file path quotes" do
+ Tree.join_to_subpaths(["/foo/", "path.rb", "| def bar"]).should == ["/foo/path.rb/| def bar"]
+ end
+
+ it "doesn't turn blank items into slashes" do
+ Tree.join_to_subpaths(["", "ip/"]).should == ["ip/"]
+ end
+
+ it "merges single = without slashes" do
+ Tree.join_to_subpaths(["=", "ip/"]).should == ["ip/"]
+ end
+
+ it "splits when shell prompt" do
+ Tree.join_to_subpaths(["/dir/path/", "$ foo"]).should == ["/dir/path/", "$ foo"]
+ end
+
+ # it "tests a bunch of other stuff, once we're comfortable with making this the official way of delimiting @'s and dealing with trailing slashes"
# Paths we should handle:
# ["a/", "b/"].should == ["a/b/"]
@@ -1225,9 +1385,184 @@
# ["a/@b/"].should == ["a/", "b/"]
# ["/tmp/@b/"].should == ["/tmp/", "b/"]
# ["/tmp@b/"].should == ["/tmp", "b/"]
- # ["a", "b", "@c/", "d/", "p Tree.path_unified options={}"]
+ # ["a", "b", "@c/", "d/", "p Tree.path options={}"]
# Shouldn't split these:
# ["a@b/"]
+
+ it "adds slash delimiter even when escaped slash at end" do
+ Tree.join_to_subpaths(["a;/", "b"]).should == ["a;//b"]
+ end
+
end
+describe Tree, "#add_slashes_except_last" do
+ it "doesn't add slash to last" do
+ path = ["a", "b"]
+ Tree.add_slashes_except_last path
+ path.should == ["a/", "b"]
+ end
+
+ it "always adds slashes redundantly by default" do
+ # After unified, should probably remove this behavior, and make :only_if_needed not required
+ path = ["a/", "b"]
+ Tree.add_slashes_except_last path
+ path.should == ["a//", "b"]
+ end
+
+ it "doesn't add redundantly when :only_if_needed" do
+ # After unified, should probably remove this behavior, and make :only_if_needed not required
+ path = ["a/", "b"]
+ Tree.add_slashes_except_last path, :only_if_needed=>1
+ path.should == ["a/", "b"]
+ end
+
+ it "doesn't add slashes to blanks when :leave_blanks" do
+ path = ["", ""]
+ Tree.add_slashes_except_last path, :leave_blanks=>1
+ path.should == ["", ""]
+ end
+
+ it "adds slash when last is escaped" do
+ path = ["a;/", "b"]
+ Tree.add_slashes_except_last path, :only_if_needed=>1
+ path.should == ["a;//", "b"]
+ end
+
+end
+
+describe Tree, "#update" do
+ it "updates one item" do
+ txt = "
+ a/
+ b
+ c/
+ ".unindent
+ Tree.update(txt, ["a", "XX"]).should == "
+ a/
+ XX
+ c/
+ ".unindent
+ end
+
+ it "updates when bullets" do
+ txt = "
+ - a/
+ - b
+ - c/
+ ".unindent
+ Tree.update(txt, ["a", "XX"]).should == "
+ - a/
+ XX
+ - c/
+ ".unindent
+ end
+
+ it "updates multiple nested lines" do
+ txt = "
+ z/
+ a/
+ b
+ c
+ c/
+ ".unindent
+ Tree.update(txt, ["a", "XX\nYY"]).should == "
+ z/
+ a/
+ XX
+ YY
+ c/
+ ".unindent
+ end
+
+ it "returns when no match" do
+ txt = "a/"
+ Tree.update(txt, ["z", "XX"]).should == "a/"
+ end
+
+end
+
+
+describe Tree, "#matching_siblings_start_index" do
+ it "finds start" do
+ txt = "
+ * c/
+ a/
+ - b/
+ * c/
+ - b/
+ ".unindent.gsub(/^/, " ")
+ Tree.matching_siblings_start_index(txt, "* ").should == 21
+ end
+
+ it "finds when no indent" do
+ txt = "
+ a/
+ - b/
+ * c/
+ ".unindent
+ Tree.matching_siblings_start_index(txt, "* ").should == 10
+ end
+
+ it "returns 0 when not all match" do
+ txt = "
+ * a/
+ - b/
+ * c/
+ ".unindent
+ Tree.matching_siblings_start_index(txt, "* ").should == 0
+ end
+
+ it "returns length of all when no match" do
+ txt = "
+ a/
+ - b/
+ c/
+ ".unindent
+ Tree.matching_siblings_start_index(txt, "* ").should == 13
+ end
+
+ it "returns length of all when no match" do
+ txt = " - hi\n * bbb\n - hi\n * you\n * you\n"
+ Tree.matching_siblings_start_index(txt, "* ").should == 22
+ end
+
+end
+
+describe Tree, "#matching_siblings_end_index" do
+ it "finds nonmatching" do
+ txt = "
+ * a/
+ - b/
+ c/
+ ".unindent.gsub(/^/, " ")
+ Tree.matching_siblings_end_index(txt, "* ").should == 16
+ end
+
+ it "finds when no indent" do
+ txt = "
+ * a/
+ - b/
+ c/
+ ".unindent
+ Tree.matching_siblings_end_index(txt, "* ").should == 12
+ end
+
+ it "returns nil when not all match" do
+ txt = "
+ * a/
+ - b/
+ * c/
+ ".unindent
+ Tree.matching_siblings_end_index(txt, "* ").should == nil
+ end
+
+ it "returns 0 when none match" do
+ txt = "
+ a/
+ - b/
+ c/
+ ".unindent
+ Tree.matching_siblings_end_index(txt, "* ").should == 0
+ end
+end
diff --git a/spec/xik_spec.rb b/spec/xik_spec.rb
new file mode 100644
index 00000000..a6bf863c
--- /dev/null
+++ b/spec/xik_spec.rb
@@ -0,0 +1,228 @@
+$:.unshift "spec/"
+
+require './spec/spec_helper'
+class Keys
+ def self.prefix; nil; end
+end
+%w"ol path tree xik code".each {|o| require "xiki/core/#{o}"}
+%w"menu_handler".each {|o| require "xiki/handlers/#{o}"}
+
+describe Xik, ".expand" do
+ it "expands a" do
+ x = Xik.new "a/\n b/"
+ x["a"].should == "b/"
+ end
+
+ it "doesn't mess up when two times in a row" do
+ menu = Xik.new "
+ * a/
+ * b/
+ - c/
+ - d/
+ "
+ menu[''].should == "* a/\n* b/"
+ menu[''].should == "* a/\n* b/"
+ end
+
+ it "doesn't mess up pluses" do
+ x = Xik.new "
+ a/
+ b/
+ - c
+ - d
+ "
+ x["b"].should == "- c\n- d"
+ end
+
+ it "evals" do
+ x = Xik.new "
+ a/
+ ! 1 + 2
+ "
+ x["a", :eval=>1].should == "3"
+ end
+
+ it "adds :nest=>1 when :eval and wasn't code" do
+ options = {}
+ x = Xik.new "
+ a/
+ b/
+ "
+ x["a", :eval=>options].should == "b/"
+ options[:nest].should == 1
+Ol "options", options
+ end
+
+end
+
+describe Xik, ".parse_hash_or_array" do
+
+ it "handles hash" do
+ Xik.parse_hash_or_array({"a"=>"b"}).join("\n").should == "
+ - a/
+ - b/
+ ".unindent.strip
+ end
+
+ it "handles array" do
+ Xik.parse_hash_or_array(["a", "b"]).join("\n").should == "
+ - ./
+ - a/
+ - ./
+ - b/
+ ".unindent.strip
+ end
+
+ it "handles a hash of arrays" do
+ Xik.parse_hash_or_array({"a"=>["aa", "ab"], "b"=>"ba"}).join("\n").should == "
+ - a/
+ - ./
+ - aa/
+ - ./
+ - ab/
+ - b/
+ - ba/
+ ".unindent.strip
+ end
+
+end
+
+$:.unshift "spec/"
+
+require './spec/spec_helper'
+%w"ol path tree xik".each {|o| require "xiki/core/#{o}"}
+
+describe Xik, ".parse_hash_or_array" do
+
+ it "handles hash" do
+ Xik.parse_hash_or_array({"a"=>"b"}).join("\n").should == "
+ - a/
+ - b/
+ ".unindent.strip
+ end
+
+ it "handles array" do
+ Xik.parse_hash_or_array(["a", "b"]).join("\n").should == "
+ - ./
+ - a/
+ - ./
+ - b/
+ ".unindent.strip
+ end
+
+ it "handles hash of arrays" do
+ Xik.parse_hash_or_array({"a"=>["aa", "ab"], "b"=>"ba"}).join("\n").should == "
+ - a/
+ - ./
+ - aa/
+ - ./
+ - ab/
+ - b/
+ - ba/
+ ".unindent.strip
+ end
+end
+
+describe Xik, ".initialize" do
+ it "creates from string" do
+ x = Xik.new "
+ - a/
+ - b/
+ "
+ x.lines.should == ["- a/", " - b/", ""]
+ end
+
+ it "creates from hash of arrays" do
+ x = Xik.new "a"=>["aa"]
+ # x = Xik.new "
+ # - a/
+ # - ./
+ # - aa/
+ # "
+ x.lines.should == ["- a/", " - ./", " - aa/"]
+ end
+
+ it "keeps indent when :leave_indent" do
+ x = Xik.new " a/\n b/", :leave_indent=>1
+ x.lines.should == [" a/", " b/"]
+ end
+end
+
+describe Xik, ".cursor" do
+ it "starts at 0" do
+ x = Xik.foo
+ x.cursor.should == 1
+ end
+
+ it "works on 2nd line" do
+ x = Xik.foo
+ x.next
+ x.cursor.should == 4
+ end
+
+ it "works on 3rd line" do
+ x = Xik.foo
+ x.line = 3
+ x.cursor.should == 11
+ end
+
+ it "works when cursor not at axis" do
+ x = Xik.foo
+ x.line = 3
+ x.column = 3
+ x.cursor.should == 13
+ end
+
+end
+
+describe Xik, ".current" do
+ it "starts at 1st line" do
+ Xik.new("a\nb").current.should == "a"
+ end
+end
+
+describe Xik, ".line" do
+ it "starts at 1st line" do
+ Xik.new("a").line.should == 1
+ end
+end
+
+describe Xik, ".next" do
+ it "moves to 2nd line" do
+ x = Xik.new("a\nb")
+ x.next
+ x.line.should == 2
+ end
+
+ it "doesn't move past the file" do
+ x = Xik.new("a\nb")
+ x.line.should == 1
+ x.current.should == "a"
+
+ x.next
+ x.line.should == 2
+ x.current.should == "b"
+
+ x.next # Can't move past last line
+ x.line.should == 2
+ x.current.should == "b"
+ # x.line.should == 1
+ end
+end
+
+describe Xik, ".at_last_line?" do
+ it "works when blank" do
+ x = Xik.new("")
+ x.at_last_line?.should == true
+ end
+ it "works when no trailing and one line" do
+ x = Xik.new("a")
+ x.at_last_line?.should == true
+ end
+ it "works when one line" do
+ x = Xik.new("a\n")
+ x.at_last_line?.should == false
+ x.next
+ x.at_last_line?.should == true
+ end
+end
diff --git a/tests/console_test.rb b/tests/console_test.rb
index 729c7fba..e2a9cf38 100644
--- a/tests/console_test.rb
+++ b/tests/console_test.rb
@@ -5,7 +5,7 @@
class CodeTreeTest < Test::Unit::TestCase
def test_extract_method
- assert_equal("ssh foo@foo.org", Console.ssh_line("/foo@foo.org/"))
- assert_equal("ssh -p 1234 foo@foo.org", Console.ssh_line("foo@foo.org:1234"))
+ assert_equal("ssh foo@foo.org", Shell.ssh_line("/foo@foo.org/"))
+ assert_equal("ssh -p 1234 foo@foo.org", Shell.ssh_line("foo@foo.org:1234"))
end
end
diff --git a/xiki.gemspec b/xiki.gemspec
index 7c22d043..09054c7a 100644
--- a/xiki.gemspec
+++ b/xiki.gemspec
@@ -1,53 +1,111 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-
-Gem::Specification.new do |s|
- s.name = "xiki"
- s.version = "1.0.0a"
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Craig Muth"]
- s.date = "2013-05-20"
- s.executables = ["xiki"]
- s.summary = "A shell console with GUI features."
- s.description = "Xiki does what shell consoles do, but lets you edit everything at any time. It's trivial to make your own commands and menus to access other tools."
- s.email = "craig.muth@gmail.com"
- s.extra_rdoc_files = [
- "LICENSE",
- "README.markdown"
- ]
+# Xiki is temporarily not set up to be used as a gem. Just download it
+# and run bin/xsh directly.
+#
+# See comment in Gemfile for more details
- s.rdoc_options += %w[--exclude etc/templates/.*]
- files = `git ls-files`.split("\n")
- files = files.select{|o| o !~ /^etc\/xiki/}
- s.files = files
-
- s.homepage = "http://xiki.org"
- s.licenses = ["MIT"]
- s.require_paths = ["."]
-
- s.add_dependency('httparty')
- s.add_dependency('activesupport')
- s.add_dependency('method_source')
- s.add_dependency('net-ssh')
- s.add_dependency('net-scp')
- s.add_dependency('net-sftp')
- s.add_dependency('rake')
- s.add_dependency('rspec', [" ~> 2.12.0"])
- s.add_dependency('trogdoro-el4r', [">= 1.0.7"])
-
- s.add_dependency('sexp_processor')
- s.add_dependency('file-tail')
- s.add_dependency('ruby_parser')
- s.add_dependency('sourcify')
- s.add_dependency('daemons')
- s.add_dependency('simple-tidy')
- # s.add_dependency('nokogiri-pretty')
- s.add_dependency('sinatra')
-
- # Restore if changes get merged into main el4r gem
- # s.add_dependency('el4r')
-end
+#Gem::Specification.new do |s|
+# s.name = "xiki"
+# s.version = "2.0.1a"
+#
+# s.required_ruby_version = ">= 1.9.3"
+#
+# s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+# s.authors = ["Craig Muth"]
+# s.date = "2014-09-28"
+#
+#"
+#/projects/xiki/
+# - README.md
+# : - wait, maybe just move loop into different file?
+# : - if I don't have Gemfile:_gemspec, it probably won't do the binary?
+# : - try just hard-coding the Gemfile with ''gem 'foo' files''
+#"
+#
+## If not, this should fix it
+##
+##- Maybe instructions should be for doing "bundle install" in subdir?
+## - So, making the directions be
+## | $ cd $xiki_dir/install
+## | $ bundle install
+## - look at what they are now!
+## - and move dependencies out into a 3rd file?
+## - loop through and do "s.add_dependency" or "gem" from Gemfile and .gemspec?
+#
+#
+# # Check out what the methods on "s" are
+# # It might clue in whether running from bundler
+#
+# # Try removing s.executables...
+# # to see if that'll still cause it to add it to the path
+# # when "$ bundle install"
+#
+# if ENV['_'] !~ /\/bundle$/ # If not called by bundler, install executables
+# s.executables = ["xiki"]
+# end
+#
+#
+#
+#
+#
+#
+# s.summary = "A shell console with GUI features."
+# s.description = "Xiki does what shell consoles do, but lets you edit everything at any time. It's trivial to make your own commands and menus to access other tools."
+# s.email = "craig.muth@gmail.com"
+# s.extra_rdoc_files = [
+# "LICENSE",
+# "README.md"
+# ]
+#
+# s.rdoc_options += %w[--exclude misc/templates/.*]
+#
+# files = `git ls-files`.split("\n")
+# files = files.select{|o| o !~ /^etc\/xiki/}
+# s.files = files
+#
+# s.homepage = "http://xiki.org"
+# s.licenses = ["MIT"]
+# s.require_paths = ["."]
+# s.require_paths = ["lib"]
+#
+# # s.add_dependency('awesome_print')
+# # s.add_dependency('json')
+# # s.add_dependency('httparty')
+# # s.add_dependency('activesupport')
+## s.add_dependency('erubis')
+# #s.add_dependency('method_source')
+# #s.add_dependency('net-ssh')
+# #s.add_dependency('net-scp')
+# #s.add_dependency('net-sftp')
+#
+# # s.add_dependency('rake')
+# # s.add_dependency('rspec', [" ~> 2.12.0"])
+# # s.add_dependency('trogdoro-el4r', [">= 1.0.10"])
+#
+## s.add_dependency('sexp_processor')
+# # s.add_dependency('file-tail')
+# # s.add_dependency('ruby_parser')
+# # s.add_dependency('sourcify')
+# # s.add_dependency('daemons')
+# # s.add_dependency('simple-tidy')
+# # s.add_dependency('nokogiri-pretty')
+# # s.add_dependency('sinatra')
+# # s.add_dependency('session') # For keeping a bash session open to send shell commands to
+# # s.add_dependency('map') # For keeping a bash session open to send shell commands to
+#
+# # Restore if changes get merged into main el4r gem
+# # s.add_dependency('el4r')
+#
+#
+#
+#
+#
+# # TODO > put instructions here "like 'run the xiki command in the shell console"
+# s.post_install_message = "Thanks for installing Xiki.\n\nInstructions\n\nRun the 'xiki' command in a shell console. It will walk you through getting started."
+#
+# # Make the 'xiki' command say to start the web server?
+#
+#end