cake 0.2.7 → 0.2.8

data/bin/cake

@@ -11,6 +11,7 @@ require 'fileutils'
 require 'pp'
 
 file     = File.readlink(__FILE__) rescue __FILE__
+$bakedir = Dir.getwd
 $cakedir = File.dirname(File.dirname(file))
 $confdir = ".cake"
 $repo    = "http://clojars.org/repo/cake/cake"
@@ -95,8 +96,12 @@ def verbose?
   debug? or $opts[:v] or $opts[:verbose]
 end
 
+def config_updated?
+  newer?(".cake/config", ".cake/cake.pid") or newer?(".cake/config", ".cake/bake.pid")
+end
+
 def restart?
-  $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command)
+  $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command) or config_updated?
 end
 
 def admin_command?
@@ -109,12 +114,27 @@ def log(command, *message)
   end
 end
 
+CONFIG_FILE = ".cake/config"
+def config
+  if @config.nil?
+    @config = {}
+    File.open(CONFIG_FILE, 'r') do |file|
+      file.each do |line|
+        key, value = line.split('=', 2)
+        @config[key.strip] = value.strip
+      end
+    end if File.exists?(CONFIG_FILE)
+  end
+  @config
+end
+
 class JVM
-  attr_reader :type, :classpath, :port, :pid, :pidfile, :start_time
+  attr_reader :type, :classpath, :libpath, :port, :pid, :pidfile, :start_time
 
-  def initialize(classpath)
+  def initialize(classpath, libpath = nil)
     @type       = self.class.name.downcase
     @classpath  = classpath
+    @libpath    = libpath
     @pidfile    = "#{$confdir}/#{type}.pid"
     @start_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
 
@@ -163,6 +183,10 @@ class JVM
     end
   end
 
+  def java_opts
+    "-cp #{classpath} -Djava.library.path=#{libpath}"
+  end
+
   MIN_PORT = 2**13
   MAX_PORT = 2**16
 
@@ -170,7 +194,7 @@ class JVM
     return if running?
     @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
     log(:start, "starting #{type} jvm on port #{port}") if debug?
-    @pid = daemon %{ java -d32 -cp #{classpath} clojure.main -e "(use '#{type})(start-server #{port})" /dev/null }
+    @pid = daemon %{ java #{java_opts} clojure.main -e "(use '#{type})(start-server #{port})" /dev/null }
     File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n") }
     log(:start, "#{type} jvm started") if verbose?
   rescue Errno::EADDRNOTAVAIL => e
@@ -243,7 +267,7 @@ private
     pid
   end
 
-  def with_socket(retries = 5)
+  def with_socket(retries = 10)
     return unless port
     socket = TCPSocket.new("localhost", port)
     result = yield(socket)
@@ -273,15 +297,19 @@ class Cake < JVM
       command
     end
   end
+
+  def java_opts
+    [ENV['CAKE_JAVA_OPTS'], config['cake.java_opts'], super].compact.join(' ')
+  end
 end
 
 class Bake < JVM
-  MARKER = rand.to_s
+  MARKER = "=#{rand.to_s}="
   PROMPT = /^(.*)#{MARKER}$/
   START_REPL = <<-END
     (clojure.main/repl
       :init   #(in-ns 'user)
-      :prompt #(printf "%s=> #{MARKER}\n" (ns-name *ns*)))
+      :prompt #(printf "%s#{MARKER}\n" (ns-name *ns*)))
   END
 
   def repl
@@ -291,8 +319,8 @@ class Bake < JVM
         socket.write START_REPL
         socket.gets # burn extra prompt
 
-        while prompt = read_until_prompt(socket)
-          line = readline(prompt)
+        while @ns = read_until_prompt(socket)
+          line = readline
           return unless line
           socket.write(line + "\n")
         end
@@ -302,6 +330,10 @@ class Bake < JVM
     save_history
   end
 
+  def java_opts
+    [ENV['JAVA_OPTS'], config['project.java_opts'], super].compact.join(' ')
+  end
+
 private
 
   HISTORY_NUM  = 500
@@ -336,9 +368,12 @@ private
     end
   end
 
-  def readline(initial_prompt)
+  Readline.completer_word_break_characters = " \t\n\"'`~@;#&{}()[]"
+
+  def readline
     input = []
-    prompt = initial_prompt.clone
+    prompt = "#{@ns}=> "
+    Readline.completion_proc = method(:completions)
     while line = Readline.readline(prompt)
       input << line
       if complete?(input)
@@ -352,6 +387,18 @@ private
     Readline::HISTORY.push(input)
     retry
   end
+
+  def completions(prefix)
+    return [] if prefix.empty?
+    with_socket do |socket|
+      socket.write(":completions [\"#{prefix}\" #{@ns}]\n")
+      completions = []
+      while line = socket.gets
+        completions << line.chomp
+      end
+      completions
+    end
+  end
 end
 
 # Bootstrap cake dependencies.
@@ -362,8 +409,8 @@ if File.exists?("#{$cakedir}/.gitignore")
     version = IO.read("#{$cakedir}/project.clj").first.match(/defproject cake \"(.*)\"/)[1]
     get_cake(version, lib)
   end
-  cakepath = "#{$cakedir}/src:#{lib}/*"
-  bakepath = "#{$cakedir}/bake"
+  cakepath = "#{$cakedir}/src:#{lib}/*:#{lib}/dev/*"
+  bakepath = "#{$cakedir}/bake:#{lib}/dev/*"
 else
   cakejar = "#{lib}/cake.jar"
   bakejar = "#{lib}/bake.jar"
@@ -380,11 +427,16 @@ else
   end
 end
 
-pwd = Dir.getwd
-srcpath = "#{pwd}/src:#{pwd}/src/clj"
+srcpath = "#{$bakedir}/src:#{$bakedir}/src/clj"
 
-cake = Cake.new("#{cakepath}:#{srcpath}:#{pwd}/lib/dev/*")
-bake = Bake.new("#{bakepath}:#{srcpath}:#{pwd}/classes:#{pwd}/test:#{pwd}/lib/*:#{pwd}/lib/dev/*")
+cake = Cake.new(
+  "#{cakepath}:#{srcpath}:#{$bakedir}/lib/dev/*",
+  "#{$bakedir}/lib/dev/native"
+)
+bake = Bake.new(
+  "#{bakepath}:#{srcpath}:#{$bakedir}/classes:#{$bakedir}/test:#{$bakedir}/lib/*:#{$bakedir}/lib/dev/*",
+  "#{$bakedir}/lib/native:#{$bakedir}/lib/dev/native"
+)
 
 if $command == :kill
   cake.kill

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -07:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: cake
 dependencies: []