xiki 0.5.1a → 0.5.3a

data/menus/redmine.rb

@@ -1,7 +1,7 @@
 require 'net/http'
 require 'uri'
 require 'timeout'
-require 'keys'
+require 'xiki/keys'
 
 class Redmine
 

data/menus/sass.rb

@@ -8,7 +8,7 @@ class Sass
     css.gsub!('"', '\"')
     code = "$('head').append(\"<style>#{css}</style>\")"
 
-    Firefox.run code
+    Firefox.exec code
 
     ".flash - Loaded in browser!"
   end

data/menus/settings.menu

@@ -0,0 +1,2 @@
+> See
+<< conf/

data/menus/technologies.rb

@@ -1,7 +1,10 @@
 class Technologies
-  def self.menu topic=nil, heading=nil, *content
+  def self.menu topic=nil, *args
+
+    heading, content = args.partition{|o| o !~ /^\|/}
 
     content = content.any? ? content.join("/") : nil
+    heading = heading.any? ? heading.join("/") : nil
 
     # If no topic, just show all dirs
 

data/menus/web_interface.rb

@@ -0,0 +1,58 @@
+class WebInterface
+
+  def self.menu
+    %`
+    > Summary
+    How to set up this url, to use Xiki menus from your browser:
+    @http://xiki
+
+    - install/
+      - Mac/
+        - 1. Configure Apache/
+          @/etc/apache2/other/
+            - Create conf file) % sudo touch xiki.vhost.conf
+            - xiki.vhost.conf
+              - Make writable) @chmod/777/
+              - Add contents (as+update):
+              | NameVirtualHost *:80
+              |
+              | AddHandler cgi-script .rb
+              |
+              | <VirtualHost *:80>
+              |   ServerName xiki
+              |   ServerAlias menu
+              |   DocumentRoot "#{Xiki.dir}etc/www/public"
+              |   ErrorDocument 503 "/error.html"
+              |
+              |   RewriteEngine On
+              |   RewriteCond %{REQUEST_URI} !^/error.html$
+              |   RewriteRule ^/(.*) http://localhost:8161/$1 [P]
+              |
+              |   <directory "#{Xiki.dir}etc/www/public">
+              |     Order deny,allow
+              |     Allow from 127.0.0.1
+              |   </directory>
+              | </VirtualHost>
+              - Restore) @chmod/644/
+        - 2. Update hosts file/
+          @/etc/hosts
+            - Make writable) @chmod/777/
+            - Add these two lines:
+            | 127.0.0.1       xiki
+            | 127.0.0.1       menu
+            - Restore) @chmod/644/
+        - 3. Restart Apache/
+          @apache/restart/
+    - start/
+      @$xiki/etc/www/
+        % ruby -rubygems sinatra_server.rb
+      @http://localhost:8161
+      @http://xiki
+
+      - TODO: should apache mod-proxy tell them how to start it up?
+        - can I give it an error message?
+
+    `
+  end
+
+end

data/menus/welcome.menu

@@ -0,0 +1,18 @@
+> Welcome
+Here are some menus and links to get you started.  Double-click
+on them or type control-enter (or command-enter) while the cursor
+is on them.
+
++ @docs/
+
+> Website and Screencasts
+Check out the screencasts on xiki.org:
+@http://xiki.org
+@http://xiki.org/screencasts
+
+> Twitter and google group
+@http://twitter.com/xiki
+@http://groups.google.com/group/xiki/
+
+> Stop showing this menu on startup
++ @xiki/setup/misc/dont show welcome/

data/menus/white.menu

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

data/menus/youtube.rb

@@ -0,0 +1,32 @@
+class Youtube
+  def self.menu
+
+    "
+    > Type some words to search youtube
+    | Dancing Cats
+
+    - url with start time/
+      @ http://www.youtube.com/watch?v=XkYcWzBCEb8#t=2m51s
+    - use dotsies in transcript/
+      @css/
+        | .cptime, .cptext{
+        |   font-weight: 300;
+        | }
+        | .cptext{
+        |   font-family: dotsies;
+        |   padding-left: 1px;
+        | }
+
+    > Notes
+    @technologies/youtube/
+    "
+  end
+
+  def self.menu_after output, *args
+    return output if output
+
+    txt = ENV['txt']
+
+    Browser.url "http://www.youtube.com/results?search_query=#{txt}"
+  end
+end

data/spec/code_tree_spec.rb

@@ -1,6 +1,6 @@
 $:.unshift "spec/"
 require 'xiki'
-require 'code_tree'
+require 'xiki/code_tree'
 # require 'core_ext'
 
 describe CodeTree, "#extract_class" do

data/spec/diff_log_spec.rb

@@ -1,8 +1,8 @@
 $:.unshift "spec/"
-require 'line'
-require 'ol'
-require 'diff_log'
-# require 'core_ext'
+require 'xiki/line'
+require 'xiki/ol'
+require 'xiki/diff_log'
+# require 'xiki/core_ext'
 
 describe Line, "#parse_tree_diffs" do
   #   it "parses a rename" do

data/spec/file_tree_spec.rb

@@ -1,6 +1,6 @@
 $:.unshift "spec/"
-require 'file_tree'
-require 'core_ext'
+require 'xiki/file_tree'
+require 'xiki/core_ext'
 
 
 describe "handles?" do

data/spec/line_spec.rb

@@ -1,6 +1,6 @@
 $:.unshift "spec/"
-require 'line'
-require 'core_ext'
+require 'xiki/line'
+require 'xiki/core_ext'
 
 describe Line, "#without_label" do
   it "removes bullets" do

data/spec/menu_spec.rb

@@ -1,12 +1,12 @@
 $:.unshift "spec/"
-require 'ol'
-require 'tree'
-require 'core_ext'
-require 'mode'
+require 'xiki/ol'
+require 'xiki/tree'
+require 'xiki/core_ext'
+require 'xiki/mode'
 class Mode
   def self.define *args; end
 end
-require 'menu'
+require 'xiki/menu'
 
 describe Menu, "#split" do
   it "splits normal strings" do

data/spec/ol_spec.rb

@@ -1,7 +1,7 @@
 $:.unshift "spec/"
-require 'line'
-require 'ol'
-require 'core_ext'
+require 'xiki/line'
+require 'xiki/ol'
+require 'xiki/core_ext'
 
 def define_vars
   @stack = [

data/spec/remote_spec.rb

@@ -3,8 +3,8 @@ require 'rubygems'
 class Keys
   def self.method_missing(meth, *args, &block); end
 end
-require 'remote'
-require 'core_ext'
+require 'xiki/remote'
+require 'xiki/core_ext'
 
 describe Remote, "#calculate_local_path" do
   it "should put dashes in path" do

data/spec/search_spec.rb

@@ -1,6 +1,6 @@
 $:.unshift "spec/"
-require 'search'
-require 'core_ext'
+require 'xiki/search'
+require 'xiki/core_ext'
 
 describe Search, "#case_options" do
   it "should initialize" do

data/spec/text_util_spec.rb

@@ -1,5 +1,5 @@
 $:.unshift "spec/"
-require 'text_util'
+require 'xiki/text_util'
 
 describe TextUtil, "#unindent" do
   it "indents to the left" do

data/spec/tree_cursor_spec.rb

@@ -1,7 +1,7 @@
 $:.unshift "spec/"
-require 'core_ext'
-require 'tree_cursor'
-require 'ol'
+require 'xiki/core_ext'
+require 'xiki/tree_cursor'
+require 'xiki/ol'
 
 def a_aa_tree
   "

data/spec/tree_spec.rb

@@ -1,7 +1,7 @@
 $:.unshift "spec/"
-require 'ol'
-require 'tree'
-require 'core_ext'
+require 'xiki/ol'
+require 'xiki/tree'
+require 'xiki/core_ext'
 
 describe Tree, "#traverse" do
 

data/xiki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "xiki"
-  s.version = "0.5.1a"
+  s.version = "0.5.3a"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Muth"]
-  s.date = "2011-08-24"
+  s.date = "2012-08-26"
   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."
@@ -27,11 +27,27 @@ Gem::Specification.new do |s|
   s.homepage = "http://xiki.org"
   s.licenses = ["MIT"]
   s.require_paths = ["."]
-  #   s.rubygems_version = "1.8.24"
 
-  #     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-  #     s.specification_version = 3
+  s.add_dependency('sourcify')
+  s.add_dependency('ruby_parser')
+  s.add_dependency('file-tail')
 
-  s.add_development_dependency("rspec", ["~> 2.3.0"])
+  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('rspec')
+  s.add_dependency('memcached')
+  s.add_dependency('trogdoro-el4r', [">= 1.0.7"])
+
+  s.add_dependency('file-tail')
+  s.add_dependency('ruby_parser')
+  s.add_dependency('sourcify')
+  s.add_dependency('daemons')
+
+  # Restore if changes get merged into main el4r gem
+  #  s.add_dependency('el4r')
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: xiki
 version: !ruby/object:Gem::Version 
-  hash: -1959472798
+  hash: 179677290
   prerelease: 5
   segments: 
   - 0
   - 5
-  - 1
+  - 3
   - a
-  version: 0.5.1a
+  version: 0.5.3a
 platform: ruby
 authors: 
 - Craig Muth
@@ -16,24 +16,234 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2012-08-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sourcify
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 2
-        - 3
         - 0
-        version: 2.3.0
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ruby_parser
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: file-tail
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: method_source
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: net-scp
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: net-sftp
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: memcached
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: trogdoro-el4r
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 0
+        - 7
+        version: 1.0.7
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: file-tail
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: ruby_parser
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: sourcify
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id016
 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.
 email: craig.muth@gmail.com
 executables: 
@@ -52,6 +262,7 @@ files:
 - etc/command/xiki_command.rb
 - etc/command/xiki_process.rb
 - etc/command/xiki_wrapper
+- etc/install/el4r_setup.sh
 - etc/js/menu1.js
 - etc/js/xiki.js
 - etc/logo.png
@@ -103,81 +314,95 @@ files:
 - etc/templates/menu_template.menu
 - etc/templates/menu_template.rb
 - etc/templates/template.rb
+- etc/themes/Black_BG.notes
 - etc/themes/Dark_Metal.notes
+- etc/themes/Default.notes
+- etc/themes/Fall_Fonts.notes
+- etc/themes/Light_Gray_BG_Theme.notes
 - etc/themes/Orange_Path.notes
+- etc/themes/Pastel_Fonts.notes
+- etc/themes/Path_Mode_Line.notes
+- etc/themes/Rainbow_Fonts.notes
 - etc/themes/Shiny_Blue.notes
 - etc/themes/Shiny_Green.notes
+- etc/themes/White_BG.notes
+- etc/vim/vim_status.notes
+- etc/vim/xiki.vim
 - etc/wrappers/wrapper.js
 - etc/wrappers/wrapper.py
 - etc/wrappers/wrapper.rb
 - etc/www/index.rb
+- etc/www/public/error.html
+- etc/www/sinatra_server.rb
 - etc/www/web_server.rb
-- lib/block.rb
-- lib/bookmarks.rb
-- lib/buffers.rb
-- lib/clipboard.rb
-- lib/code.rb
-- lib/code_tree.rb
-- lib/color.rb
-- lib/console.rb
-- lib/control_lock.rb
-- lib/control_tab.rb
-- lib/core_ext.rb
-- lib/cursor.rb
-- lib/deletes.rb
-- lib/diff_log.rb
-- lib/effects.rb
-- lib/environment.rb
-- lib/file_tree.rb
-- lib/files.rb
-- lib/hide.rb
-- lib/history.rb
-- lib/image.rb
-- lib/incrementer.rb
-- lib/insert.rb
-- lib/irc.rb
-- lib/key_bindings.rb
-- lib/keys.rb
-- lib/launcher.rb
-- lib/line.rb
-- lib/links.rb
-- lib/location.rb
-- lib/macros.rb
-- lib/man.rb
-- lib/menu.rb
-- lib/merb.rb
-- lib/message.rb
-- lib/meths.rb
-- lib/mode.rb
-- lib/move.rb
-- lib/notes.rb
-- lib/numbers.rb
-- lib/ol.rb
-- lib/ol_helper.rb
-- lib/overlay.rb
-- lib/pause_means_space.rb
-- lib/php.rb
-- lib/projects.rb
-- lib/relinquish_exception.rb
-- lib/remote.rb
-- lib/requirer.rb
-- lib/rest_tree.rb
-- lib/ruby.rb
-- lib/ruby_console.rb
-- lib/search.rb
-- lib/search_term.rb
-- lib/snippet.rb
-- lib/specs.rb
-- lib/styles.rb
-- lib/svn.rb
-- lib/text_util.rb
-- lib/tree.rb
-- lib/tree_cursor.rb
-- lib/trouble_shooting.rb
-- lib/url_tree.rb
-- lib/view.rb
-- lib/window.rb
 - lib/xiki.rb
+- lib/xiki/block.rb
+- lib/xiki/bookmarks.rb
+- lib/xiki/buffers.rb
+- lib/xiki/clipboard.rb
+- lib/xiki/code.rb
+- lib/xiki/code_tree.rb
+- lib/xiki/color.rb
+- lib/xiki/console.rb
+- lib/xiki/control_lock.rb
+- lib/xiki/control_tab.rb
+- lib/xiki/core_ext.rb
+- lib/xiki/cursor.rb
+- lib/xiki/deletes.rb
+- lib/xiki/diff_log.rb
+- lib/xiki/effects.rb
+- lib/xiki/environment.rb
+- lib/xiki/file_tree.rb
+- lib/xiki/files.rb
+- lib/xiki/hide.rb
+- lib/xiki/history.rb
+- lib/xiki/image.rb
+- lib/xiki/incrementer.rb
+- lib/xiki/insert.rb
+- lib/xiki/irc.rb
+- lib/xiki/key_bindings.rb
+- lib/xiki/keys.rb
+- lib/xiki/launcher.rb
+- lib/xiki/line.rb
+- lib/xiki/links.rb
+- lib/xiki/location.rb
+- lib/xiki/macros.rb
+- lib/xiki/man.rb
+- lib/xiki/menu.rb
+- lib/xiki/merb.rb
+- lib/xiki/message.rb
+- lib/xiki/meths.rb
+- lib/xiki/mode.rb
+- lib/xiki/move.rb
+- lib/xiki/notes.rb
+- lib/xiki/numbers.rb
+- lib/xiki/ol.rb
+- lib/xiki/ol_helper.rb
+- lib/xiki/overlay.rb
+- lib/xiki/pause_means_space.rb
+- lib/xiki/php.rb
+- lib/xiki/projects.rb
+- lib/xiki/relinquish_exception.rb
+- lib/xiki/remote.rb
+- lib/xiki/requirer.rb
+- lib/xiki/rest_tree.rb
+- lib/xiki/ruby.rb
+- lib/xiki/ruby_console.rb
+- lib/xiki/search.rb
+- lib/xiki/search_term.rb
+- lib/xiki/snippet.rb
+- lib/xiki/specs.rb
+- lib/xiki/styles.rb
+- lib/xiki/svn.rb
+- lib/xiki/text_util.rb
+- lib/xiki/tree.rb
+- lib/xiki/tree_cursor.rb
+- lib/xiki/trouble_shooting.rb
+- lib/xiki/url_tree.rb
+- lib/xiki/view.rb
+- lib/xiki/vim/line.rb
+- lib/xiki/vim/tree.rb
+- lib/xiki/window.rb
 - menus/accounts.rb
 - menus/address_book.rb
 - menus/agenda.rb
@@ -186,6 +411,7 @@ files:
 - menus/app.rb
 - menus/applescript.rb
 - menus/as.rb
+- menus/black.menu
 - menus/bookmarklet.rb
 - menus/bootstrap.rb
 - menus/browse.rb
@@ -195,6 +421,7 @@ files:
 - menus/classes.rb
 - menus/coffee_script.rb
 - menus/computer.rb
+- menus/conf.rb
 - menus/contacts.rb
 - menus/cookies.rb
 - menus/couch.rb
@@ -205,7 +432,8 @@ files:
 - menus/db.rb
 - menus/deck.rb
 - menus/dictionary.rb
-- menus/dir.rb
+- menus/dimensions_config.menu
+- menus/dimensions_config.rb
 - menus/disk.rb
 - menus/do.rb
 - menus/docs.rb
@@ -245,6 +473,7 @@ files:
 - menus/matches.rb
 - menus/memcache.rb
 - menus/mkdir.rb
+- menus/models.rb
 - menus/mongo.rb
 - menus/mysql.rb
 - menus/node.rb
@@ -254,6 +483,7 @@ files:
 - menus/postgres.rb
 - menus/pre.rb
 - menus/python.rb
+- menus/r.rb
 - menus/rails.rb
 - menus/rake.rb
 - menus/redmine.rb
@@ -264,6 +494,7 @@ files:
 - menus/say.rb
 - menus/scale.rb
 - menus/serve.rb
+- menus/settings.menu
 - menus/shuffle.rb
 - menus/spanish.rb
 - menus/standalone.rb
@@ -274,8 +505,12 @@ files:
 - menus/to.rb
 - menus/twitter.rb
 - menus/urls.menu
+- menus/web_interface.rb
+- menus/welcome.menu
+- menus/white.menu
 - menus/wikipedia.rb
 - menus/words.rb
+- menus/youtube.rb
 - spec/code_tree_spec.rb
 - spec/diff_log_spec.rb
 - spec/file_tree_spec.rb