cake 0.2.10 → 0.3.0

data/bin/cake

@@ -6,9 +6,22 @@ require 'open-uri'
 require 'rexml/document'
 require 'socket'
 require 'timeout'
-require 'readline'
 require 'fileutils'
-require 'pp'
+
+begin
+  require 'readline'
+rescue LoadError => e
+  module Readline
+    HISTORY = []
+    attr_accessor :completer_word_break_characters, :completion_proc
+    def readline(prompt)
+      $stdout.print prompt
+      $stdout.flush
+      $stdin.gets
+    end
+    extend Readline
+  end
+end
 
 PATH_SEP = ':'
 file     = File.readlink(__FILE__) rescue __FILE__
@@ -18,24 +31,29 @@ $repo    = "http://clojars.org/repo/cake/cake"
 $confdir = ".cake"
 File.makedirs($confdir)
 
-def get_cake(version, dest)
+def get_cake(version, dest = nil)
   jar  = version =~ /(.*)-SNAPSHOT/ ? "cake-#{$1}-#{snapshot(version)}.jar" : "cake-#{version}.jar"
-  dest = File.expand_path(dest)
-  path = "#{dest}/#{jar}"
+  repo = File.expand_path("~/.m2/repository/cake/cake/#{version}")
+  path = "#{repo}/#{jar}"
 
   if not File.exists?(path)
     log(:deps, "fetching cake libraries. this may take a moment...")
     url = "#{$repo}/#{version}/#{jar}"
-    File.makedirs(dest)
-    open(url) do |jar|
+    File.makedirs(repo)
+    open(url) do |jarfile|
       open(path, "wb") do |file|
-        while (buf = jar.read(8192))
+        while (buf = jarfile.read(8192))
           file.write buf
         end
       end
     end
   end
-  path
+  return path unless dest
+
+  dest = File.expand_path(dest)
+  File.makedirs(dest)
+  File.copy(path, dest)
+  "#{dest}/#{jar}"
 rescue OpenURI::HTTPError => e
   log(:deps, "unable to find cake version #{version} on clojars.")
   log(:deps, "please check http://github.com/ninjudd/cake for latest install instructions.")
@@ -60,11 +78,13 @@ def snapshot(version)
 end
 
 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)
+  if not File.exists?("#{dest}/#{file}")
+    log(:deps, "extracting #{file} from #{jar}") if verbose?
+    ret = system %{ jar xf #{jar} #{file} }
+    raise "cannot find jar command" unless ret
+    File.makedirs(dest)
+    File.move(file, dest)
+  end
   "#{dest}/#{file}"
 end
 
@@ -204,7 +224,9 @@ class JVM
   end
 
   def java_opts
-    "-cp #{classpath} -Djava.library.path=#{libpath}"
+    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
   end
 
   MIN_PORT = 2**13
@@ -214,7 +236,7 @@ class JVM
     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 }
+    @pid = daemon %{ java -Dcake.project=#{$bakedir} #{java_opts} clojure.main -e "(use '#{type})(start-server #{port})" /dev/null }
     File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n") }
     log(:start, "#{type} jvm started") if verbose?
   rescue Errno::EADDRNOTAVAIL => e
@@ -435,12 +457,13 @@ end
 # Bootstrap cake dependencies.
 lib = "#{$cakedir}/lib"
 if File.exists?("#{$cakedir}/.gitignore")
-  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.
     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/*"].join(PATH_SEP)
   bakepath = ["#{$cakedir}/bake", "#{lib}/dev/*"].join(PATH_SEP)
 else
@@ -453,8 +476,7 @@ else
   else
     # Naked script.
     version  = current_version
-    dest     = "~/.m2/repository/cake/cake/#{version}"
-    cakepath = get_cake(version, dest)
+    cakepath = get_cake(version)
     bakepath = extract(cakepath, "bake-#{version}.jar")
   end
 end
@@ -469,9 +491,18 @@ bake = Bake.new(
 )
 
 if $command == :kill
-  cake.kill
-  bake.kill
+  if $opts[:all]
+    `jps -v | grep cake.project`.split("\n").each do |line|
+      pid = line.split(' ').first.to_i
+      Process.kill($opts[:"9"] ? "KILL" : "TERM", pid)
+    end
+  else
+    cake.kill
+    bake.kill
+  end
   exit
+elsif $command == :ps
+  exec "jps -v | grep cake.project"
 elsif restart?
   cake.stop
   bake.stop

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 10
-  version: 0.2.10
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -07:00
+date: 2010-07-06 00:00:00 -07:00
 default_executable: cake
 dependencies: []