rubber 3.1.0 → 3.2.0

data/lib/rubber/tag.rb

@@ -8,4 +8,4 @@ module Rubber
       Rubber.cloud.create_tags(instance_item.instance_id, :Name => instance_alias, :Environment => Rubber.env)
     end
   end
-end
+end

data/lib/rubber/util.rb

@@ -119,6 +119,14 @@ module Rubber
       str.split('_').map{ |part| part.capitalize }.join
     end
 
+    def is_instance_id?(str)
+      str =~ /^i-[a-z0-9]+$/
+    end
+
+    def is_internet_gateway_id?(str)
+      str =~ /^igw-[a-z0-9]+$/
+    end
+
     extend self
   end
 end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.2.0'.freeze
 end

data/rubber.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh', '~> 2.6'
   s.add_dependency 'thor'
   s.add_dependency 'clamp'
-  s.add_dependency 'fog', '~> 1.6'
+  s.add_dependency 'fog', '< 2.0'
 
   s.add_development_dependency('rake')
   s.add_development_dependency('test-unit')

data/templates/base/config/rubber/rubber.yml

@@ -81,8 +81,39 @@ cloud_providers:
     # OPTIONAL: Needed for backing up database to s3
     # backup_bucket: "#{app_name}-backups"
 
+    # OPTIONAL: Define a VPC to deploy to. The alias can be thought of as a
+    # unique Rubber-specific Id.  If vpc_alias and vpc_addr are absent, Rubber
+    # will instead assume we're deploying to EC2 Classic
+    # vpc_alias: "#{app_name}_#{Rubber.env == 'production' ? 'production' : 'development'}"
+    # vpc_cidr: 10.0.0.0/16
+
+    # VPCs will typically have two subnets - one for instances that need a
+    # direct internet connection (load balancers, etc.), and one for instances
+    # that don't (database servers, app servers, etc.).  At the very least,
+    # we'll need a public subnet.  Rubber will detect the instance's private_nic
+    # configuration, and auto-create a subnet if appropriate.  Any instances on
+    # the public subnet will need the following configuration.  It is also
+    # important to note that AWS VPC Subnets are availability zone-specific,
+    # meaning you probably want to specify an availability zone for your
+    # instance.  You will also have to specify a different subnet_cidr for each
+    # availability zone, since subnets cannot overlap.
+    # private_nic:
+    #   subnet_cidr: '10.0.0.0/24'
+    #   gateway: public
+
+    # For a private subnet, you will need to configure a nat_gateway instance in
+    # the public subnet so that machines can still reach the outside world for
+    # things like software updates.  After configuring a NAT gateway, you can
+    # set up a separate private subnet.  You will also need to set your :gateway
+    # Capistrano configuration value to the full hostname of the nat gateway in
+    # order to communicate with instances on private subnets.  Instances which
+    # are on a private subnet will need the following configuration
+    #  private_nic:
+    #    subnet_cidr: '10.0.1.0/24'
+    #    gateway: "#{rubber_instances.for_role('nat_gateway').first.instance_id}"
+
     # REQUIRED: the ami and instance type for creating instances
-    # The Ubuntu images at http://alestic.com/ work well
+    # The Ubuntu images at http://old.alestic.com/ work well
     # Ubuntu 14.04.1 Trusty instance-store 64-bit: ami-92f569fa
     #
     # m1.small or m1.large or m1.xlarge

data/templates/nat_gateway/config/rubber/role/nat_gateway/nat.sh

@@ -0,0 +1,45 @@
+<%
+  @perms = 0744
+  @path = '/etc/init.d/nat'
+  @post = 'ln -sf /etc/init.d/nat /etc/rc2.d/S90nat && service nat start'
+
+  vpc_cidr = Rubber.config.cloud_providers.aws.vpc_cidr
+%>
+echo -e "\n\nLoading simple rc.firewall-iptables version $FWVER..\n"
+DEPMOD=/sbin/depmod
+MODPROBE=/sbin/modprobe
+
+#======================================================================
+#== No editing beyond this line is required for initial MASQ testing ==
+echo -en "   loading modules: "
+echo "  - Verifying that all kernel modules are ok"
+$DEPMOD -a
+echo "----------------------------------------------------------------------"
+echo -en "ip_tables, "
+$MODPROBE ip_tables
+echo -en "nf_conntrack, "
+$MODPROBE nf_conntrack
+echo -en "nf_conntrack_ftp, "
+$MODPROBE nf_conntrack_ftp
+echo -en "nf_conntrack_irc, "
+$MODPROBE nf_conntrack_irc
+echo -en "iptable_nat, "
+$MODPROBE iptable_nat
+echo -en "nf_nat_ftp, "
+$MODPROBE nf_nat_ftp
+echo "----------------------------------------------------------------------"
+echo -e "   Done loading modules.\n"
+echo "   Enabling forwarding.."
+echo "1" > /proc/sys/net/ipv4/ip_forward
+echo "   Enabling DynamicAddr.."
+echo "1" > /proc/sys/net/ipv4/ip_dynaddr
+echo "   Disabling redirects.."
+echo "0" > /proc/sys/net/ipv4/conf/eth0/send_redirects
+echo "   Clearing any existing NAT rules and setting default policy.."
+
+# Share public Internet connection.
+iptables --table nat --flush
+iptables -t nat -C POSTROUTING -o eth0 -s <%= vpc_cidr %> -j MASQUERADE 2> /dev/null || iptables -t nat -A POSTROUTING -o eth0 -s <%= vpc_cidr %> -j MASQUERADE
+
+echo -e "\nrc.firewall-iptables v$FWVER done.\n"
+

data/templates/nat_gateway/templates.yml

@@ -0,0 +1,2 @@
+description: A NAT gateway tailored to AWS w/ VPC
+

data/test/cloud/aws/classic_test.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.join(__FILE__, '../../..', 'test_helper'))
+require 'rubber/cloud/aws/classic'
+require 'ostruct'
+
+class AwsClassicTest < Test::Unit::TestCase
+
+  context "aws" do
+
+    setup do
+      env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => "us-east-1"}
+      env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
+      @cloud = Rubber::Cloud::Aws::Classic.new(env, nil)
+    end
+
+    should "instantiate" do
+      assert @cloud.compute_provider
+      assert @cloud.storage_provider
+    end
+
+    should "provide storage" do
+      assert @cloud.storage('mybucket')
+    end
+
+    should "provide table store" do
+      assert @cloud.table_store('somekey')
+    end
+
+    should "create instance" do
+      assert @cloud.create_instance('', '', '', '', '', '')
+    end
+
+    should "create instance with opts" do
+      assert @cloud.create_instance('', '', '', '', '', '', :ebs_optimized => true)
+    end
+  end
+
+  context "aws with alternative region" do
+
+    setup do
+      @region = "ap-southeast-2"
+      env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => @region}
+      env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
+      @cloud = Rubber::Cloud::Aws::Classic.new(env, nil)
+    end
+
+    should "set region on compute provider" do
+      assert_equal @cloud.compute_provider.region, @region
+    end
+
+    should "set region on storage provider" do
+      assert_equal @cloud.storage_provider.region, @region
+    end
+  end
+end

data/test/cloud/{aws_table_store_test.rb → aws/table_store_test.rb}

@@ -1,5 +1,5 @@
-require File.expand_path(File.join(__FILE__, '../..', 'test_helper'))
-require 'rubber/cloud/aws_table_store'
+require File.expand_path(File.join(__FILE__, '../../..', 'test_helper'))
+require 'rubber/cloud/aws/table_store'
 
 class AwsTableStoreTest < Test::Unit::TestCase
 
@@ -10,34 +10,34 @@ class AwsTableStoreTest < Test::Unit::TestCase
                                            :aws_secret_access_key => 'YYY')
       @table = 'mytable'
       @provider.create_domain(@table)
-      @table_store = Rubber::Cloud::AwsTableStore.new(@provider, @table)
+      @table_store = Rubber::Cloud::Aws::TableStore.new(@provider, @table)
     end
 
     should "require a table" do
       
       assert_raise do
-        Rubber::Cloud::AwsTableStore.new(@provider, nil)
+        Rubber::Cloud::Aws::TableStore.new(@provider, nil)
       end
 
       assert_raise do
-        Rubber::Cloud::AwsTableStore.new(@provider, "")
+        Rubber::Cloud::Aws::TableStore.new(@provider, "")
       end
       
-      assert Rubber::Cloud::AwsTableStore.new(@provider, @table)
+      assert Rubber::Cloud::Aws::TableStore.new(@provider, @table)
     end
     
     context "ensure_table" do
       
       should "created table if not there" do
         assert_raises { @provider.domain_metadata('sometable') }
-        @table_store = Rubber::Cloud::AwsTableStore.new(@provider, 'sometable')
+        @table_store = Rubber::Cloud::Aws::TableStore.new(@provider, 'sometable')
         assert @provider.domain_metadata('sometable')
       end
       
       should "still work if table already exists" do
         @provider.create_domain('sometable')
         assert @provider.domain_metadata('sometable')
-        @table_store = Rubber::Cloud::AwsTableStore.new(@provider, 'sometable')
+        @table_store = Rubber::Cloud::Aws::TableStore.new(@provider, 'sometable')
         assert @provider.domain_metadata('sometable')
       end
       

data/test/cloud/{aws_test.rb → aws/vpc_test.rb}

@@ -1,15 +1,15 @@
-require File.expand_path(File.join(__FILE__, '../..', 'test_helper'))
-require 'rubber/cloud/aws'
+require File.expand_path(File.join(__FILE__, '../../..', 'test_helper'))
+require 'rubber/cloud/aws/vpc'
 require 'ostruct'
 
-class AwsTest < Test::Unit::TestCase
+class AwsVpcTest < Test::Unit::TestCase
 
   context "aws" do
 
     setup do
       env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => "us-east-1"}
       env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
-      @cloud = Rubber::Cloud::Aws.new(env, nil)
+      @cloud = Rubber::Cloud::Aws::Vpc.new(env, nil)
     end
 
     should "instantiate" do
@@ -40,7 +40,7 @@ class AwsTest < Test::Unit::TestCase
       @region = "ap-southeast-2"
       env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => @region}
       env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
-      @cloud = Rubber::Cloud::Aws.new(env, nil)
+      @cloud = Rubber::Cloud::Aws::Vpc.new(env, nil)
     end
 
     should "set region on compute provider" do

data/test/cloud/digital_ocean_test.rb

@@ -8,13 +8,21 @@ class DigitalOceanTest < Test::Unit::TestCase
 
     setup do
       env = {
-        'client_key' => "XXX",
-        'api_key' => "YYY",
-        'region' => 'New York 1',
-        'key_file' => "#{File.dirname(__FILE__)}/../fixtures/basic/test.pem"
+        'digital_ocean_token' => "XYZ",
+        'region' => 'nyc1',
+        'key_file' => "#{File.dirname(__FILE__)}/../fixtures/basic/test.pem",
+        'key_name' => 'test'
       }
       env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
       @cloud = Rubber::Cloud::DigitalOcean.new(env, nil)
+
+      @cloud.compute_provider.ssh_keys.each do |key|
+        @cloud.compute_provider.delete_ssh_key(key.id)
+      end
+
+      # This is currently (as of 11/2/15) the only valid image name in
+      # Fog's mocked digital ocean images request
+      @valid_image_name = 'Nifty New Snapshot'
     end
 
     should 'instantiate' do
@@ -24,36 +32,36 @@ class DigitalOceanTest < Test::Unit::TestCase
 
     context '#create_instance' do
       should 'create instance' do
-        assert @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64', '512MB', [], '', 'New York 1')
+        assert @cloud.create_instance('my-instance', @valid_image_name, '512MB', [], '', 'nyc1')
       end
 
       should 'create instance with private networking enabled' do
         env = {
-          'client_key' => "XXX",
-          'api_key' => "YYY",
+          'digital_ocean_token' => "XYZ",
           'key_file' => "#{File.dirname(__FILE__)}/../fixtures/basic/test.pem",
+          'key_name' => 'test',
           'private_networking' => true
         }
 
         env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
 
-        assert Rubber::Cloud::DigitalOcean.new(env, nil).create_instance('my-instance', 'Ubuntu 12.04 x64', '512MB', [], '', 'New York 2')
+        assert Rubber::Cloud::DigitalOcean.new(env, nil).create_instance('my-instance', @valid_image_name, '512MB', [], '', 'nyc2')
       end
 
       should 'raise error if region does not support private networking but private networking is enabled' do
         env = {
-          'client_key' => "XXX",
-          'api_key' => "YYY",
+          'digital_ocean_token' => "XYZ",
           'key_file' => "#{File.dirname(__FILE__)}/../fixtures/basic/test.pem",
+          'key_name' => 'test',
           'private_networking' => true
         }
 
         env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
 
         begin
-          Rubber::Cloud::DigitalOcean.new(env, nil).create_instance('my-instance', 'Ubuntu 12.04 x64', '512MB', [], '', 'New York 1')
+          Rubber::Cloud::DigitalOcean.new(env, nil).create_instance('my-instance', @valid_image_name, '512MB', [], '', 'nyc1')
         rescue => e
-          assert_equal 'Private networking is enabled, but region New York 1 does not support it', e.message
+          assert_equal 'Private networking is enabled, but region nyc1 does not support it', e.message
         else
           fail 'Did not raise exception for region that does not support private networking'
         end
@@ -61,9 +69,9 @@ class DigitalOceanTest < Test::Unit::TestCase
 
       should 'raise error if invalid region' do
         begin
-          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64', '512MB', [], '', 'Mars 1')
+          @cloud.create_instance('my-instance', @valid_image_name, '512MB', [], '', 'mars1')
         rescue => e
-          assert_equal 'Invalid region for DigitalOcean: Mars 1', e.message
+          assert_equal 'Invalid region for DigitalOcean: mars1', e.message
         else
           fail 'Did not raise exception for invalid region'
         end
@@ -71,7 +79,7 @@ class DigitalOceanTest < Test::Unit::TestCase
 
       should 'raise an error if invalid image type' do
         begin
-          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64', 'm1.small', [], '', 'New York 1')
+          @cloud.create_instance('my-instance', @valid_image_name, 'm1.small', [], '', 'nyc1')
         rescue => e
           assert_equal 'Invalid image type for DigitalOcean: m1.small', e.message
         else
@@ -81,7 +89,7 @@ class DigitalOceanTest < Test::Unit::TestCase
 
       should 'raise an error if invalid image name' do
         begin
-          @cloud.create_instance('my-instance', 'Windows Server 2003', '512MB', [], '', 'New York 1')
+          @cloud.create_instance('my-instance', 'Windows Server 2003', '512MB', [], '', 'nyc1')
         rescue => e
           assert_equal 'Invalid image name for DigitalOcean: Windows Server 2003', e.message
         else
@@ -91,11 +99,15 @@ class DigitalOceanTest < Test::Unit::TestCase
 
       should 'raise an error if no remote SSH key and local key_file is bad' do
         begin
-          env = {'client_key' => "XXX", 'api_key' => "YYY", 'region' => 'New York 1'}
+          env = {
+            'digital_ocean_token' => "XYZ",
+            'region' => 'nyc1',
+            'key_name' => 'test'
+          }
           env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
           cloud = Rubber::Cloud::DigitalOcean.new(env, nil)
 
-          cloud.create_instance('my-instance', 'Ubuntu 12.04 x64', '512MB', [], '', 'New York 1')
+          cloud.create_instance('my-instance', @valid_image_name, '512MB', [], '', 'New York 1')
         rescue => e
           assert_equal 'Missing key_file for DigitalOcean', e.message
         else
@@ -108,7 +120,13 @@ class DigitalOceanTest < Test::Unit::TestCase
   context 'digital ocean with aws storage' do
 
     setup do
-      env = {'client_key' => "XXX", 'api_key' => "YYY", 'region' => 'New York 1', 'key_file' => "#{File.dirname(__FILE__)}/../fixtures/basic/test.pem"}
+      env = {
+        'digital_ocean_token' => "xyz",
+        'region' => 'nyc1',
+        'key_file' => "#{File.dirname(__FILE__)}/../fixtures/basic/test.pem",
+        'key_name' => 'test'
+      }
+
       @aws_region = "ap-southeast-2"
       env['cloud_providers'] = {'aws' => {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => @aws_region}}
       env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)

data/test/instance_test.rb

@@ -199,7 +199,7 @@ class InstanceTest < Test::Unit::TestCase
       setup do
         env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => "us-east-1"}
         env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
-        @cloud = Rubber::Cloud::Aws.new(env, nil)
+        @cloud = Rubber::Cloud::Aws::Classic.new(env, nil)
         @cloud.storage_provider.put_bucket('bucket')
         Rubber.stubs(:cloud).returns(@cloud)
       end

metadata

@@ -1,185 +1,163 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - Matt Conway
 - Kevin Menard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
-  type: :runtime
+  name: capistrano
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-  type: :runtime
+  name: net-ssh
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: thor
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: clamp
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
+        version: '2.0'
+  name: fog
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: test-unit
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: shoulda-context
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: mocha
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: awesome_print
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    The rubber plugin enables relatively complex multi-instance deployments
-  of RubyOnRails applications to\n    Amazon's Elastic Compute Cloud (EC2).  Like
-  capistrano, rubber is role based, so you can define a set\n    of configuration
-  files for a role and then assign that role to as many concrete instances as needed.
-  One\n    can also assign multiple roles to a single instance. This lets one start
-  out with a single ec2 instance\n    (belonging to all roles), and add new instances
-  into the mix as needed to scale specific facets of your\n    deployment, e.g. adding
-  in instances that serve only as an 'app' role to handle increased app server load.\n"
+description: |2
+      The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to
+      Amazon's Elastic Compute Cloud (EC2).  Like capistrano, rubber is role based, so you can define a set
+      of configuration files for a role and then assign that role to as many concrete instances as needed. One
+      can also assign multiple roles to a single instance. This lets one start out with a single ec2 instance
+      (belonging to all roles), and add new instances into the mix as needed to scale specific facets of your
+      deployment, e.g. adding in instances that serve only as an 'app' role to handle increased app server load.
 email:
 - matt@conwaysplace.com
 - nirvdrum@gmail.com
@@ -188,8 +166,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.1.8.7
@@ -201,12 +179,16 @@ files:
 - lib/capistrano/find_servers_for_task_fix.rb
 - lib/capistrano/hostcmd.rb
 - lib/capistrano/thread_safety_fix.rb
+- lib/ext/fog/compute/digital_ocean_v2.rb
 - lib/rubber.rb
 - lib/rubber/capistrano.rb
 - lib/rubber/cli.rb
 - lib/rubber/cloud.rb
 - lib/rubber/cloud/aws.rb
-- lib/rubber/cloud/aws_table_store.rb
+- lib/rubber/cloud/aws/base.rb
+- lib/rubber/cloud/aws/classic.rb
+- lib/rubber/cloud/aws/table_store.rb
+- lib/rubber/cloud/aws/vpc.rb
 - lib/rubber/cloud/base.rb
 - lib/rubber/cloud/digital_ocean.rb
 - lib/rubber/cloud/fog.rb
@@ -243,6 +225,7 @@ files:
 - lib/rubber/recipes/rubber/tags.rb
 - lib/rubber/recipes/rubber/utils.rb
 - lib/rubber/recipes/rubber/volumes.rb
+- lib/rubber/recipes/rubber/vpcs.rb
 - lib/rubber/tag.rb
 - lib/rubber/thread_safe_proxy.rb
 - lib/rubber/util.rb
@@ -514,6 +497,8 @@ files:
 - templates/mysql_proxy/config/rubber/mysql_proxy/mysql-proxy.lua
 - templates/mysql_proxy/config/rubber/rubber-mysql_proxy.yml
 - templates/mysql_proxy/templates.yml
+- templates/nat_gateway/config/rubber/role/nat_gateway/nat.sh
+- templates/nat_gateway/templates.yml
 - templates/newrelic/config/rubber/deploy-newrelic.rb
 - templates/newrelic/config/rubber/role/newrelic/monit-newrelic.conf
 - templates/newrelic/config/rubber/rubber-newrelic.yml
@@ -641,8 +626,9 @@ files:
 - templates/zookeeper/config/rubber/role/zookeeper/zookeeper-upstart.conf
 - templates/zookeeper/config/rubber/rubber-zookeeper.yml
 - templates/zookeeper/templates.yml
-- test/cloud/aws_table_store_test.rb
-- test/cloud/aws_test.rb
+- test/cloud/aws/classic_test.rb
+- test/cloud/aws/table_store_test.rb
+- test/cloud/aws/vpc_test.rb
 - test/cloud/digital_ocean_test.rb
 - test/cloud/fog_storage_test.rb
 - test/cloud/fog_test.rb
@@ -686,30 +672,25 @@ files:
 - test/util_test.rb
 homepage: https://github.com/rubber/rubber
 licenses: []
-post_install_message: 
+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.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1794893249450792958
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23.2
-signing_key: 
-specification_version: 3
-summary: A capistrano plugin for managing multi-instance deployments to the cloud
-  (ec2)
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
+specification_version: 4
+summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)
 test_files: []