rivet 2.0.0 → 3.0.0

data/spec/shared_examples/a_config.rb

@@ -0,0 +1,98 @@
+# encoding: UTF-8
+
+shared_examples_for "a config" do
+  context 'without DSL content' do
+    describe '#name' do
+      it 'returns the name' do
+        default_config.name.should == 'default_unit_test_config'
+      end
+    end
+
+    describe '#bootstrap' do
+      before do
+        default_config.bootstrap.unit_test 'goat simulator'
+      end
+
+      it 'should allow you to set an arbitrary bootstrap value' do
+        default_config.bootstrap.unit_test.should == 'goat simulator'
+      end
+    end
+
+    describe '#path' do
+      context 'with no arguments' do
+        it 'returns the default . path' do
+          default_config.path.should == '.'
+        end
+      end
+      context 'with an argument' do
+        it 'returns the set path joined with the argument' do
+          default_config.path('test').should == './test'
+        end
+      end
+    end
+
+    describe '#normalize_security_groups' do
+      before do
+        default_config.security_groups %w(group2 group1 group3)
+      end
+
+      it 'should return a sorted array of security groups' do
+        default_config.normalize_security_groups.should == %w(group1 group2 group3)
+      end
+    end
+  end
+
+  context 'with DSL content' do
+    describe '#name' do
+      it 'returns the name' do
+        config.name.should == 'unit_test_config'
+      end
+    end
+
+    describe 'generated attributes' do
+      it 'should contain all the attributes defined in the DSL CONTENT' do
+        dsl_values.each_pair do |k, v|
+          # bootstrap is an attribute of the BaseConfig class, not a generated one
+          unless k == :bootstrap
+            config.generated_attributes.should include(k)
+          end
+        end
+      end
+
+      it 'should have all values properly set according to the DSL CONTENT' do
+        dsl_values.each_pair do |k, v|
+          unless k == :bootstrap
+            config.send(k).should == eval(v)
+          end
+        end
+        if dsl_values.key? :bootstrap
+          dsl_values[:bootstrap].each_pair do |k, v|
+            config.bootstrap.send(k).should == eval(v)
+          end
+        end
+      end
+    end
+  end
+
+  tempdir_context 'with DSL content inside of a file on disk' do
+    before do
+      File.open('unit_test.rb', 'w') { |f| f.write(config_content) }
+    end
+
+    describe '::from_file' do
+      it 'should have all values properly set according to the DSL CONTENT' do
+        dsl_values.each_pair do |k, v|
+          unless k == :bootstrap
+            config_from_file.send(k).should == eval(v)
+          end
+        end
+        if dsl_values.key? :bootstrap
+          dsl_values[:bootstrap].each_pair do |k, v|
+            config_from_file.bootstrap.send(k).should == eval(v)
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/shared_examples/a_config_util.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+
+shared_examples 'a config util' do
+  tempdir_context 'with an existing config directory' do
+
+    before do
+      FileUtils.mkdir_p config_dir
+    end
+
+    context 'without an existing configuration' do
+      describe '#get_config' do
+        it 'should return false' do
+          Rivet::Utils.get_config('autoscale','unit_test', config_dir).should be_false
+        end
+      end
+    end
+
+    context 'with a configuration file' do
+      before do
+        File.open(config_file, 'w') { |f| f.write(config_content) }
+      end
+
+      describe '#get_config' do
+        it 'should return a valid configuration' do
+          config = Rivet::Utils.get_config('autoscale', 'unit_test', config_dir)
+          valid_config?(config, dsl_values)
+        end
+      end
+    end
+
+  end
+end
+

data/spec/spec_setup.rb

@@ -9,62 +9,91 @@ require_relative '../lib/rivet'
 Rivet::Log.level(Logger::FATAL)
 
 module SpecHelpers
+
+  def self.generate_config_content(values)
+    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
+  end
+
   AUTOSCALE_DIR      = File.join('.', 'autoscale')
-  CONFIG_FILE        = File.join(AUTOSCALE_DIR, 'unit_test.rb')
+  ASG_CONFIG_FILE    = File.join(AUTOSCALE_DIR, 'unit_test.rb')
+  EC2_DIR            = File.join('.', 'ec2')
+  EC2_CONFIG_FILE    = File.join(EC2_DIR, 'unit_test.rb')
+
   TEMPLATE_FILE      = File.join(AUTOSCALE_DIR, 'default.erb')
   BOOTSTRAP_TEMPLATE = '<%= "bar" %>'\
 
-  DSL_VALUES = {
+  COMMON_DSL_VALUES = {
+    :iam_instance_profile                 => "'ec2_unit_test_profile'",
+    :block_device_mappings                => "[{:device_name => '/dev/sda1', :virtual_name => 'ephemeral0'}]",
+    :placement_group                      => "'unit test placement group'",
+    :image_id                             => "'ami-12345678'",
+    :key_name                             => "'UnitTests'",
+    :security_groups                      => '%w(unit_test3 unit_tests1 unit_tests2)',
+    :instance_type                        => "'m1.large'",
+    :kernel_id                            => "'aki-12345678'",
+    :ramdisk_id                           => "'ari-12345678'",
+    :associate_public_ip_address          => 'false'
+  }
+
+  EC2_DSL_VALUES = {
+    :count                                => '1',
+    :monitoring_enabled                   => 'true',
+    :availability_zone                    => "'a'",
+    :placement_group                      => "'unit test placement group'",
+    :key_pair                             => "''",
+    :security_group_ids                   => '%w(sg-12345678 sg-01234567 sg-801234567)',
+    :user_data                            => "'ec2 user data'",
+    :disable_api_termination              => 'false',
+    :instance_initiated_shutdown_behavior => "'Stop'",
+    :subnet                               => "'subnet-4292a736'",
+    :private_ip_address                   => "'10.129.64.2'",
+    :dedicated_tenancy                    => 'false',
+    :ebs_optimized                        => 'false',
+  }.merge(COMMON_DSL_VALUES)
+
+  ASG_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
+  }.merge(COMMON_DSL_VALUES)
+
+  ASG_CONFIG_CONTENT = generate_config_content ASG_DSL_VALUES
+  EC2_CONFIG_CONTENT = generate_config_content EC2_DSL_VALUES
 
   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]))}"
+                              "detailed_instance_monitoring#{Base64.encode64(eval(ASG_DSL_VALUES[:detailed_instance_monitoring]).to_s)}"\
+                              "spot_price#{Base64.encode64(eval(ASG_DSL_VALUES[:spot_price]))}" \
+                              "iam_instance_profile#{Base64.encode64(eval(ASG_DSL_VALUES[:iam_instance_profile]))}"\
+                              "block_device_mappings#{Base64.encode64(eval(ASG_DSL_VALUES[:block_device_mappings]).join("\t"))}"\
+                              "image_id#{Base64.encode64(eval(ASG_DSL_VALUES[:image_id]))}"\
+                              "key_name#{Base64.encode64(eval(ASG_DSL_VALUES[:key_name]))}"\
+                              "security_groups#{Base64.encode64(eval(ASG_DSL_VALUES[:security_groups]).join("\t"))}"\
+                              "instance_type#{Base64.encode64(eval(ASG_DSL_VALUES[:instance_type]))}"\
+                              "kernel_id#{Base64.encode64(eval(ASG_DSL_VALUES[:kernel_id]))}"\
+                              "ramdisk_id#{Base64.encode64(eval(ASG_DSL_VALUES[:ramdisk_id]))}"\
+                              "associate_public_ip_address#{Base64.encode64(eval(ASG_DSL_VALUES[:associate_public_ip_address]).to_s)}"
 
   def tempdir_context(name, &block)
     context name do
@@ -83,11 +112,6 @@ module SpecHelpers
     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

data/spec/util_spec.rb

@@ -1,34 +1,27 @@
 # encoding: UTF-8
 require_relative './spec_setup'
+require_relative './shared_examples/a_config_util'
 
 include SpecHelpers
 
-describe 'rivet utils' do
-  tempdir_context 'with an autoscale directory' do
-    before do
-      FileUtils.mkdir_p AUTOSCALE_DIR
-    end
+describe "rivet utils" do
+  context "with client_type set to autoscale" do
 
-    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
+    let(:config_dir) { AUTOSCALE_DIR }
+    let(:config_content) { ASG_CONFIG_CONTENT }
+    let(:config_file) { ASG_CONFIG_FILE }
+    let(:dsl_values) { ASG_DSL_VALUES }
 
-    context 'with a configuration file' do
-      before do
-        File.open(CONFIG_FILE, 'w') { |f| f.write(DSL_CONFIG_CONTENT) }
-      end
+    it_behaves_like "a config util"
+  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
+  context "with client_type set to ec2" do
+    let(:config_dir) { EC2_DIR }
+    let(:config_content) { EC2_CONFIG_CONTENT }
+    let(:config_file) { EC2_CONFIG_FILE }
+    let(:dsl_values) { EC2_DSL_VALUES }
 
+    it_behaves_like "a config util"
   end
+
 end

metadata

@@ -1,78 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rivet
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Brian Bianco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.11.1
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: Rivet allows you to define autoscaling groups and launch configurations
@@ -84,9 +89,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -97,60 +102,75 @@ files:
 - bin/rivet
 - example/autoscale/defaults.rb
 - example/autoscale/example_group.rb
+- example/ec2/defaults.rb
+- example/ec2/example.rb
+- example/ec2/user_data.erb
 - 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/as/autoscale.rb
+- lib/rivet/as/autoscale_config.rb
+- lib/rivet/as/aws_autoscale_wrapper.rb
+- lib/rivet/as/launch_config.rb
+- lib/rivet/common/aws_utils.rb
+- lib/rivet/common/base_aws_attributes.rb
+- lib/rivet/common/base_config.rb
+- lib/rivet/common/bootstrap.rb
+- lib/rivet/common/client.rb
+- lib/rivet/common/config_proxy.rb
+- lib/rivet/common/logger.rb
+- lib/rivet/common/open_state.rb
+- lib/rivet/ec2/ec2.rb
+- lib/rivet/ec2/ec2_config.rb
 - lib/rivet/utils.rb
 - lib/rivet/version.rb
 - rivet.gemspec
-- spec/aws_autoscale_wrapper_spec.rb
+- spec/as/autoscale_config_spec.rb
+- spec/as/aws_autoscale_wrapper_spec.rb
+- spec/aws_utils_spec.rb
+- spec/base_config_spec.rb
 - spec/bootstrap_spec.rb
 - spec/config_proxy_spec.rb
-- spec/config_spec.rb
+- spec/ec2/ec2_config_spec.rb
 - spec/launch_config_spec.rb
 - spec/open_state_spec.rb
+- spec/shared_examples/a_config.rb
+- spec/shared_examples/a_config_util.rb
 - spec/spec_setup.rb
 - spec/util_spec.rb
 homepage: http://www.github.com/brianbianco/rivet
 licenses:
 - Apache2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A tool for managing autoscaling groups
 test_files:
-- spec/aws_autoscale_wrapper_spec.rb
+- spec/as/autoscale_config_spec.rb
+- spec/as/aws_autoscale_wrapper_spec.rb
+- spec/aws_utils_spec.rb
+- spec/base_config_spec.rb
 - spec/bootstrap_spec.rb
 - spec/config_proxy_spec.rb
-- spec/config_spec.rb
+- spec/ec2/ec2_config_spec.rb
 - spec/launch_config_spec.rb
 - spec/open_state_spec.rb
+- spec/shared_examples/a_config.rb
+- spec/shared_examples/a_config_util.rb
 - spec/spec_setup.rb
 - spec/util_spec.rb

data/lib/rivet/deep_merge.rb

@@ -1,29 +0,0 @@
-# encoding: UTF-8
-
-class Hash
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  #
-  #   h1 = { x: { y: [4,5,6] }, z: [7,8,9] }
-  #   h2 = { x: { y: [7,8,9] }, z: 'xyz' }
-  #
-  #   h1.deep_merge(h2) #=> {x: {y: [7, 8, 9]}, z: "xyz"}
-  #   h2.deep_merge(h1) #=> {x: {y: [4, 5, 6]}, z: [7, 8, 9]}
-  #   h1.deep_merge(h2) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
-  #   #=> {:x=>{:y=>[4, 5, 6, 7, 8, 9]}, :z=>[7, 8, 9, "xyz"]}
-  def deep_merge(other_hash, &block)
-    dup.deep_merge!(other_hash, &block)
-  end
-
-  # Same as +deep_merge+, but modifies +self+.
-  def deep_merge!(other_hash, &block)
-    other_hash.each_pair do |k, v|
-      tv = self[k]
-      if tv.is_a?(Hash) && v.is_a?(Hash)
-        self[k] = tv.deep_merge(v, &block)
-      else
-        self[k] = block && tv ? block.call(k, tv, v) : v
-      end
-    end
-    self
-  end
-end