cake 0.4.11 → 0.4.13

data/bin/cake

@@ -3,7 +3,6 @@
 require 'find'
 require 'open-uri'
 require 'socket'
-require 'timeout'
 require 'fileutils'
 require 'io/wait'
 require 'pp'
@@ -231,47 +230,60 @@ 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
+def download(url, dir, opts = {})
+  file = File.basename(url)
+  path = "#{dir}/#{file}"
+
+  if opts[:force] or not File.exists?(path)
+    FileUtils.makedirs(dir)
+    open(url, progress_bar(url)) do |remote|
+      open(path, "wb") do |local|
+        while (buf = remote.read(8192)); local.write buf; end
       end
-    end
+    end; puts
+  end
+  return path unless opts[:dest]
+
+  dir  = File.expand_path(opts[:dest])
+  dest = "#{dir}/#{file}"
+  if opts[:force] or not File.exists?(dest)
+    FileUtils.makedirs(dir)
+    FileUtils.copy(path, dest)
   end
+  dest
+rescue OpenURI::HTTPError
+  raise "resource not found: #{url}"
 end
 
-def get_cake(version, dest = nil, opts = {})
-  jar  = "cake-#{version}.jar"
-  repo = File.expand_path("~/.m2/repository/cake/cake/#{version}")
-  path = "#{repo}/#{jar}"
+def get_cake(opts = {})
+  log(:deps, "Fetching cake dependencies...") unless @got_cake; @got_cake = true
+  version = cake_version(opts[:version] || :current)
+  download("#{$github}/jars/cake-#{version}.jar", "#{$m2}/cake/cake/#{snapshot(version)}", opts)
+end
 
-  if not File.exists?(path)
-    url = "#{$repo}/#{jar}"
-    log(:deps, "fetching cake libraries. this may take a moment...") unless @logged; @logged = true
-    FileUtils.makedirs(repo)
-    download(url, path)
-  end
-  return path unless dest
+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)
+end
 
-  dest = File.expand_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
+def progress_bar(label, ch = '=', bg = '', width = 77, out = $stdout, progress = 0, total = nil)
+  { :progress_proc => lambda {|c| progress += ((width * c/total).to_i - progress).times { out.print_flush(ch) }},
+    :content_length_proc => lambda {|t| printf("%s\n[%#{width}s]\r[", label, bg); total = t}}
 end
 
-def current_version
-  version = open("#{$repo}/version").gets
+def cake_version(version)
+  return version unless version.kind_of?(Symbol)
+  version = open("#{$github}/#{version}").gets
   log(:deps, "most recent standalone version is #{version}") if debug?
   version
 end
 
+def snapshot(version)
+  version.gsub(/\d{8}\.\d{6}$/, "SNAPSHOT")
+end
+
 def extract(jar, file, dest = File.dirname(jar))
   if not File.exists?("#{dest}/#{file}")
     log(:deps, "extracting #{file} from #{jar}") if verbose?
@@ -299,7 +311,7 @@ class JVM
     @type      = self.class.name.downcase
     @classpath = make_path(classpath)
     @libpath   = make_path(libpath)
-    @pidfile   = "#{$confdir}/#{type}.pid"
+    @pidfile   = ".cake/#{type}.pid"
     @load_time = File.exists?(pidfile) ? File.mtime(pidfile) : Time.now
     refresh
   end
@@ -323,10 +335,7 @@ class JVM
     Process.kill(0, @pid) # make sure pid is valid
     TCPSocket.new("localhost", @port).close if @port # make sure jvm is running on port
 
-    if @version != $version
-      kill
-      reset!
-    end
+    kill if @version != $version
   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?
@@ -395,10 +404,10 @@ class JVM
   def start
     return unless enabled?
     if running?
-      log(:start, "#{type} jvm already running") if $command == :start
+      log(:start, "#{type} jvm already running") if $command == :start and not $opts[:silent]
       return
     else
-      log(:start, "starting #{type} jvm") if verbose? or $command == :start
+      log(:start, "starting #{type} jvm") if verbose? or ($command == :start and not $opts[:silent])
       @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
       @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") }
@@ -428,11 +437,14 @@ class JVM
   end
 
   def kill
-    return unless pid
-    signal = $opts[:"9"] ? KILL : TERM
-    log(:kill, "sending #{signal} signal to #{type} jvm") if debug?
-    Process.kill(signal, pid)
-    reset!
+    if pid
+      signal = $opts[:"9"] ? KILL : TERM
+      log(:kill, "sending #{signal} signal to #{type} jvm") if debug?
+      Process.kill(signal, pid)
+      reset!
+    else
+      log(:kill, "#{type} jvm not running") if $command == :kill
+    end
   end
 
   def files
@@ -475,16 +487,16 @@ class JVM
     save_history
   end
 
-  def run(file = $script)
+  def run
     with_socket do |socket|
-      log(:run, "running file #{file}") if debug?
-      socket.write(":run #{$vars} #{file.inspect}")
+      log(:run, "running file #{$script}") if debug?
+      socket.write(":run #{$vars} #{$script.inspect}")
       socket.duplex($stdin, $stdout)
     end
   end
 
-  def eval(forms = $opts[:eval])
-    forms = forms.collect do |form|
+  def eval
+    forms = $opts[:eval].collect do |form|
       form == '-' ? $stdin.gets(nil) : form
     end.join(' ')
     forms = "(doall (map println [#{forms}]))" unless $opts[:q]
@@ -496,7 +508,8 @@ class JVM
   end
 
   EOL = "EOL__#{rand}"
-  def filter(forms = $opts[:filter])
+  def filter
+    forms = $opts[:filter]
     with_socket do |socket|
       socket.write %(:filter #{$vars} "#{EOL}")
       while line = $stdin.gets
@@ -646,6 +659,7 @@ class Cake < JVM
   end
 
   def java_opts
+    # bootclasspath = %{-Xbootclasspath/a:"#{$clojure}"}
     [ENV['CAKE_JAVA_OPTS'], $config['cake.java_opts'], super].compact.join(' ')
   end
 
@@ -675,16 +689,16 @@ class Bake < JVM
   end
 
   def enabled?
-    Dir["lib/*.jar"].any?
+    Dir['lib/*.jar'].any?
   end
 end
 
-#==================================
-
-FileUtils.makedirs("#{$home}/.cake")
-project_clj = "#{$home}/.cake/project.clj"
-File.open(project_clj, 'w') do |file|
-  file.write <<END
+def initialize_cake_dirs
+  FileUtils.makedirs("#{$bakedir}/.cake")
+  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, but you can change the version if you want."
   :dependencies [[clojure "1.2.0"]
@@ -698,21 +712,24 @@ File.open(project_clj, 'w') do |file|
 ;;  4. Configuration options in ~/.cake/config are used in all projects.
 ;;--------------------
 END
-end unless File.exists?(project_clj)
+  end unless File.exists?(project_clj)
+end
+
+#==================================
 
 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://github.com/ninjudd/cake-standalone/raw/master"
-$confdir = ".cake"
+$github  = "http://github.com/ninjudd/cake-standalone/raw/master"
+$m2      = "#{$home}/.m2/repository"
 $config  = Configuration.new("#{$home}/.cake/config", ".cake/config")
-$timeout = ($config['connect.timeout'] || 20).to_i
 $vars    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
+$timeout = ($config['connect.timeout'] || 20).to_i
 
 Dir.chdir($bakedir)
-FileUtils.makedirs($confdir)
+initialize_cake_dirs
 
 if debug?
   puts "config: #{$config.inspect}"
@@ -733,21 +750,18 @@ if File.exists?("#{$cakedir}/.gitignore") and File.exists?(project)
   $version = IO.read(project).split("\n").first.match(/defproject cake \"(.*)\"/)[1]
   log(:deps, "project.clj version is #{$version}") if debug?
 
-  FileUtils.remove_dir(lib, true) if newer?(project, lib)
+  # 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? or Dir["#{lib}/dev/*.jar"].empty?
-    # In a new git checkout, need to fetch dependencies.
-    begin
-      version = $version
-      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")
+    # 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}/*:#{lib}/dev/*"].join(PATH_SEP)
-  bakepath = ["#{$cakedir}/bake", "#{lib}/dev/*"].join(PATH_SEP)
+  cakepath = ["#{$cakedir}/src", "#{lib}/*:#{lib}/dev/*"]
+  bakepath = ["#{$cakedir}/bake", "#{lib}/dev/*"]
 else
   cakejar = "#{lib}/cake.jar"
   bakejar = "#{lib}/bake.jar"
@@ -756,23 +770,32 @@ else
     log(:cake, "running from gem") if verbose?
     if $command == :upgrade
       log(:upgrade, "checking for updates to cake gem")
-      system('gem update cake')
+      system('gem update cake --no-ri --no-rdoc')
     end
 
     $version = File.basename(File.dirname(lib)).split('-')[1]
-    cakepath = cakejar
+    $clojure = "#{lib}/clojure.jar"
+
+    cakepath = [cakejar, $clojure]
     bakepath = bakejar
   else
     # Standalone script.
     log(:cake, "running from standalone script") if verbose?
-    download("http://github.com/ninjudd/cake/raw/master/bin/cake", __FILE__) if $command == :upgrade
+    download("#{$github}/cake", __FILE__, :force => true) if $command == :upgrade
+
+    $version = cake_version(:stable)
+    cakejar  = get_cake(:version => $version)
+    $clojure = get_clojure
 
-    $version = current_version
-    cakepath = get_cake($version)
-    bakepath = extract(cakepath, "bake-#{$version}.jar")
+    cakepath = [cakejar, $clojure]
+    bakepath = extract(cakejar, "bake.jar")
   end
 end
-exec("cake deps") if $command == :upgrade
+
+if $command == :upgrade
+  system($0, "start", "--silent")
+  exec($0, "--version")
+end
 
 cake = Cake.new(
   [cakepath, "src", "src/clj", $config['cake.claspath'], "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
@@ -787,11 +810,13 @@ if $command == :default and $opts[:version]
   puts "cake #{$version}"
   exit
 elsif $command == :kill
-  if $opts[:all]
-    ps.each do |line|
+  if $opts[:all] or $opts[:kill] == ['all']
+    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
       Process.kill($opts[:"9"] ? KILL : TERM, pid)
-    end
+    end.size
+    puts "No matching processes belonging to you were found" if num == 0
   else
     cake.kill
     bake.kill

data/cake.gemspec

@@ -9,6 +9,6 @@ Gem::Specification.new do |s|
   s.description = "Save your fork, there's cake!"
   s.email = 'code@justinbalthrop.com'
   s.executables = ['cake']
-  s.files = ['cake.gemspec', 'bin/cake', 'lib/cake.jar', 'lib/bake.jar']
+  s.files = ['cake.gemspec', 'bin/cake', 'lib/cake.jar', 'lib/bake.jar', 'lib/clojure.jar']
   s.homepage = 'http://github.com/ninjudd/cake'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 4
-  - 11
-  version: 0.4.11
+  - 13
+  version: 0.4.13
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -07:00
+date: 2010-09-09 00:00:00 -07:00
 default_executable: cake
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - bin/cake
 - lib/cake.jar
 - lib/bake.jar
+- lib/clojure.jar
 has_rdoc: true
 homepage: http://github.com/ninjudd/cake
 licenses: []