cake 0.5.8 → 0.6.0

data/bin/cake

@@ -23,7 +23,7 @@ if RUBY_PLATFORM =~ /(mingw|mswin)(32|64)$/
   $win  = true
 
   def daemon(cmd)
-    Process.create(:app_name => cmd).process_id
+    Process.create(:app_name => cmd.join(' ')).process_id
   end
 else
   TERM = 'TERM'
@@ -33,14 +33,14 @@ else
 
   class Process::Error; end
   def daemon(cmd)
-    puts cmd if debug?
+    puts cmd.join(' ') if debug?
     pid = fork do
       if not $stdin.tty?
         $stdout.close
         $stderr.close
       end
       Process.setsid
-      exec(cmd)
+      exec(*cmd)
     end
     Process.detach(pid)
     pid
@@ -55,11 +55,17 @@ class IO
       break if c == delim
     end
     line
-  rescue Errno::EAGAIN, Errno::EWOULDBLOCK, EOFError
+  rescue Errno::EAGAIN, Errno::EWOULDBLOCK, EOFError => e
+    @eof_reached = true if e.is_a?(EOFError)
     line
   end
 
+  def eof_reached?
+    @eof_reached
+  end
+
   def eof_nonblock?
+    return true if eof_reached?
     ungetc(read_nonblock(1)[0])
     false
   rescue Errno::EAGAIN, Errno::EWOULDBLOCK, EOFError => e
@@ -84,8 +90,8 @@ class IO
       return if finished
 
       while input.ready?
-        return if input.eof?
-        write(input.gets)
+        write(input.gets_nonblock(nil))
+        close_write if input.eof_reached?
       end unless $win or input_wait > 0
     end
   end
@@ -161,7 +167,8 @@ def parse_opts!
   $opts = {}
   ARGV[1..-1].each do |opt|
     case opt
-    when /^@(\w+)$/           then add_opt!(:context, $1)
+    when /^@([-\w]+)$/        then add_opt!(:context, $1)
+    when /^--$/               then break  # Other REs will match, so check first.
     when /^-(\w+)$/           then $1.split('').each {|c| add_opt!(c, '')}
     when /^--?([-\w]+)=(.+)$/ then add_opt!($1, *$2.split(','))
     when /^--?([-\w]+)$/      then add_opt!($1, "")
@@ -180,7 +187,7 @@ def verbose?
 end
 
 def restart?
-  $opts[:r] or $opts[:restart]
+  $opts[:R] or $opts[:restart]
 end
 
 def log(command, *messages)
@@ -242,16 +249,18 @@ rescue Errno::EEXIST
   FileUtils.makedirs(dir)
 end
 
+GET = system('which wget > /dev/null') ? "wget -O" : "curl -fo" # prefer wget because it retries on incomplete transfers
 def download(url, path, opts = {})
   file = File.basename(url)
 
-  if opts[:force] or not File.exists?(path)        
+  if opts[:force] or not File.exists?(path)
     mkdir_force(File.dirname(path))
-    open(url, progress_bar(url)) do |remote|
-      open(path, "wb") do |local|
-        while (buf = remote.read(8192)); local.write buf; end
-      end
-    end; puts
+    open(url) {} # check to see if the remote file exists
+    puts "Downloading #{url}..."
+    system("#{GET} #{path} #{url}") || begin
+      FileUtils.rm_f(path)
+      raise "unable to fetch #{url} with curl or wget"
+    end
   end
   return path unless opts[:dest]
 
@@ -278,14 +287,9 @@ def get_clojure(opts = {})
   download("#{repo}/#{path}/clojure-#{version}.jar", "#{$m2}/#{path}/clojure-#{version}.jar", opts)
 end
 
-def progress_bar(label, ch = '=', bg = '', width = 77, out = $stdout, progress = 0, total = nil)
-  { :progress_proc => lambda {|c| progress += ((width * c/total).to_i - progress).times { out.print_flush(ch) }},
-    :content_length_proc => lambda {|t| printf("%s\n[%#{width}s]\r[", label, bg); total = t}}
-end
-
 def cake_version(version_type)
   return version_type unless version_type.kind_of?(Symbol)
-  version = open("#{$releases}/#{version_type}").gets
+  version = open("#{$releases}/#{version_type}").gets.chomp
   log(:deps, "most recent #{version_type} version is #{version}") if debug?
   version
 end
@@ -297,8 +301,8 @@ end
 def extract(jar, file, dest = File.dirname(jar))
   if not File.exists?("#{dest}/#{file}")
     log(:deps, "extracting #{file} from #{jar}") if verbose?
-    ret = system "jar xf #{jar} #{file}"
-    raise "cannot find jar command" unless ret
+    ret = system("jar xf #{jar} #{file}")
+    raise "error extracting with jar command" unless ret
     FileUtils.makedirs(dest)
     FileUtils.move(file, dest)
   end
@@ -314,14 +318,28 @@ def ps
   `jps -v`.split("\n").select {|l| l =~ /cake\.project/}
 end
 
+def cake_pids
+  ps.collect {|line| line.split(' ').first.to_i}
+end
+
+def killall
+  cake_pids.each do |pid|
+    Process.kill($opts[:"9"] ? KILL : TERM, pid)
+  end.size > 0
+end
+
+def tail_log(num_lines)
+  exec("tail -n#{num_lines || 10} -f #{$project}/.cake/cake.log")
+end
+
 class JVM
-  attr_reader :type, :classpath, :libpath, :port, :pid, :pidfile, :load_time
+  attr_reader :classpath, :libpath, :port, :pid, :pidfile, :load_time
 
-  def initialize(classpath, libpath)
-    @type      = self.class.name.downcase
+  def initialize(classpath, libpath, java_opts = "")
     @classpath = make_path(classpath)
     @libpath   = make_path(libpath)
-    @pidfile   = ".cake/#{type}.pid"
+    @java_opts = java_opts
+    @pidfile   = ".cake/#{ENV['USER']}.pid"
     @load_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
     refresh
   end
@@ -330,75 +348,38 @@ class JVM
     not pid.nil?
   end
 
-  def enabled?
-    true
-  end
-
-  def init
-    reload_stale_files if enabled? and running?
-    start
-  end
-
   def refresh
     @pid, @port, @version = IO.read(pidfile).split("\n"); @pid = @pid.to_i; @port = @port.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
 
-    kill if @version != $version
-  rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED, Errno::EBADF, Process::Error => e
-    if e.kind_of?(Errno::ECONNREFUSED)
-      log(:cake, "defunct #{type} jvm") if debug?
+    kill if @version != $version or newer?("#{$project}/lib/dev", pidfile)
+  rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED, Errno::EBADF, Errno::EPERM, Process::Error => e
+    if e.kind_of?(Errno::ECONNREFUSED) and cake_pids.include?(@pid)
+      log(:cake, "defunct jvm") if debug?
       kill(true)
     end
     reset! # no pidfile or invalid pid or connection refused
   end
 
-  def reload
-    refresh
-    init
-  end
-
-  def with_restart
-    kill
-    yield
-    start
-  end
-
-  def reload_stale_files
-    with_socket(nil) do |socket|
-      socket.write ":reload {}"
-      socket.close_write
-      if socket.eof?
-        FileUtils.touch(pidfile)
-        @load_time = Time.now
-      else
-        inspect(socket) if debug?
-        log(:reload, "unable to reload all #{type} files, restarting") if verbose?
-        kill
-      end
-    end
-  end
-
   def java_opts
-    %{-cp "#{classpath}" -Djava.library.path="#{libpath}"}
-  end
-
-  def vm_opts
-    result = `java -d32 -version 2>&1`
-    '-client -d32' if $? == 0 and result !~ /Cannot run Java in 32 bit mode/
+    enable_server = $config['jvm.server'] == 'true' || `java -d32 -version 2>&1` =~ /Cannot run Java in 32 bit mode/ || $? != 0
+    vm_opts       = enable_server ? ['-server', '-d64', '-Xmx2G', '-XX:MaxPermSize=256M'] : ['-client', '-d32', '-Xms128M', '-Xmx256M', '-XX:MaxPermSize=128M']
+    user_opts     = "#{ENV['JAVA_OPTS']} #{$config['jvm.opts']}".split.compact
+    [vm_opts, user_opts, @java_opts,'-cp', classpath, %{-Djava.library.path="#{libpath}"}]
   end
 
   MIN_PORT = 2**14
   MAX_PORT = 2**16
 
   def start
-    return unless enabled?
     return if running?
 
-    log(:cake, "starting #{type} jvm") if verbose?
+    log(:cake, "starting jvm") if verbose?
     @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
-    @pid = daemon %{java #{vm_opts} -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(require '#{type}.core) (#{type}.core/start-server #{port})"}
+    @pid = daemon ["java", java_opts, "clojure.main", "-e", "(require 'cake.main) (cake.main/start-server #{port})"].flatten.compact
+    log(:cake, "cake started with pid #{@pid} on port #{@port}") if debug?
     File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n#{$version}\n") }
   rescue Errno::EADDRNOTAVAIL => e # port already in use
     retry
@@ -407,19 +388,18 @@ class JVM
   def kill(force = $opts[:"9"])
     if pid
       signal = force ? KILL : TERM
-      log(:kill, "sending #{signal} signal to #{type} jvm") if debug?
+      log(:kill, "sending #{signal} signal to jvm (#{pid})") if debug?
       Process.kill(signal, pid)
       reset!
     else
-      log(:kill, "#{type} jvm not running") if $command == :kill
+      log(:kill, "jvm not running") if $command == :kill
     end
   end
 
   def ping
-    return unless enabled?
     with_socket do |socket|
       socket.write ":ping {}\n"
-      log($command, "#{type} jvm not running") unless socket.gets == "pong\n"
+      log($command, "jvm not running") unless socket.gets == "pong\n"
     end
   end
 
@@ -429,7 +409,7 @@ class JVM
     load_history
     loop do
       with_socket do |socket|
-        socket.write %{:repl #{$vars} "#{REPL_PROMPT}"}
+        socket.write %{[repl] #{$vars} "#{REPL_PROMPT}"}
         while @ns = read_until_prompt(socket)
           line = readline
           return unless line
@@ -441,39 +421,21 @@ class JVM
     save_history
   end
 
-  def run
-    with_socket do |socket|
-      log(:run, "running file #{$script}") if debug?
-      socket.write(":run #{$vars} #{$script.inspect}")
-      socket.duplex($stdin, $stdout)
-    end
-  end
-
-  def eval
-    forms = $opts[:eval].collect do |form|
-      form == '-' ? $stdin.gets(nil) : form
-    end.join(' ')
-    forms = "(doall (map println [#{forms}]))" unless $opts[:q]
-    with_socket do |socket|
-      log(:eval, forms) if debug?
-      socket.write(":eval #{$vars} #{forms} :cake/EOF ")
-      socket.duplex($stdin, $stdout)
-    end
-  end
-
-  EOL = "EOL__#{rand}"
-  def filter
-    forms = $opts[:filter]
+  READLINE = "READLINE__#{rand}"
+  def send_command(command)
     with_socket do |socket|
-      socket.write %(:filter #{$vars} "#{EOL}")
-      while line = $stdin.gets
-        socket.write [line.chomp, ~forms].to_clj
-        while (line = socket.gets)
-          break if line.index(EOL) == 0
-          puts line
+      cmd = [command, READLINE].to_clj
+      log(command, "sending: " + cmd) if debug?
+      socket.write("#{cmd} #{$vars}")
+      socket.duplex($stdin, $stdout) do |line|
+        if line =~ /^#{READLINE}(.*)$/
+          socket.write(prompt($1))
+        elsif line =~ /^@#{READLINE}(.*)$/
+          socket.write(prompt($1, :echo => false))
+        else
+          line
         end
       end
-      socket.close_write
     end
   end
 
@@ -483,13 +445,6 @@ private
     paths.flatten.compact.join(PATH_SEP)
   end
 
-  def inspect(socket)
-    while line = socket.gets
-      break if line.index('reload-failed:') == 0 and not debug?
-      puts line
-    end
-  end
-
   def reset!
     File.unlink(pidfile) if File.exists?(pidfile)
     @pid, @port = []
@@ -509,7 +464,7 @@ private
     sleep 1
     if retries
       if (retries -= 1) == 0
-        log :cake, "connection to #{type} jvm is taking a long time...",
+        log :cake, "connection to jvm is taking a long time...",
                    "you can use ^C to abort and use 'cake kill' or 'cake kill -9' to force the jvm to restart"
       end
       retry unless retries < -$timeout
@@ -581,7 +536,7 @@ private
   def completions(prefix)
     return [] if prefix.empty?
     with_socket do |socket|
-      socket.write ~[:completions, {}, ~[prefix, ~@ns]]
+      socket.write ~[:completions, {}, ~[prefix, ~@ns, $opts[:cake]]]
       completions = []
       while line = socket.gets
         completions << line.chomp
@@ -589,41 +544,12 @@ private
       completions
     end
   end
-end
-
-class Cake < JVM
-  READLINE = "READLINE__#{rand}"
-  def send_command(command)
-    with_restart { FileUtils.remove_dir("lib/dev", true) } if $win and [:deps, :clean].include?(command)
-
-    with_socket do |socket|
-      cmd = [command, READLINE].to_clj
-      log(command, "sending: " + cmd) if debug?
-      socket.write("#{cmd} #{$vars}")
-      socket.duplex($stdin, $stdout) do |line|
-        if line =~ /^#{READLINE}(.*)$/
-          socket.write(prompt($1))
-        elsif line =~ /^@#{READLINE}(.*)$/
-          socket.write(prompt($1, :echo => false))
-        else
-          line
-        end
-      end
-    end
-  end
-
-  def java_opts
-    # bootclasspath = %{-Xbootclasspath/a:"#{$clojure}"}
-    ["-Xms16M -Xmx64M", ENV['CAKE_JAVA_OPTS'], $config['cake.java_opts'], super].compact.join(' ')
-  end
-
-private
 
   def prompt(prompt, opts = {})
     if opts[:echo] == false
       output = `stty -echo 2>&1`
       log($command, output) if verbose?
-      echo_off = $?.exitstatus == 0
+      echo_off = $? == 0
       prompt << ' (WARNING, input will be visible on console!)' unless echo_off
       prompt << ':'
     end
@@ -637,18 +563,8 @@ private
   end
 end
 
-class Bake < JVM
-  def java_opts
-    ["-Xms128M -Xmx256M", ENV['JAVA_OPTS'], $config['project.java_opts'], super].compact.join(' ')
-  end
-
-  def enabled?
-    Dir['lib/*.jar'].any? or Dir['classes/**/*.class'].any?
-  end
-end
-
 def initialize_cake_dirs
-  FileUtils.makedirs("#{$bakedir}/.cake/run")
+  FileUtils.makedirs("#{$project}/.cake/run")
   FileUtils.makedirs("#{$home}/.cake/run")
   project_clj = "#{$home}/.cake/project.clj"
   File.open(project_clj, 'w') do |file|
@@ -680,8 +596,9 @@ end
 parse_opts!
 $script   = File.expand_path($opts[:run].first) if $opts[:run]
 $pwd      = Dir.getwd
-$bakedir  = project_dir($pwd)
-$cakedir  = File.expand_path(File.dirname(File.dirname(readlink(__FILE__))))
+$project  = project_dir($pwd)
+$file     = File.expand_path(__FILE__)
+$cakedir  = File.dirname(File.dirname(File.expand_path(readlink($file), File.dirname($file))))
 $releases = "http://releases.clojure-cake.org"
 $m2       = "#{$home}/.m2/repository"
 $config   = Configuration.new("#{$home}/.cake/config", ".cake/config")
@@ -689,7 +606,7 @@ $vars     = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :
 $timeout  = ($config['connect.timeout'] || 20).to_i
 
 initialize_cake_dirs
-Dir.chdir($bakedir)
+Dir.chdir($project)
 
 if debug?
   puts "config: #{$config.inspect}"
@@ -700,20 +617,23 @@ end
 lib     = "#{$cakedir}/lib"
 project = "#{$cakedir}/project.clj"
 
-if File.exists?("#{$cakedir}/.gitignore") and File.exists?(project)
+if File.exists?("#{$cakedir}/src/cake/core.clj") and File.exists?(project)
   log(:cake, "running from git checkout") if verbose?
   if $command == :upgrade
     log(:upgrade, "pulling latest code from git")
     Dir.chdir($cakedir) { system('git pull') }
   end
 
-  $version = IO.read(project).split("\n").first.match(/defproject cake \"(.*)\"/)[1]
+  $version = `cd #{$cakedir} && git describe`.chomp
   log(:deps, "project.clj version is #{$version}") if debug?
 
   # Force new cake libs if cake's project.clj has changed.
-  FileUtils.remove_dir(lib, true) if newer?(project, lib) and not $config['cake.disable-auto-deps']
+  if newer?(project, lib)
+    killall
+    FileUtils.remove_dir(lib, true)
+  end
 
-  if Dir["#{lib}/*.jar"].empty? or Dir["#{lib}/dev/*.jar"].empty?
+  if Dir["#{lib}/*.jar"].empty?
     # In a new git checkout, need to fetch dependencies.
     cakejar = get_cake(:version => $version, :dest => lib) rescue get_cake(:version => :current, :dest => lib)
     extract(cakejar, "bake.jar", "#{lib}/dev")
@@ -721,7 +641,7 @@ if File.exists?("#{$cakedir}/.gitignore") and File.exists?(project)
   $clojure = get_clojure(:dest => lib)
 
   cakepath = ["#{$cakedir}/src", "#{lib}/*", "#{lib}/dev/*"]
-  bakepath = ["#{$cakedir}/bake", "#{lib}/dev/*"]
+  bakepath = "#{$cakedir}/bake"
 else
   cakejar = "#{lib}/cake.jar"
   bakejar = "#{lib}/bake.jar"
@@ -759,85 +679,43 @@ else
   end
 end
 
-if $command == :upgrade
-  system($0, "killall")
-  exec($0, "--version")
-end
-
-cake = Cake.new(
-  [cakepath, "src", "src/clj", $config['cake.claspath'], "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
-  [$config['cake.library.path'], "lib/dev/native"]
-)
-bake = Bake.new(
-  [bakepath, "src", "src/clj", "classes", "resources", "dev", "test", "test/classes", $config['project.classpath'], $opts[:cp], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
-  [$config['project.library.path'], "lib/native", "lib/dev/native"]
+cake = JVM.new(
+  [$config['jvm.classpath'], bakepath, cakepath, "src", "src/clj", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
+  [$config['jvm.library.path'], "lib/ext/native", "lib/native", "lib/dev/native"],
+  ["-Dcake.project=#{$project}", "-Dbake.path=#{bakepath}"]
 )
 
-if $command == :default and $opts[:version]
+if $command == :upgrade
+  killall
+  puts "cake upgraded to #{$version}"
+  exit
+elsif $command == :default and $opts[:version]
   puts "cake #{$version}"
   exit
-elsif $command == :killall or $command == :kill
-  if $opts[:all] or $opts[:kill] == ['all'] or $command == :killall
-    puts "'cake kill --all' is deprecated, in the future use 'cake killall' instead" if $opts[:all]
-    puts "'cake kill all' is deprecated, in the future use 'cake killall' instead" if $opts[:kill] == ['all']
-    num = ps.each do |line|
-      pid = line.split(' ').first.to_i
-      Process.kill($opts[:"9"] ? KILL : TERM, pid)
-    end.size
-    puts "No matching processes belonging to you were found" if num == 0
-  else
-    cake.kill
-    bake.kill
-  end
+elsif $command == :log
+  tail_log($opts[:log])
+elsif $command == :killall
+  killall || puts("No matching processes belonging to you were found")
+  exit
+elsif $command == :kill
+  cake.kill
   exit
 elsif $command == :ps
   puts ps.sort.reverse
   exit
-elsif $command == :restart and $opts[:restart] == ["project"]
-  log(:restart, "restarting bake jvm") if debug?
-  bake.kill
-  bake.init
-  exit
-elsif restart?
-  cake.kill
-  bake.kill
 end
 
-cake.init
-if [:deps, :clean].include?($command)
-  bake.kill
-elsif File.exists?('project.clj')
-  if not bake.enabled?
-    cake.send_command(:deps)
-    cake.init
-  end
+cake.kill if restart?
+cake.start
 
-  bake.init
-end
-
-if [:repl, :eval, :filter, :run].include?($command)
-  if $opts[:cake] or not File.exists?('project.clj')
-    cake.send($command)
-  else
-    bake.send($command)
-  end
-elsif [:reload].include?($command)
-  cake.ping
-  bake.ping
+if $command == :console
+  num_windows = $opts[:console].first || 1
+  interval    = $opts[:i] ? $opts[:i].first : 4
+  system("jconsole -interval=#{interval}" + " #{cake.pid}" * num_windows.to_i + "&")
+elsif $command == :repl
+  cake.repl
 else
-  if $command == :autotest
-    cake.send_command(:test)
-    interval = ($opts[:interval].first if $opts[:interval]) || $config['autotest.interval'] || 5
-    while true
-      sleep(interval.to_i)
-      cake.send_command(:autotest)
-      $stdout.print_flush('.')
-      bake.reload
-      cake.reload
-    end
-  else
-    cake.send_command($command)
-  end
+  cake.send_command($command)
 end
 
-system("tail -n0 -f .cake/project.log") if $opts[:l] or $opts[:log]
+tail_log(0) if $opts[:l]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -08:00
+date: 2011-01-01 00:00:00 -08:00
 default_executable: cake
 dependencies: []
 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cake
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: A tasty build tool and concurrent repl for Clojure.