cake 0.3.4 → 0.3.6

data/bin/cake

@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
 # Save your fork, there's cake!"
-require 'ftools'
 require 'find'
 require 'open-uri'
 require 'rexml/document'
 require 'socket'
 require 'timeout'
 require 'fileutils'
-require 'pp'
 
 begin
   require 'readline'
@@ -24,6 +22,19 @@ rescue LoadError => e
   end
 end
 
+class IO
+  def gets_nonblock
+    line = ""
+    while c = read_nonblock(1)
+      line << c
+      break if c == "\n"
+    end
+    line
+  rescue Errno::EAGAIN, EOFError => e
+    line
+  end
+end
+
 def project_dir(dir)
   while dir != "/"
     return dir if [".cake", "project.clj", "build.clj"].any? {|file| File.exists?("#{dir}/#{file}")}
@@ -34,14 +45,15 @@ end
 
 PATH_SEP = ':'
 file     = File.readlink(__FILE__) rescue __FILE__
-$bakedir = project_dir(Dir.getwd)
+$pwd     = Dir.getwd
+$bakedir = project_dir($pwd)
 $cakedir = File.dirname(File.dirname(file))
 $repo    = "http://clojars.org/repo/cake/cake"
 $confdir = ".cake"
 Dir.chdir($bakedir)
-File.makedirs($confdir)
+FileUtils.makedirs($confdir)
 
-def get_cake(version, dest = nil)
+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}"
@@ -49,7 +61,8 @@ def get_cake(version, dest = nil)
   if not File.exists?(path)
     log(:deps, "fetching cake libraries. this may take a moment...")
     url = "#{$repo}/#{version}/#{jar}"
-    File.makedirs(repo)
+    log(:deps, "downloading #{url}") if verbose?
+    FileUtils.makedirs(repo)
     open(url) do |jarfile|
       open(path, "wb") do |file|
         while (buf = jarfile.read(8192))
@@ -61,10 +74,11 @@ def get_cake(version, dest = nil)
   return path unless dest
 
   dest = File.expand_path(dest)
-  File.makedirs(dest)
-  File.copy(path, dest)
+  FileUtils.makedirs(dest)
+  FileUtils.copy(path, dest)
   "#{dest}/#{jar}"
 rescue OpenURI::HTTPError => e
+  raise if opts[:raise]
   log(:deps, "unable to find cake version #{version} on clojars.")
   log(:deps, "please check http://github.com/ninjudd/cake for latest install instructions.")
   exit
@@ -92,8 +106,8 @@ def extract(jar, file, dest = File.dirname(jar))
     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)
+    FileUtils.makedirs(dest)
+    FileUtils.move(file, dest)
   end
   "#{dest}/#{file}"
 end
@@ -202,7 +216,7 @@ class JVM
   end
 
   def refresh
-    @pid, @port = IO.read(pidfile).map {|l| l.to_i}
+    @pid, @port = IO.read(pidfile).split("\n").map {|l| l.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
   rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED => e
@@ -266,7 +280,7 @@ class JVM
       @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") }
     end
-  rescue Errno::EADDRNOTAVAIL => e
+  rescue Errno::EADDRNOTAVAIL => e # port already in use
     retry
   end
 
@@ -302,7 +316,7 @@ class JVM
         Find.find(path) do |f|
           Find.prune if f == "#{$bakedir}/src/jvm"
           files << f if File.exists?(f) and not File.directory?(f)
-        end
+        end if File.exists?(path)
       end
     end
     files
@@ -310,7 +324,7 @@ class JVM
 
   def ping
     return unless enabled?
-    with_socket(10) do |socket|
+    with_socket do |socket|
       socket.write ":ping\n"
       log($command, "#{type} jvm not running") unless socket.gets == "pong\n"
     end
@@ -333,6 +347,17 @@ class JVM
     save_history
   end
 
+  def eval(forms = $opts[:eval])
+    forms = forms.join(' ')
+    with_socket do |socket|
+      log(:eval, forms) if debug?
+      socket.write(':eval [' + forms + ']')
+      while (line = socket.gets)
+        puts line
+      end
+    end
+  end
+
 private
 
   def make_path(paths)
@@ -367,7 +392,7 @@ private
     pid
   end
 
-  def with_socket(retries = 10)
+  def with_socket(retries = 20)
     return unless port
     socket = TCPSocket.new("localhost", port)
     result = yield(socket)
@@ -375,6 +400,7 @@ private
   rescue Errno::ECONNREFUSED => e
     sleep 1
     retry if (retries -= 1) >= 0
+    log($command, "timeout while connecting to #{type} jvm")
     exit
   ensure
     socket.close if socket
@@ -396,9 +422,15 @@ private
   end
 
   def read_until_prompt(socket)
-    while line = socket.gets
-      return $1 if line =~ /^#{REPL_PROMPT}(.*)$/
-      puts line
+    while ready = select([socket, $stdin])[0]
+      if ready.first == socket
+        line = socket.gets_nonblock
+        return $1 if line =~ /^#{REPL_PROMPT}(.*)$/
+        $stdout.print line
+        $stdout.flush
+      else
+        socket.puts($stdin.gets)
+      end
     end
   end
 
@@ -450,7 +482,7 @@ class Cake < JVM
   def send_command(command, args = [])
     with_socket do |socket|
       args = args.collect{|arg| '"' + arg.gsub('"', '\"').gsub("\n", "\\n") + '"'}
-      cmd  = %{(#{command} [#{args.join(' ')}] #{bakeport}) "#{READLINE}"}
+      cmd  = %{[#{command} [#{args.join(' ')}] #{bakeport || "nil"} "#{$pwd}"] "#{READLINE}"}
       log(command, "sending: " + cmd) if debug?
       socket.write(cmd)
       while (line = socket.gets)
@@ -498,17 +530,6 @@ class Bake < JVM
   def enabled?
     Dir["lib/*.jar"].any?
   end
-
-  def eval(*forms)
-    forms = forms.join(' ')
-    with_socket do |socket|
-      log(:eval, forms) if debug?
-      socket.write('[' + forms + ']')
-      while (line = socket.gets)
-        puts line
-      end
-    end
-  end
 end
 
 # Bootstrap cake dependencies.
@@ -516,8 +537,13 @@ lib = "#{$cakedir}/lib"
 if File.exists?("#{$cakedir}/.gitignore") and File.exists?("#{$cakedir}/project.clj")
   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)
+    begin
+      version = IO.read("#{$cakedir}/project.clj").split("\n").first.match(/defproject cake \"(.*)\"/)[1]
+      cakejar = get_cake(version, lib, :raise => true)
+    rescue OpenURI::HTTPError => e
+      version = current_version
+      cakejar = get_cake(version, lib)
+    end
     extract(cakejar, "bake-#{version}.jar", "#{lib}/dev")
   end
 
@@ -572,7 +598,7 @@ if not [:deps, :clean].include?($command) and File.exists?('project.clj')
   if newer?('project.clj', 'pom.xml')
     cake.send_command(:deps) 
     cake.init
-  elsif File.exist?('.cake/swank')    
+  elsif config['swank.auto-start'] or config['swank']
     cake.send_command(:"swank-deps")
     cake.init
   end
@@ -580,17 +606,16 @@ if not [:deps, :clean].include?($command) and File.exists?('project.clj')
   bake.init
 end
 
-if $command == :repl
+if [:repl, :eval].include?($command)
   if File.exists?('project.clj') and not $opts[:cake]
-    bake.repl
+    bake.send($command)
   else
-    cake.repl
+    cake.send($command)
   end
-elsif $command == :eval
-  bake.eval(*$opts[:eval])
 elsif [:start, :reload, :restart].include?($command)
   if $opts[:l] or $opts[:log]
-    system("tail -f .cake/bake.log")
+    system("touch .cake/project.log")
+    system("tail -f .cake/project.log")
   else
     cake.ping
     bake.ping
@@ -598,6 +623,7 @@ elsif [:start, :reload, :restart].include?($command)
 else
   cake.bakeport = bake.port
   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
@@ -608,7 +634,7 @@ else
         args << "--report"
         ran = true
       end
-      cake.send_command('test', args) if run_tests
+      cake.send_command(:test, args) if run_tests
       run_tests = bake.reload
       cake.reload
       sleep(interval)

metadata

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