rubber 2.0.0.pre1 → 2.0.0.pre2

data/lib/rubber/cloud/fog.rb

@@ -238,26 +238,23 @@ module Rubber
         server = @compute_provider.servers.get(instance_id)
         volume.device = device
         volume.server = server
-        return volume.status
       end
 
       def detach_volume(volume_id, force=true)
         volume = @compute_provider.volumes.get(volume_id)
         force ? volume.force_detach : (volume.server = nil)
-        return volume.status
       end
 
       def describe_volumes(volume_id=nil)
         volumes = []
         opts = {}
-        opts[:volume-id] = volume_id if volume_id
+        opts[:'volume-id'] = volume_id if volume_id
         response = @compute_provider.volumes.all(opts)
         response.each do |item|
           volume = {}
           volume[:id] = item.id
           volume[:status] = item.state
           if item.server_id
-            attach = item.attachmentSet.item[0]
             volume[:attachment_instance_id] = item.server_id
             volume[:attachment_status] = item.attached_at ? "attached" : "waiting"
           end

data/lib/rubber/cloud/fog_storage.rb

@@ -56,7 +56,7 @@ module Rubber
       def multipart_store(key, data, opts={})
         raise "a key is required" unless key && key.size > 0
         
-        opts = {:chunk_size => (5 * 10**6)}.merge(opts)
+        opts = {:chunk_size => (5 * 2**20)}.merge(opts)
   
         chunk = data.read(opts[:chunk_size])
   

data/lib/rubber/dns/fog.rb

@@ -60,7 +60,7 @@ module Rubber
           fqdn << "#{opts[:domain]}"
         end
 
-        hosts = fqdn ? zone.records.find(fqdn) : zone.records.all
+        hosts = fqdn ? (zone.records.find(fqdn) rescue []) : zone.records.all
         hosts.each do |h|
           keep = true
 

data/lib/rubber/dns/zerigo.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'fog'
+require 'rubber/dns/fog'
 
 module Rubber
   module Dns
@@ -7,14 +8,10 @@ module Rubber
     class Zerigo < Fog
 
       def initialize(env)
-        super(env)
-
-        @client = Fog::DNS.new({
-            :provider     => 'zerigo',
-            :zerigo_email => provider_env.email,
-            :zerigo_token => provider_env.token
-          })
+        super(env.merge({"credentials" => { "provider" => 'zerigo', "zerigo_email" => env.email, "zerigo_token" => env.token }}))
       end
-
+    
+    end
+    
   end
 end

data/lib/rubber/recipes/rubber/deploy.rb

@@ -65,7 +65,7 @@ namespace :rubber do
     opts = ""
     opts += " --no_post" if options[:no_post]
     opts += " --force" if options[:force]
-    opts += " --file=#{options[:file]}" if options[:file]
+    opts += " --file=\"#{options[:file]}\"" if options[:file]
 
     # Need to do this so we can work with staging instances without having to
     # checkin instance file between create and bootstrap, as well as during a deploy

data/lib/rubber/recipes/rubber/volumes.rb

@@ -109,7 +109,11 @@ namespace :rubber do
         print "."
         sleep 2
         volume = cloud.describe_volumes(vol_id).first
-        break if volume[:attachment_status] == "attached"
+        if volume[:attachment_status] == "attached"
+          print "."
+          sleep 2
+          break
+        end
       end
       print "\n"
 
@@ -382,7 +386,7 @@ namespace :rubber do
     detach_volume(volume_id)
 
     logger.info "Deleting volume #{volume_id}"
-    cloud.destroy_volume(volume_id)
+    cloud.destroy_volume(volume_id) rescue logger.info("Volume did not exist in cloud")
 
     logger.info "Removing volume #{volume_id} from rubber instances file"
     artifacts = rubber_instances.artifacts

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.0.pre1"
+  VERSION = "2.0.0.pre2"
 end
 

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

@@ -15,7 +15,7 @@ namespace :rubber do
             
       task_name = "_backup_db_#{selected_db_instance.full_name}".to_sym()
       task task_name, :hosts => selected_db_instance.full_name do
-        rsudo "cd #{current_path} && RUBBER_ENV=#{Rubber.env} ./script/rubber util:backup_db --directory=/mnt/db_backups --dbuser=#{rubber_env.db_user} --dbpass=#{rubber_env.db_pass} --dbname=#{rubber_env.db_name} --dbhost=#{rubber_env.db_host}"
+        rsudo "cd #{current_path} && RUBBER_ENV=#{Rubber.env} ./script/rubber util:backup_db --directory=/mnt/db_backups --dbuser=#{rubber_env.db_user} --dbpass=#{rubber_env.db_pass} --dbname=#{rubber_env.db_name} --dbhost=#{selected_db_instance.full_name}"
       end
       send task_name
     end
@@ -31,7 +31,7 @@ namespace :rubber do
       for instance in master_instances+slaves
         task_name = "_restore_db_cloud_#{instance.full_name}".to_sym()
         task task_name, :hosts => instance.full_name do
-          rsudo "cd #{current_path} && RUBBER_ENV=#{Rubber.env} ./script/rubber util:restore_db --filename=#{filename} --dbuser=#{rubber_env.db_user} --dbpass=#{rubber_env.db_pass} --dbname=#{rubber_env.db_name} --dbhost=#{rubber_env.db_host}"
+          rsudo "cd #{current_path} && RUBBER_ENV=#{Rubber.env} ./script/rubber util:restore_db --filename=#{filename} --dbuser=#{rubber_env.db_user} --dbpass=#{rubber_env.db_pass} --dbname=#{rubber_env.db_name} --dbhost=#{instance.full_name}"
         end
         send task_name
       end

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

@@ -17,4 +17,4 @@ web_tools_proxies:
     
 roles:
   graphite_web:
-    packages: [python-django python-django-tagging apache2 libapache2-mod-wsgi python-cairo python-memcache memcached sqlite3 bzr]
+    packages: [python-django python-django-tagging apache2 libapache2-mod-wsgi python-cairo python-memcache memcached sqlite3 bzr zip]

data/templates/munin/config/rubber/role/munin/munin-plugins.conf

@@ -5,7 +5,7 @@
 # munin-node clears out enviroment variables, so we need to add these in
 # to make sure we are running the correct ruby (rvm env vars, plus paths)
 [*]
-<%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i }.each do |k, v| -%>
+<%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i; v != "" }.each do |k, v| -%>
 env.<%= k %> <%= v %>
 <%- end -%>
 env.RUBYOPT rubygems

data/templates/nginx/config/rubber/deploy-nginx.rb

@@ -2,9 +2,22 @@
 namespace :rubber do
 
   namespace :nginx do
-  
+    
     rubber.allow_optional_tasks(self)
     
+    before "rubber:install_packages", "rubber:nginx:install"
+    
+    task :install, :roles => :nginx do
+      # Setup apt sources for current nginx
+      sources = <<-SOURCES
+        deb http://nginx.org/packages/ubuntu/ lucid nginx
+        deb-src http://nginx.org/packages/ubuntu/ lucid nginx
+      SOURCES
+      sources.gsub!(/^ */, '')
+      put(sources, "/etc/apt/sources.list.d/nginx.list")
+      rsudo "wget -qO- http://nginx.org/keys/nginx_signing.key | apt-key add -"  
+    end
+    
     # serial_task can only be called after roles defined - not normally a problem, but
     # rubber auto-roles don't get defined till after all tasks are defined
     on :load do

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

@@ -1,6 +1,6 @@
 <%
   @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-passenger"
-  @post = "a2enmod rewrite && a2enmod ssl && a2ensite #{rubber_env.app_name}-passenger"
+  @post = "a2enmod rewrite && a2enmod ssl && a2enmod expires && a2enmod xsendfile && a2ensite #{rubber_env.app_name}-passenger"
 %>
 
 <% [rubber_env.passenger_listen_port, rubber_env.passenger_listen_ssl_port].each do |port| %>
@@ -20,6 +20,8 @@ Listen <%= port %>
 
   RailsEnv  <%= Rubber.env %>
 
+  XSendFile on
+
   RewriteEngine On
   RewriteCond %{HTTP_HOST} ^<%= rubber_env.domain %>$
   RewriteRule ^(.*)$ http://www.<%= rubber_env.domain %>$1 [R,L]
@@ -29,6 +31,40 @@ Listen <%= port %>
   RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
   RewriteCond %{SCRIPT_FILENAME} !maintenance.html  
   RewriteRule ^.*$ /system/maintenance.html [L]
+
+  <% if Rubber::Util.has_asset_pipeline? %>
+  <LocationMatch "^/assets/.*$">
+    Header unset ETag
+    FileETag None
+
+    # RFC says only cache for 1 year.
+    ExpiresActive On
+    ExpiresDefault "access plus 1 year"
+
+    # Cache the resource even if SSL is in use.
+    Header merge Cache-Control public
+
+    SetEnv no-gzip
+  </LocationMatch>
+
+  # Serve the gzip'd assets directly from disk if they were generated by Sprockets.
+  # This avoids gzipping the asset on the fly by Apache and Sprockets will usually use a higher level
+  # of compression than mod_deflate will, yielding savings all around.
+
+  RewriteCond %{HTTP:Accept-Encoding} \b(x-)?gzip\b
+  RewriteCond <%= Rubber.root + "/public" %>%{REQUEST_FILENAME}.gz -s
+  RewriteRule ^(.+) $1.gz [L]
+
+  <FilesMatch \.css\.gz$>
+    ForceType text/css
+    Header set Content-Encoding gzip
+  </FilesMatch>
+
+  <FilesMatch \.js\.gz$>
+    ForceType text/javascript
+    Header set Content-Encoding gzip
+  </FilesMatch>
+  <% end %>
   
   <% if port == rubber_env.passenger_listen_ssl_port %>
   SSLEngine on

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

@@ -11,6 +11,6 @@ role_dependencies:
 
 roles:
   passenger:
-    packages: [apache2-mpm-prefork, apache2-prefork-dev, libcurl4-openssl-dev]
+    packages: [apache2-mpm-prefork, apache2-prefork-dev, libcurl4-openssl-dev, libapache2-mod-xsendfile]
     gems: [fastthread, rack, [passenger, "#{passenger_version}"]]
 

data/templates/unicorn/config/rubber/role/unicorn/unicorn.rb

@@ -55,7 +55,7 @@ after_fork do |server, worker|
   # drop the workers to www-data:www-data
   begin
     uid, gid = Process.euid, Process.egid
-    user, group = '#{rubber_env.app_user}', '#{rubber_env.app_user}'
+    user, group = '<%=rubber_env.app_user %>', '<%=rubber_env.app_user %>'
     target_uid = Etc.getpwnam(user).uid
     target_gid = Etc.getgrnam(group).gid
     worker.tmp.chown(target_uid, target_gid)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2192938620 !ruby/object:Gem::Requirement
+  requirement: &11447820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2192938620
+  version_requirements: *11447820
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2192937860 !ruby/object:Gem::Requirement
+  requirement: &11451580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2192937860
+  version_requirements: *11451580
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &2192937100 !ruby/object:Gem::Requirement
+  requirement: &11450820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2192937100
+  version_requirements: *11450820
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &2192936520 !ruby/object:Gem::Requirement
+  requirement: &11449680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2192936520
+  version_requirements: *11449680
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2192935880 !ruby/object:Gem::Requirement
+  requirement: &11447780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2192935880
+  version_requirements: *11447780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2192935340 !ruby/object:Gem::Requirement
+  requirement: &11446860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2192935340
+  version_requirements: *11446860
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2192934620 !ruby/object:Gem::Requirement
+  requirement: &11446300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2192934620
+  version_requirements: *11446300
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &2192934040 !ruby/object:Gem::Requirement
+  requirement: &11444960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2192934040
+  version_requirements: *11444960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2192933520 !ruby/object:Gem::Requirement
+  requirement: &15335180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2192933520
+  version_requirements: *15335180
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2192932900 !ruby/object:Gem::Requirement
+  requirement: &15334760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2192932900
+  version_requirements: *15334760
 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
@@ -284,8 +284,8 @@ files:
 - templates/graphite/config/rubber/rubber-graphite.yml
 - templates/graphite/templates.yml
 - templates/graylog/config/initializers/graylog.rb
+- templates/graylog/config/rubber/common/graylog-rsyslog.conf
 - templates/graylog/config/rubber/deploy-graylog.rb
-- templates/graylog/config/rubber/role/common/graylog-rsyslog.conf
 - templates/graylog/config/rubber/role/graylog_server/graylog2.conf
 - templates/graylog/config/rubber/role/graylog_server/graylog_server-upstart.conf
 - templates/graylog/config/rubber/role/graylog_web/crontab
@@ -506,7 +506,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3429804464715076274
+      hash: -3761224985838668413
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -515,43 +515,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 1.8.10
+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/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
+test_files: []