cake 0.3.6 → 0.3.8

data/bin/cake

@@ -7,6 +7,30 @@ require 'socket'
 require 'timeout'
 require 'fileutils'
 
+if RUBY_PLATFORM =~ /(mingw|mswin)32$/
+  require 'win32/process'
+  PATH_SEP = ';'
+  $home = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
+
+  def daemon(cmd)
+    Process.create(:app_name => cmd).process_id
+  end
+else
+  PATH_SEP = ':'
+  $home = File.expand_path("~")
+
+  class Process::Error; end
+  def daemon(cmd)
+    puts cmd if debug?
+    pid = fork do
+      Process.setsid
+      exec(cmd)
+    end
+    Process.detach(pid)
+    pid
+  end
+end
+
 begin
   require 'readline'
 rescue LoadError => e
@@ -35,19 +59,34 @@ class IO
   end
 end
 
+GLOBAL_DEFAULT_PROJECT = <<END
+(defproject global "0.0.0"
+  :description "This is the global cake project. It is used whenever you run cake outside a project directory"
+  :dependencies [[clojure "1.2.0-RC2"]
+                 [clojure-contrib "1.2.0-RC2"]])
+END
+
 def project_dir(dir)
-  while dir != "/"
-    return dir if [".cake", "project.clj", "build.clj"].any? {|file| File.exists?("#{dir}/#{file}")}
+  while dir != File.dirname(dir)
+    return dir if ["project.clj", "tasks.clj"].any? {|file| File.exists?("#{dir}/#{file}")}
     dir = File.dirname(dir)
   end
-  File.expand_path("~")
+  project_dir = "#{$home}/.cake"
+  project_clj = "#{project_dir}/project.clj"
+  FileUtils.makedirs(project_dir) unless File.exists?(project_dir)
+  File.open(project_clj, 'w') {|f| f.write(GLOBAL_DEFAULT_PROJECT)} unless File.exists?(project_clj)
+  project_dir
+end
+
+def readlink(file)
+  File.readlink(file)
+rescue NotImplementedError
+  file
 end
 
-PATH_SEP = ':'
-file     = File.readlink(__FILE__) rescue __FILE__
 $pwd     = Dir.getwd
 $bakedir = project_dir($pwd)
-$cakedir = File.dirname(File.dirname(file))
+$cakedir = File.dirname(File.dirname(readlink(__FILE__)))
 $repo    = "http://clojars.org/repo/cake/cake"
 $confdir = ".cake"
 Dir.chdir($bakedir)
@@ -104,7 +143,7 @@ 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} }
+    ret = system "jar xf #{jar} #{file}"
     raise "cannot find jar command" unless ret
     FileUtils.makedirs(dest)
     FileUtils.move(file, dest)
@@ -219,7 +258,7 @@ class JVM
     @pid, @port = IO.read(pidfile).split("\n").map {|l| l.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
-  rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED => e
+  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)
     reset! # no pidfile or invalid pid or connection refused
   end
@@ -250,7 +289,7 @@ class JVM
             FileUtils.touch(pidfile)
             @load_time = Time.now
           else
-            inspect(socket) if debug?
+            inspect(socket)
             log(:reload, "unable to reload all #{type} files, restarting") if verbose?
             stop(:reload)
           end
@@ -261,12 +300,12 @@ class JVM
   end
 
   def java_opts
-    opts = "-cp #{classpath} -Djava.library.path=#{libpath}"
-    opts << " -Djava.home=#{ENV['JAVA_HOME']} -Djava.ext.dirs=#{ENV['JAVA_HOME']}/lib" if ENV['JAVA_HOME']
+    opts =  %{-cp "#{classpath}" -Djava.library.path="#{libpath}"}
+    opts << %{ -Djava.home="#{ENV['JAVA_HOME']}" -Djava.ext.dirs="#{ENV['JAVA_HOME']}/lib"} if ENV['JAVA_HOME']
     opts
   end
 
-  MIN_PORT = 2**13
+  MIN_PORT = 2**14
   MAX_PORT = 2**16
 
   def start
@@ -277,7 +316,7 @@ class JVM
     else
       log(:start, "starting #{type} jvm") if verbose? or $command == :start
       @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
-      @pid = daemon %{ java -Dcake.project=#{$bakedir} #{java_opts} clojure.main -e "(use '#{type})(start-server #{port})" /dev/null }
+      @pid = daemon %{java -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(use '#{type})(start-server #{port})"}
       File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n") }
     end
   rescue Errno::EADDRNOTAVAIL => e # port already in use
@@ -361,14 +400,16 @@ class JVM
 private
 
   def make_path(paths)
-    paths.flatten.compact.collect do |path|
-      path[0,1] == '/' ? path : "#{$bakedir}/#{path}"
-    end.join(PATH_SEP)
+    paths.flatten.compact.join(PATH_SEP)
   end
 
   def inspect(socket)
-    while line = socket.gets
+    line = socket.gets
+    if debug? or not line.start_with?('reload-failed:')
       puts line
+      while line = socket.gets
+        puts line
+      end
     end
   end
 
@@ -382,22 +423,12 @@ private
     File.exists?(file) and File.mtime(file) > load_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 = 20)
     return unless port
     socket = TCPSocket.new("localhost", port)
     result = yield(socket)
     result
-  rescue Errno::ECONNREFUSED => e
+  rescue Errno::ECONNREFUSED, Errno::EBADF => e
     sleep 1
     retry if (retries -= 1) >= 0
     log($command, "timeout while connecting to #{type} jvm")
@@ -498,7 +529,7 @@ class Cake < JVM
   end
 
   def files
-    super.concat ["build.clj", ".cake/swank"]
+    super.concat ["build.clj", "#{$home}/.cake/tasks.clj"]
   end
 
   def java_opts
@@ -596,7 +627,7 @@ end
 cake.init
 if not [:deps, :clean].include?($command) and File.exists?('project.clj')
   if newer?('project.clj', 'pom.xml')
-    cake.send_command(:deps) 
+    cake.send_command(:deps)
     cake.init
   elsif config['swank.auto-start'] or config['swank']
     cake.send_command(:"swank-deps")
@@ -607,10 +638,10 @@ if not [:deps, :clean].include?($command) and File.exists?('project.clj')
 end
 
 if [:repl, :eval].include?($command)
-  if File.exists?('project.clj') and not $opts[:cake]
-    bake.send($command)
-  else
+  if $opts[:cake] or not File.exists?('project.clj')
     cake.send($command)
+  else
+    bake.send($command)
   end
 elsif [:start, :reload, :restart].include?($command)
   if $opts[:l] or $opts[:log]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 -07:00
+date: 2010-08-09 00:00:00 -07:00
 default_executable: cake
 dependencies: []