rivet 1.3.0 → 1.4.0

data/.gitignore

@@ -1,3 +1,28 @@
-autoscale/
-*.swp
 *.gem
+*.rbc
+*.swp
+.bundle
+.config
+.DS_Store
+.envrc
+.ruby-version
+.rvmrc
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+
+autoscale/
+
+bin/*
+!bin/rivet

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Rivet CHANGELOG
 ===
 
+1.4.0 - Released 11/22/13
+---
+  * Adds functionality to apply an elastic_ip durning bootstrap
+  * Adds functionality to apply knife commands for a specified chef_username durning bootstrap
+  * Tweaked some of the code styling to adhere to common Ruby styling conventions:
+    https://github.com/bbatsov/ruby-style-guide
+
 1.3.0 - Released 11/20/13
 ---
   * Adds functionality to allow chef_command to be specified in group configurations

data/Gemfile

@@ -8,4 +8,3 @@ group(:development, :test) do
 end
 
 gem 'aws-sdk',  '>= 1.11.1'
-

data/README.md

@@ -4,7 +4,7 @@ Rivet
 =======
 Rivet enables you to describe autoscaling groups and their launch configurations as yaml.  You can then sync those changes to Amazon Web Services (AWS.)
 
-You provide a template and it's options to render as user-data for your launch configurations to build a bootstrap script for chef, installed via gems.  
+You provide a template and it's options to render as user-data for your launch configurations to build a bootstrap script for chef, installed via gems.
 
 Rivet generates unique deterministic names for launch configurations and automatically assigns the proper launch configuration to your
 autoscaling group based upon it's generated identity.
@@ -44,7 +44,7 @@ aws_secret_access_key=<YOUR SECRET_ACCESS KEY>
 region=us-west-2
 ```
 
-Alternatively you can specify your `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` as environment variables. 
+Alternatively you can specify your `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` as environment variables.
 
 You will still need to specify the region to use in your `AWS_CONFIG_FILE`.
 
@@ -73,17 +73,27 @@ The yaml file format:
 ```yaml
 min_size: SIZE <integer>
 max_size: SIZE <integer>
-region: AWS REGION <STRING>
+region: AWS_REGION <string>
 availability_zones: [ZONE<string>,ZONE...]
 iam_instance_profile: INSTANCE_PROFILE <string>
-tags: [ { key: KEY_NAME<string>, value: KEY_VALLUE<string> } ]
+tags:
+  -
+    key: KEY_NAME<string>
+    value: KEY_VALUE<string>
+  -
+    key: KEY_NAME<string>
+    value: KEY_VALUE<string>
 
 bootstrap:
   chef_command: CHEF_COMMAND <string>
   chef_organization: CHEF_ORGANIZATION <string>
+  chef_username: CHEF_USERNAME <string>
   template: TEMPLATE <string>
   config_dir: CONFIGURATION_FILES_DIR <string>
   environment: CHEF_ENVIRONMENT <string>
+  region: AWS_REGION <string>
+  name: NAME <string>
+  elastic_ip: AWS_ELASTIC_IP <string>
   gems:
     - [GEM_NAME<string>,GEM_VERSION<string>]
     - [GEM_NAME<string>]

data/lib/rivet/autoscale.rb

@@ -1,25 +1,25 @@
 module Rivet
   class Autoscale
 
-    REQUIRED_FIELDS = [:min_size,:max_size,:launch_configuration,:availability_zones] 
+    REQUIRED_FIELDS = [:min_size, :max_size, :launch_configuration, :availability_zones]
 
     attr_reader :min_size, :max_size, :name, :launch_configuration
     attr_reader :availability_zones, :tags
 
-    def initialize(name,definition)
-      @name = name
-      @min_size = definition['min_size']
-      @max_size = definition['max_size']
+    def initialize(name, definition)
+      @name       = name
+      @min_size   = definition['min_size']
+      @max_size   = definition['max_size']
 
-      if definition.has_key?('tags')
+      if definition.has_key? 'tags'
         definition['tags'].each do |t|
-          unless t.has_key?('propagate_at_launch')
+          unless t.has_key? 'propagate_at_launch'
             t['propagate_at_launch'] = true
           end
         end
         @tags = definition['tags']
       else
-        @tags = Array.new
+        @tags = []
       end
       @launch_config = LaunchConfig.new(definition)
 
@@ -49,17 +49,17 @@ module Rivet
 
       Rivet::Log.write(level, "Remote and local defintions match") unless differences?
 
-      differences.each_pair do |attr,values|
-        Rivet::Log.write(level,"#{attr}:")
-        Rivet::Log.write(level,"  remote: #{values['remote']}")
-        Rivet::Log.write(level,"  local:  #{values['local']}")
+      differences.each_pair do |attr, values|
+        Rivet::Log.write(level, "#{attr}:")
+        Rivet::Log.write(level, "  remote: #{values['remote']}")
+        Rivet::Log.write(level, "  local:  #{values['local']}")
       end
     end
 
     def sync
       if differences?
         Rivet::Log.info("Syncing autoscale group changes to AWS for #{@name}")
-        autoscale = AWS::AutoScaling.new()
+        autoscale = AWS::AutoScaling.new
         group = autoscale.groups[@name]
 
         @launch_config.save
@@ -77,13 +77,13 @@ module Rivet
     protected
 
     def get_update_options
-      options = Hash.new
-      differences.each_pair do |attribute,values|
+      options = {}
+      differences.each_pair do |attribute, values|
         options[attribute.to_sym] = values['local']
       end
 
       REQUIRED_FIELDS.each do |field|
-        unless options.has_key?(field)
+        unless options.has_key? field
           options[field] = self.send(field)
         end
       end
@@ -92,8 +92,8 @@ module Rivet
 
     def get_differences
       remote = get_remote
-      differences = Hash.new
-      [:min_size,:max_size,:launch_configuration,:tags].each do |a|
+      differences = {}
+      [:min_size, :max_size, :launch_configuration, :tags].each do |a|
         if remote[a.to_s] != self.send(a)
           differences[a.to_s] = { 'remote' => remote[a.to_s], 'local' => self.send(a) }
         end
@@ -101,25 +101,23 @@ module Rivet
 
       if remote['availability_zones'] != availability_zones
         differences['availability_zones'] = { 'remote' => remote['availability_zones'], 'local' => availability_zones }
-      end if remote.has_key?('availability_zones')
+      end if remote.has_key? 'availability_zones'
 
       differences
     end
 
-    protected
-
     def get_remote
-      autoscale = AWS::AutoScaling.new()
+      autoscale = AWS::AutoScaling.new
       remote_group = autoscale.groups[@name]
       if remote_group.exists?
 
-        remote_hash = [:min_size,:max_size].inject(Hash.new) do |accum,attr|
-          accum[attr.to_s] = remote_group.send(attr)
+        remote_hash = [:min_size, :max_size].inject({}) do |accum, attr|
+          accum[attr.to_s] = remote_group.send attr
           accum
         end
 
         # {:resource_id=>"venus", :propagate_at_launch=>true, :value=>"Venus", :key=>"Name", :resource_type=>"auto-scaling-group"}
-        remote_hash['tags'] = remote_group.tags.to_a.inject(Array.new) do |tags,current|
+        remote_hash['tags'] = remote_group.tags.to_a.inject([]) do |tags, current|
           tags << normalize_tag(current)
         end
 
@@ -130,22 +128,22 @@ module Rivet
 
         remote_hash
       else
-        { }
+        {}
       end
     end
 
     def create(options)
-      autoscale = AWS::AutoScaling.new()
+      autoscale = AWS::AutoScaling.new
       if autoscale.groups[@name].exists?
         raise "Cannot create AutoScaling #{@name} group it already exists!"
       else
-        autoscale.groups.create(@name,options)
+        autoscale.groups.create(@name, options)
       end
     end
 
     def normalize_tag(tag)
-      normalized_tag = Hash.new
-      tag.each_pair do |k,v|
+      normalized_tag = {}
+      tag.each_pair do |k, v|
         unless (k == :resource_id || k == :resource_type)
           normalized_tag[k.to_s] = v
         end

data/lib/rivet/aws_utils.rb

@@ -5,8 +5,8 @@ module Rivet
       return false if groups.nil?
       Rivet::Log.info("Verifying security groups: #{groups.join(",")}")
 
-      security_groups_collection = AWS::EC2.new().security_groups
-      filtered_groups = Array.new
+      security_groups_collection = AWS::EC2.new.security_groups
+      filtered_groups = []
       security_groups_collection.filter('group-name', *groups).each do |g|
         filtered_groups << g.name
       end
@@ -25,13 +25,13 @@ module Rivet
         current_profile = nil
         profile_matcher = /^\[(profile+\s)?(\w+)\]/
         option_matcher  = /(\w.*)=(\S.*)\s*/
-        aws_config      = Hash.new
+        aws_config      = {}
 
         File.open(ENV['AWS_CONFIG_FILE'],"r").each_line do |line|
 
           if line =~ profile_matcher
             current_profile = line.match(profile_matcher)[2]
-            aws_config[current_profile] = Hash.new unless aws_config.has_key?(current_profile)
+            aws_config[current_profile] = {} unless aws_config.has_key?(current_profile)
           end
 
           if line =~ option_matcher && !current_profile.nil?
@@ -49,7 +49,7 @@ module Rivet
           end
 
           end
-      aws_config
+        aws_config
       end
     end
 

data/lib/rivet/bootstrap.rb

@@ -2,22 +2,22 @@ module Rivet
   class Bootstrap
     TEMPLATE_SUB_DIR = "bootstrap"
 
-    attr_reader :gems, :run_list, :template, :environment
-    attr_reader :template_path, :chef_command, :chef_organization
+    attr_reader :gems, :run_list, :template, :environment, :region, :name, :elastic_ip
+    attr_reader :template_path, :chef_command, :chef_organization, :chef_username
 
-    def initialize(bootstrap_definition = Hash.new)
+    def initialize(bootstrap_definition = {})
       ivars = [
-        'gems','run_list','template','environment',
-        'config_dir','chef_organization','chef_command']
+        'gems', 'run_list', 'template', 'environment', 'region', 'name', 'elastic_ip',
+        'config_dir', 'chef_command', 'chef_organization', 'chef_username']
 
       ivars.each do |i|
-        if bootstrap_definition.has_key?(i)
-          instance_variable_set("@#{i}",bootstrap_definition[i])
+        if bootstrap_definition.has_key? i
+          instance_variable_set("@#{i}", bootstrap_definition[i])
         end
       end unless bootstrap_definition.nil?
 
-      @config_dir ||= "."
-      @template   ||= "default.erb"
+      @config_dir ||= '.'
+      @template   ||= 'default.erb'
 
       set_calculated_attrs
     end
@@ -29,31 +29,43 @@ module Rivet
     protected
 
     def set_calculated_attrs
-      @template_path  = File.join(@config_dir,TEMPLATE_SUB_DIR)
-      @secret_file    = File.join(@config_dir,"encrypted_data_bag_secret_#{@environment}")
-      @validation_key = File.new(File.join(@config_dir,"#{@chef_organization}-validator.pem")).read
+      @template_path  = File.join(@config_dir, TEMPLATE_SUB_DIR)
+      @secret_file    = File.join(@config_dir, "encrypted_data_bag_secret_#{@environment}")
+      @validation_key = File.new(File.join(@config_dir, "#{@chef_organization}-validator.pem")).read
     end
 
     def generate_user_data
-      config_content = "log_level :info\n"
+      config_content =  "log_level :info\n"
       config_content << "log_location STDOUT\n"
-      config_content << "environment #{environment}\n"
-      config_content << "chef_server_url  'https://api.opscode.com/organizations/#{chef_organization}'\n"
+      config_content << "environment '#{environment}'\n"
+      config_content << "chef_server_url 'https://api.opscode.com/organizations/#{chef_organization}'\n"
       config_content << "validation_client_name '#{chef_organization}-validator'\n"
 
-      install_gems = String.new
+      knife_content =  "chef_username       = '#{chef_username}'\n"
+      knife_content << "chef_organization   = '#{chef_organization}'\n"
+      knife_content << "\n"
+      knife_content << "environment         '#{environment}'\n"
+      knife_content << "log_level           :info\n"
+      knife_content << "log_location        STDOUT\n"
+      knife_content << "node_name           \"\#{chef_username}\"\n"
+      knife_content << "client_key          \"~/.chef/\#{chef_username}.pem\"\n"
+      knife_content << "chef_server_url     \"https://api.opscode.com/organizations/\#{chef_organization}\"\n"
+      knife_content << "cache_type          'BasicFile'\n"
+      knife_content << "puts \"Using \#{environment} environment...\"\n"
 
-      gems.each do |gem|
-        if gem.size > 1
-          install_gems << "gem install #{gem[0]} -v #{gem[1]} --no-rdoc --no-ri\n"
+      install_gems = ''
+
+      gems.each do |g|
+        if g.size > 1
+          install_gems << "gem install #{g[0]} -v #{g[1]} --no-rdoc --no-ri\n"
         else
-          install_gems << "gem install #{gem[0]} --no-rdoc --no-ri\n"
+          install_gems << "gem install #{g[0]} --no-rdoc --no-ri\n"
         end
       end unless gems.nil?
 
       first_boot = { :run_list => @run_list.flatten }.to_json unless @run_list.nil?
 
-      template = ERB.new File.new(File.join(@template_path,@template)).read
+      template = ERB.new File.new(File.join(@template_path, @template)).read
       template.result(binding)
     end
 

data/lib/rivet/client.rb

@@ -20,7 +20,7 @@ module Rivet
       end
 
       Rivet::Log.info("Checking #{options[:group]} autoscaling definition")
-      autoscale_def = Rivet::Autoscale.new(options[:group],group_def)
+      autoscale_def = Rivet::Autoscale.new(options[:group], group_def)
       autoscale_def.show_differences
 
       if options[:sync]
@@ -33,4 +33,3 @@ module Rivet
 
   end
 end
-

data/lib/rivet/launch_config.rb

@@ -1,7 +1,7 @@
 module Rivet
   class LaunchConfig
 
-    LC_ATTRIBUTES = ['key_name','image_id','instance_type','security_groups','iam_instance_profile','bootstrap']
+    LC_ATTRIBUTES = %w(key_name image_id instance_type security_groups iam_instance_profile bootstrap)
 
     LC_ATTRIBUTES.each do |a|
       attr_reader a.to_sym
@@ -9,17 +9,17 @@ module Rivet
 
     attr_reader :id_prefix
 
-    def initialize(spec,id_prefix="rivet_")
+    def initialize(spec,id_prefix = 'rivet_')
       @id_prefix = id_prefix
 
       LC_ATTRIBUTES.each do |a|
 
         if respond_to? "normalize_#{a}".to_sym
-          spec[a] = self.send("normalize_#{a.to_sym}",spec[a])
+          spec[a] = self.send("normalize_#{a.to_sym}", spec[a])
         end
 
         Rivet::Log.debug("Setting LaunchConfig @#{a} to #{spec[a]}")
-        instance_variable_set("@#{a}",spec[a])
+        instance_variable_set("@#{a}", spec[a])
       end
     end
 
@@ -34,30 +34,30 @@ module Rivet
     def save
       AwsUtils.verify_security_groups(security_groups)
 
-      lc_collection = AWS::AutoScaling.new().launch_configurations
+      lc_collection = AWS::AutoScaling.new.launch_configurations
 
       if lc_collection[identity].exists?
         Rivet::Log.info("Launch configuration #{identity} already exists in AWS")
       else
         options = {}
-        options[:key_pair] = key_name unless key_name.nil?
-        options[:security_groups] = security_groups unless security_groups.nil?
-        options[:user_data] = user_data unless user_data.nil?
-        options[:iam_instance_profile] = iam_instance_profile unless iam_instance_profile.nil?
+        options[:key_pair]              = key_name              unless key_name.nil?
+        options[:security_groups]       = security_groups       unless security_groups.nil?
+        options[:user_data]             = user_data             unless user_data.nil?
+        options[:iam_instance_profile]  = iam_instance_profile  unless iam_instance_profile.nil?
 
         Rivet::Log.info("Saving launch configuration #{identity} to AWS")
         Rivet::Log.debug("Launch Config options:\n #{options.inspect}")
-        lc_collection.create(identity,image_id,instance_type, options)
+        lc_collection.create(identity, image_id, instance_type, options)
       end
     end
 
     protected
 
     def build_identity_string
-      identity = LC_ATTRIBUTES.inject(String.new) do |accum,attribute|
+      identity = LC_ATTRIBUTES.inject('') do |accum, attribute|
         if attribute != 'bootstrap'
           attr_value = self.send(attribute.to_sym) ? self.send(attribute.to_sym) : "\0"
-          attr_value = attr_value.join("\t") if attr_value.respond_to?(:join)
+          attr_value = attr_value.join("\t") if attr_value.respond_to? :join
           accum << attribute.to_s
           accum << Base64.encode64(attr_value)
         else
@@ -80,4 +80,3 @@ module Rivet
 
   end
 end
-

data/lib/rivet/logger.rb

@@ -2,25 +2,25 @@ module Rivet
 
   module Log
 
-    def self.write(level,message)
+    def self.write(level, message)
       @@log ||= SimpleLogger.instance
       @@log.send(level.to_sym) { message }
     end
 
     def self.info(message)
-      write('info',message)
+      write('info', message)
     end
 
     def self.debug(message)
-      write('debug',message)
+      write('debug', message)
     end
 
     def self.fatal(message)
-      write('fatal',message)
+      write('fatal', message)
     end
 
     def self.warn(message)
-      write('warn',message)
+      write('warn', message)
     end
 
     def self.level(level)
@@ -28,14 +28,14 @@ module Rivet
       @@log.level = level
     end
 
-    class SimpleLogger< Logger
+    class SimpleLogger < Logger
       include Singleton
 
       def initialize
         @dev = Logger::LogDevice.new(STDOUT)
         super @dev
         @progname = "Rivet"
-        @formatter = proc do |sev,datetime,name,msg|
+        @formatter = proc do |sev, datetime, name, msg|
           "[#{name}] [#{datetime}] [#{sev}]: #{msg}\n"
         end
         @datetime_format
@@ -48,5 +48,3 @@ module Rivet
 
   end
 end
-
-

data/lib/rivet/utils.rb

@@ -1,16 +1,16 @@
 module Rivet
   module Utils
 
-    def self.die(level = 'fatal',message)
-      Rivet::Log.write(level,message)
+    def self.die(level = 'fatal', message)
+      Rivet::Log.write(level, message)
       exit
     end
 
     # This returns the merged definition given a group
 
-    def self.get_definition(group,directory)
+    def self.get_definition(group, directory)
       defaults = consume_defaults(directory)
-      group_def = load_definition(group,directory)
+      group_def = load_definition(group, directory)
 
       if defaults && group_def
         group_def = defaults.deep_merge(group_def)
@@ -21,8 +21,8 @@ module Rivet
     # Gobbles up the defaults file from YML, returns the hash or false if empty
 
     def self.consume_defaults(autoscale_dir)
-      defaults_file = File.join(autoscale_dir,"defaults.yml")
-      if File.exists?(defaults_file)
+      defaults_file = File.join(autoscale_dir, 'defaults.yml')
+      if File.exists? defaults_file
         parsed = begin
           Rivet::Log.debug("Consuming defaults from #{defaults_file}")
           YAML.load(File.open(defaults_file))
@@ -38,9 +38,9 @@ module Rivet
     # This loads the given definition from it's YML file, returns the hash or
     # false if empty
 
-    def self.load_definition(name,directory)
+    def self.load_definition(name, directory)
       definition_dir = File.join(directory,name)
-      conf_file      = File.join(definition_dir,"conf.yml")
+      conf_file      = File.join(definition_dir, 'conf.yml')
       if Dir.exists?(definition_dir) && File.exists?(conf_file)
         Rivet::Log.debug("Loading definition for #{name} from #{conf_file}")
         parsed = begin
@@ -56,4 +56,3 @@ module Rivet
 
   end
 end
-

data/lib/rivet/version.rb

@@ -1,4 +1,3 @@
 module Rivet
-  VERSION = "1.3.0"
+  VERSION = '1.4.0'
 end
-

data/rivet.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-sdk", ">= 1.11.1"
+  spec.add_development_dependency "pry", "~> 0.9.12"
   spec.add_development_dependency "rake", ">= 10.1.0"
   spec.add_development_dependency "rspec", "~> 2.14.1"
 end
-
-

data/spec/rivet_bootstrap_spec.rb

@@ -8,7 +8,7 @@ describe 'rivet bootstrap' do
 
   tempdir_context 'with all necessary files in place' do
     before do
-      FileUtils.mkdir_p(bootstrap_def['config_dir'])
+      FileUtils.mkdir_p bootstrap_def['config_dir']
 
       validator_file = File.join(
         bootstrap_def['config_dir'],
@@ -20,21 +20,41 @@ describe 'rivet bootstrap' do
         bootstrap_def['config_dir'],
         Rivet::Bootstrap::TEMPLATE_SUB_DIR)
 
-      FileUtils.mkdir_p(template_dir)
+      FileUtils.mkdir_p template_dir
 
-      template_file = File.join(template_dir,bootstrap_def['template'])
-      File.open(template_file,'w') { |f| f.write(SpecHelpers::BOOTSTRAP_TEMPLATE) }
+      template_file = File.join(template_dir, bootstrap_def['template'])
+      File.open(template_file, 'w') { |f| f.write(SpecHelpers::BOOTSTRAP_TEMPLATE) }
     end
 
     describe "#user_data" do
       it 'returns a string that contains the chef organization' do
-        org = bootstrap_def['organization']
-        bootstrap.user_data.should =~ /chef_server_url\s+.*#{org}.*/
+        org = bootstrap_def['chef_organization']
+        bootstrap.user_data.should =~ /chef_organization\s+.*\'#{org}\'.*/
+      end
+
+      it 'returns a string that contains the chef username' do
+        org = bootstrap_def['chef_username']
+        bootstrap.user_data.should =~ /chef_username\s+.*\'#{org}\'.*/
       end
 
       it 'returns a string that contains the environment' do
-        env = bootstrap_def['env']
-        bootstrap.user_data.should =~ /environment\s+.*#{env}.*/
+        env = bootstrap_def['environment']
+        bootstrap.user_data.should =~ /environment\s+.*\'#{env}\'.*/
+      end
+
+      it 'returns a string that contains the region' do
+        region = bootstrap_def['region']
+        bootstrap.user_data.should =~ /#{region}/
+      end
+
+      it 'returns a string that contains the name' do
+        name = bootstrap_def['name']
+        bootstrap.user_data.should =~ /#{name}/
+      end
+
+      it 'returns a string that contains the elastic_ip' do
+        elastic_ip = bootstrap_def['elastic_ip']
+        bootstrap.user_data.should =~ /#{elastic_ip}/
       end
 
       it 'returns a string that contains the run_list as json' do
@@ -58,4 +78,3 @@ describe 'rivet bootstrap' do
   end
 
 end
-

data/spec/rivet_launch_config_spec.rb

@@ -26,9 +26,9 @@ describe "rivet launch config" do
 
     describe "#normalize_security_groups" do
       it "returns a sorted array of groups" do
-        unsorted_groups = ['group3','group1','group2']
+        unsorted_groups = %w(group3 group1 group2)
         sorted_groups = unsorted_groups.sort
-        returned_groups = launch_config.send(:normalize_security_groups,unsorted_groups)  
+        returned_groups = launch_config.send(:normalize_security_groups, unsorted_groups)
         returned_groups.should == sorted_groups
       end
     end

data/spec/rivet_spec_setup.rb

@@ -7,33 +7,37 @@ require_relative '../lib/rivet'
 
 Rivet::Log.level(Logger::FATAL)
 
-
 module SpecHelpers
 
-
-   BOOTSTRAP_TEMPLATE = '<%= install_gems %>'\
-                        '<%= config_content %>'\
-                        '<%= first_boot %>'\
-                        "\n"\
-                        '<%= chef_command %>'
-
+ BOOTSTRAP_TEMPLATE = '<%= install_gems %>'\
+                      '<%= region %>' + "\n"\
+                      '<%= name %>' + "\n"\
+                      '<%= elastic_ip %>' + "\n"\
+                      '<%= knife_content %>'\
+                      '<%= first_boot %>'\
+                      "\n"\
+                      '<%= chef_command %>'
 
   AUTOSCALE_DEF = {
     'min_size' => 1,
     'max_size' => 3,
     'region'   => 'us-west-2',
-    'availability_zones' => ['a','b','c'],
+    'availability_zones' => %w(a b c),
     'key_name' => 'UnitTests',
     'instance_type' => 'm1.large',
-    'security_groups' => ['unit_tests1','unit_tests2'],
+    'security_groups' => %w(unit_tests1 unit_tests2),
     'image_id' => 'ami-12345678',
     'iam_instance_profile' => 'unit_test_profile',
     'bootstrap' => {
       'chef_organization' => 'unit_tests',
+      'chef_username' => 'unit_tests_user',
       'template' => 'default.erb',
       'config_dir' => 'unit_tests',
       'environment' => 'unit_tests',
-      'gems' => [ ['gem1','0.0.1'],['gem2','0.0.2'] ],
+      'region' => 'us-west-2',
+      'name' => 'unit_tests_name',
+      'elastic_ip' => '10.0.0.1',
+      'gems' => [ ['gem1', '0.0.1'], ['gem2', '0.0.2'] ],
       'run_list' => ['unit_tests']
     }
   }

data/spec/rivet_util_spec.rb

@@ -2,19 +2,19 @@ require_relative './rivet_spec_setup'
 
 include SpecHelpers
 
-AUTOSCALE_DIR   = "."
-DEFINITION_NAME = "unit_test"
-DEFINITION_DIR  = File.join(AUTOSCALE_DIR,DEFINITION_NAME)
-LAUNCH_CONFIG_PARAMS = ['ssh_key','instance_size','security_groups','ami','bootstrap']
+AUTOSCALE_DIR   = '.'
+DEFINITION_NAME = 'unit_test'
+DEFINITION_DIR  = File.join(AUTOSCALE_DIR, DEFINITION_NAME)
+LAUNCH_CONFIG_PARAMS = %w(ssh_key instance_size security_groups ami bootstrap)
 
 defaults_hash = {
   'min_size' => 0,
   'max_size' => 0,
   'region' => 'us-west-2',
-  'zones' => ['a','b','c'],
+  'zones' => %w(a b c),
   'key_name' => 'unit_tests',
   'instance_type' => 'm1.large',
-  'security_groups' => ['unit_tests'],
+  'security_groups' => %w(unit_tests),
   'image_id' => 'ami-unit_tests',
   'bootstrap' => {
     'run_list' => ['role[unit_tests]']
@@ -32,7 +32,7 @@ unit_test_definition_hash = {
 describe "rivet utils" do
   tempdir_context "with an autoscaling directory" do
     before do
-      FileUtils.mkdir_p(AUTOSCALE_DIR)
+      FileUtils.mkdir_p AUTOSCALE_DIR
     end
 
     describe "consume_defaults" do
@@ -43,13 +43,13 @@ describe "rivet utils" do
 
     describe "load_definition" do
       it "should return false" do
-        Rivet::Utils.load_definition("unit_test",AUTOSCALE_DIR).should be_false
+        Rivet::Utils.load_definition('unit_test', AUTOSCALE_DIR).should be_false
       end
     end
 
     describe "get_definition" do
       it "should return false" do
-        Rivet::Utils.get_definition("unit_test",AUTOSCALE_DIR)
+        Rivet::Utils.get_definition('unit_test', AUTOSCALE_DIR)
       end
     end
 
@@ -60,26 +60,26 @@ describe "rivet utils" do
 
       describe "load_definition" do
         it "should return false" do
-          Rivet::Utils.load_definition("unit_test",AUTOSCALE_DIR).should be_false
+          Rivet::Utils.load_definition('unit_test', AUTOSCALE_DIR).should be_false
         end
       end
 
       context "and with a conf.yml" do
         before do
           FileUtils.mkdir_p DEFINITION_DIR
-          File.open(File.join(DEFINITION_DIR,"conf.yml"),'w') do |f|
+          File.open(File.join(DEFINITION_DIR, 'conf.yml'), 'w') do |f|
             f.write(unit_test_definition_hash.to_yaml)
           end
         end
         describe "load_definition" do
           it "returns a hash" do
-            loaded_def = Rivet::Utils.load_definition("unit_test",AUTOSCALE_DIR)
+            loaded_def = Rivet::Utils.load_definition('unit_test', AUTOSCALE_DIR)
             unit_test_definition_hash.each_pair { |k,v| loaded_def.should include(k => v) }
           end
         end
         context "and with a defaults.yml" do
           before do
-            File.open(File.join(AUTOSCALE_DIR,"defaults.yml"),'w') do |f|
+            File.open(File.join(AUTOSCALE_DIR, 'defaults.yml'), 'w') do |f|
               f.write(defaults_hash.to_yaml)
             end
           end
@@ -93,7 +93,7 @@ describe "rivet utils" do
 
          describe "get_definition" do
            it "returns a merged hash" do
-            result = Rivet::Utils.get_definition(DEFINITION_NAME,AUTOSCALE_DIR)
+            result = Rivet::Utils.get_definition(DEFINITION_NAME, AUTOSCALE_DIR)
             merged_hash = defaults_hash.merge(unit_test_definition_hash)
             result.should == defaults_hash.merge(unit_test_definition_hash)
            end
@@ -106,4 +106,3 @@ describe "rivet utils" do
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivet
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-12-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.11.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement