rubber 2.0.0.pre6 → 2.0.0.pre7

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.0.pre6"
+  VERSION = "2.0.0.pre7"
 end
 

data/rubber.gemspec

@@ -28,11 +28,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'capistrano', '>= 2.8.0'
+  s.add_dependency 'capistrano', '~> 2.8'
   s.add_dependency 'thor'
   s.add_dependency 'clamp'
   s.add_dependency 'open4'
-  s.add_dependency 'fog', '>= 1.0.0'
+  s.add_dependency 'fog', '~> 1.2'
   
   s.add_development_dependency('rake')
   s.add_development_dependency('test-unit')

data/templates/base/config/deploy.rb

@@ -33,6 +33,15 @@ set :keep_releases, 3
 # the safety of forcing it to be checked in for production.
 set :push_instance_config, Rubber.env != 'production'
 
+# don't waste time bundling gems that don't need to be there 
+set :bundle_without, [:development, :test, :staging] if Rubber.env == 'production'
+
+# Allow us to do N hosts at a time for all tasks - useful when trying
+# to figure out which host in a large set is down:
+# RUBBER_ENV=production MAX_HOSTS=1 cap invoke COMMAND=hostname
+max_hosts = ENV['MAX_HOSTS'].to_i
+default_run_options[:max_hosts] = max_hosts if max_hosts > 0
+
 # Allows the tasks defined to fail gracefully if there are no hosts for them.
 # Comment out or use "required_task" for default cap behavior of a hard failure
 rubber.allow_optional_tasks(self)
@@ -65,7 +74,19 @@ Dir["#{File.dirname(__FILE__)}/rubber/deploy-*.rb"].each do |deploy_file|
   load deploy_file
 end
 
-after "deploy", "deploy:cleanup"
+# capistrano's deploy:cleanup doesn't play well with FILTER
+after "deploy", "cleanup"
+after "deploy:migrations", "cleanup"
+task :cleanup, :except => { :no_release => true } do
+  count = fetch(:keep_releases, 5).to_i
+  
+  rsudo <<-CMD
+    all=$(ls -x1 #{releases_path} | sort -n);
+    keep=$(ls -x1 #{releases_path} | sort -n | tail -n #{count});
+    remove=$(comm -23 <(echo -e "$all") <(echo -e "$keep"));
+    for r in $remove; do rm -rf #{releases_path}/$r; done;
+  CMD
+end
 
 if Rubber::Util.has_asset_pipeline?
   # load asset pipeline tasks, and reorder them to run after

data/templates/base/config/rubber/deploy-setup.rb

@@ -75,7 +75,7 @@ namespace :rubber do
         if [[ "#{repository}" =~ "@" ]]; then
           # Get host key for src machine to prevent ssh from failing
           rm -f ~/.ssh/known_hosts
-          ! ssh -o 'StrictHostKeyChecking=no' #{repository.gsub(/:.*/, '')} &> /dev/null
+          ssh -o 'StrictHostKeyChecking=no' #{repository.gsub(/:.*/, '')} &> /dev/null || true
         fi
       ENDSCRIPT
     end

data/templates/collectd/config/rubber/role/collectd/collectd-ping.conf

@@ -0,0 +1,21 @@
+<%
+  @path = '/etc/collectd/conf.d/collectd-ping.conf'
+
+  ping_hosts = []
+  if rubber_instances[rubber_env.host].role_names.include?('graphite_server')
+    # monitor all servers from graphite_server
+    ping_hosts = rubber_instances.collect {|ic| ic.full_name }.select {|h| h != rubber_env.full_host }
+  elsif rubber_instances[rubber_env.host].role_names.include?('web_tools')
+    # monitor just graphite_server from tools
+    ping_hosts = [rubber_instances.for_role('graphite_server').first.full_name]
+  end
+
+  @skip = (ping_hosts.size == 0)
+%>
+
+LoadPlugin ping
+<Plugin "ping">
+  <% ping_hosts.each do |h| %>
+  Host "<%= h %>"
+  <% end %>
+</Plugin>

data/templates/collectd/config/rubber/role/collectd/collectd.conf

@@ -64,28 +64,6 @@ LoadPlugin notify_email
 
 <% end %>
 
-<%
-  ping_hosts = []
-  if rubber_instances[rubber_env.host].role_names.include?('graphite_server')
-    # monitor all servers from graphite_server
-    ping_hosts = rubber_instances.collect {|ic| ic.full_name }.select {|h| h != rubber_env.full_host }
-  elsif rubber_instances[rubber_env.host].role_names.include?('web_tools')
-    # monitor just graphite_server from tools
-    ping_hosts = [rubber_instances.for_role('graphite_server').first.full_name]
-  end
-%>
-
-<% if ping_hosts.size > 0 %>
-
-  LoadPlugin ping
-  <Plugin "ping">
-    <% ping_hosts.each do |h| %>
-    Host "<%= h %>"
-    <% end %>
-  </Plugin>
-  
-<% end %>
-
 Include "/etc/collectd/conf.d/*.conf"
 Include "/etc/collectd/thresholds.d/*.conf"
 Include "/etc/collectd/filters.d/*.conf"

data/templates/collectd/script/collectd/role/{resque_worker → web_tools}/global_worker_stats.rb

@@ -1,6 +1,6 @@
 require "resque"
 
-redis_server = Rubber.instances.for_role('redis_slave').first.full_name rescue nil
+redis_server = Rubber.instances.for_role('redis_master').first.full_name rescue nil
 redis_server ||= 'localhost' if Rubber.env == 'development'
 Resque.redis = "#{redis_server}:6379"
 

data/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf

@@ -18,6 +18,9 @@ Listen <%= port %>
 
   SetEnvIf User-Agent "^(.*MSIE.*)|(.*AppleWebKit.*)$" nokeepalive
 
+  # Don't show haproxy checks in access log (see also apache2.conf)
+  SetEnvIf Request_URI "^/httpchk.txt$" dontlog
+
   RailsEnv  <%= Rubber.env %>
 
   XSendFile on
@@ -74,6 +77,9 @@ Listen <%= port %>
   # SSLCertificateFile <%= Rubber.root %>/config/<%= rubber_env.domain %>.crt
   # SSLCertificateKeyFile <%= Rubber.root %>/config/<%= rubber_env.domain %>.key
   # SSLCertificateChainFile /etc/ssl/certs/gd_intermediate_bundle.crt
+
+  SSLHonorCipherOrder On
+  SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
   <% end %>
 
 </VirtualHost>

data/templates/postgresql/config/rubber/role/db/postgresql-sysctl.conf

@@ -4,3 +4,4 @@
 %>
 kernel.shmmax=1610612736
 kernel.shmall=393216
+kernel.sem=2500 320000 320 1280

data/templates/postgresql/config/rubber/role/db/postgresql.conf

@@ -489,7 +489,7 @@ autovacuum = on			# Enable autovacuum subprocess?  'on'
 #statement_timeout = 0			# in milliseconds, 0 is disabled
 #vacuum_freeze_min_age = 50000000
 #vacuum_freeze_table_age = 150000000
-bytea_output = 'hex'			# hex, escape
+#bytea_output = 'hex'			# hex, escape
 #xmlbinary = 'base64'
 #xmloption = 'content'
 

data/templates/postgresql/config/rubber/rubber-postgresql.yml

@@ -10,7 +10,7 @@ postgresql_synchronous_replication: false
 
 # REQUIRED: The command to use to do a full backup of your database using
 #           "rubber util:backup_db"
-db_backup_cmd: "nice sudo -u postgres pg_dumpall -U postgres | gzip -c > %backup_file%"
+db_backup_cmd: "set -e -o pipefail; nice sudo -u postgres pg_dumpall -U postgres | gzip -c > %backup_file%"
 
 # REQUIRED: The command to use to restore the database using
 #           "rake util:restore_db"

data/templates/resque/config/rubber/rubber-resque.yml

@@ -7,14 +7,6 @@ resque_pool_pid_file: /var/run/resque-pool.pid
 #
 resque_worker_count: "#{Rubber.env == 'production' ? 4 : 2}"
 
-resque_workers:
-  -
-    queues: "*"
-    poll_interval: 1
-  -
-    queues: "*"
-    poll_interval: 1
-
 gems: [yajl-ruby, resque, resque-pool]
 
 web_tools_proxies:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre6
+  version: 2.0.0.pre7
   prerelease: 6
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &11348280 !ruby/object:Gem::Requirement
+  requirement: &70150988668160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *11348280
+  version_requirements: *70150988668160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &11347860 !ruby/object:Gem::Requirement
+  requirement: &70150988678560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11347860
+  version_requirements: *70150988678560
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &11347400 !ruby/object:Gem::Requirement
+  requirement: &70150988675800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11347400
+  version_requirements: *70150988675800
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &11346980 !ruby/object:Gem::Requirement
+  requirement: &70150988673100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,21 +55,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11346980
+  version_requirements: *70150988673100
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &11346480 !ruby/object:Gem::Requirement
+  requirement: &70150988696320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *11346480
+  version_requirements: *70150988696320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11346060 !ruby/object:Gem::Requirement
+  requirement: &70150988688640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11346060
+  version_requirements: *70150988688640
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &11361900 !ruby/object:Gem::Requirement
+  requirement: &70150988696640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11361900
+  version_requirements: *70150988696640
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &11361480 !ruby/object:Gem::Requirement
+  requirement: &70150988741240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11361480
+  version_requirements: *70150988741240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &11361060 !ruby/object:Gem::Requirement
+  requirement: &70150988739720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11361060
+  version_requirements: *70150988739720
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &11360640 !ruby/object:Gem::Requirement
+  requirement: &70150988755820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11360640
+  version_requirements: *70150988755820
 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
@@ -221,6 +221,7 @@ files:
 - templates/cassandra/config/rubber/rubber-cassandra.yml
 - templates/cassandra/templates.yml
 - templates/collectd/config/rubber/deploy-collectd.rb
+- templates/collectd/config/rubber/role/collectd/collectd-ping.conf
 - templates/collectd/config/rubber/role/collectd/collectd.conf
 - templates/collectd/config/rubber/role/collectd/filters.conf
 - templates/collectd/config/rubber/role/collectd/thresholds.conf
@@ -236,9 +237,9 @@ files:
 - templates/collectd/script/collectd/role/examples/example_simple.rb
 - templates/collectd/script/collectd/role/postgresql_slave/replication_status.rb
 - templates/collectd/script/collectd/role/redis/redis_info.rb
-- templates/collectd/script/collectd/role/resque_worker/global_worker_stats.rb
 - templates/collectd/script/collectd/role/resque_worker/host_worker_stats.rb
-- templates/collectd/script/collectd/role/resque_worker/resque_jobs_processed.rb
+- templates/collectd/script/collectd/role/web_tools/global_worker_stats.rb
+- templates/collectd/script/collectd/role/web_tools/resque_jobs_processed.rb
 - templates/collectd/templates.yml
 - templates/complete_mongrel_mysql/config/rubber/role/haproxy/haproxy-mongrel.conf
 - templates/complete_mongrel_mysql/config/rubber/role/nginx/nginx-mongrel.conf
@@ -273,7 +274,6 @@ files:
 - templates/graphite/config/rubber/deploy-graphite.rb
 - templates/graphite/config/rubber/role/collectd/graphite-collectd.conf
 - templates/graphite/config/rubber/role/graphite_server/carbon.conf
-- templates/graphite/config/rubber/role/graphite_server/graphite-collectd-ping.conf
 - templates/graphite/config/rubber/role/graphite_server/graphite_server-upstart.conf
 - templates/graphite/config/rubber/role/graphite_server/storage-schemas.conf
 - templates/graphite/config/rubber/role/graphite_web/crontab
@@ -506,7 +506,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3050976247343600522
+      hash: -4342084380980422767
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -515,9 +515,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 1.8.17
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud
   (ec2)
-test_files: []
+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/dns/fog_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/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

data/templates/graphite/config/rubber/role/graphite_server/graphite-collectd-ping.conf

@@ -1,11 +0,0 @@
-<%
-  @path = '/etc/collectd/conf.d/graphite-ping.conf'
-%>
-
-LoadPlugin ping
-
-<Plugin "ping">
-  <% rubber_instances.each do |ic| %>
-  Host "<%= ic.full_name %>"
-  <% end %>
-</Plugin>