bake.clj 0.3.1 → 0.3.2

data/bin/bake

@@ -148,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|
@@ -171,7 +171,7 @@ class Config < Hash
 end
 
 def config
-  @config ||= Config.new(".bake/config")
+  @config ||= Configuration.new(".bake/config")
 end
 
 class JVM
@@ -184,9 +184,6 @@ class JVM
     @pidfile    = "#{$confdir}/#{type}.pid"
     @load_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
     refresh
-  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 running?
@@ -206,7 +203,10 @@ class JVM
   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) if @port # make sure jvm is running on port
+    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
@@ -586,7 +586,7 @@ else
   bake.cakeport = cake.port
   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
+    interval = (config['test.auto.interval'].to_i if config['test.auto.interval']) || (1 if interval == 0)
     run_tests = true
     while true
       bake.send_command($command, ARGV) if run_tests

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bake.clj
 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-23 00:00:00 -07:00
+date: 2010-07-24 00:00:00 -07:00
 default_executable: bake
 dependencies: []