cake 0.4.17 → 0.4.18

data/bin/cake

@@ -133,6 +133,7 @@ end
 begin
   require 'readline'
 rescue LoadError
+  $no_readline = true
   module Readline
     HISTORY = []
     attr_accessor :basic_word_break_characters, :completion_proc
@@ -390,7 +391,7 @@ class JVM
 
   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 << %{ -Djava.home="#{ENV['JAVA_HOME']}"} if ENV['JAVA_HOME']
     opts
   end
 
@@ -473,6 +474,7 @@ class JVM
 
   REPL_PROMPT = "REPL_PROMPT__#{rand}"
   def repl
+    puts ";; cannot find readline; your repl won't be very awesome without it" if $no_readline
     load_history
     loop do
       with_socket do |socket|
@@ -613,7 +615,11 @@ private
         Readline::HISTORY.push(input.join(' '))
         return input.join("\n")
       end
-      prompt[-2] = ?*
+      if $config['repl.disable-secondary-prompt'] == 'true'
+        prompt = ' ' * prompt.length
+      else
+        prompt[-2] = ?*
+      end
     end
   rescue Interrupt => e
     return nil if input.empty?
@@ -726,7 +732,7 @@ $cakedir = 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
@@ -809,7 +815,7 @@ cake = Cake.new(
   [$config['cake.library.path'], "lib/dev/native"]
 )
 bake = Bake.new(
-  [bakepath, "src", "src/clj", "classes", "resources", "dev", "test", $config['project.classpath'], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
+  [bakepath, "src", "src/clj", "classes", "resources", "dev", "test", $config['project.classpath'], $opts[:cp], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
   [$config['project.library.path'], "lib/native", "lib/dev/native"]
 )
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 4
-  - 17
-  version: 0.4.17
+  - 18
+  version: 0.4.18
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -07:00
+date: 2010-09-25 00:00:00 -07:00
 default_executable: cake
 dependencies: []