rubber 1.1.6 → 1.1.7

data/CHANGELOG

@@ -1,3 +1,18 @@
+1.1.7
+-----
+
+Merge branch 'master' of github.com:wr0ngway/rubber <cb39353> [Matt Conway]
+fix for new security group param name in amazon-ec2 <a9f9b19> [Matt Conway]
+Only raise an exception if there's a problem. <890837b> [nirvdrum]
+Merge remote branch 'nirvdrum/resque2' <09fd5b8> [Matt Conway]
+Merge remote branch 'nirvdrum/master' <0c99d7d> [Matt Conway]
+use rubygems for crontab too <08d1d51> [Matt Conway]
+munin needs a mailer for notifications <d933a8c> [Matt Conway]
+Switched to the Jetty Hightide distribution to get JSP, JTA, and a few other niceties. <6d1b1a9> [Kevin Menard]
+Bumped passenger version. <79feda0> [Kevin Menard]
+Allow a configurable number of resque workers. <0587b40> [Kevin Menard]
+Added support for resque. <67ae003> [Kevin Menard]
+
 1.1.6
 -----
 

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf

@@ -59,4 +59,8 @@ Listen <%= rubber_env.web_tools_ssl_port %>
     ProxyHTMLURLMap / /monit_<%= ic.name %>/
   <% end %>
   
+  <% if resque_host = rubber_instances.for_role('resque').first %>
+    RackBaseURI /resque
+  <% end %>
+  
 </VirtualHost>

data/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-index.html

@@ -24,6 +24,10 @@
       <% rubber_instances.sort {|a,b| a.name <=> b.name }.each do |ic| %>
           <li><a href="/monit_<%= ic.name %>/">Monit <%= ic.name %></a></li>
       <% end %>
+      
+      <% if resque_host = rubber_instances.for_role('resque').first %>
+          <li><a href="/resque/">Resque</a></li>
+      <% end %>
 
 		</ul>
 	</body>

data/generators/vulcanize/templates/base/config/rubber/common/crontab

@@ -8,6 +8,7 @@ MAILTO=<%= rubber_env.admin_email %>
 # don't need to set RUBBER_ENV for each script since we set it for all cron here
 RUBBER_ENV=<%= RUBBER_ENV %>
 RAILS_ENV=<%= RUBBER_ENV %>
+RUBYOPT=rubygems
 
 # Roll all rails logs at midnight
 0 0 * * * LOG_DIR=<%= RUBBER_ROOT %>/log <%= RUBBER_ROOT %>/script/cron-rake rubber:rotate_logs

data/generators/vulcanize/templates/jetty/config/rubber/deploy-jetty.rb

@@ -9,23 +9,26 @@ namespace :rubber do
     
     task :custom_install, :roles => :jetty do
       rubber.sudo_script 'install_jetty', <<-ENDSCRIPT
-        if [[ -z `ls #{rubber_env.jetty_dir} 2> /dev/null` ]]; then
-          wget -q http://ftp.osuosl.org/pub/eclipse/jetty/#{rubber_env.jetty_version}/dist/jetty-distribution-#{rubber_env.jetty_version}.tar.gz
-          tar -zxf jetty-distribution-#{rubber_env.jetty_version}.tar.gz
+        if [[ -z `ls #{rubber_env.jetty_prefix}/jetty-hightide-#{rubber_env.jetty_version} 2> /dev/null` ]]; then
+          wget -q http://dist.codehaus.org/jetty/jetty-hightide-7.0.0/jetty-hightide-#{rubber_env.jetty_version}.tar.gz
+          tar -zxf jetty-hightide-#{rubber_env.jetty_version}.tar.gz
           
           # Install to appropriate location.
-          mv jetty-distribution-#{rubber_env.jetty_version} #{rubber_env.jetty_prefix}
-          ln -s #{rubber_env.jetty_prefix}/jetty-distribution-#{rubber_env.jetty_version} #{rubber_env.jetty_dir}
+          mv jetty-hightide-#{rubber_env.jetty_version} #{rubber_env.jetty_prefix}
+          rm -f #{rubber_env.jetty_dir}
+          ln -s #{rubber_env.jetty_prefix}/jetty-hightide-#{rubber_env.jetty_version} #{rubber_env.jetty_dir}
           chmod 744 #{rubber_env.jetty_dir}/bin/*.sh
           
           # Cleanup the jetty distribution
-          rm #{rubber_env.jetty_dir}/webapps/*
+          rm -r #{rubber_env.jetty_dir}/webapps/*
           rm -r #{rubber_env.jetty_dir}/contexts/test.d/
-          mv #{rubber_env.jetty_dir}/contexts/demo.xml #{rubber_env.jetty_dir}/contexts/demo.xml.example
-          mv #{rubber_env.jetty_dir}/contexts/javadoc.xml #{rubber_env.jetty_dir}/contexts/javadoc.xml.example
-          
+
+          for file in #{rubber_env.jetty_dir}/contexts/*.xml; do
+            mv $file $file.example
+          done
+
           # Cleanup after ourselves.
-          rm jetty-distribution-#{rubber_env.jetty_version}.tar.gz
+          rm jetty-hightide-#{rubber_env.jetty_version}.tar.gz
         fi
       ENDSCRIPT
     end

data/generators/vulcanize/templates/munin/config/rubber/rubber-munin.yml

@@ -1,6 +1,6 @@
 # Uses admin_email from base
 
-packages: [munin-node, munin-plugins-extra]
+packages: [munin-node, munin-plugins-extra, mailx]
 
 roles:
   web_tools:

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

@@ -1,4 +1,4 @@
-passenger_version: 2.2.5
+passenger_version: 2.2.8
 passenger_root: "#{ruby_prefix}/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{ruby_prefix}/bin/ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"

data/generators/vulcanize/templates/resque/config/rubber/deploy-resque-worker-default.rb

@@ -0,0 +1,38 @@
+namespace :rubber do
+  
+  namespace :resque_worker_default do
+    
+    rubber.allow_optional_tasks(self)
+    
+    before "deploy:stop", "rubber:resque_worker_default:stop"
+    after "deploy:start", "rubber:resque_worker_default:start"
+    after "deploy:restart", "rubber:resque_worker_default:restart"
+    
+    desc "Starts default resque worker"
+    task :start, :roles => :resque_worker_default do
+      as = fetch(:runner, "app")
+      via = fetch(:run_method, :sudo)
+      rubber_env.resque_worker_default_count.times do |i|
+        invoke_command "sh -c 'cd #{current_path}; RAILS_ENV=#{rails_env} QUEUE=* nohup rake resque:work &> log/resque_worker_default_#{i}.log & echo $! > tmp/pids/resque_worker_default_#{i}.pid'", :via => via, :as => as
+      end
+    end
+
+    desc "Stops default resque worker"
+    task :stop, :roles => :resque_worker_default do
+      as = fetch(:runner, "app")
+      via = fetch(:run_method, :sudo)
+      rubber_env.resque_worker_default_count.times do |i|
+        invoke_command "sh -c 'cd #{current_path} && kill `cat tmp/pids/resque_worker_default_#{i}.pid` && rm -f tmp/pids/resque_worker_default_#{i}.pid; exit 0;'", :via => via, :as => as
+      end
+
+      sleep 11 #wait for process to finish
+    end
+
+    desc "Restarts default resque worker"
+    task :restart, :roles => :resque_worker_default do
+      rubber.resque_worker_default.stop
+      rubber.resque_worker_default.start
+    end
+  end
+
+end

data/generators/vulcanize/templates/resque/config/rubber/deploy-resque.rb

@@ -0,0 +1,39 @@
+
+namespace :rubber do
+
+  namespace :resque do
+  
+    rubber.allow_optional_tasks(self)
+  
+    after "rubber:install_packages", "rubber:resque:custom_install"
+    
+    task :custom_install, :roles => :resque do
+      rubber.sudo_script 'install_resque', <<-ENDSCRIPT
+        if [ -d resque ]; then
+          rm -r resque
+        fi
+
+        git clone git://github.com/defunkt/resque.git
+
+        if [ -d #{rubber_env.resque_web_dir} ]; then
+          rm -r #{rubber_env.resque_web_dir}
+        fi
+
+        mkdir -p #{rubber_env.resque_web_dir}
+        mkdir #{rubber_env.resque_web_dir}/tmp
+        mv resque/config.ru #{rubber_env.resque_web_dir}
+        mv resque/lib/resque/server/* #{rubber_env.resque_web_dir}/
+
+        rm -f /var/www/resque
+        ln -s #{rubber_env.resque_web_dir}/public /var/www/resque
+      ENDSCRIPT
+    end
+
+    after "rubber:setup_app_permissions", "rubber:resque:setup_resque_permissions"
+
+    task :setup_resque_permissions, :roles => :resque do
+      run "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.resque_web_dir}/config.ru"
+    end
+    
+  end
+end

data/generators/vulcanize/templates/resque/config/rubber/role/resque_worker_default/monit-resque_worker_default.conf

@@ -0,0 +1,19 @@
+<%
+  @path = '/etc/monit/monit.d/monit-resque_worker_default.conf'
+%>
+
+<% rubber_env.resque_worker_default_count.times do |i| %>
+  <%
+    PIDFILE = "#{RUBBER_ROOT}/tmp/pids/resque_worker_default_#{i}.pid"
+
+    start_program = "/usr/bin/sudo -u #{rubber_env.app_user} sh -c 'cd #{RUBBER_ROOT}; RAILS_ENV=#{RUBBER_ENV} QUEUE=* nohup rake resque:work &> log/resque_worker_default_#{i}.log & echo $! > tmp/pids/resque_worker_default_#{i}.pid'"
+    stop_program  = "/usr/bin/sudo -u #{rubber_env.app_user} sh -c 'cd #{RUBBER_ROOT} && kill `cat tmp/pids/resque_worker_default_#{i}.pid` && rm -f tmp/pids/resque_worker_default_#{i}.pid'"
+  %>
+
+  check process resque_worker_default_<%= i %> with pidfile <%= PIDFILE %>
+    group resque_worker_default
+    start program = "<%= start_program %>"
+    stop program = "<%= stop_program %>"
+
+    if totalmem > 200.0 MB for 5 cycles then restart
+<% end %>

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

@@ -0,0 +1,10 @@
+resque_web_dir: /opt/resque
+
+resque_worker_default_count: 5
+
+role_dependencies:
+  css_validator: [redis]
+
+roles:
+  resque:
+    gems: [redis redis-namespace yajl-ruby sinatra resque]

data/generators/vulcanize/templates/resque/templates.yml

@@ -0,0 +1,3 @@
+description: The resque background queue system
+dependent_templates:
+  - redis

data/lib/rubber/cloud/aws.rb

@@ -17,7 +17,7 @@ module Rubber
 
 
       def create_instance(ami, ami_type, security_groups, availability_zone)
-        response = @ec2.run_instances(:image_id => ami, :key_name => @aws_env.key_name, :instance_type => ami_type, :group_id => security_groups, :availability_zone => availability_zone)
+        response = @ec2.run_instances(:image_id => ami, :key_name => @aws_env.key_name, :instance_type => ami_type, :security_group => security_groups, :availability_zone => availability_zone)
         instance_id = response.instancesSet.item[0].instanceId
         return instance_id
       end
@@ -255,7 +255,7 @@ module Rubber
 
       def destroy_image(image_id)
         image = describe_images(image_id).first
-        raise "Could not find image: #{image_id}, aborting destroy_image"
+        raise "Could not find image: #{image_id}, aborting destroy_image" if image.nil?
         image_location = image[:location]
         bucket = image_location.split('/').first
         image_name = image_location.split('/').last.gsub(/\.manifest\.xml$/, '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -05:00
+date: 2009-12-22 00:00:00 -05:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.7.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
@@ -219,6 +219,11 @@ files:
 - generators/vulcanize/templates/redis/config/rubber/role/redis/redis.conf
 - generators/vulcanize/templates/redis/config/rubber/rubber-redis.yml
 - generators/vulcanize/templates/redis/templates.yml
+- generators/vulcanize/templates/resque/config/rubber/deploy-resque-worker-default.rb
+- generators/vulcanize/templates/resque/config/rubber/deploy-resque.rb
+- generators/vulcanize/templates/resque/config/rubber/role/resque_worker_default/monit-resque_worker_default.conf
+- generators/vulcanize/templates/resque/config/rubber/rubber-resque.yml
+- generators/vulcanize/templates/resque/templates.yml
 - generators/vulcanize/templates/sphinx/config/rubber/common/sphinx.yml
 - generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb
 - generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/crontab