cake 0.5.3 → 0.5.4

data/bin/cake

@@ -161,6 +161,7 @@ def parse_opts!
   $opts = {}
   ARGV[1..-1].each do |opt|
     case opt
+    when /^@(\w+)$/           then add_opt!(:context, $1)
     when /^-(\w+)$/           then $1.split('').each {|c| add_opt!(c, '')}
     when /^--?([-\w]+)=(.+)$/ then add_opt!($1, *$2.split(','))
     when /^--?([-\w]+)$/      then add_opt!($1, "")
@@ -238,11 +239,18 @@ rescue NotImplementedError, Errno::EINVAL
   file
 end
 
+def mkdir_force(dir)
+  FileUtils.makedirs(dir)
+rescue Errno::EEXIST
+  File.unlink(dir)
+  FileUtils.makedirs(dir)
+end
+
 def download(url, path, opts = {})
   file = File.basename(url)
 
-  if opts[:force] or not File.exists?(path)
-    FileUtils.makedirs(File.dirname(path))
+  if opts[:force] or not File.exists?(path)        
+    mkdir_force(File.dirname(path))
     open(url, progress_bar(url)) do |remote|
       open(path, "wb") do |local|
         while (buf = remote.read(8192)); local.write buf; end
@@ -254,7 +262,7 @@ def download(url, path, opts = {})
   dir  = File.expand_path(opts[:dest])
   dest = "#{dir}/#{file}"
   if opts[:force] or not File.exists?(dest)
-    FileUtils.makedirs(dir)
+    mkdir_force(dir)
     FileUtils.copy(path, dest)
   end
   dest
@@ -377,14 +385,12 @@ class JVM
   end
 
   def java_opts
-    opts =  %{-cp "#{classpath}" -Djava.library.path="#{libpath}"}
-    opts << %{ -Djava.home="#{ENV['JAVA_HOME']}"} if ENV['JAVA_HOME']
-    opts
+    %{-cp "#{classpath}" -Djava.library.path="#{libpath}"}
   end
 
   def vm_opts
-    `java -d32 -version 2>&1`
-    '-client -d32' if $? == 0
+    result = `java -d32 -version 2>&1`
+    '-client -d32' if $? == 0 and result !~ /Cannot run Java in 32 bit mode/
   end
 
   MIN_PORT = 2**14
@@ -706,7 +712,7 @@ $cakedir = File.expand_path(File.dirname(File.dirname(readlink(__FILE__))))
 $github  = "http://github.com/ninjudd/cake-standalone/raw/master"
 $m2      = "#{$home}/.m2/repository"
 $config  = Configuration.new("#{$home}/.cake/config", ".cake/config")
-$vars    = {:shellenv => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
+$vars    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
 $timeout = ($config['connect.timeout'] || 20).to_i
 
 initialize_cake_dirs

metadata

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