cake 0.2.6 → 0.2.7

data/bin/cake

@@ -1,20 +1,28 @@
 #!/usr/bin/env ruby
 # Save your fork, there's cake!"
 require 'ftools'
+require 'find'
 require 'open-uri'
 require 'rexml/document'
+require 'socket'
+require 'timeout'
+require 'readline'
+require 'fileutils'
+require 'pp'
 
-$repo = "http://clojars.org/repo/cake/cake"
-$file = File.readlink(__FILE__) rescue __FILE__
-$root = File.dirname(File.dirname($file))
+file     = File.readlink(__FILE__) rescue __FILE__
+$cakedir = File.dirname(File.dirname(file))
+$confdir = ".cake"
+$repo    = "http://clojars.org/repo/cake/cake"
+File.makedirs($confdir)
 
-def have_cake(version, dest)
+def get_cake(version, dest)
   jar  = version =~ /(.*)-SNAPSHOT/ ? "cake-#{$1}-#{snapshot(version)}.jar" : "cake-#{version}.jar"
   dest = File.expand_path(dest)
   path = "#{dest}/#{jar}"
 
   if not File.exists?(path)
-    puts "fetching cake libraries. this may take a moment..."
+    log(:deps, "fetching cake libraries. this may take a moment...")
     url = "#{$repo}/#{version}/#{jar}"
     File.makedirs(dest)
     open(url) do |jar|
@@ -27,16 +35,11 @@ def have_cake(version, dest)
   end
   path
 rescue OpenURI::HTTPError => e
-  puts "unable to find cake version #{version} on clojars."
-  puts "please check http://github.com/ninjudd/cake for latest install instructions."
+  log(:deps, "unable to find cake version #{version} on clojars.")
+  log(:deps, "please check http://github.com/ninjudd/cake for latest install instructions.")
   exit
 end
 
-def eat_cake(*args)
-  opts = %{ -d32 -cp #{$classpath} -Dbakepath="#{$bakepath}" }
-  system %{ java #{opts} clojure.main -e "(use 'cake)(-main)" /dev/null #{args.join(' ')} }
-end
-
 def current_version
   open("#{$repo}/maven-metadata.xml") do |file|
     doc = REXML::Document.new file
@@ -60,34 +63,358 @@ def extract(jar, file)
   "#{dest}/#{file}"
 end
 
-# Bootstap cake dependencies.
-lib = "#{$root}/lib"
-if File.exists?("#{$root}/.gitignore")
+def newer?(file1, file2)
+  not File.exists?(file2) or test(?>, file1, file2)
+end
+
+def add_opt!(key, *vals)
+  ($opts[key.to_sym] ||= []).concat vals
+end
+
+def parse_opts!
+  ARGV.unshift('default') if ARGV.empty? or ARGV.first[0,1] == '-'
+  $command = ARGV.shift.to_sym
+  $opts = {}
+  ARGV.each do |opt|
+    case opt
+    when /^-(\w*)$/                then $1.chars.each {|c| add_opt!(c, "")}
+    when /^--?([-\w]*)=([-,\w]+)$/ then add_opt!($1, *$2.split(','))
+    when /^--?([-\w]*)$/           then add_opt!($1, "")
+    else                                add_opt!($command, opt)
+    end
+  end
+  $opts.freeze
+end
+parse_opts!
+
+def debug?
+  ENV['CAKE_DEBUG'] or $opts[:d] or $opts[:debug]
+end
+
+def verbose?
+  debug? or $opts[:v] or $opts[:verbose]
+end
+
+def restart?
+  $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command)
+end
+
+def admin_command?
+  [:start, :stop, :reload, :restart].include?($command)
+end
+
+def log(command, *message)
+  message.each do |line|
+    printf("%11s %s\n", "[#{command}]", line)
+  end
+end
+
+class JVM
+  attr_reader :type, :classpath, :port, :pid, :pidfile, :start_time
+
+  def initialize(classpath)
+    @type       = self.class.name.downcase
+    @classpath  = classpath
+    @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
+  end
+
+  def running?
+    not pid.nil?
+  end
+
+  def init
+    reload_stale_files if running?
+    start
+  end
+
+  def reload_stale_files
+    stale_files = files.select {|f| stale?(f)}
+
+    if stale_files.empty?
+      log(:reload, "no stale #{type} files found") if verbose? and admin_command?
+    else
+      log(:reload, "the following #{type} files have changed: #{stale_files.join(', ')}") if debug?
+
+      if stale_files.any? {|f| File.extname(f) != ".clj"}
+        log(:reload, "non-clojure #{type} files have changed, restarting") if verbose?
+        stop(:reload)
+      else
+        log(:reload, "clojure #{type} files have changed, reloading") if verbose?
+        with_socket(0) do |socket|
+          stale_files = stale_files.collect {|f| %{"#{f}"} }
+          socket.write ":reload [#{stale_files.join(" ")}]\n"
+          if socket.eof?
+            FileUtils.touch(pidfile)
+            @start_time = Time.now
+          else
+            inspect(socket) if debug?
+            log(:reload, "unable to reload all #{type} files, restarting") if verbose?
+            stop(:reload)
+          end
+        end
+      end
+    end
+  end
+
+  MIN_PORT = 2**13
+  MAX_PORT = 2**16
+
+  def start
+    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 }
+    File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n") }
+    log(:start, "#{type} jvm started") if verbose?
+  rescue Errno::EADDRNOTAVAIL => e
+    retry
+  end
+
+  def stop(mode = :stop)
+    with_socket(0) do |socket|
+      action = mode == :reload ? 'quit' : 'force-quit'
+      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?
+        reset!
+      else
+        inspect(socket) if debug?
+        if mode == :stop
+          log(mode, "error stopping #{type} jvm, try 'cake kill' or 'cake kill -9'")
+        else
+          log(mode, "warning: classes have changed but can't restart #{type} jvm with active connections")
+          log(mode, "         close active connections or use 'cake stop' to force quit")
+        end
+      end
+    end || (log(mode, "#{type} jvm not running") if verbose?)
+  end
+
+  def kill
+    Process.kill($opts[:"9"] ? "KILL" : "TERM", pid) if pid
+  end
+
+  def files
+    files = []
+    classpath.split(':').uniq.each do |path|
+      if path =~ /(.*)\/\*$/
+        files.concat Dir["#{path}.jar"] << "#{$1}/." # include the directory itself so deletions will be detected
+      else
+        Find.find(path) do |f|
+          files << f if File.exists?(f) and not File.directory?(f)
+        end
+      end
+    end
+    files
+  end
+
+private
+
+  def inspect(socket)
+    while line = socket.gets
+      puts line
+    end
+  end
+
+  def reset!
+    File.unlink(pidfile) if File.exists?(pidfile)
+    @pid, @port = []
+    @start_time = Time.now
+  end
+
+  def stale?(file)
+    File.exists?(file) and File.mtime(file) > start_time
+  end
+
+  def daemon(cmd)
+    puts cmd if debug?
+    pid = fork do
+      Process.setsid
+      exec(cmd)
+    end
+    Process.detach(pid)
+    pid
+  end
+
+  def with_socket(retries = 5)
+    return unless port
+    socket = TCPSocket.new("localhost", port)
+    result = yield(socket)
+    result
+  rescue Errno::ECONNREFUSED => e
+    sleep 1
+    retry if (retries -= 1) >= 0
+    exit
+  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
+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 prompt = read_until_prompt(socket)
+          line = readline(prompt)
+          return unless line
+          socket.write(line + "\n")
+        end
+      end
+    end
+  ensure
+    save_history
+  end
+
+private
+
+  HISTORY_NUM  = 500
+  HISTORY_FILE = ".cake/history"
+
+  def load_history
+    open(HISTORY_FILE) do |file|
+      file.each {|line| Readline::HISTORY << line.chomp}
+    end if File.exists?(HISTORY_FILE)
+  end
+
+  def save_history
+    open(HISTORY_FILE, 'w') do |file|
+      history = Readline::HISTORY.to_a
+      file.puts(history[-HISTORY_NUM..-1] || history)
+    end
+  end
+
+  def read_until_prompt(socket)
+    while line = socket.gets
+      return $1 if line =~ PROMPT
+      puts line
+    end
+  end
+
+  def complete?(input)
+    return true if input.empty?
+    with_socket do |socket|
+      socket.write(":validate #{input.join("\n").strip}")
+      socket.close_write # send eof
+      socket.gets != "incomplete\n"
+    end
+  end
+
+  def readline(initial_prompt)
+    input = []
+    prompt = initial_prompt.clone
+    while line = Readline.readline(prompt)
+      input << line
+      if complete?(input)
+        Readline::HISTORY.push(input.join(' ').strip)
+        return input.join("\n").strip
+      end
+      prompt[-2] = ?*
+    end
+  rescue Interrupt => e
+    return nil if input.empty?
+    Readline::HISTORY.push(input)
+    retry
+  end
+end
+
+# Bootstrap cake dependencies.
+lib = "#{$cakedir}/lib"
+if File.exists?("#{$cakedir}/.gitignore")
   if Dir["#{lib}/*.jar"].empty?
     # In a new git checkout, need to fetch dependencies.
-    version = IO.read("#{$root}/project.clj").first.match(/defproject cake \"(.*)\"/)[1]
-    have_cake(version, lib)
+    version = IO.read("#{$cakedir}/project.clj").first.match(/defproject cake \"(.*)\"/)[1]
+    get_cake(version, lib)
   end
-  $classpath = "#{$root}/src/:#{lib}/*"
-  $bakepath  = "#{$root}/bake"
+  cakepath = "#{$cakedir}/src:#{lib}/*"
+  bakepath = "#{$cakedir}/bake"
 else
-  cake_jar = "#{lib}/cake.jar"
-  bake_jar = "#{lib}/bake.jar"
-  if File.exists?(cake_jar) and File.exists?(bake_jar)
+  cakejar = "#{lib}/cake.jar"
+  bakejar = "#{lib}/bake.jar"
+  if File.exists?(cakejar) and File.exists?(bakejar)
     # Inside a gem install.
-    $classpath = cake_jar
-    $bakepath  = bake_jar
+    cakepath = cakejar
+    bakepath = bakejar
   else
     # Naked script.
-    version    = current_version
-    dest       = "~/.m2/repository/cake/cake/#{version}"
-    $classpath = have_cake(version, dest)
-    $bakepath  = extract($classpath, "bake-#{version}.jar")
+    version  = current_version
+    dest     = "~/.m2/repository/cake/cake/#{version}"
+    cakepath = get_cake(version, dest)
+    bakepath = extract(classpath, "bake-#{version}.jar")
   end
 end
 
-if not File.exists?("pom.xml") or test(?>, "project.clj", "pom.xml") and ARGV.first != "deps"
-  eat_cake("deps")
+pwd = Dir.getwd
+srcpath = "#{pwd}/src:#{pwd}/src/clj"
+
+cake = Cake.new("#{cakepath}:#{srcpath}:#{pwd}/lib/dev/*")
+bake = Bake.new("#{bakepath}:#{srcpath}:#{pwd}/classes:#{pwd}/test:#{pwd}/lib/*:#{pwd}/lib/dev/*")
+
+if $command == :kill
+  cake.kill
+  bake.kill
+  exit
+elsif restart?
+  cake.stop
+  bake.stop
+  exit if $command == :stop
 end
 
-eat_cake(*ARGV)
+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")
+  end
+
+  bake.init
+  cake.init if deps # must check if dev dependencies have changed
+end
+
+if $command == :repl
+  if File.exists?('project.clj')
+    bake.repl
+  else
+    log(:repl, "cannot start repl without project.clj")
+  end
+elsif not [:start, :reload, :restart].include?($command)
+  cake.bakeport = bake.port
+  cake.send_command($command, ARGV)
+end

metadata

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