cake 0.6.1 → 0.6.2

data/bin/cake

@@ -162,7 +162,7 @@ end
 
 def parse_opts!
   ARGV.unshift('run')     if ARGV.any? and ARGV.first.index('/')
-  ARGV.unshift('default') if ARGV.empty? or ARGV.first[0,1] == '-'
+  ARGV.unshift('default') if ARGV.empty? or ['-', '@'].include?(ARGV.first[0,1])
   $command = ARGV.first.to_sym
   $opts = {}
   ARGV[1..-1].each do |opt|
@@ -342,7 +342,7 @@ class JVM
     @classpath = make_path(classpath)
     @libpath   = make_path(libpath)
     @java_opts = java_opts
-    @pidfile   = ".cake/#{ENV['USER']}.pid"
+    @pidfile   = ".cake/#{[ENV['USER'], $config['jvm.separate-contexts'] && $opts[:context]].compact.join('-')}.pid"
     @load_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
     refresh
   end
@@ -368,9 +368,9 @@ class JVM
 
   def java_opts
     enable_server = $config['jvm.server'] == 'true' || `java -d32 -version 2>&1` =~ /Cannot run Java in 32 bit mode/ || $? != 0
-    vm_opts       = enable_server ? ['-server', '-d64', '-Xmx2G', '-XX:MaxPermSize=256M'] : ['-client', '-d32', '-Xms128M', '-Xmx256M', '-XX:MaxPermSize=128M']
+    vm_opts       = enable_server ? ['-server', '-d64', '-Xmx512M', '-XX:MaxPermSize=256M'] : ['-client', '-d32', '-Xms128M', '-Xmx256M', '-XX:MaxPermSize=128M']
     user_opts     = "#{ENV['JAVA_OPTS']} #{$config['jvm.opts']}".split.compact
-    [vm_opts, user_opts, @java_opts,'-cp', classpath, %{-Djava.library.path="#{libpath}"}]
+    [vm_opts, user_opts, @java_opts,'-cp', classpath, %{-Djava.library.path=#{libpath}}]
   end
 
   MIN_PORT = 2**14
@@ -604,7 +604,7 @@ $file     = File.expand_path(__FILE__)
 $cakedir  = File.dirname(File.dirname(File.expand_path(readlink($file), File.dirname($file))))
 $releases = "http://releases.clojure-cake.org"
 $m2       = "#{$home}/.m2/repository"
-$config   = Configuration.new("#{$home}/.cake/config", ".cake/config")
+$config   = Configuration.new("#{$home}/.cake/config", "cake.config", ".cake/config")
 $vars     = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
 $timeout  = ($config['connect.timeout'] || 20).to_i
 
@@ -683,7 +683,7 @@ else
 end
 
 cake = JVM.new(
-  [$config['jvm.classpath'], bakepath, cakepath, "src", "src/clj", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
+  [bakepath, cakepath, "src", "src/clj", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
   [$config['jvm.library.path'], "lib/ext/native", "lib/native", "lib/dev/native"],
   ["-Dcake.project=#{$project}", "-Dbake.path=#{bakepath}"]
 )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 -08:00
+date: 2011-03-07 00:00:00 -08:00
 default_executable: cake
 dependencies: []