cake 0.5.6 → 0.5.7

data/bin/cake

@@ -47,15 +47,6 @@ else
   end
 end
 
-module OpenURI
-  REDIRECTABLE = ['http', 'ftp', 'https']
-  def self.redirectable?(uri1, uri2)
-    scheme1 = uri1.scheme.downcase
-    scheme2 = uri2.scheme.downcase
-    scheme1 == scheme2 or (REDIRECTABLE.include?(scheme1) and REDIRECTABLE.include?(scheme2))
-  end
-end
-
 class IO
   def gets_nonblock(delim = "\n")
     line = ""
@@ -277,7 +268,7 @@ end
 
 def get_cake(opts = {})
   version = cake_version(opts[:version] || :current)
-  download("#{$github}/jars/cake-#{version}.jar", "#{$m2}/cake/cake/#{snapshot(version)}/cake-#{version}.jar", opts)
+  download("#{$releases}/jars/cake-#{version}.jar", "#{$m2}/cake/cake/#{snapshot(version)}/cake-#{version}.jar", opts)
 end
 
 def get_clojure(opts = {})
@@ -294,7 +285,7 @@ end
 
 def cake_version(version_type)
   return version_type unless version_type.kind_of?(Symbol)
-  version = open("#{$github}/#{version_type}").gets
+  version = open("#{$releases}/#{version_type}").gets
   log(:deps, "most recent #{version_type} version is #{version}") if debug?
   version
 end
@@ -357,7 +348,7 @@ class JVM
     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?
+      log(:cake, "defunct #{type} jvm") if debug?
       kill(true)
     end
     reset! # no pidfile or invalid pid or connection refused
@@ -403,15 +394,12 @@ class JVM
 
   def start
     return unless enabled?
-    if running?
-      log(:start, "#{type} jvm already running") if $command == :start
-      return
-    else
-      log(:start, "starting #{type} jvm") if verbose? or $command == :start
-      @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
-      @pid = daemon %{java #{vm_opts} -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(require '#{type}.core) (#{type}.core/start-server #{port})"}
-      File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n#{$version}\n") }
-    end
+    return if running?
+
+    log(:cake, "starting #{type} jvm") if verbose?
+    @port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
+    @pid = daemon %{java #{vm_opts} -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(require '#{type}.core) (#{type}.core/start-server #{port})"}
+    File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n#{$version}\n") }
   rescue Errno::EADDRNOTAVAIL => e # port already in use
     retry
   end
@@ -690,15 +678,15 @@ end
 #==================================
 
 parse_opts!
-$script  = File.expand_path($opts[:run].first) if $opts[:run]
-$pwd     = Dir.getwd
-$bakedir = project_dir($pwd)
-$cakedir = File.expand_path(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
-$timeout = ($config['connect.timeout'] || 20).to_i
+$script   = File.expand_path($opts[:run].first) if $opts[:run]
+$pwd      = Dir.getwd
+$bakedir  = project_dir($pwd)
+$cakedir  = File.expand_path(File.dirname(File.dirname(readlink(__FILE__))))
+$releases = "http://releases.clojure-cake.org"
+$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
+$timeout  = ($config['connect.timeout'] || 20).to_i
 
 initialize_cake_dirs
 Dir.chdir($bakedir)
@@ -753,7 +741,7 @@ else
   else
     # Standalone script.
     log(:cake, "running from standalone script") if verbose?
-    download("#{$github}/cake", __FILE__, :force => true) if $command == :upgrade
+    download("#{$releases}/cake", __FILE__, :force => true) if $command == :upgrade
 
     version_file = "#{$home}/.cake/stable_version"
     if File.exists?(version_file) and $command != :upgrade

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cake
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2010-11-12 00:00:00 -08:00
 default_executable: cake
 dependencies: []