cake 0.4.2 → 0.4.3

data/bin/cake

@@ -327,11 +327,15 @@ class JVM
     Process.kill(0, @pid) # make sure pid is valid
     TCPSocket.new("localhost", @port).close if @port # make sure jvm is running on port
 
-    return if @version == $version
-    Process.kill(TERM, @pid)
-    reset!
+    if @version != $version
+      kill
+      reset!
+    end
   rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED, Errno::EBADF, Process::Error => e
-    log(:start, "defunct #{type} jvm") if debug? and e.kind_of?(Errno::ECONNREFUSED)
+    if e.kind_of?(Errno::ECONNREFUSED)
+      log(:start, "defunct #{type} jvm") if debug?
+      kill
+    end
     reset! # no pidfile or invalid pid or connection refused
   end
 
@@ -428,7 +432,11 @@ class JVM
   end
 
   def kill
-    Process.kill($opts[:"9"] ? KILL : TERM, pid) if pid
+    return unless pid
+    signal = $opts[:"9"] ? KILL : TERM
+    log(:kill, "sending #{signal} signal to #{type} jvm") if debug?
+    Process.kill(signal, pid)
+    reset!
   end
 
   def files
@@ -615,14 +623,12 @@ private
 end
 
 class Cake < JVM
-  attr_accessor :bakeport
-
   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, bakeport, READLINE].to_clj
+      cmd = [command, READLINE].to_clj
       log(command, "sending: " + cmd) if debug?
       socket.write("#{cmd} #{$vars}")
       socket.duplex($stdin, $stdout) do |line|
@@ -701,7 +707,7 @@ $cakedir = File.dirname(File.dirname(readlink(__FILE__)))
 $repo    = "http://clojars.org/repo/cake/cake"
 $confdir = ".cake"
 $config  = Configuration.new("#{$home}/.cake/config", ".cake/config")
-$vars    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts}.to_clj
+$vars    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
 
 Dir.chdir($bakedir)
 FileUtils.makedirs($confdir)
@@ -771,6 +777,11 @@ elsif $command == :kill
 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.stop
   bake.stop
@@ -804,7 +815,6 @@ elsif [:start, :reload, :restart].include?($command)
     bake.ping
   end
 else
-  cake.bakeport = bake.port
   if $command == :autotest
     cake.send_command(:autotest)
     interval = $opts[:autotest].last.to_i if $opts[:autotest]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -07:00
+date: 2010-08-20 00:00:00 -07:00
 default_executable: cake
 dependencies: []