cake 0.3.1 → 0.3.2

data/bin/cake

@@ -13,7 +13,7 @@ begin
 rescue LoadError => e
   module Readline
     HISTORY = []
-    attr_accessor :completer_word_break_characters, :completion_proc
+    attr_accessor :basic_word_break_characters, :completion_proc
     def readline(prompt)
       $stdout.print prompt
       $stdout.flush
@@ -23,12 +23,21 @@ rescue LoadError => e
   end
 end
 
+def project_dir(dir)
+  while dir != "/"
+    return dir if [".cake", "project.clj", "build.clj"].any? {|file| File.exists?("#{dir}/#{file}")}
+    dir = File.dirname(dir)
+  end
+  File.expand_path("~")
+end
+
 PATH_SEP = ':'
 file     = File.readlink(__FILE__) rescue __FILE__
-$bakedir = Dir.getwd
+$bakedir = project_dir(Dir.getwd)
 $cakedir = File.dirname(File.dirname(file))
 $repo    = "http://clojars.org/repo/cake/cake"
 $confdir = ".cake"
+Dir.chdir($bakedir)
 File.makedirs($confdir)
 
 def get_cake(version, dest = nil)
@@ -89,6 +98,7 @@ def extract(jar, file, dest = File.dirname(jar))
 end
 
 def newer?(file1, file2)
+  return false unless File.exists?(file1)
   not File.exists?(file2) or test(?>, file1, file2)
 end
 
@@ -121,11 +131,11 @@ def verbose?
 end
 
 def config_updated?
-  newer?(".cake/config", ".cake/cake.pid") or newer?(".cake/config", ".cake/bake.pid")
+  newer?(".cake/config", ".cake/cake.pid") or (File.exists?(".cake/bake.pid") and newer?(".cake/config", ".cake/bake.pid"))
 end
 
 def restart?
-  $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command) or config_updated?
+  $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command)
 end
 
 def admin_command?
@@ -138,7 +148,7 @@ def log(command, *message)
   end
 end
 
-class Config < Hash
+class Configuration < Hash
   def initialize(path)
     File.open(path, 'r') do |file|
       file.each do |line|
@@ -161,24 +171,19 @@ class Config < Hash
 end
 
 def config
-  @config ||= Config.new(".cake/config")
+  @config ||= Configuration.new(".cake/config")
 end
 
 class JVM
-  attr_reader :type, :classpath, :libpath, :port, :pid, :pidfile, :start_time
+  attr_reader :type, :classpath, :libpath, :port, :pid, :pidfile, :load_time
 
   def initialize(classpath, libpath)
     @type       = self.class.name.downcase
     @classpath  = make_path(classpath)
     @libpath    = make_path(libpath)
     @pidfile    = "#{$confdir}/#{type}.pid"
-    @start_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
-
-    @pid, @port = IO.read(pidfile).map {|l| l.to_i}
-    Process.kill(0, @pid) # make sure pid is valid
-
-  rescue Errno::ESRCH, Errno::ENOENT => e
-    reset! # no pidfile or invalid pid
+    @load_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
+    refresh
   end
 
   def running?
@@ -190,8 +195,23 @@ class JVM
   end
 
   def init
-    reload_stale_files if enabled? and running?
+    stale = reload_stale_files if enabled? and running?
     start
+    stale
+  end
+
+  def refresh
+    @pid, @port = IO.read(pidfile).map {|l| l.to_i}
+    Process.kill(0, @pid) # make sure pid is valid
+    TCPSocket.new("localhost", @port).close if @port # make sure jvm is running on port
+  rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED => e
+    log(:start, "defunct #{type} jvm") if debug? and e.kind_of?(Errno::ECONNREFUSED)
+    reset! # no pidfile or invalid pid or connection refused
+  end
+
+  def reload
+    refresh
+    init
   end
 
   def reload_stale_files
@@ -199,6 +219,7 @@ class JVM
 
     if stale_files.empty?
       log(:reload, "no stale #{type} files found") if verbose? and admin_command?
+      false
     else
       log(:reload, "the following #{type} files have changed: #{stale_files.join(', ')}") if debug?
 
@@ -212,7 +233,7 @@ class JVM
           socket.write ":reload [#{stale_files.join(" ")}]\n"
           if socket.eof?
             FileUtils.touch(pidfile)
-            @start_time = Time.now
+            @load_time = Time.now
           else
             inspect(socket) if debug?
             log(:reload, "unable to reload all #{type} files, restarting") if verbose?
@@ -220,6 +241,7 @@ class JVM
           end
         end
       end
+      true
     end
   end
 
@@ -233,12 +255,16 @@ class JVM
   MAX_PORT = 2**16
 
   def start
-    return if not enabled? or running?
-    @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
-    log(:start, "starting #{type} jvm on port #{port}") if debug?
-    @pid = daemon %{ java -Dcake.project=#{$bakedir} #{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?
+    return unless enabled?
+    if running?
+      log(:start, "#{type} jvm already running") if $command == :start
+      return
+    else
+      log(:start, "starting #{type} jvm") if verbose? or $command == :start
+      @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
+      @pid = daemon %{ java -Dcake.project=#{$bakedir} #{java_opts} clojure.main -e "(use '#{type})(start-server #{port})" /dev/null }
+      File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n") }
+    end
   rescue Errno::EADDRNOTAVAIL => e
     retry
   end
@@ -249,7 +275,7 @@ class JVM
       log(mode, "sending #{action} to #{type} jvm on port #{port}") if debug?
       socket.write(":#{action}\n")
       if socket.eof?
-        log(mode, "#{type} jvm stopped") if verbose?
+        log(mode, "#{type} jvm stopped") if restart?
         reset!
       else
         inspect(socket) if debug?
@@ -260,7 +286,7 @@ class JVM
           log(mode, "         close active connections or use 'cake stop' to force quit")
         end
       end
-    end || (log(mode, "#{type} jvm not running") if verbose?)
+    end || (log(mode, "#{type} jvm not running") if $command == :stop)
   end
 
   def kill
@@ -268,7 +294,7 @@ class JVM
   end
 
   def files
-    files = []
+    files = ["project.clj"]
     classpath.split(PATH_SEP).uniq.each do |path|
       if path =~ /(.*)\/\*$/
         files.concat Dir["#{path}.jar"] << "#{$1}/." # include the directory itself so deletions will be detected
@@ -282,6 +308,31 @@ class JVM
     files
   end
 
+  def ping
+    return unless enabled?
+    with_socket(10) do |socket|
+      socket.write ":ping\n"
+      log($command, "#{type} jvm not running") unless socket.gets == "pong\n"
+    end
+  end
+
+  REPL_PROMPT = "REPL_PROMPT__#{rand}"
+  def repl
+    load_history
+    loop do
+      with_socket do |socket|
+        socket.write %{:repl "#{REPL_PROMPT}"}
+        while @ns = read_until_prompt(socket)
+          line = readline
+          return unless line
+          socket.write(line + "\n")
+        end
+      end
+    end
+  ensure
+    save_history
+  end
+
 private
 
   def make_path(paths)
@@ -299,11 +350,11 @@ private
   def reset!
     File.unlink(pidfile) if File.exists?(pidfile)
     @pid, @port = []
-    @start_time = Time.now
+    @load_time = Time.now
   end
 
   def stale?(file)
-    File.exists?(file) and File.mtime(file) > start_time
+    File.exists?(file) and File.mtime(file) > load_time
   end
 
   def daemon(cmd)
@@ -328,70 +379,9 @@ private
   ensure
     socket.close if socket
   end
-end
-
-class Cake < JVM
-  attr_accessor :bakeport
-
-  def files
-    super.concat ["project.clj", "build.clj", ".cake/swank"]
-  end
-
-  def send_command(command, *args)
-    with_socket do |socket|
-      socket.write("(#{command} [#{args.join(' ')}] #{bakeport})\n")
-      while(line = socket.gets)
-        puts line
-      end
-      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}="
-  PROMPT = /^(.*)#{MARKER}$/
-  START_REPL = <<-END
-    (clojure.main/repl
-      :init   #(in-ns 'user)
-      :prompt #(printf "%s#{MARKER}\n" (ns-name *ns*)))
-  END
-
-  def repl
-    load_history
-    loop do
-      with_socket do |socket|
-        socket.write START_REPL
-        socket.gets # burn extra prompt
-
-        while @ns = read_until_prompt(socket)
-          line = readline
-          return unless line
-          socket.write(line + "\n")
-        end
-      end
-    end
-  ensure
-    save_history
-  end
-
-  def java_opts
-    [ENV['JAVA_OPTS'], config['project.java_opts'], super].compact.join(' ')
-  end
-
-  def enabled?
-    Dir["lib/*.jar"].any?
-  end
-
-private
 
   HISTORY_NUM  = 500
   HISTORY_FILE = ".cake/history"
-
   def load_history
     open(HISTORY_FILE) do |file|
       file.each {|line| Readline::HISTORY << line.chomp}
@@ -407,7 +397,7 @@ private
 
   def read_until_prompt(socket)
     while line = socket.gets
-      return $1 if line =~ PROMPT
+      return $1 if line =~ /^#{REPL_PROMPT}(.*)$/
       puts line
     end
   end
@@ -421,8 +411,7 @@ private
     end
   end
 
-  Readline.completer_word_break_characters = " \t\n\"'`~@;#&{}()[]"
-
+  Readline.basic_word_break_characters = " \t\n\"'`~@;#&{}()[]"
   def readline
     input = []
     prompt = "#{@ns}=> "
@@ -454,6 +443,74 @@ private
   end
 end
 
+class Cake < JVM
+  attr_accessor :bakeport
+
+  READLINE = "READLINE__#{rand}"
+  def send_command(command, args = [])
+    with_socket do |socket|
+      args = args.collect{|arg| '"' + arg.gsub('"', '\"').gsub("\n", "\\n") + '"'}
+      cmd  = %{(#{command} [#{args.join(' ')}] #{bakeport}) "#{READLINE}"}
+      log(command, "sending: " + cmd) if debug?
+      socket.write(cmd)
+      while (line = socket.gets)
+        if line =~ /^#{READLINE}(.*)$/
+          socket.write(prompt($1))
+        elsif line =~ /^@#{READLINE}(.*)$/
+          socket.write(prompt($1, :echo => false))
+        else
+          puts line
+        end
+      end
+    end
+  end
+
+  def files
+    super.concat ["build.clj", ".cake/swank"]
+  end
+
+  def java_opts
+    [ENV['CAKE_JAVA_OPTS'], config['cake.java_opts'], super].compact.join(' ')
+  end
+
+private
+
+  def prompt(prompt, opts = {})
+    if opts[:echo] == false
+      echo_off = system("stty -echo 2&> /dev/null")
+      prompt << " (WARNING, input will be visible on console!)" unless echo_off
+    end
+    input = Readline.readline(prompt + ": ") || ''
+    input + "\n"
+  ensure
+    if echo_off
+      system("stty echo 2&> /dev/null")
+      puts
+    end
+  end
+end
+
+class Bake < JVM
+  def java_opts
+    [ENV['JAVA_OPTS'], config['project.java_opts'], super].compact.join(' ')
+  end
+
+  def enabled?
+    Dir["lib/*.jar"].any?
+  end
+
+  def eval(*forms)
+    forms = forms.join(' ')
+    with_socket do |socket|
+      log(:eval, forms) if debug?
+      socket.write('[' + forms + ']')
+      while (line = socket.gets)
+        puts line
+      end
+    end
+  end
+end
+
 # Bootstrap cake dependencies.
 lib = "#{$cakedir}/lib"
 if File.exists?("#{$cakedir}/.gitignore")
@@ -482,7 +539,7 @@ else
 end
 
 cake = Cake.new(
-  [cakepath, "src", "src/clj", config['cake.classpath'], "lib/dev/*"],
+  [cakepath, "src", "src/clj", config['cake.claspath'], "lib/dev/*"],
   [config['cake.library.path'], "lib/dev/native"]
 )
 bake = Bake.new(
@@ -502,8 +559,9 @@ if $command == :kill
   end
   exit
 elsif $command == :ps
-  exec "jps -v | grep cake.project"
-elsif restart?
+  puts `jps -v | grep cake.project`.sort.reverse
+  exit
+elsif restart? or config_updated?
   cake.stop
   bake.stop
   exit if $command == :stop
@@ -512,22 +570,44 @@ end
 cake.init
 if not [:deps, :clean].include?($command) and File.exists?('project.clj')
   if newer?('project.clj', 'pom.xml')
-    deps = cake.send_command(:deps)
-  elsif File.exist?('.cake/swank')
-    deps = cake.send_command(:"swank-deps")
+    cake.send_command(:deps) 
+    cake.init
+  elsif File.exist?('.cake/swank')    
+    cake.send_command(:"swank-deps")
+    cake.init
   end
 
   bake.init
-  cake.init if deps # must check if dev dependencies have changed
 end
 
 if $command == :repl
-  if File.exists?('project.clj')
+  if File.exists?('project.clj') and not $opts[:cake]
     bake.repl
   else
-    log(:repl, "cannot start repl without project.clj")
+    cake.repl
+  end
+elsif $command == :eval
+  bake.eval(*$opts[:eval])
+elsif [:start, :reload, :restart].include?($command)
+  if $opts[:l] or $opts[:log]
+    system("tail -f .cake/bake.log")
+  else
+    cake.ping
+    bake.ping
   end
-elsif not [:start, :reload, :restart].include?($command)
+else
   cake.bakeport = bake.port
-  cake.send_command($command, ARGV)
+  if $command == :test and $opts[:auto]
+    interval = $opts[:auto].last.to_i 
+    interval = (config['test.auto.interval'].to_i if config['test.auto.interval']) || (1 if interval == 0)
+    run_tests = true
+    while true
+      cake.send_command($command, ARGV) if run_tests
+      run_tests = bake.reload
+      cake.reload
+      sleep(interval)
+    end
+  else
+    cake.send_command($command, ARGV)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -07:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: cake
 dependencies: []