cake 0.3.8 → 0.3.11

data/bin/cake

@@ -6,9 +6,13 @@ require 'rexml/document'
 require 'socket'
 require 'timeout'
 require 'fileutils'
+require 'io/wait'
+require 'pp'
 
-if RUBY_PLATFORM =~ /(mingw|mswin)32$/
+if RUBY_PLATFORM =~ /(mingw|mswin)(32|64)$/
   require 'win32/process'
+  TERM = 'BRK'
+  KILL = 'KILL'
   PATH_SEP = ';'
   $home = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
 
@@ -16,6 +20,8 @@ if RUBY_PLATFORM =~ /(mingw|mswin)32$/
     Process.create(:app_name => cmd).process_id
   end
 else
+  TERM = 'TERM'
+  KILL = 'KILL'
   PATH_SEP = ':'
   $home = File.expand_path("~")
 
@@ -47,11 +53,11 @@ rescue LoadError => e
 end
 
 class IO
-  def gets_nonblock
+  def gets_nonblock(delim = "\n")
     line = ""
     while c = read_nonblock(1)
       line << c
-      break if c == "\n"
+      break if c == delim
     end
     line
   rescue Errno::EAGAIN, EOFError => e
@@ -228,6 +234,10 @@ def config
   @config ||= Configuration.new(".cake/config")
 end
 
+def ps
+  `jps -v`.split("\n").select {|l| l =~ /cake\.project/}
+end
+
 class JVM
   attr_reader :type, :classpath, :libpath, :port, :pid, :pidfile, :load_time
 
@@ -343,7 +353,7 @@ class JVM
   end
 
   def kill
-    Process.kill($opts[:"9"] ? "KILL" : "TERM", pid) if pid
+    Process.kill($opts[:"9"] ? KILL : TERM, pid) if pid
   end
 
   def files
@@ -452,25 +462,40 @@ private
     end
   end
 
-  def read_until_prompt(socket)
-    while ready = select([socket, $stdin])[0]
-      if ready.first == socket
+  def read_until_prompt(socket, wait = 0.01, read_timeout = 3)
+    prompt = nil
+    while read_timeout -= wait
+      while socket.wait(wait)
         line = socket.gets_nonblock
-        return $1 if line =~ /^#{REPL_PROMPT}(.*)$/
-        $stdout.print line
-        $stdout.flush
-      else
-        socket.puts($stdin.gets)
+        if line =~ /^#{REPL_PROMPT}(.*)$/
+          prompt = $1
+        else
+          $stdout.print line
+          $stdout.flush
+        end
       end
+      break if prompt
+
+      while $stdin.ready?
+        socket.puts($stdin.gets)
+      end if read_timeout <= 0
     end
+    prompt
   end
 
-  def complete?(input)
-    return true if input.empty?
+  def validate(input)
+    return input if input.empty?
     with_socket do |socket|
       socket.write(":validate #{input.join("\n").strip}")
       socket.close_write # send eof
-      socket.gets != "incomplete\n"
+      results = socket.gets(nil)
+
+      return if results == "incomplete\n"
+      if results == "invalid\n"
+        input.join(' ').strip
+      else
+        results.strip
+      end
     end
   end
 
@@ -481,9 +506,9 @@ private
     Readline.completion_proc = method(:completions)
     while line = Readline.readline(prompt)
       input << line
-      if complete?(input)
-        Readline::HISTORY.push(input.join(' ').strip)
-        return input.join("\n").strip
+      if valid_input = validate(input)
+        Readline::HISTORY.push(valid_input)
+        return valid_input
       end
       prompt[-2] = ?*
     end
@@ -513,7 +538,8 @@ class Cake < JVM
   def send_command(command, args = [])
     with_socket do |socket|
       args = args.collect{|arg| '"' + arg.gsub('"', '\"').gsub("\n", "\\n") + '"'}
-      cmd  = %{[#{command} [#{args.join(' ')}] #{bakeport || "nil"} "#{$pwd}"] "#{READLINE}"}
+      env  = command == :run ? ('{' + ENV.collect {|k,v| "#{k.inspect} #{v.inspect}"}.join(' ') + '}') : 'nil'
+      cmd  = %{[#{command} [#{args.join(' ')}] #{bakeport || 'nil'} "#{$pwd}" #{env}] "#{READLINE}"}
       log(command, "sending: " + cmd) if debug?
       socket.write(cmd)
       while (line = socket.gets)
@@ -606,9 +632,9 @@ bake = Bake.new(
 
 if $command == :kill
   if $opts[:all]
-    `jps -v | grep cake.project`.split("\n").each do |line|
+    ps.each do |line|
       pid = line.split(' ').first.to_i
-      Process.kill($opts[:"9"] ? "KILL" : "TERM", pid)
+      Process.kill($opts[:"9"] ? KILL : TERM, pid)
     end
   else
     cake.kill
@@ -616,7 +642,7 @@ if $command == :kill
   end
   exit
 elsif $command == :ps
-  puts `jps -v | grep cake.project`.sort.reverse
+  puts ps.sort.reverse
   exit
 elsif restart? or config_updated?
   cake.stop

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -07:00
+date: 2010-08-11 00:00:00 -07:00
 default_executable: cake
 dependencies: []