judo 0.4.2 → 0.4.3
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/judo/group.rb +7 -6
- data/lib/judo/server.rb +2 -2
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.4.
|
1
|
+
0.4.3
|
data/lib/judo/group.rb
CHANGED
@@ -50,16 +50,17 @@ module Judo
|
|
50
50
|
raise JudoError, "can not find group folder #{dir}" unless File.exists?(dir)
|
51
51
|
conf = JSON.parse(read_file('config.json'))
|
52
52
|
raise JudoError, "config option 'import' no longer supported" if conf["import"]
|
53
|
+
tar = tar_file(@version)
|
53
54
|
Dir.chdir(@base.repo) do |d|
|
54
55
|
puts ""
|
55
|
-
system "tar czvf #{
|
56
|
+
system "tar czvf #{tar} #{name}"
|
56
57
|
puts "Uploading config to s3..."
|
57
58
|
@base.s3_put(version_config_file(@version), conf.to_json)
|
58
59
|
puts "Uploading userdata.erb to s3..."
|
59
60
|
@base.s3_put(version_userdata_file(@version), read_file('userdata.erb'))
|
60
61
|
puts "Uploading tar file to s3..."
|
61
|
-
@base.s3_put(
|
62
|
-
File.delete(
|
62
|
+
@base.s3_put(tar, File.new(tar).read(File.stat(tar).size))
|
63
|
+
File.delete(tar)
|
63
64
|
end
|
64
65
|
set_version
|
65
66
|
end
|
@@ -73,12 +74,12 @@ module Judo
|
|
73
74
|
"#{name}.#{version}.erb"
|
74
75
|
end
|
75
76
|
|
76
|
-
def tar_file
|
77
|
+
def tar_file(version)
|
77
78
|
"#{name}.#{version}.tar.gz"
|
78
79
|
end
|
79
80
|
|
80
|
-
def s3_url
|
81
|
-
@url = @base.s3_url(tar_file)
|
81
|
+
def s3_url(version)
|
82
|
+
@url = @base.s3_url(tar_file(version))
|
82
83
|
end
|
83
84
|
|
84
85
|
|
data/lib/judo/server.rb
CHANGED
@@ -350,7 +350,7 @@ module Judo
|
|
350
350
|
|
351
351
|
def restart(options = {})
|
352
352
|
stop(options) if running?
|
353
|
-
start
|
353
|
+
start(options)
|
354
354
|
end
|
355
355
|
|
356
356
|
def generic_name?
|
@@ -565,7 +565,7 @@ module Judo
|
|
565
565
|
end
|
566
566
|
|
567
567
|
def url
|
568
|
-
group.s3_url
|
568
|
+
group.s3_url(version)
|
569
569
|
end
|
570
570
|
|
571
571
|
def domain
|