rivet 1.4.0 → 2.0.0

data/.rubocop.yml

@@ -0,0 +1,18 @@
+AllCops:
+  Excludes:
+    - autoscale/**
+    - example/**
+    - example/autoscale/**
+
+Eval:
+  Enabled: false
+
+LineLength:
+  Enabled: false
+
+HashSyntax:
+  Enabled: false
+
+MethodLength:
+  Max: 25
+

data/.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 rvm:
  - 1.9.3
+ - 2.0.0
+ - 2.1.0
  - rbx-2.1.1
- - rbx-head
+ - rbx-2.2.5
  - jruby-head
 before_install:
-  - rvm get head; rvm use $TRAVIS_RUBY_VERSION --install --binary --fuzzy --debug
   - gem install bundler
-matrix:
-  allow_failures:
-    - rvm: rbx-head
 

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Rivet CHANGELOG
 ===
 
+2.0.0 -
+---
+  * Completely rewrite of the configuration system to use a DSL instead of YAML
+  * Complete overhaul of how generating bootstrap data works.  A user now provides
+    any arbitrary options they please and a template to use.  Rivet will simply
+    render the template with the provided options.
+
 1.4.0 - Released 11/22/13
 ---
   * Adds functionality to apply an elastic_ip durning bootstrap

data/Gemfile.lock

@@ -1,27 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.24.0)
+    aws-sdk (1.33.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4, < 1.6.0)
+      nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     diff-lcs (1.2.5)
     ffi2-generators (0.1.1)
     json (1.8.1)
     json (1.8.1-java)
-    minitest (4.7.5)
-    nokogiri (1.5.10)
-    nokogiri (1.5.10-java)
-    rake (10.1.0)
+    mini_portile (0.5.2)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.1-java)
+      mini_portile (~> 0.5.0)
+    rake (10.1.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rubysl (2.0.12)
+    rspec-mocks (2.14.5)
+    rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -56,7 +58,6 @@ GEM
       rubysl-io-wait (~> 2.0)
       rubysl-ipaddr (~> 2.0)
       rubysl-irb (~> 2.0)
-      rubysl-json (~> 2.0)
       rubysl-logger (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-matrix (~> 2.0)
@@ -89,7 +90,6 @@ GEM
       rubysl-resolv (~> 2.0)
       rubysl-rexml (~> 2.0)
       rubysl-rinda (~> 2.0)
-      rubysl-ripper (~> 2.0)
       rubysl-rss (~> 2.0)
       rubysl-scanf (~> 2.0)
       rubysl-securerandom (~> 2.0)
@@ -102,13 +102,11 @@ GEM
       rubysl-sync (~> 2.0)
       rubysl-syslog (~> 2.0)
       rubysl-tempfile (~> 2.0)
-      rubysl-test-unit (~> 2.0)
       rubysl-thread (~> 2.0)
       rubysl-thwait (~> 2.0)
       rubysl-time (~> 2.0)
       rubysl-timeout (~> 2.0)
       rubysl-tmpdir (~> 2.0)
-      rubysl-tracer (~> 2.0)
       rubysl-tsort (~> 2.0)
       rubysl-un (~> 2.0)
       rubysl-uri (~> 2.0)
@@ -117,36 +115,36 @@ GEM
       rubysl-xmlrpc (~> 2.0)
       rubysl-yaml (~> 2.0)
       rubysl-zlib (~> 2.0)
-    rubysl-abbrev (2.0.2)
+    rubysl-abbrev (2.0.4)
     rubysl-base64 (2.0.0)
-    rubysl-benchmark (2.0.0)
+    rubysl-benchmark (2.0.1)
     rubysl-bigdecimal (2.0.2)
-    rubysl-cgi (2.0.0)
-    rubysl-cgi-session (2.0.0)
+    rubysl-cgi (2.0.1)
+    rubysl-cgi-session (2.0.1)
     rubysl-cmath (2.0.0)
     rubysl-complex (2.0.0)
     rubysl-continuation (2.0.0)
     rubysl-coverage (2.0.3)
-    rubysl-csv (2.0.1)
+    rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
-    rubysl-curses (2.0.0)
+    rubysl-curses (2.0.1)
     rubysl-date (2.0.6)
-    rubysl-delegate (2.0.0)
+    rubysl-delegate (2.0.1)
     rubysl-digest (2.0.3)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
     rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.0)
+    rubysl-erb (2.0.1)
     rubysl-etc (2.0.3)
       ffi2-generators (~> 0.1)
     rubysl-expect (2.0.0)
     rubysl-fcntl (2.0.4)
       ffi2-generators (~> 0.1)
     rubysl-fiber (2.0.0)
-    rubysl-fileutils (2.0.2)
-    rubysl-find (2.0.0)
-    rubysl-forwardable (2.0.0)
+    rubysl-fileutils (2.0.3)
+    rubysl-find (2.0.1)
+    rubysl-forwardable (2.0.1)
     rubysl-getoptlong (2.0.0)
     rubysl-gserver (2.0.0)
       rubysl-socket (~> 2.0)
@@ -155,13 +153,11 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.0.3)
+    rubysl-irb (2.0.4)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-readline (~> 2.0)
       rubysl-thread (~> 2.0)
-      rubysl-tracer (~> 2.0)
-    rubysl-json (2.0.2)
     rubysl-logger (2.0.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
@@ -185,13 +181,13 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.0.3)
+    rubysl-openssl (2.1.0)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.0.4)
     rubysl-pathname (2.0.0)
     rubysl-prettyprint (2.0.2)
-    rubysl-prime (2.0.0)
+    rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
     rubysl-pstore (2.0.0)
@@ -200,8 +196,7 @@ GEM
     rubysl-readline (2.0.2)
     rubysl-resolv (2.0.0)
     rubysl-rexml (2.0.2)
-    rubysl-rinda (2.0.0)
-    rubysl-ripper (2.0.0)
+    rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
     rubysl-securerandom (2.0.0)
@@ -215,14 +210,11 @@ GEM
     rubysl-syslog (2.0.1)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-test-unit (2.0.1)
-      minitest (~> 4.7)
     rubysl-thread (2.0.2)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
     rubysl-tmpdir (2.0.0)
-    rubysl-tracer (2.0.0)
     rubysl-tsort (2.0.1)
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
@@ -231,7 +223,7 @@ GEM
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
     rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.0.3)
+    rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
     uuidtools (2.1.4)
 

data/README.md

@@ -2,9 +2,9 @@
 
 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.)
+Rivet enables you to describe autoscaling groups and their launch configurations as configuration.  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 optionally provide a template and it's options to render as user-data for your launch configurations. 
 
 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.
@@ -56,59 +56,85 @@ Autoscaling group definition directories and files
 
 Example files can be found in the example/ directory in the rivet git repository
 
-Rivet will look in the directory specified on the command line (or ./autoscale by default) for some definitions.  It expects autoscale groups to have a directory named for them
-with a conf.yml inside of it as well as a defaults.yml in whatever directory you use for your autoscaling group definitions.
+Rivet will look in the directory specified on the command line (or ./autoscale by default) for configuration files.  It expects the configuration file name to match the name of the autoscaling group. 
 
 ```
 ./autoscale
-  `- defaults.yml
-     `- <autoscale group name>
-        `- conf.yml
+  `- group_name.rb
 ```
 
-defaults.yml and conf.yml both accept all the same options.  A groups definition will be deep merged over the defaults.
-
-The yaml file format:
-
-```yaml
-min_size: SIZE <integer>
-max_size: SIZE <integer>
-region: AWS_REGION <string>
-availability_zones: [ZONE<string>,ZONE...]
-iam_instance_profile: INSTANCE_PROFILE <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>]
-  run_list:
-    - 'role[example]' <string>
+Configuration DSL
+-------------------------
+
+You can execute any arbitrary ruby you please inside of a rivet configuration.
+
+Rivets built in commands:
+
+path()
+
+- A function that returns the configuration directory path.
+- optionally takes any number of strings as arguments and will return the configuration
+  path with those strings joined to it.
+
+import(PATH)
+
+- A function that allows you to import other rivet configuration files
+
+bootstrap
+
+- provide this with a template file and a set of variables.  The variables will
+be made available to the template file provided.  Rendered, and injected as EC2
+user-data.
+
+Rivet will only use the following attributes.
+
+```
+min_size INTEGER <required>
+max_size INTEGER <required>
+desired_capacity INTEGER <optional, default 0)
+region STRING <required>
+availability_zones ARRAY <required>
+default_cooldown INTEGER <optional, default 300)
+health_check_grace_period INTEGER <optional, default 0)
+health_check_type SYMBOL <optional, default :ec2)
+load_balancers ARRAY <optional, default nil)
+subnet ARRAY <optional, default nil)
+iam_instance_profile STRING <optional, default nil)
+tags ARRAY <optional, default nil)
 
 ```
 
-Availability zones should use the single character of the zone.  The region will be appended by rivet.
+Availability zones should use the single character of the zone ('a', 'b','c').  The region will be appended by rivet.
+
+Tags should be an Array of Hashes with the format:
+{  key: String,
+   value: String,
+   propogate_at_launch: True/False <optional, default True>'}
+
+
+Using the bootstrap functionality
+---------------------------------
+
+Rivet allows you to provide it with an ERB template as well as any number of variables to make
+available to that template.  This will be rendered as user-data for the launch configuration.
+
+The following attribute is required
+
+bootstrap.template <some_path_to_a_template>
+
+You may also provide any number of your own variables to use in the template
+
+```
+bootstrap.my_var "yellow"
+bootstrap.number_of_elves 4
+```
 
-The following files should exist in the configuration directory specified under the bootstrap -> config_dir key:
+Rivet will pass a binding to the template such that you can access these options
+without prepending bootstrap to them.
 
-* A template file (specified by the bootstrap -> template file name)
-* A validator pem (named by the bootstrap -> environment key as <environment>-validator.pem)
+For example
 
+`<%= my_var %>` in your template will render the string 'yellow'.
 
 Usage
 =====
@@ -119,8 +145,7 @@ Usage: rivet [options]
     -l, --log-level [LEVEL]          specify the log level (default is INFO)
     -p, --profile [PROFILE_NAME]     Selects the AWS profile to use (default is 'default')
     -s, --sync                       Sync the changes remotely to AWS
-    -d [PATH],                       The autoscale definitions directory to use (default is ./autoscale)
-        --definitions-directory
+    -c, --config-path [PATH]         The autoscale config path to use (default is ./autoscale)
     -h
 ```
 

data/autoscale/defaults.rb

@@ -0,0 +1,23 @@
+region 'us-west-2'
+availability_zones %w(a b c)
+key_name 'ProdWest20130503'
+instance_type 'm1.xlarge'
+image_id 'ami-d3ce5ee3'
+
+bootstrap.template path('default.erb')
+bootstrap.chef_command '/usr/bin/chef-client -j /etc/chef/first-boot.json -L /root/first_run.log -E prodwest'
+bootstrap.chef_organization 'cmwest'
+bootstrap.chef_username 'ops_prodwest_cm'
+bootstrap.environment 'prodwest'
+bootstrap.region region
+bootstrap.gems 'httparty' => '0.11.0',
+               'net-ssh' => '2.2.2',
+               'net-ssh-gateway' => '1.1.0',
+               'net-ssh-multi' => '1.1',
+               'json' => '1.7.6',
+               'hipchat' => '0.12.0',
+               'rake' => '10.0.4',
+               'bundler' => '1.3.5',
+               'aws-sdk' => '1.30.0',
+               'ohai' => '6.20.0',
+               'chef' => '11.8.0'

data/bin/rivet

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rivet'
-require 'rivet/client'
 
 DEBUG = Logger::DEBUG
 WARN  = Logger::WARN
@@ -10,39 +10,43 @@ FATAL = Logger::FATAL
 INFO  = Logger::INFO
 
 # Default option values
-options = {
-  :log_level => INFO,
-  :profile => 'default',
-  :definitions_directory => './autoscale'
-}
+options             = OpenStruct.new
+options.log_level   = INFO
+options.profile     = 'default'
+options.config_path = File.join('.', 'autoscale')
 
 OptionParser.new do |o|
   o.on('-g', '--group [GROUP_NAME]', String, 'Autoscaling group name') do |g|
-    options[:group] = g
+    options.group = g
   end
 
-  o.on('-l', '--log-level [LEVEL]', String, "specify the log level (default is INFO)") do |l|
-    options[:log_level] = Kernel.const_get l.upcase
+  o.on('-l', '--log-level [LEVEL]', String, 'specify the log level (default is INFO)') do |l|
+    options.log_level = Kernel.const_get l.upcase
   end
 
 
-  o.on('-p', '--profile [PROFILE_NAME]', "Selects the AWS profile to use (default is 'default')") do |p|
-    options[:profile] = p
+  o.on('-p', '--profile [PROFILE_NAME]', 'Selects the AWS profile to use (default is "default")') do |p|
+    options.profile = p
   end
 
-  o.on('-s', '--sync', "Sync the changes remotely to AWS") do |s|
-    options[:sync] = s
+  o.on('-s', '--sync', 'Sync the changes remotely to AWS') do |s|
+    options.sync = s
   end
 
-  o.on('-d', '--definitions-directory [PATH]', "The autoscale definitions directory to use (default is ./autoscale)") do |d|
-    options[:definitions_directory] = d
+  o.on('-c', '--config-path [PATH]', 'The configuration path to use (default is ./autoscale)') do |c|
+    options.config_path = c
   end
 
-  o.on('-h') { puts o; exit }
-  o.parse!
-end
+  o.on('-h') { Rivet::Log.info o; exit }
 
-raise "--group [GROUP_NAME] argument is required!" if options[:group].nil?
+  begin
+    o.parse!
+  rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+    Rivet::Log.fatal $!.to_s
+    Rivet::Log.fatal o
+    exit 255
+  end
+end
 
 Rivet::Client.new.run(options)
 

data/example/autoscale/defaults.rb

@@ -0,0 +1,22 @@
+min_size 0
+max_size 0
+desired_capacity 0
+region 'us-east-2'
+availability_zones %w(a b c)
+key_name 'YourKeyName'
+instance_type 'm1.large'
+security_groups ['group1','group2']
+image_id 'ami-1234567'
+iam_instance_profile 'some_iam_profile'
+
+bootstrap.chef_organization 'YourChefOrg'
+bootstrap.chef_command '/usr/bin/chef-client -j /etc/chef/first-boot.json -L /root/first_run.log'
+bootstrap.template 'default.erb'
+bootstrap.environment 'ChefEnvironment'
+bootstrap.gems [
+  { rake: '10.0.4' }
+  { ohai: '6.16.0' }
+  { chef: '11.6.0' }
+]
+bootstrap.run_list [ 'role[some_chef_role]' ]
+

data/example/autoscale/example_group.rb

@@ -0,0 +1,10 @@
+import path('defaults.rb')
+
+min_size 1
+max_size 3
+desired_capacity 2
+region 'us-west-2'
+tags [ { key: 'Name', value: 'Value' } ]
+
+bootstrap.run_list [ 'role[example]' ]
+