ec2launcher 1.7.0 → 1.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWIwYTY3YTRlYTllOTUxN2E2MTI2NmI2MDdkNGY4YjZkZDRiYzZjZA==
+    MDAzMTg1MTYwMWI4MjVhOGUxNmY2MmNmYWI1YTk0OTFhZWM0OTI0Nw==
   data.tar.gz: !binary |-
-    NGNkMzJjMjIyODE5ZWQxYTk5MGEwM2UwMTRiNDY1ZTNiNDBhNmUwNQ==
+    ZTBiNDUyZTU1MWRkODM5MzMyYTM4NTBiNjBlZmRhMmRkM2FlZTdlOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTAwNWFhYjAwZWFlYTVhMjdiMzkxODUzY2Y1YmY4MDlkZjI3ZDQ5YjBjOTc0
-    MmUwM2UxMmVkMjE5MDA5NmY0ODI1ZDlmMDIxZGZhODU1NDgxODgyOGFhMDEw
-    ODQ4YTQ3YmJmYjNlZTBmYzA5NTIwMzZjOTBjNTBiMDg3NGMwZGE=
+    MzNkYjNhY2MxZWExYmQ1YzNhMzMwOTY4ZjcyMjcwNjk0MjhiZjJjNzk5ODJh
+    YTk4M2Y1YjNlOGFiOGI0NTY5MDkxMmViNTczNmFmMzNmYmU5NDg5MWY3ZWYz
+    ODNjYWRjMDdlOTAzNDAzZjQ5NjQ2YTM3ZTMyMTk1MDc1M2VhYzc=
   data.tar.gz: !binary |-
-    MGQwYmU3NDNlMTQ5ZjQ0MTdjYjI0OTQwNDZhMWExZmQyN2IwMjYyZDc2NTE5
-    MGE2YWVjZGMwNWVhODQ2YjQwZmJkZjhmY2VmNmM2Y2VkMDEwNjAzZDczYWI1
-    YjBiNDFiZTBiMmU5Mjk1ZDEwMTI0MzIxZTRiNjMxNzdkNWM0NzE=
+    MDI4MjNiYmNlMzRjZTg4OGFiOTlhZTE0NGNmMmZiN2EzODQyMjhiN2U1OWYz
+    MDVmMjJlZDM2Y2IxZTBiNzZlZjBiYTI3YzkwZTk1ZWYzNTUxYTA2N2U1YmQw
+    MDMyOTk5MGY5MGE4ODc3N2NiNjNiMzM3OTg4M2MxNDVmZGExMWI=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.7.1
+
+* Added support to specify version numbers when preinstalling gems.
+* Force setup script to install the same version of ec2launcher that was used to generate the launch configuration.
+
 ## 1.7.0
 
 * New optional "dynamic" naming convention that leverages the instance id instead of a sequential number. Useful for ASGs.

data/lib/ec2launcher.rb

@@ -293,7 +293,7 @@ module EC2Launcher
       gems = []
       gems += @environment.gems unless @environment.gems.nil?
       gems += @application.gems unless @application.gems.nil?
-      gems << "ec2launcher"
+      gems << {"name" => "ec2launcher", "version" => "1.7.0"}
 
       ##############################
       # Packages - preinstall
@@ -336,7 +336,24 @@ module EC2Launcher
       @log.info "Chef PEM            : #{chef_validation_pem_url}"
       @log.info "AWS key file        : #{aws_keyfile}"
       @log.info "Roles               : #{roles.join(', ')}"
-      @log.info "Gems                : #{gems.join(', ')}"
+      
+      gem_list = []
+      gems.each do |gem_info|
+        if gem_info.kind_of? Hash
+          gem_name = gem_info[:name]
+          gem_version = gem_info[:version]
+          next unless gem_name
+
+          gem_details = gem_name
+          gem_details += " (#{gem_version})" if gem_version
+
+          gem_list << gem_details
+        else
+          gem_list << gem_info
+        end
+      end
+      @log.info "Gems                : #{gem_list.join(', ')}"
+      
       @log.info "Packages            : #{packages.join(', ')}"
       if subnet
         cidr_block = @ec2.subnets[subnet].cidr_block

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/startup-scripts/setup.rb

@@ -108,7 +108,24 @@ ruby_path = instance_data["ruby_path"]
 # Pre-install gems
 unless instance_data["gems"].nil?
   puts "Preinstalling gems..."
-	instance_data["gems"].each {|gem_name| puts `#{gem_path} install --no-rdoc --no-ri #{gem_name}` }
+	instance_data["gems"].each do |gem_info| 
+    if gem_info.kind_of? Hash
+      gem_name = gem_info["name"]
+      gem_version = gem_info["version"]
+
+      if gem_name
+        command = "#{gem_path} install --no-rdoc --no-ri #{gem_name}"
+        command += " -v #{gem_version}" if gem_version
+        puts "Installing #{gem_name} #{gem_version}..."
+        puts `#{command}`
+      else
+        puts "Unable to parse gem name for preinstallation from: '#{gem_info.to_s}'"
+      end
+    else
+      puts "Installing latest version of #{gem_info}..."
+      puts `#{gem_path} install --no-rdoc --no-ri #{gem_info}`
+    end
+  end
 end
 
 # Pre-install packages

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Sean Laurent