rubber 2.0.3 → 2.0.4

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 1.9.3
   - jruby-18mode
   - jruby-19mode
-  - jruby-head
+#  - jruby-head
 #  - rbx-18mode
 #  - rbx-19mode
 # script: bundle exec rspec spec

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end
 

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

@@ -35,6 +35,8 @@ NameVirtualHost *:<%= rubber_env.web_tools_ssl_port %>
   # SSLCertificateKeyFile <%= Rubber.root %>/config/<%= rubber_env.domain %>.key
   # SSLCertificateChainFile /etc/ssl/certs/gd_intermediate_bundle.crt
 
+  RequestHeader set X_FORWARDED_PROTO "https"
+
   <Location />
     AuthType Basic
     AuthName "Rubber Admin Tools"
@@ -95,6 +97,8 @@ NameVirtualHost *:<%= rubber_env.web_tools_ssl_port %>
     # SSLCertificateKeyFile <%= Rubber.root %>/config/<%= rubber_env.domain %>.key
     # SSLCertificateChainFile /etc/ssl/certs/gd_intermediate_bundle.crt
 
+    RequestHeader set X_FORWARDED_PROTO "https"
+
     <Location />
       AuthType Basic
       AuthName "Rubber Admin Tools"

data/templates/collectd/config/rubber/role/collectd/collectd-ping.conf

@@ -7,7 +7,7 @@
     ping_hosts = rubber_instances.collect {|ic| ic.full_name }.select {|h| h != rubber_env.full_host }
   elsif rubber_instances[rubber_env.host].role_names.include?('web_tools')
     # monitor just graphite_server from tools
-    ping_hosts = Array(rubber_instances.for_role('graphite_server').first.full_name rescue nil)
+    ping_hosts = Array((rubber_instances.for_role('graphite_server').first.full_name rescue nil))
   end
 
   @skip = (ping_hosts.size == 0)

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

@@ -1,12 +1,7 @@
-require 'yaml'
-require 'resque'
-
-rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
-rails_env = ENV['RAILS_ENV'] || 'development'
 
 redis_host = 'localhost:6379'
 
-resque_yml = rails_root + '/config/resque.yml'
+resque_yml = Rubber.root + '/config/resque.yml'
 if File.exist? resque_yml
   resque_config = YAML.load_file(resque_yml)
   redis_host = resque_config[rails_env]

data/templates/resque/config/resque-web.ru

@@ -0,0 +1,6 @@
+# This file is used by Rack-based servers to start resque web
+# we load environment to get the rails environment, because plugins
+# like resque-retry reference job classes from one's environment within
+# the web ui
+require ::File.expand_path('../environment',  __FILE__)
+run Resque::Server

data/templates/resque/config/rubber/role/resque_web/resque-web-upstart.conf

@@ -8,7 +8,7 @@ start on started redis
 stop on runlevel [016]
 
 script
-  exec sudo -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= Rubber.root %> && exec bundle exec resque-web --foreground --port <%= rubber_env.resque_web_port %> --no-launch --app-dir tmp/resque_web config/initializers/resque.rb > log/resque-web.log 2>&1'
+  exec sudo -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= Rubber.root %> && exec bundle exec puma --port <%= rubber_env.resque_web_port %> config/resque-web.ru &>> log/resque-web.log'
 end script
 
 post-start script

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

@@ -14,7 +14,10 @@ web_tools_proxies:
     role: resque_web
     port: "#{resque_web_port}"
     path: /
+    
+roles:
+  resque_web:
+    gems: [puma]
 
 role_dependencies:
   web_tools: [resque_web]
-

data/templates/resque/templates.rb

@@ -1,2 +1,3 @@
-append_to_file 'Gemfile', "gem 'resque'\n" if Rubber::Util::is_bundler?
+append_to_file 'Gemfile', "gem 'resque', :require => 'resque/server'\n" if Rubber::Util::is_bundler?
 append_to_file 'Gemfile', "gem 'resque-pool'\n" if Rubber::Util::is_bundler?
+append_to_file 'Gemfile', "gem 'puma'\n" if Rubber::Util::is_bundler?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -528,6 +528,7 @@ files:
 - templates/redis/templates.yml
 - templates/resque/config/initializers/resque.rb
 - templates/resque/config/resque-pool.yml
+- templates/resque/config/resque-web.ru
 - templates/resque/config/rubber/common/resque.yml
 - templates/resque/config/rubber/deploy-resque.rb
 - templates/resque/config/rubber/role/resque_web/resque-web-upstart.conf
@@ -609,7 +610,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2032687907343408495
+      hash: -689394664553774018
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -618,12 +619,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2032687907343408495
+      hash: -689394664553774018
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 1.8.23
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud
   (ec2)
-test_files: []
+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