rubber 2.0.0.pre10 → 2.0.0.pre11

data/lib/rubber/commands/cron.rb

@@ -95,8 +95,10 @@ module Rubber
         
         # set current directory to rootdir
         Dir.chdir(rootdir)
-  
-        status = Open4::popen4(*cmd) do |pid, stdin, stdout, stderr|
+
+        # Open4 forks, which JRuby doesn't support.  But JRuby added a popen4-compatible method on the IO class,
+        # so we can use that instead.
+        status = (defined?(JRUBY_VERSION) ? IO : Open4).popen4(*cmd) do |pid, stdin, stdout, stderr|
           File.open(log, "w") do | fh |
             threads = []
             threads <<  Thread.new(stdout) do |stdout|

data/lib/rubber/recipes/rubber/setup.rb

@@ -408,7 +408,7 @@ namespace :rubber do
       # graphite web app)
       if instance_item.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          provider.update("#{name}.#{instance_item.full_name}", instance_item.external_ip)
+          provider.update("#{name}.#{instance_item.name}", instance_item.external_ip)
         end
       end
     end
@@ -426,7 +426,7 @@ namespace :rubber do
       # graphite web app)
       if instance_item.role_names.include?('web_tools')
         Array(rubber_env.web_tools_proxies).each do |name, settings|
-          provider.destroy("#{name}.#{instance_item.full_name}")
+          provider.destroy("#{name}.#{instance_item.name}")
         end
       end
     end

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.0.pre10"
+  VERSION = "2.0.0.pre11"
 end
 

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

@@ -22,7 +22,7 @@ namespace :rubber do
         TMPDIR=`mktemp -d` || exit 1
         cd $TMPDIR
         echo 'Downloading'
-        wget -qN http://sysoev.ru/nginx/nginx-#{rubber_env.nginx_version}.tar.gz
+        wget -qN http://nginx.org/download/nginx-#{rubber_env.nginx_version}.tar.gz
         echo 'Unpacking'
         tar xf nginx-#{rubber_env.nginx_version}.tar.gz
         passenger-install-nginx-module --auto --prefix=/opt/nginx --nginx-source-dir=$TMPDIR/nginx-#{rubber_env.nginx_version} --extra-configure-flags="--conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --lock-path=/var/lock/nginx.lock --pid-path=/var/run/nginx.pid --sbin-path=/usr/sbin/nginx --with-http_gzip_static_module"

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

@@ -1,5 +1,5 @@
-passenger_version: 3.0.7
-nginx_version: 1.0.0
+passenger_version: 3.0.11
+nginx_version: 1.0.11
 passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{rvm_prefix}/wrappers/#{`bash -l -c 'rvm strings #{rvm_ruby}'`.strip}/ruby"
 passenger_lib: "#{passenger_root}/ext/nginx"
@@ -16,5 +16,5 @@ use_ssl_key: false
 
 roles:
   passenger_nginx:
-    packages: [libcurl4-openssl-dev]
+    packages: [libcurl4-openssl-dev, libpcre3-dev]
     gems: [[passenger, "#{passenger_version}"]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre10
+  version: 2.0.0.pre11
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -569,7 +569,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4223981313086308948
+      hash: 4313840116415290415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: