aws-carb 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19fc64169fc88e5ce4bdfef17a52f2d233cf74da
-  data.tar.gz: ec9b44e8702bccb8bbabe4e3e9337de20475be3f
+  metadata.gz: 6bf032650347a62069764cc805a50168484e9b1a
+  data.tar.gz: 8e47753073f6988f85537e13dfbca80a1a77bee2
 SHA512:
-  metadata.gz: 21bf4ccc56724803da05635bdd1de6898a782caa32761a753350c3dd74275be730cd7cdf3226049bc616bac45dc1b675b9cf28947f52fe2b8cb4b6a67a8094a5
-  data.tar.gz: 462bd7aef352740406d6efb07373a8ed62584864c032f469c0583dcd01d581bdaac55cce468065f7f6d7b9fcd307f5822c72e21226642ba14735ca29c381a433
+  metadata.gz: 32849d7aff9c0cf490f7530246b8476fe278bc5aa5240b84a58132d2c88c6a369347ec387f4137faea22db2037d8b8f54733fcae91035c3eef9807a5a43ce4e0
+  data.tar.gz: 1f344e552169ac6c8e98ccae7bf538cb49df2c0e0a94bea6dc3ac4cfd594ae85832fa72fcfc23ed15d117587b2b3e23f2970b722b083c1592c54f48bbb419941

data/README.md

@@ -59,9 +59,8 @@ carb -v create --user-data-template ~/.carb/templates/basic.cloud-config.erb --c
 # list all the ec2 options:
 carb help create 
 
-# 
---block-device-mappings="{ :device_name => "/dev/sdc", :ebs => { :volume_size => "100G" } }"
-
+# 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' } }"
 
 
 

data/lib/aws-carb/cli_argument_parser.rb

@@ -105,7 +105,7 @@ module AWSCarb
           begin
             data = eval(common_variables)
             raise unless data.class == Hash
-            cli_arguments.subcommand.config_overrides.common_variables = data.deep_symbolize_keys
+            cli_arguments.subcommand.config_overrides.common_variables = ActiveSupport::HashWithIndifferentAccess.new(data)
           rescue => e
             puts "# could not parse argument for --common-variables, is it a valid hash?"
             die e
@@ -118,7 +118,7 @@ module AWSCarb
           begin
             data = eval(general_variables)
             raise unless data.class == Hash
-            cli_arguments.subcommand.config_overrides.general_variables = data.deep_symbolize_keys
+            cli_arguments.subcommand.config_overrides.general_variables = ActiveSupport::HashWithIndifferentAccess.new(data)
           rescue => e
             puts "# could not parse argument for --general-variables, is it a valid hash?"
             die e
@@ -131,7 +131,7 @@ module AWSCarb
           begin
             data = eval(ec2_variables)
             raise unless data.class == Hash
-            cli_arguments.subcommand.config_overrides.ec2_variables = data.deep_symbolize_keys
+            cli_arguments.subcommand.config_overrides.ec2_variables = ActiveSupport::HashWithIndifferentAccess.new(data)
           rescue => e
             puts "# could not parse argument for --ec2-variables, is it a valid hash?"
             die e
@@ -144,7 +144,7 @@ module AWSCarb
           begin
             data = eval(route53_variables)
             raise unless data.class == Hash
-            cli_arguments.subcommand.config_overrides.route53_variables = data.deep_symbolize_keys
+            cli_arguments.subcommand.config_overrides.route53_variables = ActiveSupport::HashWithIndifferentAccess.new(data)
           rescue => e
             puts "# could not parse argument for --route53-variables, is it a valid hash?"
             die e
@@ -157,7 +157,7 @@ module AWSCarb
           begin
             data = eval(user_data_template_variables)
             raise unless data.class == Hash
-            cli_arguments.subcommand.config_overrides.user_data_template_variables = data.deep_symbolize_keys
+            cli_arguments.subcommand.config_overrides.user_data_template_variables = ActiveSupport::HashWithIndifferentAccess.new(data)
           rescue => e
             puts "# could not parse argument for --user-data-template-variables, is it a valid hash?"
             die e
@@ -204,17 +204,17 @@ module AWSCarb
 
         block_device_help = <<-HEREDOC.strip_heredoc
 
-           :virtual_name - (String) Specifies the virtual device name.
-           :device_name - (String) Specifies the device name (e.g., /dev/sdh).
-           :ebs - (Hash) Specifies parameters used to automatically setup Amazon\n#{indent}             EBS volumes when the instance is launched.
-             :snapshot_id - (String) The ID of the snapshot from which the volume will be created.
-             :volume_size - (Integer) The size of the volume, in gigabytes.
-             :delete_on_termination - (Boolean) Specifies whether the Amazon EBS volume is\n#{indent}                          deleted on instance termination.
-             :volume_type - (String) Valid values include:
+           virtual_name - (String) Specifies the virtual device name.
+           device_name - (String) Specifies the device name (e.g., /dev/sdh).
+           ebs - (Hash) Specifies parameters used to automatically setup Amazon\n#{indent}             EBS volumes when the instance is launched.
+             snapshot_id - (String) The ID of the snapshot from which the volume will be created.
+             volume_size - (Integer) The size of the volume, in gigabytes.
+             delete_on_termination - (Boolean) Specifies whether the Amazon EBS volume is\n#{indent}                          deleted on instance termination.
+             volume_type - (String) Valid values include:
                standard
                io1
-           :iops - (Integer)
-           :no_device - (String) Specifies the device name to suppress during instance launch.
+           iops - (Integer)
+           no_device - (String) Specifies the device name to suppress during instance launch.
         HEREDOC
 
         block_device_help = block_device_help.lines.map { |line| indent + "  #{line}" }
@@ -224,10 +224,10 @@ module AWSCarb
         option.on "--block-device-mappings=HASH", block_device_help do |mapping|
           begin
             data = eval(mapping)
-            raise unless data.class == Hash
-            cli_arguments.subcommand.ec2.block_device_mappings = data
+            raise "parsed value isn't a hash!" unless data.class == Hash
+            cli_arguments.subcommand.ec2.block_device_mappings = ActiveSupport::HashWithIndifferentAccess.new(data)
           rescue => e
-            puts "# could not parse argument for --common-variables, is it a valid hash?"
+            puts "# could not parse argument for --block-device-mappings, is it a valid hash and are the values properly quoted?"
             die e
           end
         end

data/lib/aws-carb/config.rb

@@ -30,13 +30,13 @@ module AWSCarb
         # special condition: common command line arguments are shared between all instances first..
         if cli_arguments.subcommand.config_overrides.common_variables
           @config[:common] ||= {}
-          @config[:common].merge! cli_arguments.subcommand.config_overrides.common_variables
+          @config[:common].update cli_arguments.subcommand.config_overrides.common_variables
         end
 
         # all sections share 'common' variables..
         config_sections.each do |section|
           @config[section] ||= {}
-          @config[section].merge! @config[:common]
+          @config[section].update @config[:common]
         end
 
         # merge the config overrides hashes into config
@@ -49,20 +49,17 @@ module AWSCarb
             config_key = key.to_s.gsub('_variables', '').to_sym
 
             @config[config_key] ||= {}
-            @config[config_key].merge! cli_arguments.subcommand.config_overrides.send(key)
+            @config[config_key].update cli_arguments.subcommand.config_overrides.send(key)
           end
         end
 
         # merge the convenience arguments..
         config_sections.each do |section|
           if cli_arguments.subcommand.send(section.to_s)
-            @config[section].merge! cli_arguments.subcommand.send(section.to_s).marshal_dump
+            @config[section].update cli_arguments.subcommand.send(section.to_s).marshal_dump
           end
         end
 
-        # merge the convenience argument parameters with config
-        @config.deep_symbolize_keys!
-
       rescue => e
         puts "# failed to merge cli arguments with config"
         die e
@@ -77,8 +74,7 @@ module AWSCarb
       config_file = cli_argument_config_file
 
       begin
-        # make keys symbols so we can more easily merge with cli arg structs..
-        @config = YAML.load_file(config_file).deep_symbolize_keys
+        @config = ActiveSupport::HashWithIndifferentAccess.new(YAML.load_file(config_file))
       rescue => e
         puts "# failed to load config file: '#{config_file}'"
         die e

data/lib/aws-carb/user_data.rb

@@ -40,7 +40,6 @@ module AWSCarb
           @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:"
-          ap e.class
           die e
         end
       end

data/lib/aws-carb/version.rb

@@ -1,3 +1,3 @@
 module AWSCarb
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/aws-carb.rb

@@ -6,6 +6,10 @@ require 'erubis'
 require 'awesome_print'
 require 'securerandom'
 require 'shell-spinner'
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_support/core_ext/hash'
+require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/string/strip'
 require 'active_support/core_ext/hash/keys'
 require 'ostruct'
@@ -14,6 +18,8 @@ require 'singleton'
 require 'andand'
 require 'colorize'
 
+include ActiveSupport
+
 # module is broken up into:
 #
 # AWSCarb.*                  - main methods
@@ -80,7 +86,6 @@ module AWSCarb
     #
     # aws interaction
     # 
-
     if @config[:route53].andand[:new_dns_records]
       @route53 = Services::Route53.instance
       @route53.client(@config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-carb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Rob Wilson
@@ -14,140 +14,140 @@ dependencies:
   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
 description: a tool for provisioning ec2 instances with a templated cloudinit configuration,
@@ -160,7 +160,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -187,17 +187,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.2.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: aws - cloudinit and route53 bootstrap