cake 0.4.9 → 0.4.10

data/bin/cake

@@ -2,7 +2,6 @@
 # Save your fork, there's cake!"
 require 'find'
 require 'open-uri'
-require 'rexml/document'
 require 'socket'
 require 'timeout'
 require 'fileutils'
@@ -11,6 +10,7 @@ require 'pp'
 
 if RUBY_PLATFORM =~ /(mingw|mswin)(32|64)$/
   begin
+    require 'rubygems' rescue nil
     require 'win32/process'
   rescue LoadError
     puts 'cake requires win32/process. use "gem install win32-process" to install'
@@ -95,6 +95,7 @@ class Object
       case self
       when Array  then return collect {|i| i.to_clj(true)}.join(' ')
       when String then return self
+      when nil    then return ''
       end
     end
     case self
@@ -242,12 +243,12 @@ def download(url, path)
 end
 
 def get_cake(version, dest = nil, opts = {})
-  jar  = version =~ /(.*)-SNAPSHOT/ ? "cake-#{$1}-#{snapshot(version)}.jar" : "cake-#{version}.jar"
+  jar  = "cake-#{version}.jar"
   repo = File.expand_path("~/.m2/repository/cake/cake/#{version}")
   path = "#{repo}/#{jar}"
 
   if not File.exists?(path)
-    url = "#{$repo}/#{version}/#{jar}"
+    url = "#{$repo}/#{jar}"
     log(:deps, "fetching cake libraries. this may take a moment...") unless @logged; @logged = true
     FileUtils.makedirs(repo)
     download(url, path)
@@ -266,24 +267,11 @@ rescue OpenURI::HTTPError => e
 end
 
 def current_version
-  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 = open("#{$repo}/version").gets
+  log(:deps, "most recent standalone version is #{version}") if debug?
   version
 end
 
-def snapshot(version)
-  open("#{$repo}/#{version}/maven-metadata.xml") do |file|
-    doc = REXML::Document.new file
-    snapshot  = doc.elements['metadata'].elements['versioning'].elements['snapshot'].elements
-    timestamp = snapshot['timestamp'].get_text
-    build_num = snapshot['buildNumber'].get_text
-    "#{timestamp}-#{build_num}"
-  end
-end
-
 def extract(jar, file, dest = File.dirname(jar))
   if not File.exists?("#{dest}/#{file}")
     log(:deps, "extracting #{file} from #{jar}") if verbose?
@@ -397,8 +385,8 @@ class JVM
   end
 
   def vm_opts
-    opts = '-client'
-    opts << ' -d32' unless $win
+    `java -d32 -version 2>&1`
+    '-client -d32' if $? == 0
   end
 
   MIN_PORT = 2**14
@@ -499,7 +487,7 @@ class JVM
     forms = forms.collect do |form|
       form == '-' ? $stdin.gets(nil) : form
     end.join(' ')
-    forms = "(doall (map println [#{forms}]))" if $opts[:p]
+    forms = "(doall (map println [#{forms}]))" unless $opts[:q]
     with_socket do |socket|
       log(:eval, forms) if debug?
       socket.write(":eval #{$vars} #{forms} :cake/EOF ")
@@ -512,7 +500,7 @@ class JVM
     with_socket do |socket|
       socket.write %(:filter #{$vars} "#{EOL}")
       while line = $stdin.gets
-        socket.write [line, ~forms].to_clj
+        socket.write [line.chomp, ~forms].to_clj
         while (line = socket.gets)
           break if line.start_with?(EOL)
           puts line
@@ -668,9 +656,10 @@ private
       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
+      prompt << ' (WARNING, input will be visible on console!)' unless echo_off
+      prompt << ':'
     end
-    input = Readline.readline(prompt + ": ") || ''
+    input = Readline.readline(prompt + ' ') || ''
     input + "\n"
   ensure
     if echo_off
@@ -716,7 +705,7 @@ $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"
+$repo    = "http://github.com/ninjudd/cake-standalone/raw/master"
 $confdir = ".cake"
 $config  = Configuration.new("#{$home}/.cake/config", ".cake/config")
 $timeout = ($config['connect.timeout'] || 20).to_i
@@ -738,7 +727,7 @@ if File.exists?("#{$cakedir}/.gitignore") and File.exists?(project)
   log(:cake, "running from git checkout") if verbose?
   if $command == :upgrade
     log(:upgrade, "pulling latest code from git")
-    system('git pull')
+    Dir.chdir($cakedir) { system('git pull') }
   end
 
   $version = IO.read(project).split("\n").first.match(/defproject cake \"(.*)\"/)[1]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 4
-  - 9
-  version: 0.4.9
+  - 10
+  version: 0.4.10
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -07:00
+date: 2010-08-30 00:00:00 -07:00
 default_executable: cake
 dependencies: []