cake 0.4.7 → 0.4.8

data/bin/cake

@@ -308,10 +308,10 @@ class JVM
   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"
+    @type      = self.class.name.downcase
+    @classpath = make_path(classpath)
+    @libpath   = make_path(libpath)
+    @pidfile   = "#{$confdir}/#{type}.pid"
     @load_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
     refresh
   end
@@ -545,7 +545,7 @@ private
     File.exists?(file) and File.mtime(file) > load_time
   end
 
-  def with_socket(retries = 20)
+  def with_socket(retries = $timeout)
     return unless port
     socket = TCPSocket.new("localhost", port)
     result = yield(socket)
@@ -553,9 +553,11 @@ private
   rescue Errno::ECONNREFUSED, Errno::EBADF => e
     sleep 1
     if retries
-      retry if (retries -= 1) >= 0
-      log($command, "timeout while connecting to #{type} jvm")
-      exit
+      if (retries -= 1) == 0
+        log :cake, "connection to #{type} 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
     end
   ensure
     socket.close if socket
@@ -695,15 +697,15 @@ project_clj = "#{$home}/.cake/project.clj"
 File.open(project_clj, 'w') do |file|
   file.write <<END
 (defproject global "0.0.0"
-  :description "Don't rename this project, though you can change the version to your heart's content."
+  :description "Don't rename this project, but you can change the version if you want."
   :dependencies [[clojure "1.2.0"]
                  [clojure-contrib "1.2.0"]])
 ;;--------------------
 ;; This is the global cake project. What does that mean?
 ;;  1. This project is used whenever you run cake outside a project directory.
 ;;  2. Any dependencies specified here will be available in the global repl.
-;;  3. Any dev-dependencies specified here will be available in all projects, though you
-;;     must run 'cake deps --global' manually when you change this file.
+;;  3. Any dev-dependencies specified here will be available in all projects, but
+;;     you must run 'cake deps --global' manually when you change this file.
 ;;  4. Configuration options in ~/.cake/config are used in all projects.
 ;;--------------------
 END
@@ -717,6 +719,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")
+$timeout = ($config['connect.timeout'] || 20).to_i
 $vars    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
 
 Dir.chdir($bakedir)
@@ -736,8 +739,11 @@ if File.exists?("#{$cakedir}/.gitignore") and File.exists?("#{$cakedir}/project.
     system('git pull')
   end
 
-  $version = IO.read("#{$cakedir}/project.clj").split("\n").first.match(/defproject cake \"(.*)\"/)[1]
+  project  = "#{$cakedir}/project.clj"
+  $version = IO.read(project).split("\n").first.match(/defproject cake \"(.*)\"/)[1]
   log(:deps, "project.clj version is #{$version}") if debug?
+
+  FileUtils.remove_dir("lib", true) if newer?(project, lib)
   if Dir["#{lib}/*.jar"].empty? or Dir["#{lib}/dev/*.jar"].empty?
     # In a new git checkout, need to fetch dependencies.
     begin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -07:00
+date: 2010-08-25 00:00:00 -07:00
 default_executable: cake
 dependencies: []