rubber 2.6.5 → 2.7.0

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

@@ -1,4 +1,4 @@
-redis_server_version: 2.6.16
+redis_server_version: 2.8.4
 redis_server_pid_file: /var/run/redis-server.pid
 redis_server_conf_file: /etc/redis.conf
 redis_server_log_file: /var/log/redis-server.log

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

@@ -22,9 +22,9 @@ namespace :rubber do
             echo 'installing oracle java'
             tar -zxf /tmp/#{rubber_env.jdk} -C /tmp
             sudo mkdir -p /usr/lib/jvm/jdk1.7
-            mv -f /tmp/jdk1.7.0_10/* /usr/lib/jvm/jdk1.7/
+            mv -f /tmp/#{rubber_env.jdk}/* /usr/lib/jvm/jdk1.7/
 
-            echo 'updating java alterlative'
+            echo 'updating java alternative'
             update-alternatives --install "/usr/bin/java" "java" "/usr/lib/jvm/jdk1.7/bin/java" 1
             update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jvm/jdk1.7/bin/javac" 1
             update-alternatives --install "/usr/bin/javaws" "javaws" "/usr/lib/jvm/jdk1.7/bin/javaws" 1
@@ -37,14 +37,14 @@ namespace :rubber do
             echo 'installing solr'
             curl -o /tmp/apache-solr-4.0.0.tgz http://ftp.heanet.ie/mirrors/www.apache.org/dist/lucene/solr/4.0.0/apache-solr-4.0.0.tgz
             tar -zxf /tmp/apache-solr-4.0.0.tgz -C /tmp
-            cp /tmp/apache-solr-4.0.0/dist/apache-solr-4.0.0.war /mnt/apache-tomcat-7.0.34/webapps/solr.war
+            cp /tmp/apache-solr-4.0.0/dist/apache-solr-4.0.0.war #{rubber_env.tomcat_dest_folder}/apache-tomcat-7.0.34/webapps/solr.war
             rm -fr /tmp/apache-solr-4.0.0*
 
             echo 'setting up solr'
-            mkdir -p #{rubber_env.solr_home_dest_foler}/solr/data
-            mkdir -p #{rubber_env.solr_home_dest_foler}/solr/#{rubber_env.core_name}
+            mkdir -p #{rubber_env.solr_home_dest_folder}/solr/data
+            mkdir -p #{rubber_env.solr_home_dest_folder}/solr/#{rubber_env.core_name}
             tar -zxf /tmp/solr_conf.tar.gz -C /mnt/solr/#{rubber_env.core_name}
-            mv /tmp/#{rubber_env.solr_xml} #{rubber_env.solr_home_dest_foler}/solr
+            mv /tmp/#{rubber_env.solr_xml} #{rubber_env.solr_home_dest_folder}/solr
             rm /tmp/solr_conf.tar.gz
           fi
         ENDSCRIPT
@@ -52,7 +52,7 @@ namespace :rubber do
 
 
     def set_java_opts
-      "export JAVA_OPTS='-server -Xmx#{rubber_env.Xmx} -Dsolr.data.dir=#{rubber_env.solr_home_dest_foler}/solr/data -Dsolr.solr.home=#{rubber_env.solr_home_dest_foler}/solr'"
+      "export JAVA_OPTS='-server -Xmx#{rubber_env.Xmx} -Dsolr.data.dir=#{rubber_env.solr_home_dest_folder}/solr/data -Dsolr.solr.home=#{rubber_env.solr_home_dest_folder}/solr'"
     end
 
     desc "start solr"
@@ -68,7 +68,7 @@ namespace :rubber do
     desc "stop solr"
     task :stop_solr, :roles => :solr do
       rubber.sudo_script 'stop_solr', <<-ENDSCRIPT
-        echo 'stoping tomcat'
+        echo 'stopping tomcat'
         #{set_java_opts}
         #{rubber_env.tomcat_dest_folder}/apache-tomcat-7.0.34/bin/shutdown.sh
       ENDSCRIPT

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

@@ -1,10 +1,10 @@
-jdk: JDK_TAR_GZ_FILE_NAME
+jdk: JDK_TAR_GZ_FILE_NAME (e.g. jdk1.7.0_17)
 jdk_path: JDK_TAR_GZ_FILE_NAME_INC_FILE_NAME
-solr_xml: SOLR_XML_FILE_NAME
-solr_xml_path: SOLR_XML_FILE_PATH_AND_NAME
-core_name: SOLR_CORE_NAME
-tarz_config_files: PATH_TO_SOLR_CIONFIG_TAR_GZ_FILE
+solr_xml: SOLR_XML_FILE_NAME (e.g. solrconfig.xml)
+solr_xml_path: SOLR_XML_FILE_PATH_AND_NAME (e.g. #{Rubber.root}/solr/conf/solrconfig.xml)
+core_name: SOLR_CORE_NAME (e.g. default-solr)
+tarz_config_files: PATH_TO_SOLR_CONFIG_TAR_GZ_FILE
 tomcat_dest_folder: TOMCAT7_DEST_FOLER
-solr_home_dest_foler: SOLR_BASE_FOLDER
+solr_home_dest_folder: SOLR_BASE_FOLDER
 Xmx: HEAP_SPACE_FOR_JVM (e.g. 1024m or 2gb etc)
 

data/templates/solr/templates.yml

@@ -1,3 +1 @@
-description: The apache solr module
-dependent_templates:
-  - base
+description: The apache solr module

data/templates/solr_sunspot/config/rubber/common/solr_sunspot.yml

@@ -0,0 +1,10 @@
+<%
+  @path = "#{Rubber.root}/config/sunspot.yml"
+  @additive =  ["#prod_start", "#prod_end"]
+%> <% rubber_instances.for_role('solr_sunspot').each do |ic| %>
+production:
+    solr:
+      hostname: <%= ic.external_host %>
+      port: 8983
+      log_level: WARNING
+<% end %>

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

@@ -0,0 +1,30 @@
+# installs, starts, stops and reindexes solr using the sunspot gem
+
+namespace :rubber do
+
+  namespace :solr_sunspot do
+
+    desc "start solr"
+    task :start, :roles => :solr_sunspot, :except => { :no_release => true } do 
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec sunspot-solr start --port=8983 --data-directory=#{shared_path}/solr/data --pid-dir=#{shared_path}/pids"
+    end
+    desc "stop solr"
+    task :stop, :roles => :solr_sunspot, :except => { :no_release => true } do 
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec sunspot-solr stop --port=8983 --data-directory=#{shared_path}/solr/data --pid-dir=#{shared_path}/pids"
+    end
+    desc "reindex the whole database"
+    task :reindex, :roles => :solr_sunspot do
+      stop
+      run "rm -rf #{shared_path}/solr/data"
+      start
+      run "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rake sunspot:solr:reindex"
+    end
+    
+    task :setup_solr_data_dir, :roles => :solr_sunspot  do
+      run "mkdir -p #{shared_path}/solr/data"
+    end
+
+    after 'deploy:setup', 'rubber:solr_sunspot:setup_solr_data_dir'
+  end
+end
+

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

@@ -0,0 +1,5 @@
+gems: [sunspot_rails, sunspot_solr]
+
+roles:
+  solr_sunspot:
+    packages: [openjdk-7-jre-headless]

data/templates/solr_sunspot/templates.yml

@@ -0,0 +1 @@
+description: The apache solr module using the sunspot rails gem and its pre-packaged solr distribution

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

@@ -2,34 +2,39 @@
 namespace :rubber do
 
   namespace :unicorn do
-  
+
     rubber.allow_optional_tasks(self)
-    
+
     before "deploy:stop", "rubber:unicorn:stop"
     after "deploy:start", "rubber:unicorn:start"
     after "deploy:restart", "rubber:unicorn:reload"
-    
+
     desc "Stops the unicorn server"
     task :stop, :roles => :unicorn do
-      rsudo "if [ -f /var/run/unicorn.pid ]; then pid=`cat /var/run/unicorn.pid` && kill -TERM $pid; fi"
+      rsudo "service unicorn stop"
+    end
+
+    desc "Forcefully kills the unicorn server"
+    task :force_stop, :roles => :unicorn do
+      rsudo "service unicorn force-stop"
     end
-    
+
     desc "Starts the unicorn server"
     task :start, :roles => :unicorn do
-      rsudo "cd #{current_path} && bundle exec unicorn_rails -c #{current_path}/config/unicorn.rb -E #{Rubber.env} -D"
+      rsudo "service unicorn start"
     end
-    
+
     desc "Restarts the unicorn server"
     task :restart, :roles => :unicorn do
-      stop
-      start
+      rsudo "service unicorn restart"
     end
-  
+
     desc "Reloads the unicorn web server"
     task :reload, :roles => :unicorn do
-      rsudo "if [ -f /var/run/unicorn.pid ]; then pid=`cat /var/run/unicorn.pid` && kill -USR2 $pid; else cd #{current_path} && bundle exec unicorn_rails -c #{current_path}/config/unicorn.rb -E #{Rubber.env} -D; fi"
+      rsudo "service unicorn upgrade"
     end
 
+
     desc "Display status of the unicorn web server"
     task :status, :roles => :unicorn do
       # "service unicorn status" always returns "unicorn stop/waiting"

data/templates/unicorn/config/rubber/role/unicorn/unicorn

@@ -0,0 +1,91 @@
+<%
+  @path = "/etc/init.d/unicorn"
+  @perms = 0755
+  current_path = "/mnt/#{rubber_env.app_name}-#{Rubber.env}/current"
+%>
+
+#!/bin/sh
+set -e
+# Example init script, this can be used with nginx, too,
+# since nginx and unicorn accept the same signals
+
+# Feel free to change any of the following variables for your app:
+TIMEOUT=${TIMEOUT-60}
+APP_ROOT=<%= current_path %>
+PID=/var/run/unicorn.pid
+CMD="<%= "bundle exec unicorn_rails -c #{current_path}/config/unicorn.rb -E #{Rubber.env} -D" %>"
+action="$1"
+set -u
+
+old_pid="$PID.oldbin"
+
+cd $APP_ROOT || exit 1
+
+sig () {
+  test -s "$PID" && kill -$1 `cat $PID`
+}
+
+oldsig () {
+  test -s $old_pid && kill -$1 `cat $old_pid`
+}
+
+case $action in
+start)
+  sig 0 && echo >&2 "Already running" && exit 0
+  $CMD
+  ;;
+stop)
+  sig QUIT && exit 0
+  echo >&2 "Not running"
+  ;;
+force-stop)
+  sig TERM && exit 0
+  echo >&2 "Not running"
+  ;;
+restart|reload)
+  sig HUP && echo reloaded OK && exit 0
+  echo >&2 "Couldn't reload, starting '$CMD' instead"
+  $CMD
+  ;;
+upgrade)
+  if sig USR2
+  then
+    printf 'Waiting for new workers'
+    n=$TIMEOUT
+    while (! (test -s $PID && ps --no-headers --ppid `cat $PID` > /dev/null)) && test $n -ge 0
+    do
+      printf '.' && sleep 1 && n=$(( $n - 1 ))
+    done
+    if test ! -s $old_pid
+    then
+      echo
+      echo >&2 'New workers failed to start; see error log'
+      exit 1
+    fi
+    printf '\nStopping old master' && oldsig QUIT
+
+    n=$TIMEOUT
+    while test -s $old_pid && test $n -ge 0
+    do
+      printf '.' && sleep 1 && n=$(( $n - 1 ))
+    done
+    echo
+
+    if test $n -lt 0 && test -s $old_pid
+    then
+      echo >&2 "$old_pid still exists after $TIMEOUT seconds"
+      exit 1
+    fi
+    exit 0
+  fi
+  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
+  $CMD
+  ;;
+reopen-logs)
+  sig USR1
+  ;;
+*)
+  echo >&2 "Usage: $0 <start|stop|restart|upgrade|force-stop|reopen-logs>"
+  exit 1
+  ;;
+esac

data/test/generator_test.rb

@@ -105,6 +105,60 @@ class GeneratorTest < Test::Unit::TestCase
     assert_equal "hello\nthere", File.read(out_file.path).strip, "transformed contents are incorrect"
   end
 
+  def test_delayed_post_command
+    out_dir = "#{Dir::tmpdir}/test_rubber_delayed_post"
+    FileUtils.rm_rf(out_dir)
+    assert ! File.exists?(out_dir)
+
+    g = Generator.new("#{File.dirname(__FILE__)}/fixtures/basic", nil, nil, :out_dir => out_dir)
+
+    post_file = "#{out_dir}/post"
+
+    src1 = <<-SRC
+      <%
+        @path = "#{out_dir}/src1"
+        @delayed_post = 'echo `date` >> #{post_file}'
+      %>
+      contents1
+    SRC
+
+    src2 = <<-SRC
+      <%
+        @path = "#{out_dir}/src2"
+        @delayed_post = 'echo `date` >> #{post_file}'
+      %>
+      contents2
+    SRC
+
+    src3 = <<-SRC
+      <%
+        @path = "#{out_dir}/src3"
+        @delayed_post = 'echo 3 `date` >> #{post_file}'
+      %>
+      contents3
+    SRC
+
+    g.transform(src1)
+    g.transform(src2)
+    g.transform(src3)
+
+    assert File.exists?("#{out_dir}/src1"), "transform did not generate an output file"
+    assert ! File.exists?(post_file), "transform executed delayed post early"
+    assert_equal "contents1", File.read("#{out_dir}/src1").strip, "transformed contents are incorrect"
+
+    assert File.exists?("#{out_dir}/src2"), "transform did not generate an output file"
+    assert ! File.exists?(post_file), "transform executed delayed post early"
+    assert_equal "contents2", File.read("#{out_dir}/src2").strip, "transformed contents are incorrect"
+
+    assert File.exists?("#{out_dir}/src3"), "transform did not generate an output file"
+    assert ! File.exists?(post_file), "transform executed delayed post early"
+    assert_equal "contents3", File.read("#{out_dir}/src3").strip, "transformed contents are incorrect"
+
+    g.run()
+    assert File.exists?(post_file), "delayed post was not executed"
+    assert_equal 2, File.read(post_file).lines.to_a.size, "delayed post was not de-duped"
+  end
+
   def test_stop_on_error
     out_file = Tempfile.new('teststoponerr')
     post_file = out_file.path + '.post'

data/test/test_helper.rb

@@ -11,6 +11,8 @@ require 'ap'
 require 'tempfile'
 require 'fog'
 
+module Rubber; @@logger = Logger.new("/dev/null"); end
+
 if defined?(JRUBY_VERSION)
   require 'unlimited-strength-crypto'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.7.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -356,12 +356,26 @@ files:
 - templates/cruise/config/rubber/role/web_tools/cruise-nginx.conf
 - templates/cruise/config/rubber/rubber-cruise.yml
 - templates/cruise/templates.yml
+- templates/delayed_job/config/rubber/deploy-delayed_job.rb
+- templates/delayed_job/config/rubber/role/delayed_job/monit-delayed_job.conf
+- templates/delayed_job/config/rubber/rubber-delayed_job.yml
+- templates/delayed_job/templates.yml
+- templates/discourse/config/rubber/deploy-discourse.rb
+- templates/discourse/config/rubber/role/nginx/nginx.conf
+- templates/discourse/config/rubber/role/nginx/unicorn_nginx.conf
+- templates/discourse/config/rubber/role/unicorn/unicorn.rb
+- templates/discourse/config/rubber/rubber-discourse.yml
+- templates/discourse/templates.yml
 - templates/elasticsearch/config/rubber/deploy-elasticsearch.rb
-- templates/elasticsearch/config/rubber/role/elasticsearch/elasticsearch-upstart.conf
+- templates/elasticsearch/config/rubber/role/elasticsearch/elasticsearch-default.conf
 - templates/elasticsearch/config/rubber/role/elasticsearch/elasticsearch.yml
 - templates/elasticsearch/config/rubber/role/elasticsearch/logging.yml
+- templates/elasticsearch/config/rubber/role/elasticsearch/monit-elasticsearch.conf
 - templates/elasticsearch/config/rubber/rubber-elasticsearch.yml
 - templates/elasticsearch/templates.yml
+- templates/ffmpeg/config/rubber/deploy-ffmpeg.rb
+- templates/ffmpeg/config/rubber/rubber-ffmpeg.yml
+- templates/ffmpeg/templates.yml
 - 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
@@ -378,16 +392,14 @@ files:
 - templates/graphite/config/rubber/role/graphite_web/uwsgi.ini
 - 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/graylog_server/graylog2.conf
 - templates/graylog/config/rubber/role/graylog_server/graylog_server-upstart.conf
-- templates/graylog/config/rubber/role/graylog_web/crontab
-- templates/graylog/config/rubber/role/graylog_web/email.yml
-- templates/graylog/config/rubber/role/graylog_web/general.yml
+- templates/graylog/config/rubber/role/graylog_server/monit-graylog_server.conf
+- templates/graylog/config/rubber/role/graylog_web/graylog2-web-interface.conf
 - templates/graylog/config/rubber/role/graylog_web/graylog_web-upstart.conf
-- templates/graylog/config/rubber/role/graylog_web/mongoid.yml
+- templates/graylog/config/rubber/role/graylog_web/monit-graylog_web.conf
 - templates/graylog/config/rubber/rubber-graylog.yml
 - templates/graylog/templates.rb
 - templates/graylog/templates.yml
@@ -415,10 +427,9 @@ files:
 - templates/jetty/config/rubber/role/jetty/jetty.xml
 - templates/jetty/config/rubber/rubber-jetty.yml
 - templates/jetty/templates.yml
-- templates/memcached/config/memcached.yml
-- templates/memcached/config/rubber/common/memcached.yml
 - templates/memcached/config/rubber/deploy-memcached.rb
 - templates/memcached/config/rubber/role/memcached/crontab
+- templates/memcached/config/rubber/role/memcached/dalli.rb
 - templates/memcached/config/rubber/role/memcached/memcached.conf
 - templates/memcached/config/rubber/rubber-memcached.yml
 - templates/memcached/templates.yml
@@ -446,6 +457,7 @@ files:
 - templates/monit/config/rubber/role/graylog_web/monit-graylog_web.conf
 - templates/monit/config/rubber/role/haproxy/monit-haproxy.conf
 - templates/monit/config/rubber/role/jetty/monit-jetty.conf
+- templates/monit/config/rubber/role/memcached/monit-memcached.conf
 - templates/monit/config/rubber/role/mongodb/monit-mongodb.conf
 - templates/monit/config/rubber/role/mongrel/monit-mongrel.conf
 - templates/monit/config/rubber/role/monit/monit-default.conf
@@ -508,6 +520,10 @@ files:
 - templates/mysql_proxy/config/rubber/mysql_proxy/mysql-proxy.lua
 - templates/mysql_proxy/config/rubber/rubber-mysql_proxy.yml
 - templates/mysql_proxy/templates.yml
+- templates/newrelic/config/rubber/deploy-newrelic.rb
+- templates/newrelic/config/rubber/role/newrelic/monit-newrelic.conf
+- templates/newrelic/config/rubber/rubber-newrelic.yml
+- templates/newrelic/templates.yml
 - templates/nginx/config/rubber/deploy-nginx.rb
 - templates/nginx/config/rubber/role/nginx/crontab
 - templates/nginx/config/rubber/role/nginx/nginx.conf
@@ -591,6 +607,10 @@ files:
 - templates/solr/config/rubber/deploy-solr.rb
 - templates/solr/config/rubber/rubber-solr.yml
 - templates/solr/templates.yml
+- templates/solr_sunspot/config/rubber/common/solr_sunspot.yml
+- templates/solr_sunspot/config/rubber/deploy-solr_sunspot.rb
+- templates/solr_sunspot/config/rubber/rubber-solr_sunspot.yml
+- templates/solr_sunspot/templates.yml
 - templates/sphinx/config/rubber/common/sphinx.yml
 - templates/sphinx/config/rubber/deploy-sphinx.rb
 - templates/sphinx/config/rubber/role/sphinx/crontab
@@ -611,7 +631,7 @@ files:
 - templates/torquebox/templates.yml
 - templates/unicorn/config/rubber/deploy-unicorn.rb
 - templates/unicorn/config/rubber/role/nginx/unicorn_nginx.conf
-- templates/unicorn/config/rubber/role/unicorn/unicorn-upstart.conf
+- templates/unicorn/config/rubber/role/unicorn/unicorn
 - templates/unicorn/config/rubber/role/unicorn/unicorn.rb
 - templates/unicorn/config/rubber/rubber-unicorn.yml
 - templates/unicorn/templates.yml