rubber 2.0.5 → 2.0.6

data/templates/base/config/rubber/rubber.yml

@@ -75,11 +75,11 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 12.04 Precise instance-store 64-bit: ami-3c994355
+    # Ubuntu 12.04 Precise instance-store 64-bit: ami-eafa5883
     #
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
-    image_id: ami-3c994355
+    image_id: ami-eafa5883
 
     # OPTIONAL: EC2 spot instance request support.
     #

data/templates/collectd/config/rubber/role/passenger/passenger-status-sudoers.conf

@@ -2,7 +2,7 @@
   @path = '/etc/sudoers'
   @additive = ["# passenger-status start", "# passenger-status end"]
 %>
-Defaults env_keep = GEM_PATH
+Defaults env_keep += GEM_PATH
 
 nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-status
 nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats

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

@@ -9,7 +9,7 @@ elasticsearch_http_port: 9200
 
 roles:
   elasticsearch:
-    packages: [openjdk-7-jdk]
+    packages: [openjdk-7-jdk, unzip]
 
 web_tools_proxies:
   elasticsearch:

data/templates/graphite/config/rubber/role/graphite_web/dashboard.html

@@ -212,10 +212,12 @@ Simple graphite dashboard cycler for use on a large display - e.g. googletv/chro
           var defn = e[1];
           var params = $.extend(true, {}, defaultParams); // deep copy
           params = $.extend(true, params, defn); // deep copy
-          params["target"] = params["target"][0];
-
-          var url = ROOT_URL + "/render?" + $.param(params);
 
+          // graphite only works with target=abc&target=xyz not with
+          // standard form of target[]=abc&target[]=xyz
+          var encoded_params = $.param(params).replace(/target%5B%5D=/g, "target=");
+          var url = ROOT_URL + "/render?" + encoded_params;
+          
           return url;
         });
         return urls;

data/templates/jenkins/config/environments/jenkins.rb

@@ -1,4 +1,4 @@
-Appleton::Application.configure do
+Rails.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on

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

@@ -30,4 +30,4 @@ security_groups:
 roles:
   jenkins:
     assigned_security_groups: [jenkins_web]
-    packages: [sun-java6-jdk, jenkins]
+    packages: [openjdk-6-jdk, jenkins]

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

@@ -21,14 +21,6 @@ namespace :rubber do
       ENDSCRIPT
     end
 
-    # passenger does things differently for rack apps, so if this is a rails app, remove config.ru
-    # to stop passenger from treating this like a rack app
-    after "deploy:update_code", "rubber:passenger:remove_config_ru" if Rubber::Util.is_rails?
-
-    task :remove_config_ru, :roles => :passenger do
-      rsudo "rm -f #{releases_path}/*/config.ru"
-    end
-
     # passenger depends on apache for start/stop/restart, just need these defined
     # as apache hooks into standard deploy lifecycle
     

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

@@ -1,8 +1,8 @@
 # REQUIRED: The credentials for creating/accessing your app's database
 #
-db_user: "#{app_name[0,16]}"
+db_user: "#{app_name[0,16].downcase}"
 db_pass:
-db_name: "#{app_name}_#{Rubber.env}"
+db_name: "#{app_name.downcase}_#{Rubber.env}"
 
 db_replication_user: replication
 db_replication_pass:

data/templates/resque/config/initializers/resque.rb

@@ -1,10 +1,10 @@
 
 redis_host = 'localhost:6379'
 
-resque_yml = Rubber.root + '/config/resque.yml'
+resque_yml = Rubber.root.to_s + '/config/resque.yml'
 if File.exist? resque_yml
   resque_config = YAML.load_file(resque_yml)
-  redis_host = resque_config[rails_env]
+  redis_host = resque_config[Rubber.env]
 end
 
 Resque.redis = redis_host

data/templates/resque/config/resque.yml

@@ -0,0 +1,4 @@
+# this is a placeholder for development.  for the production version, see config/rubber/common/resque.yml
+environments:
+  development: 'localhost:6379'
+  test: 'localhost:6379'

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

@@ -2,4 +2,4 @@
   @path = "#{Rubber.root}/config/resque.yml"
 %>
 
-<%= Rubber.env %>: <%= rubber_instances.for_role('redis').first.full_name rescue 'localhost' %>:6379
+<%= Rubber.env %>: <%= rubber_instances.for_role('redis_master').first.full_name rescue 'localhost' %>:6379

data/templates/resque_scheduler/config/rubber/common/resque_schedule.yml

@@ -0,0 +1,9 @@
+<%
+  @path = "#{Rubber.root}/config/resque_schedule.yml"
+%>
+
+myjob:
+  cron: 0 * * * *
+  class: MyJob
+  queue: scheduler
+  description: Schedules MyJob.  Runs every hour on the hour.

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

@@ -0,0 +1,38 @@
+namespace :rubber do
+
+  namespace :resque_scheduler do
+
+    rubber.allow_optional_tasks(self)
+
+    before "deploy:stop", "rubber:resque_scheduler:stop"
+    after "deploy:start", "rubber:resque_scheduler:start"
+    after "deploy:restart", "rubber:resque_scheduler:restart"
+    
+    desc "Stops the resque_scheduler"
+    task :stop, :roles => :resque_scheduler do
+      rsudo "service resque-scheduler stop || true"
+    end
+
+    desc "Starts the resque_scheduler"
+    task :start, :roles => :resque_scheduler do
+      rsudo "service resque-scheduler start"
+    end
+
+    desc "Restarts the resque_scheduler"
+    task :restart, :roles => :resque_scheduler do
+      stop
+      start      
+    end
+
+    # pauses deploy until daemon is up so monit doesn't try and start it
+    before "rubber:monit:start", "rubber:resque_scheduler:wait_start"
+    task :wait_start, :roles => :resque_scheduler do
+      logger.info "Waiting for scheduler daemon pid file to show up"
+
+      run "while ! test -f #{rubber_env.resque_scheduler_pid_file}; do sleep 1; done"
+    end
+
+
+  end
+
+end

data/templates/resque_scheduler/config/rubber/role/resque_scheduler/resque-scheduler-upstart.conf

@@ -0,0 +1,20 @@
+<%
+  @path = "/etc/init/resque-scheduler.conf"
+  @backup = false
+%>
+description "resque scheduler daemon"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+script
+  exec sudo -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= Rubber.root %> && exec bundle exec rake resque:scheduler >> log/resque-scheduler_upstart.log 2>&1'
+end script
+
+post-start script
+  status resque-scheduler | head -n1 | awk '{print $NF}' > <%= rubber_env.resque_scheduler_pid_file %>
+end script
+
+post-stop script
+  rm -f <%= rubber_env.resque_scheduler_pid_file %>
+end script

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

@@ -0,0 +1,7 @@
+resque_scheduler_pid_file: /var/run/resque-scheduler.pid
+resque_scheduler_log_file: /var/log/resque-scheduler.log
+
+gems: [resque-scheduler]
+
+role_dependencies:
+  web_tools: [resque_scheduler]

data/templates/resque_scheduler/lib/tasks/resque-scheduler.rake

@@ -0,0 +1,28 @@
+# Resque tasks
+require 'resque/tasks'
+require 'resque_scheduler/tasks'
+
+namespace :resque do
+  
+  task :setup do
+    # If you want to be able to dynamically change the schedule,
+    # uncomment this line.  A dynamic schedule can be updated via the
+    # Resque::Scheduler.set_schedule (and remove_schedule) methods.
+    # When dynamic is set to true, the scheduler process looks for
+    # schedule changes and applies them on the fly.
+    # Note: This feature is only available in >=2.0.0.
+    #Resque::Scheduler.dynamic = true
+
+    # The schedule doesn't need to be stored in a YAML, it just needs to
+    # be a hash.  YAML is usually the easiest.
+    # Resque.schedule = YAML.load_file('your_resque_schedule.yml')
+
+    # If your schedule already has +queue+ set for each job, you don't
+    # need to require your jobs.  This can be an advantage since it's
+    # less code that resque-scheduler needs to know about. But in a small
+    # project, it's usually easier to just include you job classes here.
+    # So, something like this:
+    # require 'jobs'
+  end
+
+end

data/templates/resque_scheduler/templates.rb

@@ -0,0 +1 @@
+append_to_file 'Gemfile', "gem 'resque-scheduler', :require => ['resque_scheduler', 'resque_scheduler/server']\n" if Rubber::Util::is_bundler?

data/templates/resque_scheduler/templates.yml

@@ -0,0 +1,3 @@
+description: The resque-scheduler job scheduler for resque
+dependent_templates:
+  - resque

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

@@ -13,4 +13,4 @@ mod_cluster_version: 1.2.0
 
 roles:
   torquebox:
-    packages: [openjdk-7-jdk libaio1]
+    packages: [openjdk-7-jdk, libaio1, unzip]

data/templates/zookeeper/config/rubber/role/zookeeper/myid.conf

@@ -1,4 +1,5 @@
-<%
-  @path = "#{rubber_env.zookeeper_install_dir}/conf/myid"
-%>
-<%= rubber_env.host.gsub(/[^0-9]*/, '').to_i %>
+<%-
+  @path = "#{rubber_env.zookeeper_data_dir}/myid"
+  require 'zlib'
+-%>
+<%= Zlib.crc32(rubber_env.host) %>

data/templates/zookeeper/config/rubber/role/zookeeper/zoo.cfg

@@ -1,7 +1,10 @@
 <%
   @path = "#{rubber_env.zookeeper_install_dir}/conf/zoo.cfg"
   @post = "mkdir -p #{rubber_env.zookeeper_data_dir}"
+  require 'zlib'
 %>
+# Docs at http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_advancedConfiguration
+
 # The number of milliseconds of each tick
 tickTime=2000
 # The number of ticks that the initial 
@@ -14,13 +17,15 @@ syncLimit=5
 dataDir=<%= rubber_env.zookeeper_data_dir %>
 # the port at which the clients will connect
 clientPort=<%= rubber_env.zookeeper_client_port %>
+# limit to # of connections from a client (IP), default 10, 0 for unlimited
+maxClientCnxns=0
 
 <%
   zookeeper_hosts = rubber_instances.for_role("zookeeper")
   if zookeeper_hosts.size > 1
     zookeeper_hosts.each do |ic|
 %>
-server.<%= ic.name.gsub(/[^0-9]*/, '').to_i %>=<%= ic.name %>:2888:3888
+server.<%= Zlib.crc32(ic.name) %>=<%= ic.name %>:2888:3888
 <%
     end
   end

data/test/command_test.rb

@@ -3,14 +3,9 @@ require File.expand_path(File.join(__FILE__, '..', 'test_helper'))
 class CommandTest < Test::Unit::TestCase
 
   def setup
-    system("rm -f #{Rubber.root}/log/*.log")
     ENV['RUBBER_ROOT'] = Rubber.root
   end
   
-  def teardown
-    system("rm -f #{Rubber.root}/log/*.log")
-  end
-  
   def test_rubber_help
     out = `rubber`
     assert out =~ /Subcommands:\n(.*)\nOptions:/m
@@ -31,55 +26,5 @@ class CommandTest < Test::Unit::TestCase
     end
   
   end
-
-  def test_rubber_cron_basic
-    date = Time.now.tv_sec.to_s
-    out = `rubber cron echo #{date}`
-
-    assert_equal 0, $?
-    assert_equal "", out
-
-    logs = Dir["#{Rubber.root}/log/*.log"]
-    assert_equal 1, logs.size
-    assert_equal date, File.read(logs.first).strip
-  end
-  
-  def test_rubber_cron_logfile
-    date = Time.now.tv_sec.to_s
-    out = `rubber cron -l #{Rubber.root}/log/foo.log -- echo #{date}`
-    logs = Dir["#{Rubber.root}/log/*.log"]
-    assert_equal 1, logs.size
-    assert_equal "#{Rubber.root}/log/foo.log", logs.first
-    assert_equal date, File.read(logs.first).strip
-  end
-  
-  def test_rubber_cron_task_logfile
-    date = Time.now.tv_sec.to_s
-    out = `rubber cron --task -- cron -o -- echo #{date}`
-    logs = Dir["#{Rubber.root}/log/cron-task*.log"]
-    assert_equal 1, logs.size
-    assert_equal date, File.read(logs.first).strip
-  end
-  
-  def test_rubber_cron_directory_changed
-    out = `rubber cron -o -r /tmp -- pwd`
-    assert_match /(\/private)?\/tmp/, out, "Unexpected output:\n#{out}"
-  end
-  
-  def test_rubber_cron_output_empty
-    out = `rubber cron -- ls -la`
-    assert_equal "", out, "Unexpected output:\n#{out}"
-  end
-
-  def test_rubber_cron_output_echoed
-    out = `rubber cron -o -- ls -la`
-    assert_not_equal "", out, "Unexpected output:\n#{out}"
-  end
-  
-  def test_rubber_cron_output_on_error
-    out = `rubber cron -- ls -la jkbhbj`
-    assert_not_equal 0, $?
-    assert_not_equal "", out, "Unexpected output:\n#{out}"
-  end
   
 end

data/test/commands/cron_test.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.join(__FILE__, '../..', 'test_helper'))
+
+class CronTest < Test::Unit::TestCase
+
+  def setup
+    system("rm -f #{Rubber.root}/log/*.log")
+    ENV['RUBBER_ROOT'] = Rubber.root
+  end
+  
+  def teardown
+    system("rm -f #{Rubber.root}/log/*.log")
+  end
+
+  def test_rubber_cron_basic
+    date = Time.now.tv_sec.to_s
+    out = `rubber cron echo #{date}`
+
+    assert_equal 0, $?
+    assert_equal "", out
+
+    logs = Dir["#{Rubber.root}/log/*.log"]
+    assert_equal 1, logs.size
+    assert_equal "#{Rubber.root}/log/cron-sh-echo.log", logs.first
+    assert_match /rubber:cron running \["echo", "#{date}"\] at/, File.read(logs.first).strip
+    assert_match /\n#{date}$/, File.read(logs.first).strip
+  end
+  
+  def test_rubber_cron_log_append
+    date = Time.now.tv_sec.to_s
+
+    out = `rubber cron echo #{date}`
+    assert_equal 0, $?
+    assert_equal "", out
+
+    out = `rubber cron echo #{date}`
+    assert_equal 0, $?
+    assert_equal "", out
+
+    logs = Dir["#{Rubber.root}/log/*.log"]
+    assert_equal 1, logs.size
+    running_lines = File.read(logs.first).lines.to_a.grep(/rubber:cron running/)
+    assert_equal 2, running_lines.size
+  end
+  
+  def test_rubber_cron_logfile
+    date = Time.now.tv_sec.to_s
+    out = `rubber cron -l #{Rubber.root}/log/foo.log -- echo #{date}`
+    logs = Dir["#{Rubber.root}/log/*.log"]
+    assert_equal 1, logs.size
+    assert_equal "#{Rubber.root}/log/foo.log", logs.first
+    assert_match /\n#{date}$/, File.read(logs.first).strip
+  end
+  
+  def test_rubber_cron_task_logfile
+    date = Time.now.tv_sec.to_s
+    out = `rubber cron --task -- cron -o -- echo #{date}`
+    logs = Dir["#{Rubber.root}/log/cron-task*.log"]
+    assert_equal 1, logs.size
+    assert_match /\n#{date}$/, File.read(logs.first).strip
+  end
+  
+  def test_rubber_cron_directory_changed
+    out = `rubber cron -o -r /tmp -- pwd`
+    assert_match /(\/private)?\/tmp/, out, "Unexpected output:\n#{out}"
+  end
+  
+  def test_rubber_cron_output_empty
+    out = `rubber cron -- ls -la`
+    assert_equal "", out, "Unexpected output:\n#{out}"
+  end
+
+  def test_rubber_cron_output_echoed
+    out = `rubber cron -o -- ls -la`
+    assert_not_equal "", out, "Unexpected output:\n#{out}"
+  end
+  
+  def test_rubber_cron_output_on_error
+    out = `rubber cron -- ls -la jkbhbj`
+    assert_not_equal 0, $?
+    assert_not_equal "", out, "Unexpected output:\n#{out}"
+  end
+  
+end