rivet 2.0.0 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 29038451ff7a607f2b7a987620d1b269b5ffad06
+  data.tar.gz: 4fc0b891b7440d8f5dac41bf62100b33f5549c3b
+SHA512:
+  metadata.gz: 7c91c7c5e65035d72314c673626f6402b4995bc7809ca50bf58fc6ed4c2367be11e8a1b69052bcb3f833ada13f7f2486f4a2b95a44fc455fee47029fb7430d4b
+  data.tar.gz: c763546bf997532698826304473fa755d108b8f54d0f991238aa9e4bf4341692ec790812db28715362e7ac9d7ce0f918ae6969bff9608e93ede9b5ae47ee4534

data/.gitignore

@@ -23,6 +23,7 @@ _yardoc
 doc/
 
 autoscale/
+ec2/
 
 bin/*
 !bin/rivet

data/.rubocop.yml

@@ -1,8 +1,8 @@
 AllCops:
-  Excludes:
-    - autoscale/**
-    - example/**
-    - example/autoscale/**
+  Exclude:
+    - autoscale/**/*
+    - example/**/*
+    - example/autoscale/**/*
 
 Eval:
   Enabled: false

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
  - 1.9.3
- - 2.0.0
- - 2.1.0
- - rbx-2.1.1
- - rbx-2.2.5
+ - 2.1.5
+ - rbx-2
  - jruby-head
 before_install:
   - gem install bundler
-
+matrix:
+  allow_failures:
+    - rvm: rbx

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Rivet CHANGELOG
 ===
 
+3.0.0 -
+---
+  * Adds functionality to launch regular EC2 instances
+  * A diff is now displayed for launch configurations
+  * Bug Fix: The tags array is now sorted alphabetically by key (as this is how the SDK
+    seems to return it now)
+
 2.0.0 -
 ---
   * Completely rewrite of the configuration system to use a DSL instead of YAML

data/Gemfile

@@ -3,8 +3,10 @@ source 'https://rubygems.org'
 gem 'rubysl', platform: :rbx
 
 group(:development, :test) do
-  gem 'rake', '>= 10.1.0'
-  gem 'rspec', '~> 2.14.1'
+  gem 'rubocop'
+  gem 'rake',   '>= 10.1.0'
+  gem 'rspec',  '~> 2.14.1'
 end
 
 gem 'aws-sdk',  '>= 1.11.1'
+gem 'diff-lcs', '>= 1.2.5'

data/Gemfile.lock

@@ -1,29 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.33.0)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    aws-sdk (1.59.0)
+      aws-sdk-v1 (= 1.59.0)
+    aws-sdk-v1 (1.59.0)
       json (~> 1.4)
       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)
-    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)
+    mini_portile (0.6.1)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.4.1-java)
+    parser (2.2.0.pre.8)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
+    rainbow (2.0.0)
+    rake (10.4.0)
+    rb-readline (0.5.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-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    rubysl (2.0.15)
+    rspec-mocks (2.14.6)
+    rubocop (0.27.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.7, < 3.0)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.7.0)
+    rubysl (2.1.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -57,7 +73,7 @@ GEM
       rubysl-io-nonblock (~> 2.0)
       rubysl-io-wait (~> 2.0)
       rubysl-ipaddr (~> 2.0)
-      rubysl-irb (~> 2.0)
+      rubysl-irb (~> 2.1)
       rubysl-logger (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-matrix (~> 2.0)
@@ -86,7 +102,6 @@ GEM
       rubysl-pstore (~> 2.0)
       rubysl-pty (~> 2.0)
       rubysl-rational (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-resolv (~> 2.0)
       rubysl-rexml (~> 2.0)
       rubysl-rinda (~> 2.0)
@@ -128,7 +143,7 @@ GEM
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.6)
+    rubysl-date (2.0.8)
     rubysl-delegate (2.0.1)
     rubysl-digest (2.0.3)
     rubysl-drb (2.0.1)
@@ -153,12 +168,12 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.0.4)
+    rubysl-irb (2.1.0)
+      rb-readline (~> 0.5)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-thread (~> 2.0)
-    rubysl-logger (2.0.0)
+    rubysl-logger (2.1.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
@@ -181,21 +196,20 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.1.0)
+    rubysl-openssl (2.2.1)
     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-pathname (2.1.0)
+    rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
     rubysl-pstore (2.0.0)
     rubysl-pty (2.0.2)
     rubysl-rational (2.0.1)
-    rubysl-readline (2.0.2)
-    rubysl-resolv (2.0.0)
-    rubysl-rexml (2.0.2)
+    rubysl-resolv (2.1.0)
+    rubysl-rexml (2.0.4)
     rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
@@ -207,14 +221,14 @@ GEM
     rubysl-stringio (2.0.0)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
-    rubysl-syslog (2.0.1)
+    rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
     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-tmpdir (2.0.1)
     rubysl-tsort (2.0.1)
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
@@ -225,7 +239,7 @@ GEM
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
-    uuidtools (2.1.4)
+    slop (3.6.0)
 
 PLATFORMS
   java
@@ -233,6 +247,8 @@ PLATFORMS
 
 DEPENDENCIES
   aws-sdk (>= 1.11.1)
+  diff-lcs (>= 1.2.5)
   rake (>= 10.1.0)
   rspec (~> 2.14.1)
+  rubocop
   rubysl

data/README.md

@@ -2,9 +2,9 @@
 
 Rivet
 =======
-Rivet enables you to describe autoscaling groups and their launch configurations as configuration.  You can then sync those changes to Amazon Web Services (AWS.)
+Rivet enables you to describe autoscaling groups, their launch configurations, and regular EC2 instances  as configuration.  You can then sync those changes to Amazon Web Services (AWS.)
 
-You optionally provide a template and it's options to render as user-data for your launch configurations. 
+You optionally provide a template and it's options to render as user-data for your launch configurations or EC2 instances. 
 
 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.
@@ -51,16 +51,18 @@ You will still need to specify the region to use in your `AWS_CONFIG_FILE`.
 Rivet will use the [default] profile if you do not specify a profile to use with the -p [--profile] option.
 
 
-Autoscaling group definition directories and files
+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 configuration files.  It expects the configuration file name to match the name of the autoscaling group. 
+Rivet will look in the directory specified on the command line (./autoscale or ./ec2 by default) for configuration files.  It expects the configuration file name to match the name of the autoscaling group or EC2 instance. 
 
 ```
 ./autoscale
-  `- group_name.rb
+  `- name.rb
+./ec2
+  `- name.rb
 ```
 
 Configuration DSL
@@ -88,6 +90,8 @@ user-data.
 
 Rivet will only use the following attributes.
 
+
+Autoscale Options
 ```
 min_size INTEGER <required>
 max_size INTEGER <required>
@@ -101,7 +105,33 @@ load_balancers ARRAY <optional, default nil)
 subnet ARRAY <optional, default nil)
 iam_instance_profile STRING <optional, default nil)
 tags ARRAY <optional, default nil)
+block_device_mapping ARRAY <optional, default nil>
+```
 
+EC2 Options
+```
+count INTEGER <required>
+image_id STRING <required>
+iam_instance_profile STRING <optional>
+block_device_mapping ARRAY <optional>
+monitoring_enabled BOOLEAN <optional>
+availability_zone STRING <optional>
+placement_group STRING <optional>
+key_name STRING <optional>
+security_groups ARRAY <optional>
+security_group_ids ARRAY <optional>
+instance_type STRING <optional>
+kernel_id STRING <optional>
+ramdisk_id STRING <optional>
+disable_api_termination BOOLEAN <optional>
+instance_initiated_shutdown_behavior STRING <optional>
+subnet STRING <optional>
+private_ip_address STRING <optional>
+dedicated_tenancy BOOLEAN <optional>
+ebs_optimized BOOLEAN <optional>
+associate_public_ip_address BOOLEAN <optional>
+elastic_ips ARRAY <optional>
+network_interfaces ARRAY <optional>
 ```
 
 Availability zones should use the single character of the zone ('a', 'b','c').  The region will be appended by rivet.
@@ -111,6 +141,19 @@ Tags should be an Array of Hashes with the format:
    value: String,
    propogate_at_launch: True/False <optional, default True>'}
 
+Block device mappings should be an array of Hashes with the format:
+{
+  virtual_name: String,
+  device_name: String,
+  ebs: {
+    snapshot_id: String
+    volume_size: Integer
+    delete_on_termination: Boolean
+    volume_type: String
+    iops: Integer
+  }
+  no_device: String
+}
 
 Using the bootstrap functionality
 ---------------------------------
@@ -140,8 +183,10 @@ Usage
 =====
 
 ```
-Usage: rivet [options]
-    -g, --group [GROUP_NAME]         Autoscaling group name
+Usage: rivet sub-command [options]
+    sub-commands: ec2, autoscale
+
+    -n, --name [NAME]                Server or Autoscaling group name
     -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
@@ -149,21 +194,27 @@ Usage: rivet [options]
     -h
 ```
 
+launch an ec2 instance
+
+```bash
+rivet ec2 -n example_instance
+```
+
 check the differences for the example_group autoscaling group
 
 ```bash
-rivet -g example_group
+rivet autoscale -n example_group
 ```
 
 check the differences for the example_group using the foobar profile
 
 ```bash
-rivet -g example_group -p foobar
+rivet autoscale -n example_group -p foobar
 ```
 
 sync the differences for the example_group using the foobar profile
 
 ```bash
-rivet -g example_group -p foobar -s
+rivet autoscale -n example_group -p foobar -s
 ```
 

data/bin/rivet

@@ -9,22 +9,23 @@ WARN  = Logger::WARN
 FATAL = Logger::FATAL
 INFO  = Logger::INFO
 
+client_type = ARGV[0]
+
+unless ["ec2","autoscale","-h"].include? client_type
+  Rivet::Utils.die "You must select either 'ec2' or 'autoscale' your first argument"
+end
+
 # Default option values
 options             = OpenStruct.new
 options.log_level   = INFO
 options.profile     = 'default'
-options.config_path = File.join('.', 'autoscale')
+options.config_path = File.join('.', client_type)
 
 OptionParser.new do |o|
-  o.on('-g', '--group [GROUP_NAME]', String, 'Autoscaling group name') do |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
   end
 
-
   o.on('-p', '--profile [PROFILE_NAME]', 'Selects the AWS profile to use (default is "default")') do |p|
     options.profile = p
   end
@@ -33,11 +34,15 @@ OptionParser.new do |o|
     options.sync = s
   end
 
-  o.on('-c', '--config-path [PATH]', 'The configuration path to use (default is ./autoscale)') do |c|
+  o.on('-c', '--config-path [PATH]', 'The configuration path to use (default is ./autoscale or ./ec2)') do |c|
     options.config_path = c
   end
 
-  o.on('-h') { Rivet::Log.info o; exit }
+  o.on('-n', '--name [NAME]', String, 'Server or Autoscaling group name') do |n|
+    options.name = n
+  end
+
+  o.on('-h') { Rivet::Log.info o; exit 0 }
 
   begin
     o.parse!
@@ -48,5 +53,5 @@ OptionParser.new do |o|
   end
 end
 
-Rivet::Client.new.run(options)
+Rivet::Client.new.run(client_type,options)
 

data/example/ec2/defaults.rb

@@ -0,0 +1,6 @@
+region 'us-east-2'
+instance_type 'm1.large'
+security_groups ['group1','group2']
+image_id 'ami-1234567'
+iam_instance_profile 'some_iam_profile'
+key_name 'YourKeyName'

data/example/ec2/example.rb

@@ -0,0 +1,8 @@
+import path('defaults.rb')
+count 1
+template path('user_data.erb')
+availability_zone 'a'
+tags [ { key: 'Name', value: 'example server' } ]
+
+bootstrap.template path('user_data.erb')
+bootstrap.packages ['ruby1.9.1', 'ruby1.9.1-dev', 'build-essential']

data/example/ec2/user_data.erb

@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo apt-get install -y <%= packages.join(' ') %>

data/lib/rivet/{autoscale.rb → as/autoscale.rb}

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+
 module Rivet
   class Autoscale
 
@@ -56,7 +57,7 @@ module Rivet
       !differences.empty?
     end
 
-    def show_differences(level = 'info')
+    def display(level = 'info')
       Rivet::Log.write(level, 'Remote and local match') unless differences?
       differences.each_pair do |attr, values|
         Rivet::Log.write(level, "#{attr}:")
@@ -64,13 +65,25 @@ module Rivet
         Rivet::Log.write(level, "  local:  #{values[:local]}")
       end
      Rivet::Log.write('debug', @launch_config.user_data)
+     display_lc_diff
+    end
+
+    def display_lc_diff
+      @lc_diff ||= get_lc_diff
+
+      Rivet::Log.info"Displaying diff for launch configuration:"
+      @lc_diff.each do |d|
+        d.each do |current|
+          Rivet::Log.info "   #{current.action} #{current.element.join}"
+        end
+      end
     end
 
     def sync
       if differences?
         Rivet::Log.info "Syncing autoscale group changes to AWS for #{@name}"
         autoscale = AWS::AutoScaling.new
-        group = autoscale.groups[@name]
+        group     = autoscale.groups[@name]
 
         @launch_config.save
         create(options) unless group.exists?
@@ -97,7 +110,7 @@ module Rivet
 
       OPTIONS.each do |o|
         remote_value = @remote_group.send(o)
-        local_value = send(o)
+        local_value  = send(o)
 
         if (remote_value != local_value)
           differences[o] = { :local => send(o), :remote => @remote_group.send(o) }
@@ -106,6 +119,23 @@ module Rivet
       differences
     end
 
+    def get_lc_diff
+      autoscale = AWS::AutoScaling.new
+      remote_lc_identity = @remote_group.launch_configuration
+
+      if remote_lc_identity.nil?
+        remote_user_data = ''
+      else
+        remote_lc = autoscale.launch_configurations[remote_lc_identity]
+        remote_user_data = remote_lc.user_data.split("\n")
+      end
+
+      # We split on new lines so the diff doesn't compare by character
+      local_user_data  = @launch_config.user_data.split("\n")
+
+      Diff::LCS.diff(remote_user_data,local_user_data)
+    end
+
     def get_update_options
       options = {}
 
@@ -123,7 +153,6 @@ module Rivet
     end
 
     def create(options)
-
       # When creating an autoscaling group passing empty arrays for subnets
       # or some other fields can cause it to barf.  Remove them first.
       options.delete_if { |k, v| v.respond_to?(:'empty?') && v.empty? }

data/lib/rivet/{config.rb → as/autoscale_config.rb}

@@ -1,21 +1,9 @@
 # encoding: UTF-8
 
 module Rivet
-  class Config < OpenState
-    attr_reader :name
-    attr_accessor :bootstrap
-
-    def self.from_file(dsl_file, load_path='.')
-      name = File.basename(dsl_file, '.rb')
-      data = Proc.new { eval(File.read(dsl_file)) }
-      new(name, load_path, &data)
-    end
+  class AutoscaleConfig < BaseConfig
 
     def initialize(name, load_path='.', &block)
-      super()
-      @name = name
-      @path = load_path
-      @bootstrap = OpenState.new
       @required_fields = {
         :min_size => nil,
         :max_size => nil,
@@ -28,25 +16,13 @@ module Rivet
         :tags => [],
         :termination_policies => ['Default']
       }
-      instance_eval(&block) if block
-    end
-
-    def path(*args)
-      if args.size < 1
-        @path
-      else
-        File.join(@path, *args)
-      end
+      super(name,load_path, &block)
     end
 
     def normalize_availability_zones
       availability_zones.map { |zone| region + zone }.sort
     end
 
-    def normalize_security_groups
-      security_groups.sort
-    end
-
     def normalize_load_balancers
       load_balancers.sort
     end
@@ -75,13 +51,7 @@ module Rivet
         end
         normalized_tags << normalized_hash
       end
-      normalized_tags
-    end
-
-    protected
-
-    def import(import_path)
-      lambda { eval(File.read(import_path)) }.call
+      normalized_tags.sort_by { |h| h[:key] }
     end
   end
 end

data/lib/rivet/{launch_config.rb → as/launch_config.rb}

@@ -5,18 +5,11 @@ module Rivet
 
     ATTRIBUTES = [
       :bootstrap,
-      :iam_instance_profile,
-      :image_id,
-      :instance_type,
-      :key_name,
-      :security_groups,
-      :associate_public_ip_address,
       :detailed_instance_monitoring,
-      :block_device_mappings,
-      :kernel_id,
-      :ramdisk_id,
       :spot_price
-    ].each { |a| attr_reader a }
+    ] + BASE_AWS_ATTRIBUTES
+
+    ATTRIBUTES.each { |a| attr_reader a }
 
     attr_reader :id_prefix, :config
 
@@ -71,7 +64,11 @@ module Rivet
     def build_identity_string
       identity = ATTRIBUTES.inject('') do |accum, attribute|
         if attribute != :bootstrap
-          attr_value = self.send(attribute) ? self.send(attribute) : "\0"
+          attr_value = if self.send(attribute).nil?
+            "\0"
+          else
+            self.send(attribute)
+          end
           attr_value = attr_value.join("\t")  if attr_value.respond_to? :join
           attr_value = attr_value.to_s        if !!attr_value == attr_value
           accum << attribute.to_s