cake 0.5.6 → 0.5.7
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/cake +19 -31
- data/lib/bake.jar +0 -0
- data/lib/cake.jar +0 -0
- metadata +4 -4
data/bin/cake
CHANGED
@@ -47,15 +47,6 @@ else
|
|
47
47
|
end
|
48
48
|
end
|
49
49
|
|
50
|
-
module OpenURI
|
51
|
-
REDIRECTABLE = ['http', 'ftp', 'https']
|
52
|
-
def self.redirectable?(uri1, uri2)
|
53
|
-
scheme1 = uri1.scheme.downcase
|
54
|
-
scheme2 = uri2.scheme.downcase
|
55
|
-
scheme1 == scheme2 or (REDIRECTABLE.include?(scheme1) and REDIRECTABLE.include?(scheme2))
|
56
|
-
end
|
57
|
-
end
|
58
|
-
|
59
50
|
class IO
|
60
51
|
def gets_nonblock(delim = "\n")
|
61
52
|
line = ""
|
@@ -277,7 +268,7 @@ end
|
|
277
268
|
|
278
269
|
def get_cake(opts = {})
|
279
270
|
version = cake_version(opts[:version] || :current)
|
280
|
-
download("#{$
|
271
|
+
download("#{$releases}/jars/cake-#{version}.jar", "#{$m2}/cake/cake/#{snapshot(version)}/cake-#{version}.jar", opts)
|
281
272
|
end
|
282
273
|
|
283
274
|
def get_clojure(opts = {})
|
@@ -294,7 +285,7 @@ end
|
|
294
285
|
|
295
286
|
def cake_version(version_type)
|
296
287
|
return version_type unless version_type.kind_of?(Symbol)
|
297
|
-
version = open("#{$
|
288
|
+
version = open("#{$releases}/#{version_type}").gets
|
298
289
|
log(:deps, "most recent #{version_type} version is #{version}") if debug?
|
299
290
|
version
|
300
291
|
end
|
@@ -357,7 +348,7 @@ class JVM
|
|
357
348
|
kill if @version != $version
|
358
349
|
rescue Errno::ENOENT, Errno::ESRCH, Errno::ECONNREFUSED, Errno::EBADF, Process::Error => e
|
359
350
|
if e.kind_of?(Errno::ECONNREFUSED)
|
360
|
-
log(:
|
351
|
+
log(:cake, "defunct #{type} jvm") if debug?
|
361
352
|
kill(true)
|
362
353
|
end
|
363
354
|
reset! # no pidfile or invalid pid or connection refused
|
@@ -403,15 +394,12 @@ class JVM
|
|
403
394
|
|
404
395
|
def start
|
405
396
|
return unless enabled?
|
406
|
-
if running?
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
@pid = daemon %{java #{vm_opts} -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(require '#{type}.core) (#{type}.core/start-server #{port})"}
|
413
|
-
File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n#{$version}\n") }
|
414
|
-
end
|
397
|
+
return if running?
|
398
|
+
|
399
|
+
log(:cake, "starting #{type} jvm") if verbose?
|
400
|
+
@port = rand(MAX_PORT - MIN_PORT) + MIN_PORT
|
401
|
+
@pid = daemon %{java #{vm_opts} -Dcake.project="#{$bakedir}" #{java_opts} clojure.main -e "(require '#{type}.core) (#{type}.core/start-server #{port})"}
|
402
|
+
File.open(pidfile, 'w') {|f| f.write("#{pid}\n#{port}\n#{$version}\n") }
|
415
403
|
rescue Errno::EADDRNOTAVAIL => e # port already in use
|
416
404
|
retry
|
417
405
|
end
|
@@ -690,15 +678,15 @@ end
|
|
690
678
|
#==================================
|
691
679
|
|
692
680
|
parse_opts!
|
693
|
-
$script
|
694
|
-
$pwd
|
695
|
-
$bakedir
|
696
|
-
$cakedir
|
697
|
-
$
|
698
|
-
$m2
|
699
|
-
$config
|
700
|
-
$vars
|
701
|
-
$timeout
|
681
|
+
$script = File.expand_path($opts[:run].first) if $opts[:run]
|
682
|
+
$pwd = Dir.getwd
|
683
|
+
$bakedir = project_dir($pwd)
|
684
|
+
$cakedir = File.expand_path(File.dirname(File.dirname(readlink(__FILE__))))
|
685
|
+
$releases = "http://releases.clojure-cake.org"
|
686
|
+
$m2 = "#{$home}/.m2/repository"
|
687
|
+
$config = Configuration.new("#{$home}/.cake/config", ".cake/config")
|
688
|
+
$vars = {:env => ENV.to_hash, :pwd => $pwd, :args => ARGV, :opts => $opts, :script => $0}.to_clj
|
689
|
+
$timeout = ($config['connect.timeout'] || 20).to_i
|
702
690
|
|
703
691
|
initialize_cake_dirs
|
704
692
|
Dir.chdir($bakedir)
|
@@ -753,7 +741,7 @@ else
|
|
753
741
|
else
|
754
742
|
# Standalone script.
|
755
743
|
log(:cake, "running from standalone script") if verbose?
|
756
|
-
download("#{$
|
744
|
+
download("#{$releases}/cake", __FILE__, :force => true) if $command == :upgrade
|
757
745
|
|
758
746
|
version_file = "#{$home}/.cake/stable_version"
|
759
747
|
if File.exists?(version_file) and $command != :upgrade
|
data/lib/bake.jar
CHANGED
Binary file
|
data/lib/cake.jar
CHANGED
Binary file
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cake
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 5
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 5
|
9
|
-
-
|
10
|
-
version: 0.5.
|
9
|
+
- 7
|
10
|
+
version: 0.5.7
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Justin Balthrop
|
@@ -16,7 +16,7 @@ autorequire:
|
|
16
16
|
bindir: bin
|
17
17
|
cert_chain: []
|
18
18
|
|
19
|
-
date: 2010-11-
|
19
|
+
date: 2010-11-12 00:00:00 -08:00
|
20
20
|
default_executable: cake
|
21
21
|
dependencies: []
|
22
22
|
|