rivet 1.4.0 → 2.0.0

data/spec/launch_config_spec.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+require_relative './spec_setup'
+
+include SpecHelpers
+
+describe 'rivet launch config' do
+  let(:config) { generate_config_mock(double('config_mock'), DSL_VALUES) }
+  let(:launch_config) { Rivet::LaunchConfig.new(config) }
+
+  context 'with a sane config' do
+    before do
+      user_data_mock = double('user_data_mock')
+      user_data_mock.stub(:user_data).and_return('unit_test_user_data')
+      Rivet::Bootstrap.stub(:new).and_return(user_data_mock)
+    end
+
+    describe '#build_identity_string' do
+      it 'should return a valid identity_string' do
+        launch_config.send(:build_identity_string).should == SpecHelpers::AUTOSCALE_IDENTITY_STRING
+      end
+    end
+
+    describe '#identity' do
+      it 'should return a deterministic identity' do
+        launch_config.identity.should == "rivet_#{Digest::SHA1.hexdigest(SpecHelpers::AUTOSCALE_IDENTITY_STRING)}"
+      end
+    end
+  end
+
+end

data/spec/open_state_spec.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+require_relative './spec_setup'
+
+include SpecHelpers
+
+describe 'Rivet OpenState' do
+  let(:openstate) { Rivet::OpenState.new }
+
+  describe '#install_get_or_set' do
+    before do
+      openstate.install_get_or_set(:tortilla)
+    end
+
+    it 'installs a getter' do
+      openstate.should respond_to(:tortilla)
+    end
+
+    it 'installs a setter' do
+      openstate.tortilla 'shells'
+      openstate.tortilla.should == 'shells'
+    end
+
+    it 'adds the getter setter to generated attributes' do
+      openstate.generated_attributes.should include(:tortilla)
+    end
+  end
+
+  describe '#method_missing' do
+    it 'adds an attribute when sent a message with an argument' do
+      openstate.car %w(car horse tank)
+      openstate.car.should == %w(car horse tank)
+    end
+
+    it 'raises an exception if sent a message that was not defined' do
+      expect { openstate.sloth }.to raise_error
+    end
+  end
+
+  describe '#validate' do
+    before do
+      openstate.required_fields = {
+        :pickle => 'donkey',
+        :donut  => nil,
+        :cake   => 'chocolate'
+      }
+    end
+
+    it 'raises an exception if a required attribute is not defined' do
+      openstate.cake 'chocolate'
+      openstate.pickle 'donkey'
+      expect { openstate.validate }.to raise_error
+    end
+
+    it 'sets a default value if one is provided' do
+      openstate.donut 'strawberry'
+      openstate.validate
+      openstate.pickle.should == 'donkey'
+    end
+
+    it 'returns true if all required fields have values' do
+      openstate.cake 'chocolate'
+      openstate.pickle 'donkey'
+      openstate.donut 'strawberry'
+      openstate.validate.should be_true
+    end
+  end
+end

data/spec/spec_setup.rb

@@ -0,0 +1,112 @@
+# encoding: UTF-8
+require 'rspec'
+require 'fileutils'
+require 'tempfile'
+require 'pathname'
+require 'base64'
+require_relative '../lib/rivet'
+
+Rivet::Log.level(Logger::FATAL)
+
+module SpecHelpers
+  AUTOSCALE_DIR      = File.join('.', 'autoscale')
+  CONFIG_FILE        = File.join(AUTOSCALE_DIR, 'unit_test.rb')
+  TEMPLATE_FILE      = File.join(AUTOSCALE_DIR, 'default.erb')
+  BOOTSTRAP_TEMPLATE = '<%= "bar" %>'\
+
+  DSL_VALUES = {
+    :min_size                     => '1',
+    :desired_capacity             => '1',
+    :max_size                     => '3',
+    :region                       => "'us-west-2'",
+    :availability_zones           => '%w(b c a)',
+    :key_name                     => "'UnitTests'",
+    :instance_type                => "'m1.large'",
+    :security_groups              => '%w(unit_test3 unit_tests1 unit_tests2)',
+    :image_id                     => "'ami-12345678'",
+    :iam_instance_profile         => "'unit_test_profile'",
+    :default_cooldown             => '300',
+    :placement_group              => "'unit test placement group'",
+    :health_check_type            => ':ec2',
+    :termination_policies         => '%w(policy2 policy1)',
+    :load_balancers               => '%w(balancer2 balancer1)',
+    :health_check_grace_period    => '100',
+    :associate_public_ip_address  => 'true',
+    :detailed_instance_monitoring => 'true',
+    :block_device_mappings        => "[{:device_name => '/dev/sda1', :virtual_name => 'ephemeral0'}]",
+    :kernel_id                    => "'aki-12345678'",
+    :ramdisk_id                   => "'ari-12345678'",
+    :spot_price                   => "'0.01'",
+    :bootstrap                    => {
+      :template => "'#{TEMPLATE_FILE}'",
+      :foo => "'bar'"
+    }
+  }
+  DSL_CONFIG_CONTENT = DSL_VALUES.inject(String.new) do |a, (k, v)|
+    if k == :bootstrap
+      v.each_pair do |bootstrap_attr, bootstrap_value|
+        a << "bootstrap.#{bootstrap_attr} #{bootstrap_value}\n"
+      end
+    else
+      a << "#{k} #{v}\n"
+    end
+    a
+  end
+
+  AUTOSCALE_IDENTITY_STRING = "bootstrap#{Base64.encode64('unit_test_user_data')}"\
+                              "iam_instance_profile#{Base64.encode64(eval(DSL_VALUES[:iam_instance_profile]))}"\
+                              "image_id#{Base64.encode64(eval(DSL_VALUES[:image_id]))}"\
+                              "instance_type#{Base64.encode64(eval(DSL_VALUES[:instance_type]))}"\
+                              "key_name#{Base64.encode64(eval(DSL_VALUES[:key_name]))}"\
+                              "security_groups#{Base64.encode64(eval(DSL_VALUES[:security_groups]).join("\t"))}"\
+                              "associate_public_ip_address#{Base64.encode64(eval(DSL_VALUES[:associate_public_ip_address]).to_s)}"\
+                              "detailed_instance_monitoring#{Base64.encode64(eval(DSL_VALUES[:detailed_instance_monitoring]).to_s)}"\
+                              "block_device_mappings#{Base64.encode64(eval(DSL_VALUES[:block_device_mappings]).join("\t"))}"\
+                              "kernel_id#{Base64.encode64(eval(DSL_VALUES[:kernel_id]))}"\
+                              "ramdisk_id#{Base64.encode64(eval(DSL_VALUES[:ramdisk_id]))}"\
+                              "spot_price#{Base64.encode64(eval(DSL_VALUES[:spot_price]))}"
+
+  def tempdir_context(name, &block)
+    context name do
+      before do
+        @origin_dir = Dir.pwd
+        @temp_dir = ::Pathname.new(::File.expand_path(::Dir.mktmpdir))
+        Dir.chdir @temp_dir
+      end
+
+      after do
+        Dir.chdir @origin_dir
+        FileUtils.remove_entry(@temp_dir)
+      end
+
+      instance_eval &block
+    end
+  end
+
+  def dsl_from_hash(hash)
+
+
+  end
+
+  def generate_config_mock(mock, attrs)
+    attrs.each_pair do |a, v|
+      if v.respond_to? :each_pair
+        sub_mock = generate_config_mock(double("#{a} mock"), v)
+        mock.stub(a).and_return(sub_mock)
+      else
+        mock.stub(a).and_return(eval(v))
+      end
+    end
+    mock
+  end
+
+  def valid_config?(config, dsl_values)
+    dsl_values.each_pair do |k, v|
+      if v.respond_to? :each_pair
+        valid_config?(config.send(k), v)
+      else
+        config.send(k).should == eval(v)
+      end
+    end
+  end
+end

data/spec/util_spec.rb

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+require_relative './spec_setup'
+
+include SpecHelpers
+
+describe 'rivet utils' do
+  tempdir_context 'with an autoscale directory' do
+    before do
+      FileUtils.mkdir_p AUTOSCALE_DIR
+    end
+
+    context 'without an existing configuration' do
+      describe '#get_config' do
+        it 'should return false' do
+          Rivet::Utils.get_config('unit_test', AUTOSCALE_DIR).should be_false
+        end
+      end
+    end
+
+    context 'with a configuration file' do
+      before do
+        File.open(CONFIG_FILE, 'w') { |f| f.write(DSL_CONFIG_CONTENT) }
+      end
+
+      describe '#get_config' do
+        it 'should return a valid configuration' do
+          config = Rivet::Utils.get_config('unit_test', AUTOSCALE_DIR)
+          valid_config?(config, DSL_VALUES)
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivet
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: Rivet allows you to define autoscaling groups and launch configurations
-  as YAML and can SYNC that to AWS
+  as configuration and SYNC that to AWS
 email:
 - brian.bianco@gmail.com
 executables:
@@ -85,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -92,22 +93,33 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- autoscale/defaults.rb
 - bin/rivet
+- example/autoscale/defaults.rb
+- example/autoscale/example_group.rb
 - lib/rivet.rb
 - lib/rivet/autoscale.rb
+- lib/rivet/aws_autoscale_wrapper.rb
 - lib/rivet/aws_utils.rb
 - lib/rivet/bootstrap.rb
 - lib/rivet/client.rb
+- lib/rivet/config.rb
+- lib/rivet/config_proxy.rb
 - lib/rivet/deep_merge.rb
 - lib/rivet/launch_config.rb
 - lib/rivet/logger.rb
+- lib/rivet/open_state.rb
 - lib/rivet/utils.rb
 - lib/rivet/version.rb
 - rivet.gemspec
-- spec/rivet_bootstrap_spec.rb
-- spec/rivet_launch_config_spec.rb
-- spec/rivet_spec_setup.rb
-- spec/rivet_util_spec.rb
+- spec/aws_autoscale_wrapper_spec.rb
+- spec/bootstrap_spec.rb
+- spec/config_proxy_spec.rb
+- spec/config_spec.rb
+- spec/launch_config_spec.rb
+- spec/open_state_spec.rb
+- spec/spec_setup.rb
+- spec/util_spec.rb
 homepage: http://www.github.com/brianbianco/rivet
 licenses:
 - Apache2
@@ -129,12 +141,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A tool for managing autoscaling groups
 test_files:
-- spec/rivet_bootstrap_spec.rb
-- spec/rivet_launch_config_spec.rb
-- spec/rivet_spec_setup.rb
-- spec/rivet_util_spec.rb
+- spec/aws_autoscale_wrapper_spec.rb
+- spec/bootstrap_spec.rb
+- spec/config_proxy_spec.rb
+- spec/config_spec.rb
+- spec/launch_config_spec.rb
+- spec/open_state_spec.rb
+- spec/spec_setup.rb
+- spec/util_spec.rb

data/spec/rivet_bootstrap_spec.rb

@@ -1,80 +0,0 @@
-require_relative './rivet_spec_setup'
-
-include SpecHelpers
-
-describe 'rivet bootstrap' do
-  let (:bootstrap) { Rivet::Bootstrap.new(SpecHelpers::AUTOSCALE_DEF['bootstrap']) }
-  let (:bootstrap_def) { SpecHelpers::AUTOSCALE_DEF['bootstrap'] }
-
-  tempdir_context 'with all necessary files in place' do
-    before do
-      FileUtils.mkdir_p bootstrap_def['config_dir']
-
-      validator_file = File.join(
-        bootstrap_def['config_dir'],
-        "#{bootstrap_def['environment']}-validator.pem")
-
-      FileUtils.touch(validator_file)
-
-      template_dir = File.join(
-        bootstrap_def['config_dir'],
-        Rivet::Bootstrap::TEMPLATE_SUB_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) }
-    end
-
-    describe "#user_data" do
-      it 'returns a string that contains the chef organization' do
-        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['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
-        run_list = { :run_list => bootstrap_def['run_list'].flatten }.to_json
-        bootstrap.user_data.should =~ /#{Regexp.escape(run_list)}/
-      end
-
-      it 'returns a string that contains each gem to install' do
-        bootstrap_def['gems'].each do |g|
-          if g.size > 1
-            gem_regexp = /gem\s+install\s+#{g[0]}.+#{g[1]}/
-          else
-            gem_regexp = /gem\s+install\s+#{g[0]}/
-          end
-          bootstrap.user_data.should =~ gem_regexp
-        end
-      end
-
-    end
-
-  end
-
-end

data/spec/rivet_launch_config_spec.rb

@@ -1,37 +0,0 @@
-require_relative './rivet_spec_setup'
-
-include SpecHelpers
-
-describe "rivet launch config" do
-  let (:launch_config) { Rivet::LaunchConfig.new(SpecHelpers::AUTOSCALE_DEF) }
-
-  context "with a valid autoscale definition" do
-    before do
-      user_data_mock = double('user_data_mock')
-      user_data_mock.stub(:user_data).and_return("unit_test_user_data")
-      Rivet::Bootstrap.stub(:new).and_return(user_data_mock)
-    end
-
-    describe "#build_identity_string" do
-      it "should return a valid identity_string" do
-        launch_config.send(:build_identity_string).should == SpecHelpers::AUTOSCALE_IDENTITY_STRING
-      end
-    end
-
-    describe "#identity" do
-      it "should return a deterministic identity" do
-        launch_config.identity.should == "rivet_#{Digest::SHA1.hexdigest(SpecHelpers::AUTOSCALE_IDENTITY_STRING)}"
-      end
-    end
-
-    describe "#normalize_security_groups" do
-      it "returns a sorted array of groups" do
-        unsorted_groups = %w(group3 group1 group2)
-        sorted_groups = unsorted_groups.sort
-        returned_groups = launch_config.send(:normalize_security_groups, unsorted_groups)
-        returned_groups.should == sorted_groups
-      end
-    end
-  end
-
-end

data/spec/rivet_spec_setup.rb

@@ -1,68 +0,0 @@
-require 'rspec'
-require 'fileutils'
-require 'tempfile'
-require 'pathname'
-require 'base64'
-require_relative '../lib/rivet'
-
-Rivet::Log.level(Logger::FATAL)
-
-module SpecHelpers
-
- 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' => %w(a b c),
-    'key_name' => 'UnitTests',
-    'instance_type' => 'm1.large',
-    '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',
-      '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']
-    }
-  }
-
-  AUTOSCALE_IDENTITY_STRING = "key_name#{Base64.encode64(AUTOSCALE_DEF['key_name'])}"\
-                              "image_id#{Base64.encode64(AUTOSCALE_DEF['image_id'])}"\
-                              "instance_type#{Base64.encode64(AUTOSCALE_DEF['instance_type'])}"\
-                              "security_groups#{Base64.encode64(AUTOSCALE_DEF['security_groups'].join("\t"))}"\
-                              "iam_instance_profile#{Base64.encode64(AUTOSCALE_DEF['iam_instance_profile'])}"\
-                              "bootstrap#{Base64.encode64('unit_test_user_data')}"\
-
-  def tempdir_context(name, &block)
-    context name do
-      before do
-        @origin_dir = Dir.pwd
-        @temp_dir = ::Pathname.new(::File.expand_path(::Dir.mktmpdir))
-        Dir.chdir @temp_dir
-      end
-
-      after do
-        Dir.chdir @origin_dir
-        FileUtils.remove_entry(@temp_dir)
-      end
-
-      instance_eval &block
-    end
-  end
-end

data/spec/rivet_util_spec.rb

@@ -1,108 +0,0 @@
-require_relative './rivet_spec_setup'
-
-include SpecHelpers
-
-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' => %w(a b c),
-  'key_name' => 'unit_tests',
-  'instance_type' => 'm1.large',
-  'security_groups' => %w(unit_tests),
-  'image_id' => 'ami-unit_tests',
-  'bootstrap' => {
-    'run_list' => ['role[unit_tests]']
-  }
-}
-
-unit_test_definition_hash = {
-  'min_size' => 1,
-  'max_size' => 5,
-  'bootstrap' => {
-    'run_list' => ['role[merging_test']
-  }
-}
-
-describe "rivet utils" do
-  tempdir_context "with an autoscaling directory" do
-    before do
-      FileUtils.mkdir_p AUTOSCALE_DIR
-    end
-
-    describe "consume_defaults" do
-      it "should return false" do
-        Rivet::Utils.consume_defaults(AUTOSCALE_DIR).should be_false
-      end
-    end
-
-    describe "load_definition" do
-      it "should return false" do
-        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)
-      end
-    end
-
-    context "and with a group directory" do
-      before do
-        FileUtils.mkdir_p DEFINITION_DIR
-      end
-
-      describe "load_definition" do
-        it "should return false" do
-          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|
-            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)
-            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|
-              f.write(defaults_hash.to_yaml)
-            end
-          end
-
-          describe "consume_defaults" do
-            it "consume defaults returns a hash" do
-              results = Rivet::Utils.consume_defaults(AUTOSCALE_DIR)
-              defaults_hash.each_pair { |k,v| results.should include(k => v) }
-            end
-          end
-
-         describe "get_definition" do
-           it "returns a merged hash" do
-            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
-         end
-
-        end
-
-      end
-
-    end
-  end
-end