cake 0.3.13 → 0.4.0

data/bin/cake

@@ -11,10 +11,10 @@ require 'pp'
 
 if RUBY_PLATFORM =~ /(mingw|mswin)(32|64)$/
   require 'win32/process'
-  TERM = 'BRK'
+  TERM = 1
   KILL = 'KILL'
   PATH_SEP = ';'
-  $home = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
+  $home = File.expand_path(ENV['HOMEDRIVE'] + ENV['HOMEPATH'])
   $win  = true
 
   def daemon(cmd)
@@ -38,6 +38,90 @@ else
   end
 end
 
+class IO
+  def gets_nonblock(delim = "\n")
+    line = ""
+    while c = read_nonblock(1)
+      line << c
+      break if c == delim
+    end
+    line
+  rescue Errno::EAGAIN, Errno::EWOULDBLOCK, EOFError
+    line
+  end
+
+  def eof_nonblock?
+    ungetc(read_nonblock(1)[0])
+    false
+  rescue Errno::EAGAIN, Errno::EWOULDBLOCK, EOFError => e
+    e.kind_of?(EOFError)
+  end
+
+  def print_flush(str)
+    print(str)
+    flush
+  end
+
+  def duplex(input, output, input_wait = 0, interval = 0.01)
+    until eof_nonblock?
+      while self.wait(interval)
+        if line = block_given? ? yield(gets_nonblock) : gets_nonblock
+          output.print_flush(line) if line.kind_of?(String)
+        else
+          finished = true
+        end
+      end
+      input_wait -= interval
+      return if finished
+      
+      while input.ready?
+        return if input.eof?
+        write(input.gets)
+      end unless $win or input_wait > 0
+    end
+  end
+end
+
+class Object
+  # Support converting simple Ruby data structures to Clojure expressions.
+  def to_clj(unquote = false)
+    if unquote
+      case self
+      when Array  : return collect {|i| i.to_clj(true)}.join(' ')
+      when String : return self
+      end
+    end
+    case self
+    when Hash   : '{' + collect {|k,v| k.to_clj + ' ' + v.to_clj}.join(' ') + '}'
+    when Array  : '[' + collect {|i| i.to_clj}.join(' ') + ']'
+    when Symbol : ":#{to_s}"
+    else          inspect.gsub(/(\\a|\\e|\\v)/) {|c| CLJ_SUB[c]}
+    end
+  end
+
+  CLJ_SUB = {
+    '\a' => '\007',
+    '\e' => '\033',
+    '\v' => '\013',
+  }
+
+  define_method(:~) { Unquoted.new(self) }
+end
+
+class Unquoted
+  attr_reader :object
+  def initialize(object)
+    @object = object
+  end
+
+  def to_clj(quote = false)
+    object.to_clj(!quote)
+  end
+  alias to_s to_clj
+
+  define_method(:~) { @object }
+end
+
 begin
   require 'readline'
 rescue LoadError => e
@@ -45,37 +129,23 @@ rescue LoadError => e
     HISTORY = []
     attr_accessor :basic_word_break_characters, :completion_proc
     def readline(prompt)
-      $stdout.print prompt
-      $stdout.flush
+      $stdout.print_flush(prompt)
       $stdin.gets
     end
     extend Readline
   end
 end
 
-class IO
-  def gets_nonblock(delim = "\n")
-    line = ""
-    while c = read_nonblock(1)
-      line << c
-      break if c == delim
-    end
-    line
-  rescue Errno::EAGAIN, EOFError => e
-    line
-  end
-end
-
 def add_opt!(key, *vals)
   ($opts[key.to_sym] ||= []).concat vals
 end
 
 def parse_opts!
-  ARGV.unshift('run', '--global') if ARGV.any? and ARGV.first.index('/')
-  ARGV.unshift('default')         if ARGV.empty? or ARGV.first[0,1] == '-'
-  $command = ARGV.shift.to_sym
+  ARGV.unshift('run')     if ARGV.any? and ARGV.first.index('/')
+  ARGV.unshift('default') if ARGV.empty? or ARGV.first[0,1] == '-'
+  $command = ARGV.first.to_sym
   $opts = {}
-  ARGV.each do |opt|
+  ARGV[1..-1].each do |opt|
     case opt
     when /^-(\w+)$/              then $1.split('').each {|c| add_opt!(c, '')}
     when /^--?([-\w]+)=([\S]+)$/ then add_opt!($1, *$2.split(','))
@@ -85,7 +155,6 @@ def parse_opts!
   end
   $opts.freeze
 end
-parse_opts!
 
 def debug?
   ENV['CAKE_DEBUG'] or $opts[:d] or $opts[:debug]
@@ -133,30 +202,6 @@ class Configuration < Hash
   end
 end
 
-def config
-  @config ||= Configuration.new("#{$home}/.cake/config", ".cake/config")
-end
-
-if debug?
-  puts "opts: #{$opts.inspect}"
-  puts "config: #{$config.inspect}"
-end
-
-GLOBAL_DEFAULT_PROJECT = <<END
-(defproject global "0.0.0"  
-  :description "Don't rename this project, though you can change the version to your heart's content."
-  :dependencies [[clojure "1.2.0-RC2"]
-                 [clojure-contrib "1.2.0-RC2"]])
-;;--------------------
-;; This is the global cake project. What does that mean?
-;;  1. This project is used whenever you run cake outside a project directory.
-;;  2. Any dependencies specified here will be available in the global repl.
-;;  3. Any dev-dependencies specified here will be available in all projects, though you
-;;     must run 'cake deps --global' manually when you change this file.
-;;  4. Configuration options in ~/.cake/config are used in all projects.
-;;--------------------
-END
-
 def project_dir(dir)
   if $opts[:project] and not $opts[:global]
     project = $opts[:project].last
@@ -168,11 +213,7 @@ def project_dir(dir)
     return dir if ["project.clj", "tasks.clj"].any? {|file| File.exists?("#{dir}/#{file}")}
     dir = File.dirname(dir)
   end unless $opts[:global]
-  project_dir = "#{$home}/.cake"
-  project_clj = "#{project_dir}/project.clj"
-  FileUtils.makedirs(project_dir) unless File.exists?(project_dir)
-  File.open(project_clj, 'w') {|f| f.write(GLOBAL_DEFAULT_PROJECT)} unless File.exists?(project_clj)
-  project_dir
+  "#{$home}/.cake"
 end
 
 def readlink(file)
@@ -181,14 +222,6 @@ rescue NotImplementedError, Errno::EINVAL
   file
 end
 
-$pwd     = Dir.getwd
-$bakedir = project_dir($pwd)
-$cakedir = File.dirname(File.dirname(readlink(__FILE__)))
-$repo    = "http://clojars.org/repo/cake/cake"
-$confdir = ".cake"
-Dir.chdir($bakedir)
-FileUtils.makedirs($confdir)
-
 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}")
@@ -284,9 +317,13 @@ class JVM
   end
 
   def refresh
-    @pid, @port = IO.read(pidfile).split("\n").map {|l| l.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
+
+    return if @version == $version
+    Process.kill(TERM, @pid)
+    reset!
   rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED, Errno::EBADF, Process::Error => e
     log(:start, "defunct #{type} jvm") if debug? and e.kind_of?(Errno::ECONNREFUSED)
     reset! # no pidfile or invalid pid or connection refused
@@ -319,7 +356,8 @@ class JVM
         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(" ")}]\n"
+          socket.write ":reload {} [#{stale_files.join(" ")}]"
+          socket.close_write
           if socket.eof?
             FileUtils.touch(pidfile)
             @load_time = Time.now
@@ -340,6 +378,11 @@ class JVM
     opts
   end
 
+  def vm_opts
+    opts = '-client'
+    opts << ' -d32' unless $win
+  end
+
   MIN_PORT = 2**14
   MAX_PORT = 2**16
 
@@ -351,8 +394,8 @@ class JVM
     else
       log(:start, "starting #{type} jvm") if verbose? or $command == :start
       @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
-      @pid = daemon %{java -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(use '#{type})(start-server #{port})"}
-      File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n") }
+      @pid = daemon %{java #{vm_opts} -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(use '#{type}.core) (start-server #{port})"}
+      File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n#{$version}\n") }
     end
   rescue Errno::EADDRNOTAVAIL => e # port already in use
     retry
@@ -363,7 +406,7 @@ class JVM
     with_socket(nil) do |socket|
       action = mode == :reload ? 'quit' : 'force-quit'
       log(mode, "sending #{action} to #{type} jvm on port #{port}") if debug?
-      socket.write(":#{action}\n")
+      socket.write(":#{action} {}")
       if socket.eof?
         log(mode, "#{type} jvm stopped") if restart?
         reset!
@@ -400,7 +443,7 @@ class JVM
   def ping
     return unless enabled?
     with_socket do |socket|
-      socket.write ":ping\n"
+      socket.write ":ping {}\n"
       log($command, "#{type} jvm not running") unless socket.gets == "pong\n"
     end
   end
@@ -410,7 +453,7 @@ class JVM
     load_history
     loop do
       with_socket do |socket|
-        socket.write %{:repl "#{REPL_PROMPT}"}
+        socket.write %{:repl #{$vars} "#{REPL_PROMPT}"}
         while @ns = read_until_prompt(socket)
           line = readline
           return unless line
@@ -422,16 +465,38 @@ class JVM
     save_history
   end
 
+  def run(file = $script)
+    with_socket do |socket|
+      log(:run, "running file #{file}") if debug?
+      socket.write(":run #{$vars} #{file.inspect}")
+      socket.duplex($stdin, $stdout)
+    end
+  end
+
   def eval(forms = $opts[:eval])
     forms = forms.collect do |form|
       form == '-' ? $stdin.gets(nil) : form
     end.join(' ')
+    forms = "(doall (map println [#{forms}]))" if $opts[:p]
     with_socket do |socket|
       log(:eval, forms) if debug?
-      socket.write(':eval [' + forms + ']')
-      while (line = socket.gets)
-        puts line
+      socket.write(":eval #{$vars} #{forms} :cake/EOF ")
+      socket.duplex($stdin, $stdout)
+    end
+  end
+
+  EOL = "EOL__#{rand}"
+  def filter(forms = $opts[:filter])
+    with_socket do |socket|
+      socket.write %(:filter #{$vars} "#{EOL}")
+      while line = $stdin.gets
+        socket.write [line, ~forms].to_clj
+        while (line = socket.gets)
+          break if line.start_with?(EOL)
+          puts line
+        end
       end
+      socket.close_write
     end
   end
 
@@ -442,12 +507,9 @@ private
   end
 
   def inspect(socket)
-    line = socket.gets
-    if debug? or not line.start_with?('reload-failed:')
+    while line = socket.gets
+      break if line.start_with?('reload-failed:') and not debug?
       puts line
-      while line = socket.gets
-        puts line
-      end
     end
   end
 
@@ -492,40 +554,25 @@ private
     end
   end
 
-  def read_until_prompt(socket, wait = 0.01, read_timeout = 3)
+  def read_until_prompt(socket)
     prompt = nil
-    while read_timeout -= wait
-      while socket.wait(wait)
-        line = socket.gets_nonblock
-        if line =~ /^#{REPL_PROMPT}(.*)$/
-          prompt = $1
-        else
-          $stdout.print line
-          $stdout.flush
-        end
+    socket.duplex($stdin, $stdout, 3) do |line|
+      if line =~ /^(.*)#{REPL_PROMPT}(.*)$/
+        prompt = $1.empty? ? $2 : "#{$1}\n#{$2}"
+        nil
+      else
+        line
       end
-      break if prompt
-
-      while $stdin.ready?
-        socket.puts($stdin.gets)
-      end if read_timeout <= 0
     end
     prompt
   end
 
-  def validate(input)
-    return input if input.empty?
+  def complete?(input)
+    return true if input.empty?
     with_socket do |socket|
-      socket.write(":validate #{input.join("\n").strip}")
+      socket.write(":validate {} #{input.join("\n").strip}")
       socket.close_write # send eof
-      results = socket.gets(nil)
-
-      return if results == "incomplete\n"
-      if results == "invalid\n"
-        input.join(' ').strip
-      else
-        results.strip
-      end
+      socket.gets != "incomplete\n"
     end
   end
 
@@ -536,9 +583,9 @@ private
     Readline.completion_proc = method(:completions)
     while line = Readline.readline(prompt)
       input << line
-      if valid_input = validate(input)
-        Readline::HISTORY.push(valid_input)
-        return valid_input
+      if complete?(input)
+        Readline::HISTORY.push(input.join(' '))
+        return input.join("\n")
       end
       prompt[-2] = ?*
     end
@@ -551,7 +598,7 @@ private
   def completions(prefix)
     return [] if prefix.empty?
     with_socket do |socket|
-      socket.write(":completions [\"#{prefix}\" #{@ns}]\n")
+      socket.write ~[:completions, {}, ~[prefix, ~@ns]]
       completions = []
       while line = socket.gets
         completions << line.chomp
@@ -565,33 +612,31 @@ class Cake < JVM
   attr_accessor :bakeport
 
   READLINE = "READLINE__#{rand}"
-  def send_command(command, args = [])
+  def send_command(command)
     with_restart { FileUtils.remove_dir("lib/dev", true) } if $win and [:deps, :clean].include?(command)
 
     with_socket do |socket|
-      args = args.collect{|arg| '"' + arg.gsub('"', '\"').gsub("\n", "\\n") + '"'}
-      env  = command == :run ? ('{' + ENV.collect {|k,v| "#{k.inspect} #{v.inspect}"}.join(' ') + '}') : 'nil'
-      cmd  = %{[#{command} [#{args.join(' ')}] #{bakeport || 'nil'} "#{$pwd}" #{env}] "#{READLINE}"}
+      cmd = [command, bakeport, READLINE].to_clj
       log(command, "sending: " + cmd) if debug?
-      socket.write(cmd)
-      while (line = socket.gets)
+      socket.write("#{cmd} #{$vars}")
+      socket.duplex($stdin, $stdout) do |line|
         if line =~ /^#{READLINE}(.*)$/
           socket.write(prompt($1))
         elsif line =~ /^@#{READLINE}(.*)$/
           socket.write(prompt($1, :echo => false))
         else
-          puts line
+          line
         end
       end
     end
   end
 
   def files
-    super.concat ["build.clj", "#{$home}/.cake/tasks.clj"]
+    super.concat ["tasks.clj", "#{$home}/.cake/tasks.clj"]
   end
 
   def java_opts
-    [ENV['CAKE_JAVA_OPTS'], config['cake.java_opts'], super].compact.join(' ')
+    [ENV['CAKE_JAVA_OPTS'], $config['cake.java_opts'], super].compact.join(' ')
   end
 
 private
@@ -613,7 +658,7 @@ end
 
 class Bake < JVM
   def java_opts
-    [ENV['JAVA_OPTS'], config['project.java_opts'], super].compact.join(' ')
+    [ENV['JAVA_OPTS'], $config['project.java_opts'], super].compact.join(' ')
   end
 
   def enabled?
@@ -621,13 +666,53 @@ class Bake < JVM
   end
 end
 
+#==================================
+
+FileUtils.makedirs("#{$home}/.cake")
+project_clj = "#{$home}/.cake/project.clj"
+File.open(project_clj, 'w') do |file|
+  file.write <<END
+(defproject global "0.0.0"
+  :description "Don't rename this project, though you can change the version to your heart's content."
+  :dependencies [[clojure "1.2.0-RC2"]
+                 [clojure-contrib "1.2.0-RC2"]])
+;;--------------------
+;; This is the global cake project. What does that mean?
+;;  1. This project is used whenever you run cake outside a project directory.
+;;  2. Any dependencies specified here will be available in the global repl.
+;;  3. Any dev-dependencies specified here will be available in all projects, though you
+;;     must run 'cake deps --global' manually when you change this file.
+;;  4. Configuration options in ~/.cake/config are used in all projects.
+;;--------------------
+END
+end unless File.exists?(project_clj)
+
+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__)))
+$repo    = "http://clojars.org/repo/cake/cake"
+$confdir = ".cake"
+$config  = Configuration.new("#{$home}/.cake/config", ".cake/config")
+$vars    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts}.to_clj
+
+Dir.chdir($bakedir)
+FileUtils.makedirs($confdir)
+
+if debug?
+  puts "config: #{$config.inspect}"
+  puts "vars:   #{$vars}"
+end
+
 # Bootstrap cake dependencies.
 lib = "#{$cakedir}/lib"
 if File.exists?("#{$cakedir}/.gitignore") and File.exists?("#{$cakedir}/project.clj")
+  $version = IO.read("#{$cakedir}/project.clj").split("\n").first.match(/defproject cake \"(.*)\"/)[1]
   if Dir["#{lib}/*.jar"].empty? or Dir["#{lib}/dev/*.jar"].empty?
     # In a new git checkout, need to fetch dependencies.
     begin
-      version = IO.read("#{$cakedir}/project.clj").split("\n").first.match(/defproject cake \"(.*)\"/)[1]
+      version = $version
       cakejar = get_cake(version, lib, :raise => true)
     rescue OpenURI::HTTPError => e
       version = current_version
@@ -643,26 +728,30 @@ else
   bakejar = "#{lib}/bake.jar"
   if File.exists?(cakejar) and File.exists?(bakejar)
     # Inside a gem install.
+    $version = File.basename(File.dirname(lib)).split('-')[1]
     cakepath = cakejar
     bakepath = bakejar
   else
     # Naked script.
-    version  = current_version
+    $version  = current_version
     cakepath = get_cake(version)
     bakepath = extract(cakepath, "bake-#{version}.jar")
   end
 end
 
 cake = Cake.new(
-  [cakepath, "src", "src/clj", config['cake.claspath'], "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
-  [config['cake.library.path'], "lib/dev/native"]
+  [cakepath, "src", "src/clj", $config['cake.claspath'], "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
+  [$config['cake.library.path'], "lib/dev/native"]
 )
 bake = Bake.new(
-  [bakepath, "src", "src/clj", "classes", "test", config['project.classpath'], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
-  [config['project.library.path'], "lib/native", "lib/dev/native"]
+  [bakepath, "src", "src/clj", "classes", "test", $config['project.classpath'], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
+  [$config['project.library.path'], "lib/native", "lib/dev/native"]
 )
 
-if $command == :kill
+if $command == :default and $opts[:version]
+  puts "cake #{$version}"
+  exit
+elsif $command == :kill
   if $opts[:all]
     ps.each do |line|
       pid = line.split(' ').first.to_i
@@ -686,19 +775,15 @@ cake.init
 if [:deps, :clean].include?($command)
   bake.stop
 elsif File.exists?('project.clj')
-  if newer?('project.clj', 'pom.xml') or not bake.enabled?
-    bake.stop
+  if not bake.enabled?
     cake.send_command(:deps)
     cake.init
-  elsif config['swank.auto-start'] or config['swank']
-    cake.send_command(:"swank-deps")
-    cake.init
   end
 
   bake.init
 end
 
-if [:repl, :eval].include?($command)
+if [:repl, :eval, :filter, :run].include?($command)
   if $opts[:cake] or not File.exists?('project.clj')
     cake.send($command)
   else
@@ -717,7 +802,7 @@ 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
+    interval = interval || ($config['autotest.interval'].to_i if $config['autotest.interval']) || 1
     run_tests = true
     ran = false
     while true
@@ -732,6 +817,6 @@ else
       sleep(interval)
     end
   else
-    cake.send_command($command, ARGV)
+    cake.send_command($command)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 13
-  version: 0.3.13
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -07:00
+date: 2010-08-18 00:00:00 -07:00
 default_executable: cake
 dependencies: []