rubber 3.0.1 → 3.1.0

data/CHANGELOG

@@ -1,3 +1,19 @@
+3.1.0 (05/31/2015)
+
+Improvements:
+============
+
+[core]  	Removed explicit dependency on 'json' gem. <61db9cc>
+[core] Introduced env.enable_root_login_timeout parameter to configure timeout in enabling root login. <f8d1b65>
+[passenger] Updated to Passenger 5.0.8. <c4a8261>
+[passenger_nginx] Updated to Passenger 5.0.8. <c4a8261>
+
+Bug Fixes:
+=========
+
+[passenger_nginx] Replaced defunct passenger_set_cgi_param with passenger_env_var. <ee63694>
+
+
 3.0.1 (04/27/2015)
 
 Improvements:

data/lib/rubber/recipes/rubber/instances.rb

@@ -372,7 +372,7 @@ namespace :rubber do
       if instance_item.linux?
         # weird cap/netssh bug, sometimes just hangs forever on initial connect, so force a timeout
         begin
-          Timeout::timeout(30) do
+          Timeout::timeout(env.enable_root_login_timeout || 30) do
             puts 'Trying to enable root login'
 
             # turn back on root ssh access if we are using root as the capistrano user for connecting

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/rubber.gemspec

@@ -32,8 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor'
   s.add_dependency 'clamp'
   s.add_dependency 'fog', '~> 1.6'
-  s.add_dependency 'json'
-  
+
   s.add_development_dependency('rake')
   s.add_development_dependency('test-unit')
   s.add_development_dependency('shoulda-context')

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

@@ -1,4 +1,4 @@
-passenger_version: '1:5.0.6-1~`lsb_release -sc`1'
+passenger_version: '1:5.0.8-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001

data/templates/passenger_nginx/config/rubber/role/passenger_nginx/application.conf

@@ -4,7 +4,7 @@
 
 server_name  <%= [ rubber_env.domain, rubber_env.web_aliases ].flatten.compact.join(" ") %>;
 passenger_enabled on;
-passenger_set_cgi_param HTTP_X_QUEUE_START "t=${msec}000";
+passenger_env_var HTTP_X_QUEUE_START "t=${msec}000";
 
 root <%= Rubber.root + "/public" %>;
 

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

@@ -1,4 +1,4 @@
-passenger_version: '1:5.0.6-1~`lsb_release -sc`1'
+passenger_version: '1:5.0.8-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 nginx_log_dir: /mnt/nginx/logs
 passenger_listen_port: 7000

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -92,22 +92,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -720,7 +704,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1883985794562211035
+      hash: -1794893249450792958
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2