cake 0.2.8 → 0.2.9

data/bin/cake

@@ -10,11 +10,12 @@ require 'readline'
 require 'fileutils'
 require 'pp'
 
+PATH_SEP = ':'
 file     = File.readlink(__FILE__) rescue __FILE__
 $bakedir = Dir.getwd
 $cakedir = File.dirname(File.dirname(file))
-$confdir = ".cake"
 $repo    = "http://clojars.org/repo/cake/cake"
+$confdir = ".cake"
 File.makedirs($confdir)
 
 def get_cake(version, dest)
@@ -58,9 +59,12 @@ def snapshot(version)
   end
 end
 
-def extract(jar, file)
-  dest = File.dirname(jar)
-  system %{ jar xf #{jar} -C #{dest} #{file} }
+def extract(jar, file, dest = File.dirname(jar))
+  log(:deps, "extracting #{file} from #{jar}") if verbose?
+  system %{ jar xf #{jar} #{file} }
+
+  File.makedirs(dest)
+  File.move(file, dest)
   "#{dest}/#{file}"
 end
 
@@ -78,7 +82,7 @@ def parse_opts!
   $opts = {}
   ARGV.each do |opt|
     case opt
-    when /^-(\w*)$/                then $1.chars.each {|c| add_opt!(c, "")}
+    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)
@@ -114,27 +118,39 @@ def log(command, *message)
   end
 end
 
-CONFIG_FILE = ".cake/config"
-def config
-  if @config.nil?
-    @config = {}
-    File.open(CONFIG_FILE, 'r') do |file|
+class Config < 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)
-        @config[key.strip] = value.strip
+        next unless key and value
+        self[key.strip] = value.strip
       end
-    end if File.exists?(CONFIG_FILE)
+    end if File.exists?(path)
   end
-  @config
+
+  def [](*keys)
+    if keys.first.kind_of?(Symbol)
+      key = keys.join('.') + '.'
+      clone.delete_if {|k,v| not k.index(key) == 0}
+    else
+      super
+    end
+  end
+end
+
+def config
+  @config ||= Config.new(".cake/config")
 end
 
 class JVM
   attr_reader :type, :classpath, :libpath, :port, :pid, :pidfile, :start_time
 
-  def initialize(classpath, libpath = nil)
+  def initialize(classpath, libpath)
     @type       = self.class.name.downcase
-    @classpath  = classpath
-    @libpath    = libpath
+    @classpath  = make_path(classpath)
+    @libpath    = make_path(libpath)
     @pidfile    = "#{$confdir}/#{type}.pid"
     @start_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
 
@@ -149,8 +165,12 @@ class JVM
     not pid.nil?
   end
 
+  def enabled?
+    true
+  end
+
   def init
-    reload_stale_files if running?
+    reload_stale_files if enabled? and running?
     start
   end
 
@@ -191,7 +211,7 @@ class JVM
   MAX_PORT = 2**16
 
   def start
-    return if running?
+    return if not enabled? or running?
     @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
     log(:start, "starting #{type} jvm on port #{port}") if debug?
     @pid = daemon %{ java #{java_opts} clojure.main -e "(use '#{type})(start-server #{port})" /dev/null }
@@ -227,11 +247,12 @@ class JVM
 
   def files
     files = []
-    classpath.split(':').uniq.each do |path|
+    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
       else
         Find.find(path) do |f|
+          Find.prune if f == "#{$bakedir}/src/jvm"
           files << f if File.exists?(f) and not File.directory?(f)
         end
       end
@@ -241,6 +262,12 @@ class JVM
 
 private
 
+  def make_path(paths)
+    paths.flatten.compact.collect do |path|
+      path[0,1] == '/' ? path : "#{$bakedir}/#{path}"
+    end.join(PATH_SEP)
+  end
+
   def inspect(socket)
     while line = socket.gets
       puts line
@@ -334,6 +361,10 @@ class Bake < JVM
     [ENV['JAVA_OPTS'], config['project.java_opts'], super].compact.join(' ')
   end
 
+  def enabled?
+    Dir["lib/*.jar"].any?
+  end
+
 private
 
   HISTORY_NUM  = 500
@@ -406,11 +437,12 @@ lib = "#{$cakedir}/lib"
 if File.exists?("#{$cakedir}/.gitignore")
   if Dir["#{lib}/*.jar"].empty?
     # In a new git checkout, need to fetch dependencies.
-    version = IO.read("#{$cakedir}/project.clj").first.match(/defproject cake \"(.*)\"/)[1]
-    get_cake(version, lib)
+    version = IO.read("#{$cakedir}/project.clj").split("\n").first.match(/defproject cake \"(.*)\"/)[1]
+    cakejar = get_cake(version, lib)
+    extract(cakejar, "bake-#{version}.jar", "#{lib}/dev")
   end
-  cakepath = "#{$cakedir}/src:#{lib}/*:#{lib}/dev/*"
-  bakepath = "#{$cakedir}/bake:#{lib}/dev/*"
+  cakepath = ["#{$cakedir}/src", "#{lib}/*:#{lib}/dev/*"].join(PATH_SEP)
+  bakepath = ["#{$cakedir}/bake", "#{lib}/dev/*"].join(PATH_SEP)
 else
   cakejar = "#{lib}/cake.jar"
   bakejar = "#{lib}/bake.jar"
@@ -423,19 +455,17 @@ else
     version  = current_version
     dest     = "~/.m2/repository/cake/cake/#{version}"
     cakepath = get_cake(version, dest)
-    bakepath = extract(classpath, "bake-#{version}.jar")
+    bakepath = extract(cakepath, "bake-#{version}.jar")
   end
 end
 
-srcpath = "#{$bakedir}/src:#{$bakedir}/src/clj"
-
 cake = Cake.new(
-  "#{cakepath}:#{srcpath}:#{$bakedir}/lib/dev/*",
-  "#{$bakedir}/lib/dev/native"
+  [cakepath, "src", "src/clj", config['cake.classpath'], "lib/dev/*"],
+  [config['cake.library.path'], "lib/dev/native"]
 )
 bake = Bake.new(
-  "#{bakepath}:#{srcpath}:#{$bakedir}/classes:#{$bakedir}/test:#{$bakedir}/lib/*:#{$bakedir}/lib/dev/*",
-  "#{$bakedir}/lib/native:#{$bakedir}/lib/dev/native"
+  [bakepath, "src", "src/clj", "classes", "test", config['project.classpath'], "lib/*", "lib/dev/*"],
+  [config['project.library.path'], "lib/native", "lib/dev/native"]
 )
 
 if $command == :kill

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-06-29 00:00:00 -07:00
 default_executable: cake
 dependencies: []