xiki 0.5.1a → 0.5.3a

data/menus/git.rb

@@ -107,7 +107,7 @@ class Git
     end
 
     Gito.push branch, "project - #{Dir.pwd}"
-    nil
+    ".flash - pushed!"
   end
 
   def self.branch_name dir=nil

data/menus/gito.rb

@@ -448,7 +448,7 @@ class Gito
       hash = Gito.status_to_hash(Gito.status_internal(txt))
 
       untracked = hash[:untracked].map{|i| i[1]}
-      untracked.map!{|i| "+ untracked) #{i}\n"}
+      untracked.map!{|i| "+ ignore untracked) #{i}\n"}
 
       option = is_unadded ? "- .add\n" : "- .commit/\n"
       if expand   # If showing diffs right away
@@ -673,7 +673,7 @@ class Gito
 
     siblings = Tree.siblings :include_label=>true
     # Remove "untracked (ignore)"
-    siblings = siblings.select{|i| i !~ /^. untracked \(ignore\)/}.map{|i| Line.without_label(:line=>i)}
+    siblings = siblings.select{|i| i !~ /^. ignore untracked\)/}.map{|i| Line.without_label(:line=>i)}
     siblings = self.remove_options siblings
 
     unless siblings.any?   # Error if no siblings

data/menus/headings.rb

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

data/menus/ip.rb

@@ -1,10 +1,8 @@
 class Ip
   def self.menu
-    return '111.1.1.111'   # TMP: hard-coded for presentation
-
-    inet = `ifconfig`.grep(/\binet\b/)
+    inet = `ifconfig`.split("\n").grep(/\binet\b/)
 
     return "| #{inet[0][/[\d.]+/]}" if inet.length < 2
-    "- #{inet[1][/[\d.]+/]}"
+    inet[1][/[\d.]+/]
   end
 end

data/menus/itunes.rb

@@ -7,6 +7,7 @@ class Itunes
     - .previous/
     - .artists/
     - .songs/
+    - .current/
     - .playlist/
     - api/
       > Play a song
@@ -21,12 +22,14 @@ class Itunes
     "
   end
 
+  @@use_pipe_delimiter = "set Applescript's text item delimiters to \"|\""
+
   def self.songs name=nil
 
     # If nothing passed, list all songs
     if name.nil?
-      tracks = Applescript.run "iTunes", "get the name of every track of library playlist 1"
-      tracks = JSON[tracks.sub(/^\{(.+)\}$/, "[\\1]")]
+      tracks = Applescript.run "iTunes", "get the name of every track of library playlist 1 as string", :delimiter=>"|"
+      tracks = tracks.split("|")
       return tracks.sort.uniq.select{|o| o != "" && o !~ /^ /}.map{|o| "- #{o}/\n"}.join
       return
     end
@@ -35,6 +38,10 @@ class Itunes
 
   end
 
+  def self.current
+    Applescript.run "iTunes", "get name of current track"
+  end
+
   def self.playlist name=nil
     return View.prompt("Enter a name") if name.nil?
     Applescript.run "iTunes", "play playlist \"#{name}\""

data/menus/javascript.rb

@@ -13,7 +13,9 @@ class Javascript
 
       txt << "
         function p(txt) {
-          print(JSON.stringify(txt));
+          var json = JSON.stringify(txt);
+          if(json == undefined && txt) json = txt;   // Sometimes JSON.stringify returns undefined when something there (like functions)
+          print(json);
         }";
 
       result = self.run_internal txt

data/menus/local_storage.rb

@@ -28,7 +28,7 @@ class LocalStorage
         for (var key in localStorage) { result.push(key) }
         JSON.stringify(result);
         `
-      txt = Firefox.run js,   #:jquery=>1  #, :jquery_extra=>ls_function
+      txt = Firefox.exec js   #:jquery=>1  #, :jquery_extra=>ls_function
       array = JSON[txt]
       return "
         | None found.  Create a few test records?
@@ -39,7 +39,7 @@ class LocalStorage
     end
 
     if Keys.delete?
-      Firefox.run "localStorage.removeItem(\"#{key}\")"  #, :jquery=>1
+      Firefox.exec "localStorage.removeItem(\"#{key}\")"
       Tree.to_parent if val
       Tree.kill_under
       View.flash "- deleted!"
@@ -51,7 +51,7 @@ class LocalStorage
     end
 
     if val.nil?   # If just key passed, show val
-      txt = Firefox.run "localStorage[\"#{key}\"]"  #, :jquery=>1
+      txt = Firefox.exec "localStorage[\"#{key}\"]"
       return self.docs if txt.blank? && key =~ /docs\/?/
       return self.api if txt.blank? && key =~ /api\/?/
       return Tree.quote txt
@@ -60,7 +60,7 @@ class LocalStorage
     Tree.unquote! val
 
     val = ENV['txt']
-    txt = Firefox.run "localStorage[\"#{key}\"] = #{val.inspect}"  #, :jquery=>1
+    txt = Firefox.exec "localStorage[\"#{key}\"] = #{val.inspect}"
     View.flash "- Saved!"
   end
 

data/menus/mac.rb

@@ -10,7 +10,8 @@ class Mac
       @/Users/
       @/Applications/
       @/Applications/Utilities/
-      @ ~/Library/Fonts/
+      @~/Library/Fonts/
+      @/System/Library/CoreServices/
     - api/
       | Define standard mac shortcuts
       @ Mac.define_keys

data/menus/maps.rb

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

data/menus/models.rb

@@ -0,0 +1,31 @@
+class Models
+  def self.menu
+    "
+    - .list/
+    - .relationships/
+    "
+    #     - structure/
+    #     - diagram/
+  end
+
+  def self.list
+    dir = Projects.default
+    models_dir = "#{dir}app/models/"
+    models = Dir.new(models_dir).entries.select{|o| o !~ /^\./}
+    models.map{|o| "@r/#{o[/\w+/].camelize}.first"}
+  end
+
+  def self.relationships
+    dir = Projects.default
+    models_dir = "#{dir}app/models/"
+    txt = "
+      @#{models_dir}
+        - ##^ *(has_|belongs_to )/
+      "
+    Tree.<< txt, :no_search=>1
+    Line.next
+    Launcher.launch
+    nil
+  end
+
+end

data/menus/mongo.rb

@@ -1,4 +1,4 @@
-class Mongo
+module Mongo
   def self.menu # bucket=nil
     %`
     - .collections/
@@ -35,7 +35,7 @@ class Mongo
 
   def self.run command
     command << ".forEach(printjson)" if command =~ /.find\(/
-    txt = `mongo --eval '#{command}'`
+    txt = `mongo admin --eval '#{command}'`
 
     if txt =~ /couldn't connect to server/
       raise "> Mongo isn't running. Start it?

data/menus/piano.rb

@@ -1,14 +1,19 @@
-Requirer.require_gem 'midiator', :optional=>1
+Requirer.require_gem 'unimidi', :optional=>1
+
+require 'xiki/mode'
 
-require "mode"
 
 class Piano
 
   include MIDIator::Notes rescue nil
   include MIDIator::Drums rescue nil
 
+  @@unimidi = nil
+
+  @@held_down = []
+
   @@midi = nil
-  @@velocity = 126
+  @@velocity = 100
   @@tempo = 120
   @@probability = 100
   @@melodic = 0
@@ -362,6 +367,8 @@ class Piano
       end
     end
 
+    self.clear
+
     nil
   end
 
@@ -383,21 +390,18 @@ class Piano
     end
   end
 
-  def self.clear channel=1
-    self.driver.control_change 123, channel, 123
-  end
-
   def self.<< letter
     self.note letter
   end
 
   def self.letter_to_number letter, options={}
 
-    adjustment =@@mode
+    adjustment = @@mode
 
     letter.next! if @@pentatonic && (letter == "b" || letter == "e")
 
-    number = letter[0].to_i
+    number = letter[0,1].sum
+
     number = case letter
     when "a".."z";  number - 96
     when "A".."G";  number - 71
@@ -428,7 +432,6 @@ class Piano
     if @@climb == 0
       random *= ((-1) ** rand(2))   # Half of the time, make it decrease note
     end
-    # Ol << "random: #{random.inspect}"
 
     if @@melodic == 1
       track = options[:track]
@@ -449,7 +452,6 @@ class Piano
     number
   end
 
-
   def self.note letter='a', options={}
 
     return if letter.nil? || letter == "#"
@@ -486,21 +488,44 @@ class Piano
     number += 1 if options[:sharp]
     number += (@@octave * 12)
 
-    self.driver.note_on(number, channel, velocity) unless number == 0
+    channel = 143 + channel
+    @@held_down << number
+    self.unimidi.puts(channel, number, velocity) # note on message
 
-    return if options[:no_sit]
+    return if options[:no_sit]   # Don't sit if other tracks have same beat
 
     self.pause
     nil
   end
 
+  def self.unimidi
+    @@unimidi ||= UniMIDI::Output.open(0).open
+  end
+
+  def self.send channel, number, value
+
+    output = UniMIDI::Output.open(0)
+
+    output.open do |output|
+      output.puts(channel, number, 90) # note on message
+    end
+  end
+
   def self.pause
+    # Ol << "!"
     pause = @@tempo * 4
     pause = pause / 60.0
     pause = 1 / pause
     $el ? $el.sit_for(pause) : sleep(pause)
     Piano.clear
-    Piano.clear 10
+  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
+    end
   end
 
   def self.keydef letter, note, channel=1, velocity=126
@@ -620,7 +645,6 @@ class Piano
   end
 
   def self.reset
-    self.connect
 
     @@velocity = 126
     @@tempo = 120
@@ -636,7 +660,7 @@ class Piano
     @@octave = 0
     @@program = 1
     @@repeat = 1
-    @@seed = nil
+    # @@seed = nil
 
     ".flash - success!"
   end
@@ -662,13 +686,13 @@ class Piano
   def self.probability txt="50";  @@probability = txt.to_s.sub('%', '').to_i;  ".flash - updated!";  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
+    # 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
+    # srand seed
 
     ".flash - updated!"
   end
@@ -678,7 +702,7 @@ class Piano
   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.seed txt; @@seed = txt.to_i;  ".flash - updated!";  end
 
   def self.mode txt=nil
     return @@mode if txt.nil?

data/menus/r.rb

@@ -0,0 +1,57 @@
+gem 'httparty'; require 'httparty'
+
+#
+# Runs code in a rails app.  Implants xiki_dev_controller.rb into the
+# app, 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 code=nil, yaml=nil
+
+    # If nothing passed, show last r/... commands...
+
+    if ! code
+      txt = Launcher.last "r", :exclude_path=>1
+      txt.gsub! /^- (\| )?/, '| '
+      txt = txt.split("\n").uniq.join("\n")
+      return txt
+    end
+
+    ENV['no_slash'] = "1"
+
+    if yaml
+      txt = ENV['txt']
+      txt = Rails.run_in_app txt, :yaml=>1
+    else
+      txt = Rails.run_in_app ENV['txt']
+      txt = Tree.quote(txt) if txt !~ /^\s+>/
+    end
+
+    txt
+  end
+
+  def self.suggest_creating_controller
+    %`
+    | This rails app may not have the xiki dev controller
+    | installed to let xiki evaluate code in it in dev mode.
+    | Create it?
+    @#{Projects.default}
+      - app/controllers/
+        - xiki_dev_controller.rb
+          | class XikiDevController < ApplicationController
+          |   def index
+          |     return render(:text=>"Disabled unless development and called locally.") if ! Rails.env.development? || request.remote_ip != "127.0.0.1"
+          |     code = File.read "/tmp/rails_run_tmp.txt"
+          |     txt = eval code
+          |     render :text=>txt.to_yaml
+          |   end
+          | end
+      - config/routes.rb
+        |+  match 'xiki_dev' => 'xiki_dev#index'
+        | end
+    `
+  end
+
+end

data/menus/rails.rb

@@ -1,4 +1,4 @@
-require "ruby_console"
+require 'xiki/ruby_console'
 
 class Rails
 
@@ -19,14 +19,14 @@ class Rails
     - .interact/
       - .rails console/
       - .sqlite console/
-      - .models/
+    - @models/
     - .setup/
       - .db/
         - .migrate/
       - .use rspec/
-    - .general/
       - .rails version/
     "
+    #     - .eval/
   end
 
   def self.menu_after txt, *args
@@ -34,18 +34,17 @@ class Rails
   end
 
   def self.menu_before *path
-
-    dir = Projects.current   # Returns dir in tree, or current project (top of projects.menu)
+    dir = Projects.default   # Returns dir in tree, or current project (top of projects.menu)
 
     # Don't intercede if already rails app or trying to generate
     return nil if ["generate", "general"].member?(path[0]) || File.exists?("#{dir}app")
 
     # If not a rails dir, give option to generate
     return "
-      | No rails app in #{dir} yet.  Generate it?
+      > No rails app in #{dir} yet.  Generate it?
       - generate/app/
 
-      | Not project-specific
+      > Non project-specific options
       - general/
       "
   end
@@ -55,7 +54,7 @@ class Rails
   end
 
   def self.use_rspec
-    dir = Projects.current
+    dir = Projects.default
 
     txt = "
       @ #{dir}
@@ -74,22 +73,13 @@ class Rails
       "
   end
 
-
-  def self.models
-    dir = Projects.current
-    dir = "#{dir}app/models/"
-
-    entries = Dir.new(dir).entries.select{|o| o =~ /^\w/}
-    entries.map{|o| "@r/#{TextUtil.camel_case o[/\w+/]}.first/"}.join("\n")
-  end
-
   def self.sqlite_console
-    Console.run "sqlite3 db/development.sqlite3", :dir=>Projects.current, :buffer=>"sqlite console"
+    Console.run "sqlite3 db/development.sqlite3", :dir=>Projects.default, :buffer=>"sqlite console"
     ".flash - opened console!"
   end
 
   def self.rails_console
-    Console.run "rails c", :dir=>Projects.current, :buffer=>"rails console"
+    Console.run "rails c", :dir=>Projects.default, :buffer=>"rails console"
     ".flash - opened console!"
   end
 
@@ -97,30 +87,30 @@ class Rails
 
     examples = "
       > Example fields
-      | id:primary_key
       | name:string
-      | description:text
+      | details:text
+      | summary:text
       | quantity:integer
       | price:decimal
-      | purchased_at:datetime
       | delivery:boolean
+      | purchased_at:datetime
       | user:references
       ".unindent
 
     case what
     when "app"
-      Console.run "rails new . --skip-bundle", :dir=>Projects.current
+      Console.run "rails new . --skip-bundle", :dir=>Projects.default
       return "- generating rails app..."
     when "model", "resource", "scaffold"
       return View.prompt "Enter a name" if ! name
       return examples if ! detail
       fields = ENV['txt'].gsub("\n", ' ').strip
-      Console.run "rails g #{what} #{name} #{fields}", :dir=>Projects.current
+      Console.run "rails g #{what} #{name} #{fields}", :dir=>Projects.default
       return "- generating #{what}..."
     when "controller"
       return View.prompt "Enter a name" if ! name
       return View.prompt "Enter an action" if ! detail
-      Console.run "rails g controller #{name} #{detail}", :dir=>Projects.current
+      Console.run "rails g controller #{name} #{detail}", :dir=>Projects.default
       return "- generating controller..."
     end
 
@@ -141,7 +131,7 @@ class Rails
     command = "rails s"
     command << " -p #{port}" if port
 
-    Console.run command, :dir=>Projects.current, :buffer=>"rails server"
+    Console.run command, :dir=>Projects.default, :buffer=>"rails server"
 
     # Check whether it's already running
     "| Rails app was already running\n- browse/"
@@ -150,11 +140,83 @@ class Rails
   end
 
   def self.command txt
-    Console.run txt, :dir=>Projects.current
+    Console.run txt, :dir=>Projects.default
   end
 
   def self.migrate
     self.command "rake db:migrate"
   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 = ENV['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.partial_updates = false
+
+          existing = mod.class.where :id=>mod.id
+          mod.instance_variable_set('@new_record', true) if existing.empty?
+
+          mod.save
+        end
+        "
+    end
+
+    File.open("/tmp/rails_run_tmp.txt", "w") { |f| f << txt }
+    response = HTTParty.get("http://localhost:3000/xiki_dev") rescue :exception
+
+    return "| The rails server doesn't appear to be running.  Start default server?\n@rails/start/" if response == :exception
+
+    return self.suggest_creating_controller if response.response.is_a?(Net::HTTPNotFound)
+
+    return ".flash - saved!" if options[:yaml]
+
+    txt = response.body
+    txt.gsub!(/ +$/, '')
+
+    # If is error, delete html at top
+    txt.sub!(/.+?<h1>/m, '<h1>') if txt =~ /<div id="traces">/ && txt =~ /<h1>/
+
+    # If file not found, suggest generating it
+    if txt =~ /uninitialized constant XikiDevController::(\w+)/
+      clazz = $1
+      return "
+        > Class '#{clazz}' doesn't exist.  Generate it as a model?
+        @#{Projects.default}
+          @rails/generate/model/#{clazz}
+        "
+
+    end
+
+    txt
+
+  end
+
 end