rubber 2.2.0 → 2.2.1

data/.travis.yml

@@ -3,11 +3,12 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - ruby-head
   - jruby-18mode
   - jruby-19mode
   - jruby-head
-#  - rbx-18mode
-#  - rbx-19mode
+  - rbx-18mode
+  - rbx-19mode
 # script: bundle exec rspec spec
 env:
   - JAVA_OPTS="-server -Djruby.cext.enabled=false -Djruby.compile.invokedynamic=false"

data/CHANGELOG

@@ -1,100 +1,77 @@
+
+2.2.1 (02/11/2013)
+------------------
+
+Improvements:
+============
+
+[core] Push alias changes in local instance.yml files to cloud tags <1adebd0>
+[core] Namespaced capistrano role tasks <48fb78e>
+[base] Moved security group configuration to rubber.yml <ccc9f3e>
+
+Bug Fixes:
+=========
+[core] Added support for lambdas in role options for optional tasks <72ff4b9>
+[core] Added support for lambdas in role options for serial tasks <35716a6>
+
+
 2.2.0 (02/08/2013)
 ------------------
 
-[core] Use OpenJDK so encryption tests will pass. <e36ce01>
-[core] Set up the elastic IP when it doesn't match the instance's current external IP <ea960c9>
-[core] Merge pull request #229 from peterson/master <23c0c2b>
-[core] fix reboot behavior <d77ce29>
-[core] net-ssh 2.6 supposedly fixes all the connection problems we've been seeing with 2.5.x. <9b32ecb>
-[core] Merge pull request #247 from zmillman/master <0e26bdd>
-[core] ruby 1.8.7 compatibility <09e64d4>
+New Features:
+============
+
+[core] Switched license to Apache Software License version 2
+[base] Replaced RVM with ruby-build.
+[base] Add ability to obfuscate rubber secret file (MRI only) <c9d8aac>
+[postgresql] basic slave promotion for postgresql <8b96f71>
+[sidekiq] Added a sidekiq template. <bc31d00>
+[solr] Added a Solr 4 template <8a5b041>
+[torquebox] Added support for logging to Graylog2 from TorqueBox. <b2685d5>
+
+Improvements:
+============
+
+[core] Upgraded to net-ssh 2.6, as it supposedly fixes all the connection problems we've been seeing with 2.5.x. <9b32ecb>
 [core] Allow the rubber:start task to start multiple instances <432f95e>
-[core] Fix syntax error in start_instances() <d23ad3c>
-[core] Clean up broken method call <dd90c5f>
-[core] Bugfix: net-ssh requires :keys to be an array, not string <74f10d3>
-[core] Fix threading for start_instances() <a0c3930>
 [core] Allow rubber:stop to manage multiple instances <7dd6ea2>
-[core] Let's see if JRuby 1.8 mode is stable on Travis now. <d0de63a>
-[core] Merge pull request #255 from zmillman/multiple_stop_start <42ac8e6>
-[core] fix 1.8 issue <effd41e>
-[core] Let's see if jruby-head is stable on Travis now. <4d32c6b>
 [core] Improve logging and handling of instance validation <c3e5e9b>
-[core] change license to ASLv2 <9f3915d>
-[core] Moved validation to top of method. <39c3d4e>
-[core] Marked encryption tests as pending in JRuby until we can figure out how to make that work reliably. <2134120>
-[apache] Added missing packages to make SendFile work on Apache. <6c7f84e>
-[base, collectd, mongrel, monit, munin, passenger, passenger_nginx] Replaced RVM with ruby-build. <d98c373>
-[base] Add ability to obfuscate rubber secret file <c9d8aac>
-[base] Bumped up to the latest Ruby 1.9.3 release. <140abd1>
-[base] Fixed a typo. <6c42f11>
-[base] Fixed ruby-build installation. <ddd4337>
-[base] Fixed script name. <0a35524>
-[base] I like punctuation. <c8d6c0f>
-[base] Improved ruby-build stuff based on pull request review. <a07f73a>
-[base] New ruby-build version to pull in a definition for JRuby 1.7.1. <730fc0e>
-[base] Print out ruby compilation status to let the user know what's going on. <c281cf1>
-[base] Removed old, unused RVM options. <bfaba8d>
-[base] Updated ruby-build version and use Ruby 1.9.3-p385 as the default now. <75cb6f4>
-[base] Updated ruby-build version. <00ea48c>
-[base] Updated to the latest ruby-build. <cb38e6a>
-[base] Upgraded ruby-build and use 1.9.3-p327 by default now. <d49d2d3>
-[base] Use the latest ruby-build and bump to the latest MRI release. <430b113>
-[base] bump ruby and ruby-build version <3a8176a>
-[base] fix ruby version detection <ac7ae0b>
-[base] fix ruby-build url <a4c8482>
-[base] fix ruby-build ver <c85364c>
-[base] quote account number to allow for leading 0s <b46b674>
-[base] refactoring, fix jruby tests <0bec484>
-[base] some fixes to ruby-build install <77e3e28>
+[base] Bumped up to the latest Ruby 1.9.3-p385 release. <140abd1>
 [base] update ubuntu ami to latest 12.04, make default instance size c1.medium to improve initial user experience <a270c7b>
-[complete_passenger, complete_passenger_nginx, complete_unicorn_nginx] Merge pull request #233 from messick/remove_db <c5ff221>
 [complete_passenger, complete_passenger_nginx, complete_unicorn_nginx] remove db template dependancy from complete_* templates <5be6300>
-[complete_unicorn_nginx] Merge pull request #230 from messick/unicorn_template_fix <d8144bf>
 [complete_unicorn_nginx] complete_unicorn_nginx template doesn't need haproxy <54faef3>
-[complete_unicorn_nginx] unicorn_nginx template does not exist <52953fa>
 [elasticsearch] Upgraded Elastic Search from 0.19.3 to 0.19.12. <96e5aa0>
-[elasticsearch] new es download url <ed796b7>
 [graphite] Added a monit file for graphite. <87eafab>
 [graphite] Added more control to graphite config. <8a2b84e>
 [graphite] Allow re-mounting the graphite storage directory elsewhere since it can fill the root store rather quickly. <80f5527>
-[graphite] Bugfix: Graphite depends on collectd. <5f7de4a>
 [graphite] Hook up ping data from collectd to graphite. <e8d466b>
-[graphite] Merge pull request #225 from pushcx/master <977e800>
-[graphite] Merge remote-tracking branch 'enthuseinc/feat/uwsgi_graphite' into test <6f6fa3f>
 [graphite] Migrate graphite_web to uwsgi <aaebea8>
-[graphite] Move graphite nginx config to nginx role <c92e8d3>
-[graphite] Removed some obsoleted backport code for graphite setup. <afd7444>
 [graphite] Upgraded graphite from 0.9.9 to 0.9.10. <733937f>
-[graphite] forgot http plugin for uwsgi <a67587d>
-[graphite] remove dependency on apache/nginx by using native http from uwsgi <abd0628>
-[graphite] respawn conflicts with monit <9955657>
 [passenger, torquebox] Be a bit safer about assets & CDNs by default. <197eb93>
-[passenger, torquebox] Make sure the Sidekiq Web interface can load successfully on Apache. <b669c1e>
-[passenger, torquebox] Updated the Sidekiq Web SendFile config to work with any Ruby. <86612de>
 [passenger] bump passenger version <9fde4bf>
-[passenger] passeneger needs to know where ruby is installed by ruby-build <dcb8934>
-[passenger_nginx] fix for ruby-build <9f01743>
-[postgresql] basic slave promotion for postgresql <8b96f71>
 [redis] Upgrade redis from 2.4.16 to 2.4.18. <d1a9e06>
-[resque] resque only has its own roles now, so fix to make sure resque_worker role gets vulcanized <7dbca27>
-[sidekiq] Added a sidekiq template. <bc31d00>
-[sidekiq] Cleanup Sidekiq monit configuration <deffcb7>
-[sidekiq] Merge pull request #228 from enthuseinc/sidekiq <202fa4a>
-[sidekiq] Update Sidekiq configuration <c14c4ee>
-[solr] Merge pull request #246 from klclee/master <32369b0>
-[solr] solr 4 template <8a5b041>
-[sphinx] Merge pull request #235 from JMcG/master <e0663ef>
 [sphinx] Updated sphinx custom_install task to use correct download url and changed version to latest stable release <b61df24>
-[torquebox] Added some missing rubber config values. <31eac16>
-[torquebox] Bootstrap Graylog JAR installation for TorqueBox. <a588cc0>
-[torquebox] Fixed a2ensite command. <a3547c6>
-[torquebox] Make it more evident that this is a junk username & password combo. <dc6067f>
-[torquebox] TorqueBox should not reference Passenger at all. <9db2dff>
-[torquebox] Upgraded from TorqueBox 2.2.0 to 2.3.0. <a95554c>
-[torquebox] Upgraded to TorqueBox 2.2.0 and added support for logging to Graylog2. <b2685d5>
 [torquebox] We no longer need to restart TorqueBox completely on deploy, since the memory leak & deploy race condition requiring it have been removed. <636c78f>
-[zookeeper] Merge pull request #234 from ScotterC/patch-5 <611b40b>
-[zookeeper] Update templates/zookeeper/config/rubber/rubber-zookeeper.yml <dbfd808>
+[torquebox] Upgraded from TorqueBox 2.2.0 to 2.3.0. <a95554c>
+
+Bug Fixes:
+=========
+
+[core] Set up the elastic IP when it doesn't match the instance's current external IP <ea960c9>
+[core] Fix reboot behavior so SSH connections are re-established upon reboot. <d77ce29>
+[core] Fixed some Ruby 1.8.7 compatibility issues.
+[core] Fix syntax error in start_instances() <d23ad3c>
+[core] Clean up broken method call in stopping instances <dd90c5f>
+[core] Bugfix: net-ssh requires :keys to be an array, not string <74f10d3>
+[core] Fix threading for start_instances() <a0c3930>
+[apache] Added missing packages to make SendFile work on Apache. <6c7f84e>
+[base] quote account number to allow for leading 0s in rubber.yml<b46b674>
+[complete_unicorn_nginx] unicorn_nginx template does not exist <52953fa>
+[graphite] Bugfix: Graphite depends on collectd. <5f7de4a>
+[graphite] Move graphite nginx config to nginx role <c92e8d3>
+[resque] resque only has its own roles now, so fix to make sure resque_worker role gets vulcanized <7dbca27>
+[torquebox] TorqueBox should not reference Passenger at all. <9db2dff>
+
 
 2.1.2 (10/05/2012)
 ------------------
@@ -105,16 +82,19 @@ New Features:
 [core] Allowing marking of a config variable as overriding the ones that come before it, so that non-scalar values (lists/maps) get overridden instead of combined <3d66fc8>
 [core] Allow erb in rubber*.yml <60e6394>
 
+
 2.1.1 (10/02/2012)
 ------------------
 
 New Features:
 ============
+
 [base] add ability to override by environment in rubber*.yml <f4c4af3>
 [couchbase, monit] add couchbase template <550dff4>
 
 Improvements:
 ============
+
 [core] Updated sudo_script to sudo to any user. <288ef5d>
 [apache, jenkins] create an apache bootstrap so jenkins template doesn't have to duplicate logic <5862791>
 [complete_passenger, passenger] do a rolling passenger restart by tieing into apache rolling restart <065d757>
@@ -130,6 +110,7 @@ Improvements:
 
 Bug Fixes:
 =========
+
 [core] fix merging of alias records <d314857>
 [core] Refactor to avoid fog deprecation, fixes #222 <43ea42f>
 [core] assign defaults for partial records in rubber-dns.yml when running setup_dns_records <a72a701>
@@ -137,6 +118,7 @@ Bug Fixes:
 [mysql] Delete anonymous MySQL user when bootstrapping the db. Fixes #185 (pull request #212) <ce84ff2>
 [torquebox] Always use the rubber system JRuby with Torquebox. <9c03a02>
 
+
 2.1.0 (08/20/2012)
 ------------------
 
@@ -222,6 +204,7 @@ Bug Fixes:
 
 New Features:
 ============
+
 [torquebox] Initial work on a TorqueBox template. <160557b>
 [torquebox] Merge pull request #154 from wr0ngway/add_torquebox <d750ecb>
 [torquebox] [torquebox] Bumped to TorqueBox 2.0.3 from 2.0.2. <2851768>

data/README.md

@@ -2,6 +2,6 @@ The rubber plugin enables relatively complex multi-instance deployments of
 RubyOnRails applications to Amazon's Elastic Compute Cloud (EC2).
 
 See the documentation in the github wiki for more details:
-http://github.com/wr0ngway/rubber/wiki
+http://github.com/rubber/rubber/wiki
 
-[![Build Status](https://secure.travis-ci.org/wr0ngway/rubber.png)](http://travis-ci.org/wr0ngway/rubber)
+[![Build Status](https://secure.travis-ci.org/rubber/rubber.png)](http://travis-ci.org/rubber/rubber)

data/lib/rubber/commands/vulcanize.rb

@@ -17,17 +17,19 @@ module Rubber
       end
       
       def self.description
-        lines = []
-        line = ""
-        VulcanizeThor.valid_templates.each do |t|
-          line << ", " if line.size > 0
-          line << t
-          if line.size > 55
-            lines << line + ","
-            line = ""
+        # Format templates into comma-separated paragraph with limt of 70 characters per line
+        lines = ['']
+        VulcanizeThor.valid_templates.each do |template_name|
+          line = lines.last
+          if line.size == 0
+            line << template_name
+          elsif line.size + template_name.size > 68
+            line << ','
+            lines << template_name # new line
+          else
+            line << ", " + template_name
           end
         end
-        lines << line if line.size >0
         
         Rubber::Util.clean_indent(<<-EOS
           Prepares the rails application for deploying with rubber by installing a

data/lib/rubber/recipes/rubber.rb

@@ -28,8 +28,10 @@ namespace :rubber do
         # Disable connecting to any Windows instance.
         required_task(name, options.merge(:except => { :platform => 'windows' })) do
           # define empty roles for the case when a task has a role that we don't define anywhere
-          [*options[:roles]].each do |r|
-            roles[r] ||= []
+          unless options[:roles].respond_to?(:call)
+            [*options[:roles]].each do |r|
+              top.roles[r] ||= []
+            end
           end
           
           if find_servers_for_task(current_task).empty?

data/lib/rubber/recipes/rubber/instances.rb

@@ -97,57 +97,66 @@ namespace :rubber do
     start_instances(aliases)
   end
 
+  namespace :roles do
+    rubber.allow_optional_tasks(self)
+    
+    desc <<-DESC
+      Adds the given ROLES to the instance named ALIAS
+    DESC
+    required_task :add do
+      instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
+      roles_string = get_env('ROLES', "Instance roles (e.g. web,app,db:primary=true)", true)
+      
+      instance = rubber_instances[instance_alias]
+      fatal "Instance does not exist: #{instance_alias}" unless instance
+    
+      # Parse roles_string into an Array of roles
+      ir = roles_string.split(/\s*,\s*/).collect{|r| Rubber::Configuration::RoleItem.parse(r)}
+    
+      # Add in roles that the given set of roles depends on
+      ir = Rubber::Configuration::RoleItem.expand_role_dependencies(ir, get_role_dependencies)
+    
+      instance.roles = (instance.roles + ir).uniq
+      rubber_instances.save()
+      logger.info "Roles for #{instance_alias} are now:"
+      logger.info instance.roles.collect(&:to_s).sort.join("\n")
+      logger.info ''
+      logger.info "Run 'cap rubber:bootstrap' if done adding roles"
+    end
+
+    desc <<-DESC
+      Removes the given ROLES from the instance named ALIAS
+    DESC
+    required_task :remove do
+      instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
+      roles_string = get_env('ROLES', "Instance roles (e.g. web,app,db:primary=true)", true)
+      
+      instance = rubber_instances[instance_alias]
+      fatal "Instance does not exist: #{instance_alias}" unless instance
+    
+      # Parse roles_string into an Array of roles
+      ir = roles_string.split(/\s*,\s*/).collect{|r| Rubber::Configuration::RoleItem.parse(r)}
+    
+      instance.roles = (instance.roles - ir).uniq
+      rubber_instances.save()
+      logger.info "Roles for #{instance_alias} are now:"
+      logger.info instance.role_names.sort.join("\n")
+    end
+  end
+  
+  # The :add_role and :remove_role tasks are for backwards-compatibility
   desc <<-DESC
-    Adds the given ROLES to the instance named ALIAS
+    Alias for rubber:roles:add
   DESC
   required_task :add_role do
-    instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
-    r = get_env('ROLES', "Instance roles (e.g. web,app,db:primary=true)", true)
-
-    instance_roles = r.split(/\s*,\s*/)
-
-    ir = []
-    instance_roles.each do |r|
-      role = Rubber::Configuration::RoleItem.parse(r)
-      ir << role
-    end
-
-    # Add in roles that the given set of roles depends on
-    ir = Rubber::Configuration::RoleItem.expand_role_dependencies(ir, get_role_dependencies)
-
-    instance = rubber_instances[instance_alias]
-    fatal "Instance does not exist: #{instance_alias}" unless instance
-
-    instance.roles = (instance.roles + ir).uniq
-    rubber_instances.save()
-    logger.info "Roles for #{instance_alias} are now:"
-    logger.info instance.role_names.sort.join("\n")
-    logger.info ''
-    logger.info "Run 'cap rubber:bootstrap' if done adding roles"
+    rubber.roles.add()
   end
 
   desc <<-DESC
-    Removes the given ROLES from the instance named ALIAS
+    Alias for rubber:roles:remove
   DESC
   required_task :remove_role do
-    instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
-    r = get_env('ROLES', "Instance roles (e.g. web,app,db:primary=true)", true)
-
-    instance_roles = r.split(/\s*,\s*/)
-
-    ir = []
-    instance_roles.each do |r|
-      role = Rubber::Configuration::RoleItem.parse(r)
-      ir << role
-    end
-
-    instance = rubber_instances[instance_alias]
-    fatal "Instance does not exist: #{instance_alias}" unless instance
-
-    instance.roles = (instance.roles - ir).uniq
-    rubber_instances.save()
-    logger.info "Roles for #{instance_alias} are now:"
-    logger.info instance.role_names.sort.join("\n")
+    rubber.roles.remove()
   end
 
   desc <<-DESC
@@ -379,6 +388,9 @@ namespace :rubber do
   def post_refresh
     env = rubber_cfg.environment.bind(nil, nil)
 
+    # update the remote name/environment tags
+    update_tags
+    
     # setup amazon elastic ips if configured to do so
     setup_static_ips
 
@@ -527,11 +539,11 @@ namespace :rubber do
     
     instance_items = aliases.collect do |instance_alias|
       instance_item = rubber_instances[instance_alias]
-      
+
       fatal "Instance does not exist: #{instance_alias}" if ! instance_item
       fatal "Cannot start spot instances!" if ! instance_item.spot_instance_request_id.nil?
       fatal "Cannot start instances with instance-store root device!" if (instance_item.root_device_type != 'ebs')
-      
+
       instance_item
     end
     

data/lib/rubber/recipes/rubber/tags.rb

@@ -6,6 +6,7 @@ namespace :rubber do
   DESC
   required_task :update_tags do
     rubber_instances.each do |ic|
+      logger.info "Updating instance tags for #{ic.name}"
       Rubber::Tag::update_instance_tags(ic.name)
     end
   end

data/lib/rubber/recipes/rubber/utils.rb

@@ -81,48 +81,43 @@ namespace :rubber do
   def serial_task(ns, name, options = {}, &block)
     # first figure out server names for the passed in roles - when no roles
     # are passed in, use all servers
-    serial_roles = Array(options[:roles])
+    
+    serial_roles = Array(options[:roles].respond_to?(:call) ? options[:roles].call() : options[:roles])
     servers = {}
     if serial_roles.empty?
-      all_servers = []
-      self.roles.each do |rolename, serverdefs|
-        all_servers += serverdefs.collect {|server| server.host}
+      all_servers = top.roles.collect do |rolename, serverdefs|
+        serverdefs.collect(&:host)
       end
-      servers[:_serial_all] = all_servers.uniq.sort
+      servers[:_serial_all] = all_servers.flatten.uniq.sort
     else
-      # get servers for each role
-      self.roles.each do |rolename, serverdefs|
+      # Get servers for each role
+      top.roles.each do |rolename, serverdefs|
         if serial_roles.include?(rolename)
-          servers[rolename] ||= []
-          servers[rolename] += serverdefs.collect {|server| server.host}
+          servers[rolename] = serverdefs.collect(&:host)
         end
       end
 
       # Remove duplication of servers - roles which come first in list
       # have precedence, so the servers show up in that group
-      serial_roles.each_with_index do |rolename, i|
-        servers[rolename] ||= []
-        serial_roles[i+1..-1].each do |r|
-          servers[r] -= servers[rolename]
-        end
+      added_servers = []
+      serial_roles.each do |rolename|
+        servers[rolename] -= added_servers
+        added_servers << servers[rolename]
         servers[rolename] = servers[rolename].uniq.sort
       end
     end
 
-    # group each role's servers into slices, but combine slices across roles
+    # group each role's servers into slices and combine
     slices = []
     servers.each do |rolename, svrs|
-      next if svrs.size == 0
       # figure out size of each slice by dividing server count by # of groups
-      slice_size = (Float(svrs.size) / (options.delete(:groups) || 2)).round
-      slice_size = 1 if slice_size == 0
-      slice_idx = 0
-      svrs.each_slice(slice_size) do |srv_slice|
-        slices[slice_idx] ||= []
-        slices[slice_idx] += srv_slice
-        slice_idx += 1
-      end
+      slice_size = (svrs.size.to_f / (options.delete(:groups) || 2)).round
+      slice_size = 1 if slice_size < 1
+      
+      # add servers to slices
+      slices += svrs.each_slice(slice_size).to_a
     end
+    
     # for each slice, define a new task specific to the hosts in that slice
     task_syms = []
     slices.each do |server_group|

data/lib/rubber/util.rb

@@ -86,9 +86,13 @@ module Rubber
     # remove leading whitespace from "here" strings so they look good in code
     # skips empty lines
     def clean_indent(str)
-      counts = str.lines.collect {|l| l.scan(/^\s*/).first.size }
-      m = counts.reject {|x| x <= 1 }.min
-      str.lines.collect {|l| l.size < m ? l : l[m..-1] }.join("")
+      str.lines.collect do |line|
+        if line =~ /\S/ # line has at least one non-whitespace character
+          line.lstrip
+        else
+          line
+        end
+      end.join()
     end
 
     # execute the given block, retrying only when one of the given exceptions is raised

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

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

@@ -136,6 +136,12 @@ cloud_provider: aws
 #
 # instance_storage_backup: "storage:#{cloud_providers.aws.backup_bucket}/RubberInstances_#{app_name}/instance-#{Rubber.env}-#{Time.now.strftime('%Y%m%d-%H%M%S')}.yml"
 
+# OPTIONAL: Default ports for security groups
+web_port: 80
+web_ssl_port: 443
+web_tools_port: 8080
+web_tools_ssl_port: 8443
+
 # OPTIONAL: Define security groups
 # Each security group is a name associated with a sequence of maps where the
 # keys are the parameters to the ec2 AuthorizeSecurityGroupIngress API
@@ -166,9 +172,36 @@ security_groups:
         from_port: 22
         to_port: 22
         source_ips: [0.0.0.0/0]
+  web:
+    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
+    rules:
+      - protocol: tcp
+        from_port: "#{web_port}"
+        to_port: "#{web_port}"
+        source_ips: [0.0.0.0/0]
+      - protocol: tcp
+        from_port: "#{web_ssl_port}"
+        to_port: "#{web_ssl_port}"
+        source_ips: [0.0.0.0/0]
+  web_tools:
+    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
+    rules:
+      - protocol: tcp
+        from_port: "#{web_tools_port}"
+        to_port: "#{web_tools_port}"
+        source_ips: [0.0.0.0/0]
+      - protocol: tcp
+        from_port: "#{web_tools_ssl_port}"
+        to_port: "#{web_tools_ssl_port}"
+        source_ips: [0.0.0.0/0]
 
 # OPTIONAL: The default security groups to create instances with
 assigned_security_groups: [default]
+roles:
+  web:
+    assigned_security_groups: [web]
+  web_tools:
+    assigned_security_groups: [web_tools]
 
 # OPTIONAL: Automatically create security groups for each host and role
 # EC2 doesn't allow one to change what groups an instance belongs to after
@@ -229,10 +262,10 @@ stop_on_error_cmd: "function error_exit { exit 99; }; trap error_exit ERR"
 #           of zones
 # availability_zone: us-east-1a
 
-# OPTIONAL: If you want t use Elastic Block Store (EBS) persistent
+# OPTIONAL: If you want to use Elastic Block Store (EBS) persistent
 # volumes, add them to host specific overrides and they will get created
 # and assigned to the instance.  On initial creation, the volume will get
-# attached _and_ formatted, but if your host disapears and you recreate
+# attached _and_ formatted, but if your host disappears and you recreate
 # it, the volume will only get remounted thereby preserving your data
 #
 # hosts:

data/templates/complete_mongrel_mysql/config/rubber/rubber-complete.yml

@@ -1,41 +1,6 @@
-
 role_dependencies:
   web: [nginx, haproxy]
   app: [mongrel]
   web_tools: [nginx, graphite_server, graphite_web]
 
 haproxy_listen_port: 9000
-web_port: 80
-web_ssl_port: 443
-web_tools_port: 8080
-web_tools_ssl_port: 8443
-
-security_groups:
-  web:
-    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_port}"
-        to_port: "#{web_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_ssl_port}"
-        to_port: "#{web_ssl_port}"
-        source_ips: [0.0.0.0/0]
-  web_tools:
-    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_tools_port}"
-        to_port: "#{web_tools_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_tools_ssl_port}"
-        to_port: "#{web_tools_ssl_port}"
-        source_ips: [0.0.0.0/0]
-
-roles:
-  web:
-    assigned_security_groups: [web]
-  web_tools:
-    assigned_security_groups: [web_tools]

data/templates/complete_passenger/config/rubber/rubber-complete.yml

@@ -1,40 +1,5 @@
-
 role_dependencies:
   web: [haproxy]
   app: [passenger]
   web_tools: [apache, graphite_server, graphite_web]
 
-web_port: 80
-web_ssl_port: 443
-web_tools_port: 8080
-web_tools_ssl_port: 8443
-
-security_groups:
-  web:
-    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_port}"
-        to_port: "#{web_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_ssl_port}"
-        to_port: "#{web_ssl_port}"
-        source_ips: [0.0.0.0/0]
-  web_tools:
-    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_tools_port}"
-        to_port: "#{web_tools_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_tools_ssl_port}"
-        to_port: "#{web_tools_ssl_port}"
-        source_ips: [0.0.0.0/0]
-
-roles:
-  web:
-    assigned_security_groups: [web]
-  web_tools:
-    assigned_security_groups: [web_tools]

data/templates/complete_passenger_nginx/config/rubber/rubber-complete.yml

@@ -2,38 +2,3 @@ role_dependencies:
   web: [haproxy]
   app: [passenger_nginx]
   web_tools: [passenger_nginx]
-
-web_port: 80
-web_ssl_port: 443
-web_tools_port: 8080
-web_tools_ssl_port: 8443
-
-security_groups:
-  web:
-    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_port}"
-        to_port: "#{web_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_ssl_port}"
-        to_port: "#{web_ssl_port}"
-        source_ips: [0.0.0.0/0]
-  web_tools:
-    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_tools_port}"
-        to_port: "#{web_tools_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_tools_ssl_port}"
-        to_port: "#{web_tools_ssl_port}"
-        source_ips: [0.0.0.0/0]
-
-roles:
-  web:
-    assigned_security_groups: [web]
-  web_tools:
-    assigned_security_groups: [web_tools]

data/templates/complete_unicorn_nginx/config/rubber/rubber-complete.yml

@@ -1,38 +1,3 @@
 role_dependencies:
   app: [unicorn]
   web_tools: [nginx]
-
-web_port: 80
-web_ssl_port: 443
-web_tools_port: 8080
-web_tools_ssl_port: 8443
-
-security_groups:
-  web:
-    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_port}"
-        to_port: "#{web_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_ssl_port}"
-        to_port: "#{web_ssl_port}"
-        source_ips: [0.0.0.0/0]
-  web_tools:
-    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_tools_port}"
-        to_port: "#{web_tools_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_tools_ssl_port}"
-        to_port: "#{web_tools_ssl_port}"
-        source_ips: [0.0.0.0/0]
-
-roles:
-  web:
-    assigned_security_groups: [web]
-  web_tools:
-    assigned_security_groups: [web_tools]

data/templates/minimal_passenger_nginx/config/rubber/rubber-complete.yml

@@ -1,37 +1,2 @@
 role_dependencies:
   app: [passenger_nginx]
-
-web_port: 80
-web_ssl_port: 443
-web_tools_port: 8080
-web_tools_ssl_port: 8443
-
-security_groups:
-  web:
-    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_port}"
-        to_port: "#{web_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_ssl_port}"
-        to_port: "#{web_ssl_port}"
-        source_ips: [0.0.0.0/0]
-  web_tools:
-    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
-    rules:
-      - protocol: tcp
-        from_port: "#{web_tools_port}"
-        to_port: "#{web_tools_port}"
-        source_ips: [0.0.0.0/0]
-      - protocol: tcp
-        from_port: "#{web_tools_ssl_port}"
-        to_port: "#{web_tools_ssl_port}"
-        source_ips: [0.0.0.0/0]
-
-roles:
-  web:
-    assigned_security_groups: [web]
-  web_tools:
-    assigned_security_groups: [web_tools]

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require 'rubber'
 Rubber::initialize(File.dirname(__FILE__), 'test')
 
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'shoulda-context'
 require 'pp'
 require 'ap'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -681,7 +681,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1895405216543771761
+      hash: -804077065696695776
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -690,52 +690,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1895405216543771761
+      hash: -804077065696695776
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud
   (ec2)
-test_files:
-- test/cloud/aws_table_store_test.rb
-- test/cloud/aws_test.rb
-- test/cloud/fog_storage_test.rb
-- test/cloud/fog_test.rb
-- test/command_test.rb
-- test/commands/cron_test.rb
-- test/commands/util_test.rb
-- test/dns/aws_test.rb
-- test/dns/zerigo_test.rb
-- test/encryption_test.rb
-- test/environment_test.rb
-- test/fixtures/basic/common/bar.conf
-- test/fixtures/basic/common/foo.conf
-- test/fixtures/basic/host/host1/foo.conf
-- test/fixtures/basic/host/host2/foo.conf
-- test/fixtures/basic/role/role1/foo.conf
-- test/fixtures/basic/role/role2/foo.conf
-- test/fixtures/basic/rubber-extra.yml
-- test/fixtures/basic/rubber.yml
-- test/fixtures/expansion/rubber.yml
-- test/fixtures/generator_order/common/a_first.conf
-- test/fixtures/generator_order/common/z_last.conf
-- test/fixtures/generator_order/host/host1/a_first.conf
-- test/fixtures/generator_order/host/host1/z_last.conf
-- test/fixtures/generator_order/role/role1/a_first.conf
-- test/fixtures/generator_order/role/role1/z_last.conf
-- test/fixtures/generator_order/role/role2/a_first.conf
-- test/fixtures/generator_order/role/role2/z_last.conf
-- test/fixtures/instance_expansion/instance-test.yml
-- test/fixtures/instance_expansion/rubber.yml
-- test/fixtures/nested/rubber.yml
-- test/fixtures/obfuscated/rubber.yml
-- test/fixtures/obfuscated/secret.yml
-- test/fixtures/secret/rubber.yml
-- test/fixtures/secret/secret.yml
-- test/generator_test.rb
-- test/instance_test.rb
-- test/test-rails-template.rb
-- test/test_helper.rb
-- test/util_test.rb
+test_files: []