ec2launcher 1.7.0 → 1.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/CHANGELOG.md +5 -0
- data/lib/ec2launcher.rb +19 -2
- data/lib/ec2launcher/version.rb +1 -1
- data/startup-scripts/setup.rb +18 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MDAzMTg1MTYwMWI4MjVhOGUxNmY2MmNmYWI1YTk0OTFhZWM0OTI0Nw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZTBiNDUyZTU1MWRkODM5MzMyYTM4NTBiNjBlZmRhMmRkM2FlZTdlOA==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MzNkYjNhY2MxZWExYmQ1YzNhMzMwOTY4ZjcyMjcwNjk0MjhiZjJjNzk5ODJh
|
10
|
+
YTk4M2Y1YjNlOGFiOGI0NTY5MDkxMmViNTczNmFmMzNmYmU5NDg5MWY3ZWYz
|
11
|
+
ODNjYWRjMDdlOTAzNDAzZjQ5NjQ2YTM3ZTMyMTk1MDc1M2VhYzc=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MDI4MjNiYmNlMzRjZTg4OGFiOTlhZTE0NGNmMmZiN2EzODQyMjhiN2U1OWYz
|
14
|
+
MDVmMjJlZDM2Y2IxZTBiNzZlZjBiYTI3YzkwZTk1ZWYzNTUxYTA2N2U1YmQw
|
15
|
+
MDMyOTk5MGY5MGE4ODc3N2NiNjNiMzM3OTg4M2MxNDVmZGExMWI=
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,8 @@
|
|
1
|
+
## 1.7.1
|
2
|
+
|
3
|
+
* Added support to specify version numbers when preinstalling gems.
|
4
|
+
* Force setup script to install the same version of ec2launcher that was used to generate the launch configuration.
|
5
|
+
|
1
6
|
## 1.7.0
|
2
7
|
|
3
8
|
* New optional "dynamic" naming convention that leverages the instance id instead of a sequential number. Useful for ASGs.
|
data/lib/ec2launcher.rb
CHANGED
@@ -293,7 +293,7 @@ module EC2Launcher
|
|
293
293
|
gems = []
|
294
294
|
gems += @environment.gems unless @environment.gems.nil?
|
295
295
|
gems += @application.gems unless @application.gems.nil?
|
296
|
-
gems << "ec2launcher"
|
296
|
+
gems << {"name" => "ec2launcher", "version" => "1.7.0"}
|
297
297
|
|
298
298
|
##############################
|
299
299
|
# Packages - preinstall
|
@@ -336,7 +336,24 @@ module EC2Launcher
|
|
336
336
|
@log.info "Chef PEM : #{chef_validation_pem_url}"
|
337
337
|
@log.info "AWS key file : #{aws_keyfile}"
|
338
338
|
@log.info "Roles : #{roles.join(', ')}"
|
339
|
-
|
339
|
+
|
340
|
+
gem_list = []
|
341
|
+
gems.each do |gem_info|
|
342
|
+
if gem_info.kind_of? Hash
|
343
|
+
gem_name = gem_info[:name]
|
344
|
+
gem_version = gem_info[:version]
|
345
|
+
next unless gem_name
|
346
|
+
|
347
|
+
gem_details = gem_name
|
348
|
+
gem_details += " (#{gem_version})" if gem_version
|
349
|
+
|
350
|
+
gem_list << gem_details
|
351
|
+
else
|
352
|
+
gem_list << gem_info
|
353
|
+
end
|
354
|
+
end
|
355
|
+
@log.info "Gems : #{gem_list.join(', ')}"
|
356
|
+
|
340
357
|
@log.info "Packages : #{packages.join(', ')}"
|
341
358
|
if subnet
|
342
359
|
cidr_block = @ec2.subnets[subnet].cidr_block
|
data/lib/ec2launcher/version.rb
CHANGED
data/startup-scripts/setup.rb
CHANGED
@@ -108,7 +108,24 @@ ruby_path = instance_data["ruby_path"]
|
|
108
108
|
# Pre-install gems
|
109
109
|
unless instance_data["gems"].nil?
|
110
110
|
puts "Preinstalling gems..."
|
111
|
-
instance_data["gems"].each
|
111
|
+
instance_data["gems"].each do |gem_info|
|
112
|
+
if gem_info.kind_of? Hash
|
113
|
+
gem_name = gem_info["name"]
|
114
|
+
gem_version = gem_info["version"]
|
115
|
+
|
116
|
+
if gem_name
|
117
|
+
command = "#{gem_path} install --no-rdoc --no-ri #{gem_name}"
|
118
|
+
command += " -v #{gem_version}" if gem_version
|
119
|
+
puts "Installing #{gem_name} #{gem_version}..."
|
120
|
+
puts `#{command}`
|
121
|
+
else
|
122
|
+
puts "Unable to parse gem name for preinstallation from: '#{gem_info.to_s}'"
|
123
|
+
end
|
124
|
+
else
|
125
|
+
puts "Installing latest version of #{gem_info}..."
|
126
|
+
puts `#{gem_path} install --no-rdoc --no-ri #{gem_info}`
|
127
|
+
end
|
128
|
+
end
|
112
129
|
end
|
113
130
|
|
114
131
|
# Pre-install packages
|