cake 0.3.11 → 0.3.12

data/bin/cake

@@ -15,6 +15,7 @@ if RUBY_PLATFORM =~ /(mingw|mswin)(32|64)$/
   KILL = 'KILL'
   PATH_SEP = ';'
   $home = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
+  $win  = true
 
   def daemon(cmd)
     Process.create(:app_name => cmd).process_id
@@ -65,18 +66,53 @@ class IO
   end
 end
 
+def add_opt!(key, *vals)
+  ($opts[key.to_sym] ||= []).concat vals
+end
+
+def parse_opts!
+  ARGV.unshift('run', '--global') if ARGV.first.index('/')
+  ARGV.unshift('default') if ARGV.empty? or ARGV.first[0,1] == '-'
+  $command = ARGV.shift.to_sym
+  $opts = {}
+  ARGV.each do |opt|
+    case opt
+    when /^-(\w*)$/              then $1.split('').each {|c| add_opt!(c, '')}
+    when /^--?([-\w]*)=([\S]+)$/ then add_opt!($1, *$2.split(','))
+    when /^--?([-\w]*)$/         then add_opt!($1, "")
+    else                              add_opt!($command, opt)
+    end
+  end
+  $opts.freeze
+end
+parse_opts!
+
 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"
+(defproject global "0.0.0"  
+  :description "Don't rename this project, though you can change the version to your heart's content."
   :dependencies [[clojure "1.2.0-RC2"]
                  [clojure-contrib "1.2.0-RC2"]])
+;;--------------------
+;; 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.
+;;  4. Configuration options in ~/.cake/config are used in all projects.
+;;--------------------
 END
 
 def project_dir(dir)
+  if $opts[:project] and not $opts[:global]
+    project = $opts[:project].last
+    raise "project dir #{project} does not exist" unless File.exists?(project)
+    return project
+  end
+
   while dir != File.dirname(dir)
     return dir if ["project.clj", "tasks.clj"].any? {|file| File.exists?("#{dir}/#{file}")}
     dir = File.dirname(dir)
-  end
+  end unless $opts[:global]
   project_dir = "#{$home}/.cake"
   project_clj = "#{project_dir}/project.clj"
   FileUtils.makedirs(project_dir) unless File.exists?(project_dir)
@@ -86,7 +122,7 @@ end
 
 def readlink(file)
   File.readlink(file)
-rescue NotImplementedError
+rescue NotImplementedError, Errno::EINVAL
   file
 end
 
@@ -104,7 +140,7 @@ def get_cake(version, dest = nil, opts = {})
   path = "#{repo}/#{jar}"
 
   if not File.exists?(path)
-    log(:deps, "fetching cake libraries. this may take a moment...")
+    log(:deps, "fetching cake libraries. this may take a moment...") unless @logged; @logged = true
     url = "#{$repo}/#{version}/#{jar}"
     log(:deps, "downloading #{url}") if verbose?
     FileUtils.makedirs(repo)
@@ -162,26 +198,6 @@ def newer?(file1, file2)
   not File.exists?(file2) or test(?>, file1, file2)
 end
 
-def add_opt!(key, *vals)
-  ($opts[key.to_sym] ||= []).concat vals
-end
-
-def parse_opts!
-  ARGV.unshift('default') if ARGV.empty? or ARGV.first[0,1] == '-'
-  $command = ARGV.shift.to_sym
-  $opts = {}
-  ARGV.each do |opt|
-    case opt
-    when /^-(\w*)$/                then $1.split('').each {|c| add_opt!(c, '')}
-    when /^--?([-\w]*)=([-,\w]+)$/ then add_opt!($1, *$2.split(','))
-    when /^--?([-\w]*)$/           then add_opt!($1, "")
-    else                                add_opt!($command, opt)
-    end
-  end
-  $opts.freeze
-end
-parse_opts!
-
 def debug?
   ENV['CAKE_DEBUG'] or $opts[:d] or $opts[:debug]
 end
@@ -190,10 +206,6 @@ def verbose?
   debug? or $opts[:v] or $opts[:verbose]
 end
 
-def config_updated?
-  newer?(".cake/config", ".cake/cake.pid") or (File.exists?(".cake/bake.pid") and newer?(".cake/config", ".cake/bake.pid"))
-end
-
 def restart?
   $opts[:r] or $opts[:restart] or [:stop, :restart].include?($command)
 end
@@ -209,15 +221,17 @@ def log(command, *message)
 end
 
 class Configuration < Hash
-  def initialize(path)
-    File.open(path, 'r') do |file|
-      file.each do |line|
-        next if ['#', '!'].include?(line[0,1])
-        key, value = line.split('=', 2)
-        next unless key and value
-        self[key.strip] = value.strip
-      end
-    end if File.exists?(path)
+  def initialize(*paths)
+    paths.each do |path|
+      File.open(path, 'r') do |file|
+        file.each do |line|
+          next if ['#', '!'].include?(line[0,1])
+          key, value = line.split('=', 2)
+          next unless key and value
+          self[key.strip] = value.strip
+        end
+      end if File.exists?(path)
+    end
   end
 
   def [](*keys)
@@ -231,7 +245,7 @@ class Configuration < Hash
 end
 
 def config
-  @config ||= Configuration.new(".cake/config")
+  @config ||= Configuration.new("#{$home}/.cake/config", ".cake/config")
 end
 
 def ps
@@ -278,6 +292,12 @@ class JVM
     init
   end
 
+  def with_restart
+    stop
+    yield
+    start
+  end
+
   def reload_stale_files
     stale_files = files.select {|f| stale?(f)}
 
@@ -292,7 +312,7 @@ class JVM
         stop(:reload)
       else
         log(:reload, "clojure #{type} files have changed, reloading") if verbose?
-        with_socket(0) do |socket|
+        with_socket(nil) do |socket|
           stale_files = stale_files.collect {|f| %{"#{f}"} }
           socket.write ":reload [#{stale_files.join(" ")}]\n"
           if socket.eof?
@@ -334,7 +354,8 @@ class JVM
   end
 
   def stop(mode = :stop)
-    with_socket(0) do |socket|
+    return unless running?
+    with_socket(nil) do |socket|
       action = mode == :reload ? 'quit' : 'force-quit'
       log(mode, "sending #{action} to #{type} jvm on port #{port}") if debug?
       socket.write(":#{action}\n")
@@ -357,7 +378,7 @@ class JVM
   end
 
   def files
-    files = ["project.clj"]
+    files = ["project.clj", "#{$home}/.cake/config", ".cake/config"]
     classpath.split(PATH_SEP).uniq.each do |path|
       if path =~ /(.*)\/\*$/
         files.concat Dir["#{path}.jar"] << "#{$1}/." # include the directory itself so deletions will be detected
@@ -440,9 +461,11 @@ private
     result
   rescue Errno::ECONNREFUSED, Errno::EBADF => e
     sleep 1
-    retry if (retries -= 1) >= 0
-    log($command, "timeout while connecting to #{type} jvm")
-    exit
+    if retries
+      retry if (retries -= 1) >= 0
+      log($command, "timeout while connecting to #{type} jvm")
+      exit
+    end
   ensure
     socket.close if socket
   end
@@ -536,6 +559,8 @@ class Cake < JVM
 
   READLINE = "READLINE__#{rand}"
   def send_command(command, args = [])
+    with_restart { FileUtils.remove_dir("lib/dev", true) } if $win and [:deps, :clean].include?(command)
+
     with_socket do |socket|
       args = args.collect{|arg| '"' + arg.gsub('"', '\"').gsub("\n", "\\n") + '"'}
       env  = command == :run ? ('{' + ENV.collect {|k,v| "#{k.inspect} #{v.inspect}"}.join(' ') + '}') : 'nil'
@@ -622,11 +647,11 @@ else
 end
 
 cake = Cake.new(
-  [cakepath, "src", "src/clj", config['cake.claspath'], "lib/dev/*"],
+  [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", "test", config['project.classpath'], "lib/*", "lib/dev/*"],
+  [bakepath, "src", "src/clj", "classes", "test", config['project.classpath'], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
   [config['project.library.path'], "lib/native", "lib/dev/native"]
 )
 
@@ -644,15 +669,18 @@ if $command == :kill
 elsif $command == :ps
   puts ps.sort.reverse
   exit
-elsif restart? or config_updated?
+elsif restart?
   cake.stop
   bake.stop
   exit if $command == :stop
 end
 
 cake.init
-if not [:deps, :clean].include?($command) and File.exists?('project.clj')
-  if newer?('project.clj', 'pom.xml')
+if [:deps, :clean].include?($command)
+  bake.stop
+elsif File.exists?('project.clj')
+  if newer?('project.clj', 'pom.xml') or not bake.enabled?
+    bake.stop
     cake.send_command(:deps)
     cake.init
   elsif config['swank.auto-start'] or config['swank']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -07:00
+date: 2010-08-12 00:00:00 -07:00
 default_executable: cake
 dependencies: []