cake 0.4.18 → 0.5.0

data/bin/cake

@@ -35,6 +35,10 @@ else
   def daemon(cmd)
     puts cmd if debug?
     pid = fork do
+      if not $stdin.tty?
+        $stdout.close
+        $stderr.close
+      end
       Process.setsid
       exec(cmd)
     end
@@ -132,6 +136,7 @@ end
 
 begin
   require 'readline'
+  $libedit = true unless Readline.respond_to?(:emacs_editing_mode)
 rescue LoadError
   $no_readline = true
   module Readline
@@ -235,7 +240,6 @@ end
 
 def download(url, path, opts = {})
   file = File.basename(url)
-  path = "#{path}/#{file}" if File.directory?(path)
 
   if opts[:force] or not File.exists?(path)
     FileUtils.makedirs(File.dirname(path))
@@ -260,14 +264,14 @@ end
 
 def get_cake(opts = {})
   version = cake_version(opts[:version] || :current)
-  download("#{$github}/jars/cake-#{version}.jar", "#{$m2}/cake/cake/#{snapshot(version)}", opts)
+  download("#{$github}/jars/cake-#{version}.jar", "#{$m2}/cake/cake/#{snapshot(version)}/cake-#{version}.jar", opts)
 end
 
 def get_clojure(opts = {})
   version = opts[:version] || "1.2.0"
   repo    = opts[:repo]    || "http://build.clojure.org/releases"
   path    = "org/clojure/clojure/#{version}"
-  download("#{repo}/#{path}/clojure-#{version}.jar", "#{$m2}/#{path}", opts)
+  download("#{repo}/#{path}/clojure-#{version}.jar", "#{$m2}/#{path}/clojure-#{version}.jar", opts)
 end
 
 def progress_bar(label, ch = '=', bg = '', width = 77, out = $stdout, progress = 0, total = nil)
@@ -327,13 +331,13 @@ class JVM
   end
 
   def init
-    stale = reload_stale_files if enabled? and running?
+    reload_stale_files if enabled? and running?
     start
-    stale
   end
 
   def refresh
     @pid, @port, @version = IO.read(pidfile).split("\n"); @pid = @pid.to_i; @port = @port.to_i
+
     Process.kill(0, @pid) # make sure pid is valid
     TCPSocket.new("localhost", @port).close if @port # make sure jvm is running on port
 
@@ -341,7 +345,7 @@ class JVM
   rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED, Errno::EBADF, Process::Error => e
     if e.kind_of?(Errno::ECONNREFUSED)
       log(:start, "defunct #{type} jvm") if debug?
-      kill
+      kill(true)
     end
     reset! # no pidfile or invalid pid or connection refused
   end
@@ -358,34 +362,17 @@ class JVM
   end
 
   def reload_stale_files
-    stale_files = files.select {|f| stale?(f)}
-
-    if stale_files.empty?
-      log(:reload, "no stale #{type} files found") if verbose? and admin_command?
-      false
-    else
-      log(:reload, "the following #{type} files have changed: #{stale_files.join(', ')}") if debug?
-
-      if stale_files.any? {|f| File.extname(f) != ".clj"}
-        log(:reload, "non-clojure #{type} files have changed, restarting") if verbose?
-        stop(:reload)
+    with_socket(nil) do |socket|
+      socket.write ":reload {}"
+      socket.close_write
+      if socket.eof?
+        FileUtils.touch(pidfile)
+        @load_time = Time.now
       else
-        log(:reload, "clojure #{type} files have changed, reloading") if verbose?
-        with_socket(nil) do |socket|
-          stale_files = stale_files.collect {|f| %{"#{f}"} }
-          socket.write ":reload {} [#{stale_files.join(" ")}]"
-          socket.close_write
-          if socket.eof?
-            FileUtils.touch(pidfile)
-            @load_time = Time.now
-          else
-            inspect(socket)
-            log(:reload, "unable to reload all #{type} files, restarting") if verbose?
-            stop(:reload)
-          end
-        end
+        inspect(socket) if debug?
+        log(:reload, "unable to reload all #{type} files, restarting") if verbose?
+        stop(:reload)
       end
-      true
     end
   end
 
@@ -438,9 +425,9 @@ class JVM
     end || (log(mode, "#{type} jvm not running") if $command == :stop)
   end
 
-  def kill
+  def kill(force = $opts[:"9"])
     if pid
-      signal = $opts[:"9"] ? KILL : TERM
+      signal = force ? KILL : TERM
       log(:kill, "sending #{signal} signal to #{type} jvm") if debug?
       Process.kill(signal, pid)
       reset!
@@ -449,21 +436,6 @@ class JVM
     end
   end
 
-  def files
-    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
-      else
-        Find.find(path) do |f|
-          Find.prune if f == "#{$bakedir}/src/jvm"
-          files << f if f =~ /\.(clj|class|jar)$/ and File.exists?(f) and not File.directory?(f)
-        end if File.exists?(path)
-      end
-    end
-    files
-  end
-
   def ping
     return unless enabled?
     with_socket do |socket|
@@ -518,7 +490,7 @@ class JVM
       while line = $stdin.gets
         socket.write [line.chomp, ~forms].to_clj
         while (line = socket.gets)
-          break if line.start_with?(EOL)
+          break if line.index(EOL) == 0
           puts line
         end
       end
@@ -534,7 +506,7 @@ private
 
   def inspect(socket)
     while line = socket.gets
-      break if line.start_with?('reload-failed:') and not debug?
+      break if line.index('reload-failed:') == 0 and not debug?
       puts line
     end
   end
@@ -561,7 +533,7 @@ private
         log :cake, "connection to #{type} jvm is taking a long time...",
                    "you can use ^C to abort and use 'cake kill' or 'cake kill -9' to force the jvm to restart"
       end
-      retry
+      retry unless retries < -$timeout
     end
   ensure
     socket.close if socket
@@ -661,13 +633,9 @@ class Cake < JVM
     end
   end
 
-  def files
-    super.concat ["tasks.clj", "#{$home}/.cake/tasks.clj"]
-  end
-
   def java_opts
     # bootclasspath = %{-Xbootclasspath/a:"#{$clojure}"}
-    [ENV['CAKE_JAVA_OPTS'], $config['cake.java_opts'], super].compact.join(' ')
+    ["-Xms16M -Xmx64M", ENV['CAKE_JAVA_OPTS'], $config['cake.java_opts'], super].compact.join(' ')
   end
 
 private
@@ -692,17 +660,17 @@ end
 
 class Bake < JVM
   def java_opts
-    [ENV['JAVA_OPTS'], $config['project.java_opts'], super].compact.join(' ')
+    ["-Xms128M -Xmx256M", ENV['JAVA_OPTS'], $config['project.java_opts'], super].compact.join(' ')
   end
 
   def enabled?
-    Dir['lib/*.jar'].any?
+    Dir['lib/*.jar'].any? or Dir['classes/**/*.class'].any?
   end
 end
 
 def initialize_cake_dirs
-  FileUtils.makedirs("#{$bakedir}/.cake")
-  FileUtils.makedirs("#{$home}/.cake")
+  FileUtils.makedirs("#{$bakedir}/.cake/run")
+  FileUtils.makedirs("#{$home}/.cake/run")
   project_clj = "#{$home}/.cake/project.clj"
   File.open(project_clj, 'w') do |file|
     file.write <<END
@@ -720,6 +688,12 @@ def initialize_cake_dirs
 ;;--------------------
 END
   end unless File.exists?(project_clj)
+
+  # Enable paren matching if using readline and .inputrc doesn't exist.
+  inputrc = "#{$home}/.inputrc"
+  File.open(inputrc, 'w') do |file|
+    file.write "set blink-matching-paren on\n"
+  end unless $no_readline or $libedit or File.exists?(inputrc)
 end
 
 #==================================
@@ -728,11 +702,11 @@ parse_opts!
 $script  = File.expand_path($opts[:run].first) if $opts[:run]
 $pwd     = Dir.getwd
 $bakedir = project_dir($pwd)
-$cakedir = File.dirname(File.dirname(readlink(__FILE__)))
+$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    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
+$vars    = {:shellenv => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
 $timeout = ($config['connect.timeout'] || 20).to_i
 
 initialize_cake_dirs
@@ -760,14 +734,15 @@ if File.exists?("#{$cakedir}/.gitignore") and File.exists?(project)
   # Force new cake libs if cake's project.clj has changed.
   FileUtils.remove_dir(lib, true) if newer?(project, lib) and not $config['cake.disable-auto-deps']
 
-  if Dir["#{lib}/*.jar"].empty?
+  if Dir["#{lib}/*.jar"].empty? or Dir["#{lib}/dev/*.jar"].empty?
     # In a new git checkout, need to fetch dependencies.
     cakejar = get_cake(:version => $version, :dest => lib) rescue get_cake(:version => :current, :dest => lib)
+    extract(cakejar, "bake.jar", "#{lib}/dev")
   end
   $clojure = get_clojure(:dest => lib)
 
-  cakepath = ["#{$cakedir}/src", "#{lib}/*"]
-  bakepath = ["#{$cakedir}/bake"]
+  cakepath = ["#{$cakedir}/src", "#{lib}/*", "#{lib}/dev/*"]
+  bakepath = ["#{$cakedir}/bake", "#{lib}/dev/*"]
 else
   cakejar = "#{lib}/cake.jar"
   bakejar = "#{lib}/bake.jar"
@@ -815,15 +790,15 @@ cake = Cake.new(
   [$config['cake.library.path'], "lib/dev/native"]
 )
 bake = Bake.new(
-  [bakepath, "src", "src/clj", "classes", "resources", "dev", "test", $config['project.classpath'], $opts[:cp], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
+  [bakepath, "src", "src/clj", "classes", "resources", "dev", "test", "test/classes", $config['project.classpath'], $opts[:cp], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
   [$config['project.library.path'], "lib/native", "lib/dev/native"]
 )
 
 if $command == :default and $opts[:version]
   puts "cake #{$version}"
   exit
-elsif $command == :kill
-  if $opts[:all] or $opts[:kill] == ['all']
+elsif $command == :killall or $command == :kill
+  if $opts[:all] or $opts[:kill] == ['all'] or $command == :killall
     puts "'cake kill --all' is deprecated, in the future use 'cake kill all' instead" if $opts[:all]
     num = ps.each do |line|
       pid = line.split(' ').first.to_i

metadata

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