rubber 1.5.1 → 1.5.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.5.1
+-----
+
+Fixed a problem with installing gems listed in environment.rb. <aa2b516> [Kevin Menard]
+
 1.5.0
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

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

@@ -4,5 +4,5 @@
 <% PIDFILE = "/var/run/apache2.pid" %>
 check process apache with pidfile <%= PIDFILE %>
   group apache-<%= RUBBER_ENV %>
-  start program = "/usr/sbin/service apache2 start"
-  stop program = "/usr/sbin/service apache2 stop"
+  start program = "/usr/bin/env service apache2 start"
+  stop program = "/usr/bin/env service apache2 stop"

data/generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf

@@ -3,6 +3,6 @@
 %>
 
 check process postfix with pidfile /var/spool/postfix/pid/master.pid
-  start program  "/usr/sbin/service postfix start"
-  stop program  "/usr/sbin/service postfix stop"
+  start program  "/usr/bin/env service postfix start"
+  stop program  "/usr/bin/env service postfix stop"
   if 5 restarts within 5 cycles then timeout

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

@@ -4,6 +4,6 @@
 <% PIDFILE = "/var/run/haproxy.pid" %>
 check process haproxy with pidfile <%= PIDFILE %>
   group haproxy-<%= RUBBER_ENV %>
-  start program = "/usr/sbin/service haproxy start"
-  stop program = "/usr/sbin/service haproxy stop"
+  start program = "/usr/bin/env service haproxy start"
+  stop program = "/usr/bin/env service haproxy stop"
   if failed host <%= rubber_env.host %> port <%= rubber_env.haproxy_monitor_port %> with timeout 10 seconds for 10 cycles then restart

data/generators/vulcanize/templates/munin/config/rubber/common/monit-munin.conf

@@ -3,6 +3,6 @@
 %>
 
 check process munin-node with pidfile /var/run/munin/munin-node.pid
-  start program  "/usr/sbin/service munin-node start"
-  stop program  "/usr/sbin/service munin-node stop"
+  start program  "/usr/bin/env service munin-node start"
+  stop program  "/usr/bin/env service munin-node stop"
   if 5 restarts within 5 cycles then timeout

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

@@ -80,7 +80,7 @@ namespace :rubber do
               logger.info "Creating slave from a dump of master #{source_host}"
               rubber.sudo_script "create_slave_db_from_master", <<-ENDSCRIPT
                 mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}' #{master_pass}"
-                mysqldump -u #{env.db_user} --password #{env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password ' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
               ENDSCRIPT
             else
               logger.info "Creating slave from a dump of slave #{source_host}"

data/generators/vulcanize/templates/mysql/config/rubber/role/db/monit-mysql.cnf

@@ -4,7 +4,7 @@
 
 check process mysql with pidfile /var/run/mysqld/mysqld.pid
    group mysql-<%= RUBBER_ENV %>
-   start program = "/usr/sbin/service mysql restart"
-   stop program = "/usr/sbin/service mysql stop"
+   start program = "/usr/bin/env service mysql restart"
+   stop program = "/usr/bin/env service mysql stop"
    if failed host 127.0.0.1 port 3306 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/generators/vulcanize/templates/mysql_cluster/config/rubber/role/mysql_sql/monit-mysql_cluster_sql.cnf

@@ -4,7 +4,7 @@
 
 check process mysql_cluster_sql with pidfile /var/lib/mysql/<%= rubber_env.full_host %>.pid
    group mysql_cluster_sql-<%= RUBBER_ENV %>
-   start program = "/usr/sbin/service mysql start"
-   stop program = "/usr/sbin/service mysql stop"
+   start program = "/usr/bin/env service mysql start"
+   stop program = "/usr/bin/env service mysql stop"
    if failed host 127.0.0.1 port 3306 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/generators/vulcanize/templates/mysql_proxy/config/rubber/common/monit-mysql_proxy.cnf

@@ -4,7 +4,7 @@
 
 check process mysql_proxy with pidfile /var/run/mysql-proxy.pid
    group mysql_proxy-<%= RUBBER_ENV %>
-   start program = "/usr/sbin/service mysql-proxy start"
-   stop program = "/usr/sbin/service mysql-proxy stop"
+   start program = "/usr/bin/env service mysql-proxy start"
+   stop program = "/usr/bin/env service mysql-proxy stop"
    if failed host 127.0.0.1 port 4040 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

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

@@ -4,5 +4,5 @@
 <% PIDFILE = "/var/run/nginx.pid" %>
 check process nginx with pidfile <%= PIDFILE %>
   group nginx-<%= RUBBER_ENV %>
-  start program = "/usr/sbin/service nginx start"
-  stop program = "/usr/sbin/service nginx stop"
+  start program = "/usr/bin/env service nginx start"
+  stop program = "/usr/bin/env service nginx stop"

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

@@ -23,7 +23,7 @@ postgresql_conf_dir: "/etc/postgresql/#{postgresql_ver}/main"
 postgresql_data_dir: /mnt/postgresql/data
 postgresql_archive_dir: /mnt/postgresql/archive
 postgresql_pid_file: "/var/run/postgresql/#{postgresql_ver}-main.pid"
-postgresql_ctl: "/usr/sbin/service postgresql-#{postgresql_ver}"
+postgresql_ctl: "/usr/bin/env service postgresql-#{postgresql_ver}"
 
 # Capistrano needs db:primary role for migrate to work,
 # so we might as well just make consistent across the board

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

@@ -8,7 +8,7 @@
 
 check process resque_web with pidfile <%= PIDFILE %>
   group resque_web
-  start program = "bash -l -c '<%= start_program %>'"
-  stop program = "bash -l -c '<%= stop_program %>'"
+  start program = "/bin/bash -l -c '<%= start_program %>'"
+  stop program = "/bin/bash -l -c '<%= stop_program %>'"
 
   if totalmem > 350.0 MB for 15 cycles then restart

data/generators/vulcanize/vulcanize_generator.rb

@@ -26,8 +26,11 @@ if Rubber::Util::is_rails2?
         raise Rails::Generator::UsageError.new("Invalid template #{name}, use one of #{valid_templates.join(', ')}")
       end
 
+      @template_dependencies ||= []
+
       templ_conf = load_template_config(sp)
       deps = templ_conf['dependent_templates'] || []
+      @template_dependencies.concat(deps)
       deps.each do |dep|
         apply_template(m, dep)
       end
@@ -55,7 +58,6 @@ if Rubber::Util::is_rails2?
         end
       end
 
-      puts extra_generator_steps_file
       if File.exist? extra_generator_steps_file
         eval File.read(extra_generator_steps_file), binding, extra_generator_steps_file
       end

data/lib/generators/vulcanize/templates/apache/config/rubber/role/apache/monit-apache.conf

@@ -4,5 +4,5 @@
 <% PIDFILE = "/var/run/apache2.pid" %>
 check process apache with pidfile <%= PIDFILE %>
   group apache-<%= RUBBER_ENV %>
-  start program = "/usr/sbin/service apache2 start"
-  stop program = "/usr/sbin/service apache2 stop"
+  start program = "/usr/bin/env service apache2 start"
+  stop program = "/usr/bin/env service apache2 stop"

data/lib/generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf

@@ -3,6 +3,6 @@
 %>
 
 check process postfix with pidfile /var/spool/postfix/pid/master.pid
-  start program  "/usr/sbin/service postfix start"
-  stop program  "/usr/sbin/service postfix stop"
+  start program  "/usr/bin/env service postfix start"
+  stop program  "/usr/bin/env service postfix stop"
   if 5 restarts within 5 cycles then timeout

data/lib/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/monit-haproxy.conf

@@ -4,6 +4,6 @@
 <% PIDFILE = "/var/run/haproxy.pid" %>
 check process haproxy with pidfile <%= PIDFILE %>
   group haproxy-<%= RUBBER_ENV %>
-  start program = "/usr/sbin/service haproxy start"
-  stop program = "/usr/sbin/service haproxy stop"
+  start program = "/usr/bin/env service haproxy start"
+  stop program = "/usr/bin/env service haproxy stop"
   if failed host <%= rubber_env.host %> port <%= rubber_env.haproxy_monitor_port %> with timeout 10 seconds for 10 cycles then restart

data/lib/generators/vulcanize/templates/munin/config/rubber/common/monit-munin.conf

@@ -3,6 +3,6 @@
 %>
 
 check process munin-node with pidfile /var/run/munin/munin-node.pid
-  start program  "/usr/sbin/service munin-node start"
-  stop program  "/usr/sbin/service munin-node stop"
+  start program  "/usr/bin/env service munin-node start"
+  stop program  "/usr/bin/env service munin-node stop"
   if 5 restarts within 5 cycles then timeout

data/lib/generators/vulcanize/templates/mysql/config/rubber/deploy-mysql.rb

@@ -80,7 +80,7 @@ namespace :rubber do
               logger.info "Creating slave from a dump of master #{source_host}"
               rubber.sudo_script "create_slave_db_from_master", <<-ENDSCRIPT
                 mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}' #{master_pass}"
-                mysqldump -u #{env.db_user} --password #{env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password ' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
               ENDSCRIPT
             else
               logger.info "Creating slave from a dump of slave #{source_host}"

data/lib/generators/vulcanize/templates/mysql/config/rubber/role/db/monit-mysql.cnf

@@ -4,7 +4,7 @@
 
 check process mysql with pidfile /var/run/mysqld/mysqld.pid
    group mysql-<%= RUBBER_ENV %>
-   start program = "/usr/sbin/service mysql restart"
-   stop program = "/usr/sbin/service mysql stop"
+   start program = "/usr/bin/env service mysql restart"
+   stop program = "/usr/bin/env service mysql stop"
    if failed host 127.0.0.1 port 3306 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/lib/generators/vulcanize/templates/mysql_cluster/config/rubber/role/mysql_sql/monit-mysql_cluster_sql.cnf

@@ -4,7 +4,7 @@
 
 check process mysql_cluster_sql with pidfile /var/lib/mysql/<%= rubber_env.full_host %>.pid
    group mysql_cluster_sql-<%= RUBBER_ENV %>
-   start program = "/usr/sbin/service mysql start"
-   stop program = "/usr/sbin/service mysql stop"
+   start program = "/usr/bin/env service mysql start"
+   stop program = "/usr/bin/env service mysql stop"
    if failed host 127.0.0.1 port 3306 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/monit-mysql_proxy.cnf

@@ -4,7 +4,7 @@
 
 check process mysql_proxy with pidfile /var/run/mysql-proxy.pid
    group mysql_proxy-<%= RUBBER_ENV %>
-   start program = "/usr/sbin/service mysql-proxy start"
-   stop program = "/usr/sbin/service mysql-proxy stop"
+   start program = "/usr/bin/env service mysql-proxy start"
+   stop program = "/usr/bin/env service mysql-proxy stop"
    if failed host 127.0.0.1 port 4040 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/lib/generators/vulcanize/templates/nginx/config/rubber/role/nginx/monit-nginx.conf

@@ -4,5 +4,5 @@
 <% PIDFILE = "/var/run/nginx.pid" %>
 check process nginx with pidfile <%= PIDFILE %>
   group nginx-<%= RUBBER_ENV %>
-  start program = "/usr/sbin/service nginx start"
-  stop program = "/usr/sbin/service nginx stop"
+  start program = "/usr/bin/env service nginx start"
+  stop program = "/usr/bin/env service nginx stop"

data/lib/generators/vulcanize/templates/postgresql/config/rubber/rubber-postgresql.yml

@@ -23,7 +23,7 @@ postgresql_conf_dir: "/etc/postgresql/#{postgresql_ver}/main"
 postgresql_data_dir: /mnt/postgresql/data
 postgresql_archive_dir: /mnt/postgresql/archive
 postgresql_pid_file: "/var/run/postgresql/#{postgresql_ver}-main.pid"
-postgresql_ctl: "/usr/sbin/service postgresql-#{postgresql_ver}"
+postgresql_ctl: "/usr/bin/env service postgresql-#{postgresql_ver}"
 
 # Capistrano needs db:primary role for migrate to work,
 # so we might as well just make consistent across the board

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

@@ -8,7 +8,7 @@
 
 check process resque_web with pidfile <%= PIDFILE %>
   group resque_web
-  start program = "bash -l -c '<%= start_program %>'"
-  stop program = "bash -l -c '<%= stop_program %>'"
+  start program = "/bin/bash -l -c '<%= start_program %>'"
+  stop program = "/bin/bash -l -c '<%= stop_program %>'"
 
   if totalmem > 350.0 MB for 15 cycles then restart

data/lib/generators/vulcanize/vulcanize_generator.rb

@@ -26,8 +26,11 @@ if Rubber::Util::is_rails2?
         raise Rails::Generator::UsageError.new("Invalid template #{name}, use one of #{valid_templates.join(', ')}")
       end
 
+      @template_dependencies ||= []
+
       templ_conf = load_template_config(sp)
       deps = templ_conf['dependent_templates'] || []
+      @template_dependencies.concat(deps)
       deps.each do |dep|
         apply_template(m, dep)
       end
@@ -55,7 +58,6 @@ if Rubber::Util::is_rails2?
         end
       end
 
-      puts extra_generator_steps_file
       if File.exist? extra_generator_steps_file
         eval File.read(extra_generator_steps_file), binding, extra_generator_steps_file
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -04:00
+date: 2010-05-23 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency