aws-carb 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2cd4b7289a6861cc343a3382780771b2cd7dc6
-  data.tar.gz: 61ff1613b76116aa943ea2822b25ea1e282c6506
+  metadata.gz: 38ba75a70a86a1bc54c0ab553cef41fc6e3ba2e7
+  data.tar.gz: 2dbd06f1265d67589d71805a4af19b05a48b2519
 SHA512:
-  metadata.gz: 6e0159c846fe863319ed6ed11b538a93f07fead1d848d295844626a08f474b229913e6bd98c2f06143cb9920574ca44646ee71082256b6ea6a54186cb3150393
-  data.tar.gz: 99ba599477db0b953555ee6a73063593bbc6a2386eaead54cf011f55e53453b5ffd123ed67e6b4956ba56cf28dc6bdbb69bf45d95a1f6c287222805217a7f26b
+  metadata.gz: c9ee66d7bea76d8a1f2a472c07312db3b35743967a5f69711e4ba6d05963ebf09004eac45644dd956e99ea81cfeb846a0a98c06ebc0ef72e98844f906db0ec23
+  data.tar.gz: 15f5d1d128a77a087145ccae1bceeef8dd9edf0b1ddfbc968e5e64c851c94cbf6b7cac876ad9cfe6ffaff1131bc01664d40229bb1eb234b35cd6f2a9a8f4da2d

data/README.md

@@ -1,4 +1,4 @@
-# aws-carb: amazon web services - cloudinit and route53 bootstrap
+# amazon web services - cloudinit and route53 bootstrap
 
 ## Install
 
@@ -8,12 +8,6 @@ via rubygems:
 gem install aws-carb
 ```
 
-using bundler:
-
-```
-bundler install
-```
-
 ## Configuration
 
 At minimum, Carb needs to know your aws-ec2 credentials. The simplest way to allow this is to edit ~/.carb/config/config.yaml. See config/config.yaml.example for an example config.
@@ -41,8 +35,8 @@ mkdir -p ~/.carb/{config,templates}
 
 sudo updatedb
 
-cp `locate gems/aws-carb-0.0.3/configs/config.yaml.example`  ~/.carb/config/config.yaml
-cp `locate gems/aws-carb-0.0.3/template/basic.cloud-config.erb` ~/.carb/templates/
+cp `locate gems/aws-carb-0.0.3/examples/configs/config.yaml.example`  ~/.carb/config/config.yaml
+cp `locate gems/aws-carb-0.0.3/examples/templates/basic.cloud-config.erb` ~/.carb/templates/
 
 # edit config.yaml - remember to specify an ssh key because without one your ec2 instance will be inaccessible! (copy your ssh key from id_rsa.pub as a string - not a file path)
 vim ~/.carb/config/config.yaml
@@ -59,11 +53,43 @@ carb -v create --user-data-template ~/.carb/templates/basic.cloud-config.erb --c
 # list all the ec2 options:
 carb help create 
 
-# example with block-device-mappings..
-carb -v create --user-data-template ~/.carb/templates/basic.cloud-config.erb --common-variables "{ 'hostname' => 'asdasdasasdasdsaaa' }" --block-device-mappings "{ 'device_name' => '/dev/sdc', 'ebs' => { 'volume_size' => '100G' } }"
+```
+
+## Understanding block-device-mappings
+
+### Description
 
+When specifying block-device mappings, each mapping must be a valid hash and must be contained in an array.
 
+Once the machine has booted the block device(s) will be available through their virtual block device, e.g:
 
 ```
+# /dev/xv<disk><partition>
+/dev/sdc1 = /dev/xvc1
+/dev/sdf0 = /dev/xvf0
+...
+```
+
+http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html
+
+### Examples
 
+A typical block device mapping:
+
+```
+[{ 'device_name' => '/dev/sdf1', 'ebs' => { 'volume_size' => 500 } }]
+```
+
+Multiple block device mappings:
+```
+[
+  { 'device_name' => '/dev/sdf1', 'ebs' => { 'volume_size' => 500 } },
+  { 'device_name' => '/dev/sdf2', 'ebs' => { 'volume_size' => 500 } }
+]
+```
+
+Typical command line usage:
+```
+carb -c ~/.carb/config/config.yaml -v create --user-data-template ~/.carb/templates/basic.cloud-config.erb --block-device-mappings "[{ 'device_name' => '/dev/sdf1', 'ebs' => { 'volume_size' => 500 } }]"
+```
 

data/aws-carb.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "erubis",        ">= 2.7.0"
   spec.add_dependency "shell-spinner", ">= 1.0.0"
   spec.add_dependency "subcommand",    ">= 1.0.0"
+  spec.add_dependency "log4r",         ">= 1.0.0"
 end

data/bin/carb

@@ -3,12 +3,5 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../lib'))
 
 require 'aws-carb'
-require 'aws-carb/helpers'
-require 'aws-carb/cli_argument_parser'
-require 'aws-carb/config'
-require 'aws-carb/user_data'
-require 'aws-carb/services/route53'
-require 'aws-carb/services/ec2'
-require 'aws-carb/monkey_patches'
 
 AWSCarb.run

data/lib/aws-carb.rb

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+# require first to instantiate logger before anything else
+require 'log4r'
+require 'aws-carb/log4r'
+
 require 'aws-sdk'
 require 'yaml'
 require 'erubis'
@@ -18,8 +22,18 @@ require 'singleton'
 require 'andand'
 require 'colorize'
 
+require 'aws-carb/user_data'
+require 'aws-carb/monkey_patches'
+require 'aws-carb/config'
+require 'aws-carb/version'
+require 'aws-carb/cli_argument_parser'
+require 'aws-carb/helpers'
+require 'aws-carb/services/route53'
+require 'aws-carb/services/ec2'
+
 include ActiveSupport
 
+
 # module is broken up into:
 #
 # AWSCarb.*                  - main methods
@@ -30,6 +44,7 @@ include ActiveSupport
 # AWSCarb::Services::Route53 - create dns records in route53
 #
 
+# stuff to override colouring of strings if not a terminal
 if ! $stdout.tty?
   String.class_eval do
     def colorize(args)
@@ -80,7 +95,11 @@ module AWSCarb
     # then merge user_data template with raw user_data (if provided) -
     # end up single user_data ready to pass into ec2 instance..
     @user_data = UserData.instance
-    @user_data.create(@config)
+
+    combined_user_data = @user_data.create(@config)
+
+    @config.config[:ec2][:user_data] = combined_user_data
+
     @user_data.display if @config[:user_data_template][:file] and ($GLOBAL_VERBOSE or @config[:show_parsed_template])
 
     #
@@ -108,27 +127,70 @@ module AWSCarb
     show_instance_details
   end
 
+
   def self.show_instance_details
-    puts <<-HEREDOC.strip_heredoc
-      # instance details:
+
+    instance_attributes = []
+    instance_data = {}
+
+    ShellSpinner "# collecting instance data", false do
+      instance_attributes << @ec2.instance.class.describe_call_attributes.keys
+      instance_attributes << @ec2.instance.class.reservation_attributes.keys
+      instance_attributes << @ec2.instance.class.mutable_describe_attributes.keys
+
+      instance_attributes.flatten!
+
+      begin
+        instance_attributes.each do |attribute|
+
+          # FIXME: You may only describe the sourceDestCheck attribute for VPC instances
+          next if attribute == :source_dest_check
+
+          value = @ec2.instance.send(attribute)
+
+          next unless value
+          next if attribute == :user_data
+
+          if value.class == AWS::Core::Data::List
+            instance_data[attribute] = value.to_a
+          else
+            instance_data[attribute] = value
+          end
+        end
+      rescue => e
+        puts e
+      end
+    end
+
+    puts
+    puts "# instance details:"
+    puts instance_data.to_yaml
+    puts
+
+    summary = <<-HEREDOC.strip_heredoc
+      # instance summary:
       id:               #{@ec2.instance.id}
-      public ip:        #{@ec2.instance.public_ip_address}
-      public aws fqdn:  #{@ec2.instance.public_dns_name}
-      private ip:       #{@ec2.instance.private_ip_address}
-      private aws fqdn: #{@ec2.instance.private_dns_name}
     HEREDOC
 
+    summary += "public ip:        #{@ec2.instance.public_ip_address}\n" if @ec2.instance.public_ip_address
+    summary += "private ip:       #{@ec2.instance.private_ip_address}\n"
+    summary += "public aws fqdn:  #{@ec2.instance.public_dns_name}\n"   if @ec2.instance.public_dns_name
+    summary += "private aws fqdn: #{@ec2.instance.private_dns_name}\n"
+
     unless @config[:route53][:new_dns_records].nil?
-      puts <<-HEREDOC.strip_heredoc
-        public fqdn:      #{@config[:route53][:new_dns_records][:public][:alias]}
-        private fqdn:     #{@config[:route53][:new_dns_records][:private][:alias]}
+      # tests exist since if a machine is part of a vpc it may not have a public fqdn..
+      summary += "public fqdn:      #{@config[:route53][:new_dns_records][:public][:alias]}\n" if @config[:route53][:new_dns_records][:public][:target]
+      summary += "private fqdn:     #{@config[:route53][:new_dns_records][:private][:alias]}\n" if @config[:route53][:new_dns_records][:private][:target]
+    end
+
+    if @ec2.instance.dns_name
+      summary += <<-HEREDOC.strip_heredoc
+
+        # connect: 
+        ssh #{@ec2.instance.dns_name} -l ubuntu
       HEREDOC
     end
 
-    puts <<-HEREDOC.strip_heredoc
-      
-      # connect: 
-      ssh #{@ec2.instance.dns_name} -l ubuntu
-    HEREDOC
+    puts summary
   end
 end

data/lib/aws-carb/cli_argument_parser.rb

@@ -221,13 +221,22 @@ module AWSCarb
 
         block_device_help = "\n\n#{indent}Specifies how block devices are exposed to the instance. Each mapping\n#{indent}is made up of a virtualName and a deviceName.\n" + block_device_help.join.downcase
 
-        option.on "--block-device-mappings=HASH", block_device_help do |mapping|
+        option.on "--block-device-mappings=ARRAY", block_device_help do |mappings_data|
           begin
-            data = eval(mapping)
-            raise "parsed value isn't a hash!" unless data.class == Hash
-            cli_arguments.subcommand.ec2.block_device_mappings = ActiveSupport::HashWithIndifferentAccess.new(data)
+
+            mappings = eval(mappings_data)
+
+            raise "parsed value isn't an Array!" unless mappings.class == Array
+
+            mappings.map! do |mapping|
+              raise "mapping data isn't a hash!" unless mapping.class == Hash
+              ActiveSupport::HashWithIndifferentAccess.new(mapping)
+            end
+
+            cli_arguments.subcommand.ec2.block_device_mappings = mappings
           rescue => e
-            puts "# could not parse argument for --block-device-mappings, is it a valid hash and are the values properly quoted?"
+            puts "# could not parse argument for --block-device-mappings, are your mappings"
+            puts "# valid hashes contained in an array and are the hash values properly quoted?"
             die e
           end
         end
@@ -264,13 +273,22 @@ module AWSCarb
 
         option.separator ""
 
-        option.on "--security-group-ids=ARRAY", Array, "\n\n#{indent}security_group_ids accepts a single ID or an array of\n#{indent}security group IDs.".downcase do |group_ids|
+        option.on "--security-group-ids=<ID>,<ID>,..", Array, "\n\n#{indent}security_group_ids accepts a single ID or an array of\n#{indent}security group IDs.".downcase do |group_ids|
           cli_arguments.subcommand.ec2.security_group_ids = group_ids
         end
 
         option.separator ""
 
-        option.on "--disable-api-termination=BOOLEAN", "\n\n#{indent}instance termination via the instance API.".downcase do |api_termination|
+        option.on "--disable-api-termination=BOOLEAN", "\n\n#{indent}instance termination via the instance API.".downcase do |api_termination_data|
+
+          api_termination = case api_termination_data
+          when "true"
+            true
+          when "false"
+            false
+          else raise ArgumentError, "unknown parameter for --disable-api-termination: #{api_termination_data}"
+          end
+
           cli_arguments.subcommand.ec2.disable_api_termination = api_termination
         end
 
@@ -288,12 +306,18 @@ module AWSCarb
 
         option.separator ""
 
-        option.on "--private_ip_address=STRING", "\n\n#{indent}If you're using VPC, you can optionally use this option to assign the\n#{indent}instance a specific available IP address from the subnet (e.g., '10.0.0.25').\n#{indent}This option is not valid for instances launched outside a VPC (i.e.\n#{indent}those launched without the :subnet option).".downcase do |ip|
+        option.on "--private-ip-address=STRING", "\n\n#{indent}If you're using VPC, you can optionally use this option to assign the\n#{indent}instance a specific available IP address from the subnet (e.g., '10.0.0.25').\n#{indent}This option is not valid for instances launched outside a VPC (i.e.\n#{indent}those launched without the :subnet option).".downcase do |ip|
           cli_arguments.subcommand.ec2.private_ip_address = ip
         end
 
         option.separator ""
 
+        option.on "--associate-public-ip-address=STRING", "\n\n#{indent}This option isn't documented but appears to exist in the code. For use when creating instances in a VPC.".downcase do |ip|
+          cli_arguments.subcommand.ec2.associate_public_ip_address = ip
+        end
+
+        option.separator ""
+
         option.on "--dedicated-tenancy=BOOLEAN", "\n\n#{indent}Instances with dedicated tenancy will not share physical hardware with\n#{indent}instances outside their VPC. NOTE: Dedicated tenancy incurs an \n#{indent}additional service charge. This option is not valid for\n#{indent}instances launched outside a VPC (e.g.those launched without the :subnet option).".downcase do |tenancy|
           cli_arguments.subcommand.ec2.dedicated_tenancy = tenancy
         end

data/lib/aws-carb/config.rb

@@ -4,7 +4,7 @@ module AWSCarb
   class Config
     include Singleton
 
-    attr_reader :config
+    attr_accessor :config
 
     def create(cli_arguments)
 
@@ -108,7 +108,7 @@ module AWSCarb
         @config[:route53][:hostname] = find_with_context(:hostname, :user_data_template_variables) if find_with_context(:hostname, :user_data_template_variables)
         @config[:route53][:domain]   = find_with_context(:domain,   :user_data_template_variables) if find_with_context(:domain,   :user_data_template_variables)
         @config[:route53][:hostname] = find_with_context(:hostname, :route53)                      if find_with_context(:hostname, :route53)
-        @config[:route53][:domain]   = find_with_context(:domain, :route53)                        if find_with_context(:domain, :route53)
+        @config[:route53][:domain]   = find_with_context(:domain,   :route53)                      if find_with_context(:domain,   :route53)
 
         help = <<-HEREDOC.strip_heredoc
           #       
@@ -125,26 +125,43 @@ module AWSCarb
         hostname = @config[:route53][:hostname]
 
         if domain.nil? and hostname.nil?
-          debug "# WARNING: hostname and domain not found"
-          debug help
-          debug
+          debug <<-HEREDOC.strip_heredoc
+            # WARNING: hostname and domain not found"
+            #{help}
+
+          HEREDOC
+
         elsif domain and hostname.nil?
-          debug "# WARNING: hostname not found"
-          debug help
-          debug
+          debug <<-HEREDOC.strip_heredoc
+            # WARNING: hostname not found
+            #{help}
+
+          HEREDOC
+
         elsif domain.nil? and hostname
-          debug "# WARNING: domain not found"
-          debug help
-          debug
+          debug <<-HEREDOC.strip_heredoc
+            # WARNING: domain not found
+            #{help}
+
+          HEREDOC
+
         else
-          debug "# found hostname and domain:"
-          debug "hostname: #{hostname}"
-          debug "domain:   #{domain}"
-          debug
+          debug <<-HEREDOC.strip_heredoc
+            # found hostname and domain:
+            hostname: #{hostname}
+            domain:   #{domain}
+
+          HEREDOC
 
           @config[:route53][:new_dns_records] = {
-            :public  => { :alias => "#{hostname}.#{domain}.",         :target => nil },
-            :private => { :alias => "#{hostname}-private.#{domain}.", :target => nil }
+            :public  => {
+              :alias => "#{hostname}.#{domain}.",
+              :target => nil
+            },
+            :private => {
+              :alias => "#{hostname}-private.#{domain}.",
+              :target => nil
+            }
           }
         end
       end
@@ -152,7 +169,6 @@ module AWSCarb
       puts
     end
 
-
     def display
       puts "# config:"
       ap @config

data/lib/aws-carb/log4r.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+logger = Log4r::Logger.new('carb')
+logger.outputters << Log4r::Outputter.stdout
+logger.outputters << Log4r::FileOutputter.new('carb', :filename =>  'carb.log')
+
+def debug(message)
+  logger.debug(message)
+end
+
+def info(message)
+  logger.info(message)
+end
+
+def warn(message)
+  logger.warn(message)
+end
+
+def error(message)
+  logger.error(message)
+end
+
+def fatal(message)
+  logger.fatal(message)
+end

data/lib/aws-carb/services/ec2.rb

@@ -63,6 +63,7 @@ module AWSCarb
               :private_ip_address,
               :dedicated_tenancy,
               :ebs_optimized,
+              :associate_public_ip_address,
             ]
 
             ec2_config = {}

data/lib/aws-carb/services/route53.rb

@@ -75,7 +75,19 @@ module AWSCarb
 
             raise "error: '#{record_scope}' record already exists: #{record[:alias]}" if new_record.exists?
 
-            record_sets.create(record[:alias], 'CNAME', :ttl => @config[:route53][:ttl], :resource_records => [{:value => record[:target]}])
+            # this could be blank if we're adding to a vpc and the instance has no external IP
+            next if record[:target].nil?
+
+            new_record = {
+              :name    => record[:alias],
+              :type    => 'CNAME',
+              :options => {
+                :ttl              => @config[:route53][:ttl],
+                :resource_records => [{ :value => record[:target] }]
+              }
+            }
+
+            record_sets.create(new_record[:name], new_record[:type], new_record[:options])
           end
         end
 

data/lib/aws-carb/user_data.rb

@@ -10,12 +10,14 @@ module AWSCarb
     def create(config)
       user_data_template_resolved = resolve_template(config)
       @combined_user_data         = combine_user_data(config, user_data_template_resolved)
-      @user_data_template         = nil
-      @resolved_template          = nil
+      return @combined_user_data
     end
 
     def resolve_template(config)
 
+      user_data_template         = nil
+      resolved_template          = nil
+
       # FIXME: blank templates / empty templates / no template should work..
 
       return nil unless config[:ec2] and config[:user_data_template][:file]
@@ -26,7 +28,7 @@ module AWSCarb
 
           raise ArgumentError, "no such file: #{template_file}" unless File.exist?(template_file)
 
-          @user_data_template = File.read(template_file)
+          user_data_template = File.read(template_file)
         rescue => e
           puts "# unable to open template file:"
           die e
@@ -37,7 +39,7 @@ module AWSCarb
 
      ShellSpinner "# parsing template"  do
         begin
-          @resolved_template = Erubis::Eruby.new(@user_data_template).result(config[:user_data_template_variables])
+          resolved_template = Erubis::Eruby.new(user_data_template).result(config[:user_data_template_variables])
         rescue => e
           puts "# failed to resolve variables in user_data_template:"
           die e
@@ -46,7 +48,7 @@ module AWSCarb
 
       puts
 
-      return @resolved_template
+      return resolved_template
     end
 
     def combine_user_data(config, user_data_template_resolved)

data/lib/aws-carb/version.rb

@@ -1,3 +1,3 @@
 module AWSCarb
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,153 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: aws-carb
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Rob Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.33.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: shell-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: subcommand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: a tool for provisioning ec2 instances with a templated cloudinit configuration,
@@ -160,23 +174,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
 - aws-carb.gemspec
 - bin/carb
-- configs/config.yaml.example
+- examples/configs/config.yaml.example
+- examples/templates/basic.cloud-config.erb
 - lib/aws-carb.rb
 - lib/aws-carb/cli_argument_parser.rb
 - lib/aws-carb/config.rb
 - lib/aws-carb/helpers.rb
+- lib/aws-carb/log4r.rb
 - lib/aws-carb/monkey_patches.rb
 - lib/aws-carb/services/ec2.rb
 - lib/aws-carb/services/route53.rb
 - lib/aws-carb/user_data.rb
 - lib/aws-carb/version.rb
-- templates/basic.cloud-config.erb
 homepage: http://github.com/roobert/aws-carb
 licenses:
 - MIT
@@ -187,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: aws - cloudinit and route53 bootstrap