ec2launcher 1.7.1 → 1.7.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDAzMTg1MTYwMWI4MjVhOGUxNmY2MmNmYWI1YTk0OTFhZWM0OTI0Nw==
+    ODkxNjJkYWE2NDVlZWQ4M2E5M2NjM2QxNmZhY2YyYTgzODUzMWIwNw==
   data.tar.gz: !binary |-
-    ZTBiNDUyZTU1MWRkODM5MzMyYTM4NTBiNjBlZmRhMmRkM2FlZTdlOA==
+    NjhlN2JmYjk1NmY0MTAxY2I3MWY2YzIwZjkxMmJlNjMyNmYwZGY5NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzNkYjNhY2MxZWExYmQ1YzNhMzMwOTY4ZjcyMjcwNjk0MjhiZjJjNzk5ODJh
-    YTk4M2Y1YjNlOGFiOGI0NTY5MDkxMmViNTczNmFmMzNmYmU5NDg5MWY3ZWYz
-    ODNjYWRjMDdlOTAzNDAzZjQ5NjQ2YTM3ZTMyMTk1MDc1M2VhYzc=
+    Y2MxYzE2ZjNmNjc5OTBhMzgxY2FhODY3MzY5ZjVkNjJiMzQxNDkzNDdlY2Nh
+    M2FhNjMwMDM2ZWEzNDZkZWIwM2U1MDI3NmViZTQxYjk1ZGYzYTA1OTIyOGFl
+    M2ZhODFjYmJhMTlkZjczYjg3MjMyYjczNDliOWI4MzA5ZWYyMmU=
   data.tar.gz: !binary |-
-    MDI4MjNiYmNlMzRjZTg4OGFiOTlhZTE0NGNmMmZiN2EzODQyMjhiN2U1OWYz
-    MDVmMjJlZDM2Y2IxZTBiNzZlZjBiYTI3YzkwZTk1ZWYzNTUxYTA2N2U1YmQw
-    MDMyOTk5MGY5MGE4ODc3N2NiNjNiMzM3OTg4M2MxNDVmZGExMWI=
+    NzY0NGI1ZTI0NGYyZDQyZGEzNzAxNzIwNjU3ODY4NThjNTQzZWYwOWE1YTI0
+    ZmQxZTI3MDlmNzMxNWFlOWJlNDRlNjQ4ZDgyOTY3OWEyOTIyZjMyOTQ0ZWUz
+    Y2MwN2YwN2M4MDFkNmUyMTFmOTQ5YTg5M2Q5NzgwNmVjMDY2MWU=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.7.2
+
+* Strip blank lines and comments from setup files that are included in the user-data to reduce payload size.
+
 ## 1.7.1
 
 * Added support to specify version numbers when preinstalling gems.

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 << {"name" => "ec2launcher", "version" => "1.7.0"}
+      gems << {"name" => "ec2launcher", "version" => VERSION}
 
       ##############################
       # Packages - preinstall
@@ -748,7 +748,7 @@ module EC2Launcher
     end
 
     def load_and_encode_file(pathname)
-      `cat #{pathname} |gzip -f |base64`
+      `cat #{pathname} |sed '/^[ \t]*$/d'|sed '/^[ \t]*#/d'|gzip -f |base64`
     end
 
     def load_and_encode_file_with_path(base_path, filename)

data/lib/ec2launcher/version.rb

@@ -1,6 +1,6 @@
 #
-# Copyright (c) 2012 Sean Laurent
+# Copyright (c) 2013 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

data/startup-scripts/setup_instance.rb

@@ -79,13 +79,10 @@ class InstanceSetup
     @options = option_parser.parse(args)
 
     begin
-      @logger = Log4r::Logger['ec2launcher']
-      unless @logger
-        @logger = Log4r::Logger.new 'ec2launcher'
-        log_output = Log4r::Outputter.stdout
-        log_output.formatter = PatternFormatter.new :pattern => "%m"
-        @logger.outputters = log_output
-      end
+      @logger = Log4r::Logger.new 'ec2launcher'
+      log_output = Log4r::Outputter.stdout
+      log_output.formatter = PatternFormatter.new :pattern => "%m"
+      @logger.outputters = log_output
     rescue
     end
 
@@ -187,11 +184,8 @@ class InstanceSetup
 
     #  Process ephemeral devices first
     ephemeral_drive_count = case @EC2_INSTANCE_TYPE
-      when "m1.small" then 1
-      when "m1.medium" then 1
-      when "m2.xlarge" then 1
-      when "m2.2xlarge" then 1
-      when "c1.medium" then 1
+      when "t1.micro" then 0
+      when "m3.2xlarge" then 0
       when "m1.large" then 2
       when "m2.4xlarge" then 2
       when "cc1.4xlarge" then 2
@@ -199,7 +193,7 @@ class InstanceSetup
       when "m1.xlarge" then 4
       when "c1.xlarge" then 4
       when "cc2.8xlarge" then 4
-      else 0
+      else 1
     end
 
     # Partition the ephemeral drives

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Sean Laurent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk