ec2launcher 1.0.22 → 1.0.23

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.23
+
+* Display subnet CIDR block when launching instances into VPCs.
+* Revamped output to use log4r.
+* Added command line flags to control output verbosity.
+
 ## 1.0.22
 
 * Fixed additional bug with merging applications.

data/ec2launcher.gemspec

@@ -15,4 +15,5 @@ Gem::Specification.new do |gem|
   gem.version       = EC2Launcher::VERSION
 
   gem.add_runtime_dependency "aws-sdk", [">= 1.5.0"]
+  gem.add_runtime_dependency "log4r"
 end

data/lib/ec2launcher/init_options.rb

@@ -98,7 +98,7 @@ module EC2Launcher
           @options.instance_type = instance_type
         end
 
-        opts.on("-v", "--volume-size SIZE", Integer, "EBS volume size in GB. Defaults to #{EC2Launcher::DEFAULT_VOLUME_SIZE} GB") do |volume_size|
+        opts.on("--volume-size SIZE", Integer, "EBS volume size in GB. Defaults to #{EC2Launcher::DEFAULT_VOLUME_SIZE} GB") do |volume_size|
           @options.volume_size = volume_size
         end
 
@@ -116,6 +116,14 @@ module EC2Launcher
         opts.separator ""
         opts.separator "Common options:"
 
+        opts.on_tail("-q", "--quiet", "Display as little information as possible.") do
+          @options.verbosity = :quiet
+        end
+
+        opts.on_tail("-v", "--verbose", "Display as much information as possible.") do
+          @options.verbosity = :verbose
+        end
+
         # No argument, shows at tail.  This will print an options summary.
         # Try it and see!
         opts.on_tail("-?", "--help", "Show this message") do
@@ -152,6 +160,8 @@ module EC2Launcher
       @options.instance_type = nil
       @options.volume_size = nil
 
+      @options.verbosity = :normal
+
       @options.directory = "./"
 
       if @command == "init"

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -5,6 +5,7 @@ require 'rubygems'
 require 'optparse'
 require 'ostruct'
 require 'aws-sdk'
+require 'log4r'
 
 require 'ec2launcher/version'
 require 'ec2launcher/defaults'
@@ -18,6 +19,8 @@ require 'ec2launcher/instance_paths_config'
 require 'ec2launcher/block_device_builder'
 require 'ec2launcher/hostname_generator'
 
+include Log4r
+
 module EC2Launcher
 
   class AmiDetails
@@ -35,10 +38,21 @@ module EC2Launcher
     def initialize()
       @run_url_script_cache = nil
       @setup_script_cache = nil
+
+      @log = Logger.new 'mylog'
+      log_output = Outputter.stdout
+      log_output.formatter = PatternFormatter.new :pattern => "%m"
+      @log.outputters = log_output
     end
 
     def launch(options)
       @options = options
+
+      @log.level = case @options.verbosity 
+        when :quiet then WARN
+        when :verbose then DEBUG
+        else INFO
+      end
       
       # Load configuration data
       @config = load_config_file
@@ -104,7 +118,7 @@ module EC2Launcher
       # ENVIRONMENT
       ##############################
       unless @environments.has_key? options.environ
-        puts "Environment not found: #{options.environ}"
+        @log.fatal "Environment not found: #{options.environ}"
         exit 2
       end
       @environment = @environments[options.environ]
@@ -113,7 +127,7 @@ module EC2Launcher
       # APPLICATION
       ##############################
       unless @applications.has_key? options.application
-        puts "Application not found: #{options.application}"
+        @log.fatal "Application not found: #{options.application}"
         exit 3
       end
       @application = @applications[options.application]
@@ -157,7 +171,7 @@ module EC2Launcher
       ##############################
       key_name = @environment.key_name
       if key_name.nil?
-        puts "Unable to determine SSH key name."
+        @log.fatal "Unable to determine SSH key name."
         exit 4
       end
 
@@ -190,7 +204,7 @@ module EC2Launcher
       end
 
       if missing_security_groups.length > 0
-        puts "ERROR: Missing security groups: #{missing_security_groups.join(', ')}"
+        @log.fatal "ERROR: Missing security groups: #{missing_security_groups.join(', ')}"
         exit 3
       end
 
@@ -301,34 +315,37 @@ module EC2Launcher
       aws_keyfile = @environment.aws_keyfile
 
       ##############################
-      puts
-      puts "Availability zone: #{availability_zone}"
-      puts "Key name            : #{key_name}"
-      puts "Security groups     : " + security_groups.collect {|name| "#{name} (#{sg_map[name].security_group_id})"}.join(", ")
-      puts "Instance type       : #{instance_type}"
-      puts "Architecture        : #{instance_architecture}"
-      puts "AMI name            : #{ami.ami_name}"
-      puts "AMI id              : #{ami.ami_id}"
-      puts "ELB                 : #{elb_name}" if elb_name
-      puts "Chef PEM            : #{chef_validation_pem_url}"
-      puts "AWS key file        : #{aws_keyfile}"
-      puts "Roles               : #{roles.join(', ')}"
-      puts "Gems                : #{gems.join(', ')}"
-      puts "Packages            : #{packages.join(', ')}"
-      puts "VPC Subnet          : #{subnet}" if subnet
-      puts ""
+      @log.info
+      @log.info "Availability zone: #{availability_zone}"
+      @log.info "Key name            : #{key_name}"
+      @log.info "Security groups     : " + security_groups.collect {|name| "#{name} (#{sg_map[name].security_group_id})"}.join(", ")
+      @log.info "Instance type       : #{instance_type}"
+      @log.info "Architecture        : #{instance_architecture}"
+      @log.info "AMI name            : #{ami.ami_name}"
+      @log.info "AMI id              : #{ami.ami_id}"
+      @log.info "ELB                 : #{elb_name}" if elb_name
+      @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(', ')}"
+      @log.info "Packages            : #{packages.join(', ')}"
+      if subnet
+        cidr_block = ec2.subnets[subnet].cidr_block
+        @log.info "VPC Subnet          : #{subnet} (#{cidr_block})"
+      end
+      @log.info ""
       fqdn_names.each do |fqdn|
-        puts "Name                : #{fqdn}"
+        @log.info "Name                : #{fqdn}"
       end
 
       unless block_device_mappings.empty?
-        puts ""
-        puts "Block devices     :"
+        @log.info ""
+        @log.info "Block devices     :"
         block_device_mappings.keys.sort.each do |key|
           if block_device_mappings[key] =~ /^ephemeral/
-              puts "  Block device   : #{key}, #{block_device_mappings[key]}"
+              @log.info "  Block device   : #{key}, #{block_device_mappings[key]}"
           else
-              puts "  Block device   : #{key}, #{block_device_mappings[key][:volume_size]}GB, " +
+              @log.info "  Block device   : #{key}, #{block_device_mappings[key][:volume_size]}GB, " +
                  "#{block_device_mappings[key][:snapshot_id]}, " +
                  "(#{block_device_mappings[key][:delete_on_termination] ? 'auto-delete' : 'no delete'})"
           end
@@ -336,7 +353,7 @@ module EC2Launcher
       end
 
       if chef_validation_pem_url.nil?
-        puts "***ERROR*** Missing the URL For the Chef Validation PEM file."
+        @log.fatal "***ERROR*** Missing the URL For the Chef Validation PEM file."
         exit 3
       end
 
@@ -344,10 +361,10 @@ module EC2Launcher
       if @options.show_defaults || @options.show_user_data
         if @options.show_user_data
           user_data = build_launch_command(fqdn_names[0], short_hostnames[0], roles, chef_validation_pem_url, aws_keyfile, gems, packages, email_notifications)
-          puts ""
-          puts "---user-data---"
-          puts user_data
-          puts "---user-data---"
+          @log.info ""
+          @log.info "---user-data---"
+          @log.info user_data
+          @log.info "---user-data---"
         end
         exit 0
       end
@@ -355,7 +372,7 @@ module EC2Launcher
       ##############################
       # Launch the new intance
       ##############################
-      puts ""
+      @log.warn ""
       instances = []
       fqdn_names.each_index do |i|
         block_device_tags = block_device_builder.generate_device_tags(fqdn_names[i], short_hostnames[i], @environment.name, @application.block_devices)
@@ -366,14 +383,14 @@ module EC2Launcher
 
         public_dns_name = instance.public_dns_name.nil? ? "no public dns" : instance.public_dns_name
         private_dns_name = instance.private_dns_name.nil? ? "no private dns" : instance.private_dns_name
-        puts "Launched #{fqdn_names[i]} (#{instance.id}) [#{public_dns_name} / #{private_dns_name} / #{instance.private_ip_address} ]"
+        @log.warn "Launched #{fqdn_names[i]} (#{instance.id}) [#{public_dns_name} / #{private_dns_name} / #{instance.private_ip_address} ]"
       end
 
-      puts "********************"    
+      @log.warn "********************"    
       fqdn_names.each_index do |i|
         public_dns_name = instances[i].public_dns_name.nil? ? "n/a" : instances[i].public_dns_name
         private_dns_name = instances[i].private_dns_name.nil? ? "n/a" : instances[i].private_dns_name
-        puts "** New instance: #{fqdn_names[i]} | #{instances[i].id} | #{public_dns_name} | #{private_dns_name} | #{instances[i].private_ip_address}"
+        @log.warn "** New instance: #{fqdn_names[i]} | #{instances[i].id} | #{public_dns_name} | #{private_dns_name} | #{instances[i].private_ip_address}"
       end
 
       ##############################
@@ -386,7 +403,7 @@ module EC2Launcher
       ##############################
       # COMPLETED
       ##############################
-      puts "********************"    
+      @log.warn "********************"    
     end
 
     # Attaches an instance to the specified ELB.
@@ -396,8 +413,8 @@ module EC2Launcher
     #
     def attach_to_elb(instance, elb_name)
       begin
-        puts ""
-        puts "Adding to ELB: #{elb_name}"
+        @log.info ""
+        @log.info "Adding to ELB: #{elb_name}"
         elb = AWS::ELB.new
         AWS.memoize do
           # Build list of availability zones for any existing instances
@@ -426,7 +443,7 @@ module EC2Launcher
           elb.load_balancers[elb_name].instances.register(instance)
         end
       rescue StandardError => bang
-        puts "Error adding to load balancers: " + bang.to_s
+        @log.error "Error adding to load balancers: " + bang.to_s
       end
     end
 
@@ -469,7 +486,7 @@ module EC2Launcher
     #
     # @return [AmiDetails]  AMI name and id.
     def find_ami(arch, virtualization, ami_name_match, id = nil)
-      puts "Searching for AMI..."
+      @log.info "Searching for AMI..."
       ami_name = ""
       ami_id = ""
 
@@ -526,7 +543,7 @@ module EC2Launcher
         abort("You MUST either set the AWS_ACCESS_KEY and AWS_SECRET_ACCESS_KEY environment variables or use the command line options.")
       end
 
-      puts "Initializing AWS connection..."
+      @log.info "Initializing AWS connection..."
       AWS.config({
         :access_key_id => aws_access_key,
         :secret_access_key => aws_secret_access_key
@@ -548,7 +565,7 @@ module EC2Launcher
     #
     # @return [AWS::EC2::Instance] newly created EC2 instance or nil if the launch failed.
     def launch_instance(hostname, ami_id, availability_zone, key_name, security_group_ids, instance_type, user_data, block_device_mappings = nil, block_device_tags = nil, vpc_subnet = nil)
-      puts "Launching instance... #{hostname}"
+      @log.warn "Launching instance... #{hostname}"
       new_instance = nil
       run_with_backoff(30, 1, "launching instance") do
         if block_device_mappings.nil? || block_device_mappings.keys.empty?
@@ -576,7 +593,7 @@ module EC2Launcher
       end
       sleep 5
 
-      puts "  Waiting for instance to start up..."
+      @log.info "  Waiting for instance to start up..."
       sleep 2
       instance_ready = false
       until instance_ready
@@ -588,13 +605,13 @@ module EC2Launcher
       end
 
       unless new_instance.status == :running
-        puts "Instance launch failed. Aborting."
+        @log.fatal "Instance launch failed. Aborting."
         exit 5
       end
 
       ##############################
       # Tag instance
-      puts "Tagging instance..."
+      @log.info "Tagging instance..."
       run_with_backoff(30, 1, "tag #{new_instance.id}, tag: name, value: #{hostname}") { new_instance.add_tag("Name", :value => hostname) }
       run_with_backoff(30, 1, "tag #{new_instance.id}, tag: environment, value: #{@environment.name}") { new_instance.add_tag("environment", :value => @environment.name) }
       run_with_backoff(30, 1, "tag #{new_instance.id}, tag: application, value: #{@application.name}") { new_instance.add_tag("application", :value => @application.name) }
@@ -602,7 +619,7 @@ module EC2Launcher
       ##############################
       # Tag volumes
       unless block_device_tags.empty?
-        puts "Tagging volumes..."
+        @log.info "Tagging volumes..."
         AWS.start_memoizing
         block_device_tags.keys.each do |device|
           v = new_instance.block_device_mappings[device].volume
@@ -672,7 +689,7 @@ module EC2Launcher
         if fail_on_error
           abort("ERROR - #{name} directories not found: #{temp_dirs}")
         else
-          puts "WARNING - #{name} directories not found: #{temp_dirs}"
+          @log.warn "WARNING - #{name} directories not found: #{temp_dirs}"
         end
       end
 

data/startup-scripts/setup_instance.rb

@@ -361,9 +361,9 @@ end
 ##############################
 # EMAIL NOTIFICATION
 ##############################
-
-unless instance_data["email_notification"].nil?
+if instance_data["email_notification"]
   # Email notification through SES
+  puts "Email notification through SES..."
   AWS.config({
     :access_key_id => instance_data["email_notification"]["ses_access_key"],
     :secret_access_key => instance_data["email_notification"]["ses_secret_key"]
@@ -376,4 +376,6 @@ unless instance_data["email_notification"].nil?
     :body_text => "Server setup is complete for Host: #{hostname}, Environment: #{options.environ}, Application: #{options.application}",
     :body_html => "<div>Server setup is complete for:</div><div><strong>Host:</strong> #{hostname}</div><div><strong>Environment:</strong> #{options.environ}</div><div><strong>Application:</strong> #{options.application}</div>"
   )
+else
+  puts "Skipping email notification."
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tool to manage application configurations and launch new EC2 instances
   based on the configurations.
 email: 
@@ -84,3 +100,4 @@ signing_key:
 specification_version: 3
 summary: Tool to launch EC2 instances.
 test_files: []
+has_rdoc: