cake 0.4.6 → 0.4.7

data/bin/cake

@@ -79,7 +79,7 @@ class IO
       end
       input_wait -= interval
       return if finished
-      
+
       while input.ready?
         return if input.eof?
         write(input.gets)
@@ -178,9 +178,11 @@ def admin_command?
   [:start, :stop, :reload, :restart].include?($command)
 end
 
-def log(command, *message)
-  message.each do |line|
-    printf("%11s %s\n", "[#{command}]", line)
+def log(command, *messages)
+  messages.each do |message|
+    message.split("\n").each do |line|
+      printf("%11s %s\n", "[#{command}]", line) unless line.empty?
+    end
   end
 end
 
@@ -228,23 +230,27 @@ rescue NotImplementedError, Errno::EINVAL
   file
 end
 
+def download(url, path)
+  log(:deps, "downloading #{url}")
+  open(url) do |remote|
+    open(path, "wb") do |local|
+      while (buf = remote.read(8192))
+        local.write buf
+      end
+    end
+  end
+end
+
 def get_cake(version, dest = nil, opts = {})
   jar  = version =~ /(.*)-SNAPSHOT/ ? "cake-#{$1}-#{snapshot(version)}.jar" : "cake-#{version}.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...") unless @logged; @logged = true
     url = "#{$repo}/#{version}/#{jar}"
-    log(:deps, "downloading #{url}") if verbose?
+    log(:deps, "fetching cake libraries. this may take a moment...") unless @logged; @logged = true
     FileUtils.makedirs(repo)
-    open(url) do |jarfile|
-      open(path, "wb") do |file|
-        while (buf = jarfile.read(8192))
-          file.write buf
-        end
-      end
-    end
+    download(url, path)
   end
   return path unless dest
 
@@ -260,10 +266,12 @@ rescue OpenURI::HTTPError => e
 end
 
 def current_version
-  open("#{$repo}/maven-metadata.xml") do |file|
+  version = open("#{$repo}/maven-metadata.xml") do |file|
     doc = REXML::Document.new file
     doc.elements['metadata'].elements['versioning'].elements['versions'].elements.to_a('version').last.get_text.to_s
   end
+  log(:deps, "most recent clojars version is #{version}") if debug?
+  version
 end
 
 def snapshot(version)
@@ -323,7 +331,7 @@ class JVM
   end
 
   def refresh
-    @pid, @port, @version = IO.read(pidfile).split("\n"); @pid = @pid.to_i; @port = @port.to_i    
+    @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
 
@@ -447,7 +455,7 @@ class JVM
       else
         Find.find(path) do |f|
           Find.prune if f == "#{$bakedir}/src/jvm"
-          files << f if f =~ /\.(clj|class)$/ and File.exists?(f) and not File.directory?(f)
+          files << f if f =~ /\.(clj|class|jar)$/ and File.exists?(f) and not File.directory?(f)
         end if File.exists?(path)
       end
     end
@@ -655,14 +663,16 @@ private
 
   def prompt(prompt, opts = {})
     if opts[:echo] == false
-      echo_off = system("stty -echo 2&> /dev/null")
+      output = `stty -echo 2>&1`
+      log($command, output) if verbose?
+      echo_off = $?.exitstatus == 0
       prompt << " (WARNING, input will be visible on console!)" unless echo_off
     end
     input = Readline.readline(prompt + ": ") || ''
     input + "\n"
   ensure
     if echo_off
-      system("stty echo 2&> /dev/null")
+      system('stty echo')
       puts
     end
   end
@@ -720,7 +730,14 @@ end
 # Bootstrap cake dependencies.
 lib = "#{$cakedir}/lib"
 if File.exists?("#{$cakedir}/.gitignore") and File.exists?("#{$cakedir}/project.clj")
+  log(:cake, "running from git checkout") if verbose?
+  if $command == :upgrade
+    log(:upgrade, "pulling latest code from git")
+    system('git pull')
+  end
+
   $version = IO.read("#{$cakedir}/project.clj").split("\n").first.match(/defproject cake \"(.*)\"/)[1]
+  log(:deps, "project.clj version is #{$version}") if debug?
   if Dir["#{lib}/*.jar"].empty? or Dir["#{lib}/dev/*.jar"].empty?
     # In a new git checkout, need to fetch dependencies.
     begin
@@ -740,16 +757,26 @@ else
   bakejar = "#{lib}/bake.jar"
   if File.exists?(cakejar) and File.exists?(bakejar)
     # Inside a gem install.
+    log(:cake, "running from gem") if verbose?
+    if $command == :upgrade
+      log(:upgrade, "checking for updates to cake gem")
+      system('gem update cake')
+    end
+
     $version = File.basename(File.dirname(lib)).split('-')[1]
     cakepath = cakejar
     bakepath = bakejar
   else
-    # Naked script.
-    $version  = current_version
-    cakepath = get_cake(version)
-    bakepath = extract(cakepath, "bake-#{version}.jar")
+    # Standalone script.
+    log(:cake, "running from standalone script") if verbose?
+    download("http://github.com/ninjudd/cake/raw/master/bin/cake", __FILE__) if $command == :upgrade
+
+    $version = current_version
+    cakepath = get_cake($version)
+    bakepath = extract(cakepath, "bake-#{$version}.jar")
   end
 end
+exec("cake deps") if $command == :upgrade
 
 cake = Cake.new(
   [cakepath, "src", "src/clj", $config['cake.claspath'], "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
@@ -816,21 +843,14 @@ elsif [:start, :reload, :restart].include?($command)
   end
 else
   if $command == :autotest
-    cake.send_command(:autotest)
-    interval = $opts[:autotest].last.to_i if $opts[:autotest]
-    interval = interval || ($config['autotest.interval'].to_i if $config['autotest.interval']) || 1
-    run_tests = true
-    ran = false
+    cake.send_command(:test)
+    interval = ($opts[:interval].first if $opts[:interval]) || $config['autotest.interval'] || 5
     while true
-      args = ["--auto"]
-      if ran == false
-        args << "--report"
-        ran = true
-      end
-      cake.send_command(:test, args) if run_tests
-      run_tests = bake.reload
+      sleep(interval.to_i)
+      cake.send_command(:autotest)
+      $stdout.print_flush('.')
+      bake.reload
       cake.reload
-      sleep(interval)
     end
   else
     cake.send_command($command)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -07:00
 default_executable: cake
 dependencies: []