cake 0.4.15 → 0.4.16

data/bin/cake

@@ -101,7 +101,7 @@ class Object
     when Hash   then '{' + collect {|k,v| k.to_clj + ' ' + v.to_clj}.join(' ') + '}'
     when Array  then '[' + collect {|i| i.to_clj}.join(' ') + ']'
     when Symbol then ":#{to_s}"
-    else             inspect.gsub(/(\\a|\\e|\\v)/) {|c| CLJ_SUB[c]}
+    else             inspect.gsub(/(\\a|\\e|\\v|\\x)/) {|c| CLJ_SUB[c]}
     end
   end
 
@@ -109,6 +109,7 @@ class Object
     '\a' => '\007',
     '\e' => '\033',
     '\v' => '\013',
+    '\x' => 'x', # This will mangle some strings in ruby 1.9.1, but it is better than breaking altogether.
   }
 
   define_method(:~) { Unquoted.new(self) }
@@ -153,10 +154,10 @@ def parse_opts!
   $opts = {}
   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(','))
-    when /^--?([-\w]+)$/         then add_opt!($1, "")
-    else                              add_opt!($command, opt)
+    when /^-(\w+)$/           then $1.split('').each {|c| add_opt!(c, '')}
+    when /^--?([-\w]+)=(.+)$/ then add_opt!($1, *$2.split(','))
+    when /^--?([-\w]+)$/      then add_opt!($1, "")
+    else                           add_opt!($command, opt)
     end
   end
   $opts.freeze
@@ -230,12 +231,12 @@ rescue NotImplementedError, Errno::EINVAL
   file
 end
 
-def download(url, dir, opts = {})
+def download(url, path, opts = {})
   file = File.basename(url)
-  path = "#{dir}/#{file}"
+  path = "#{path}/#{file}" if File.directory?(path)
 
   if opts[:force] or not File.exists?(path)
-    FileUtils.makedirs(dir)
+    FileUtils.makedirs(File.dirname(path))
     open(url, progress_bar(url)) do |remote|
       open(path, "wb") do |local|
         while (buf = remote.read(8192)); local.write buf; end
@@ -256,7 +257,6 @@ rescue OpenURI::HTTPError
 end
 
 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
@@ -273,10 +273,10 @@ def progress_bar(label, ch = '=', bg = '', width = 77, out = $stdout, progress =
     :content_length_proc => lambda {|t| printf("%s\n[%#{width}s]\r[", label, bg); total = t}}
 end
 
-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?
+def cake_version(version_type)
+  return version_type unless version_type.kind_of?(Symbol)
+  version = open("#{$github}/#{version_type}").gets
+  log(:deps, "most recent #{version_type} version is #{version}") if debug?
   version
 end
 
@@ -725,7 +725,7 @@ $cakedir = File.dirname(File.dirname(readlink(__FILE__)))
 $github  = "http://github.com/ninjudd/cake-standalone/raw/master"
 $m2      = "#{$home}/.m2/repository"
 $config  = Configuration.new("#{$home}/.cake/config", ".cake/config")
-$vars    = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
+$vars    = {:shellenv => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
 $timeout = ($config['connect.timeout'] || 20).to_i
 
 Dir.chdir($bakedir)
@@ -753,15 +753,14 @@ if File.exists?("#{$cakedir}/.gitignore") and File.exists?(project)
   # 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.    
+  if Dir["#{lib}/*.jar"].empty?
+    # 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/*"]
-  bakepath = ["#{$cakedir}/bake", "#{lib}/dev/*"]
+  cakepath = ["#{$cakedir}/src", "#{lib}/*"]
+  bakepath = ["#{$cakedir}/bake"]
 else
   cakejar = "#{lib}/cake.jar"
   bakejar = "#{lib}/bake.jar"
@@ -783,7 +782,14 @@ else
     log(:cake, "running from standalone script") if verbose?
     download("#{$github}/cake", __FILE__, :force => true) if $command == :upgrade
 
-    $version = cake_version(:stable)
+    version_file = "#{$home}/.cake/stable_version"
+    if File.exists?(version_file) and $command != :upgrade
+      $version = IO.read(version_file)
+    else
+      $version = cake_version(:stable)
+      File.open(version_file, "w") {|f| f.write($version)}
+    end
+
     cakejar  = get_cake(:version => $version)
     $clojure = get_clojure
 
@@ -802,7 +808,7 @@ cake = Cake.new(
   [$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/*"],
+  [bakepath, "src", "src/clj", "classes", "resources", "dev", "test", $config['project.classpath'], "lib/*", "lib/dev/*", "#{$home}/.cake/lib/dev/*"],
   [$config['project.library.path'], "lib/native", "lib/dev/native"]
 )
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 4
-  - 15
-  version: 0.4.15
+  - 16
+  version: 0.4.16
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -07:00
+date: 2010-09-21 00:00:00 -07:00
 default_executable: cake
 dependencies: []