rubber 2.0.0.pre4 → 2.0.0.pre5

data/lib/rubber/cloud/fog.rb

@@ -34,7 +34,7 @@ module Rubber
       end
 
       def create_spot_instance_request(spot_price, ami, ami_type, security_groups, availability_zone)
-        response = @compute_provider.spot_requests.create(:spot_price => spot_price,
+        response = @compute_provider.spot_requests.create(:price => spot_price,
                                                           :image_id => ami,
                                                           :flavor_id => ami_type,
                                                           :groups => security_groups,

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.0.pre4"
+  VERSION = "2.0.0.pre5"
 end
 

data/templates/base/config/deploy.rb

@@ -36,6 +36,7 @@ set :push_instance_config, Rubber.env != 'production'
 # Allows the tasks defined to fail gracefully if there are no hosts for them.
 # Comment out or use "required_task" for default cap behavior of a hard failure
 rubber.allow_optional_tasks(self)
+
 # Wrap tasks in the deploy namespace that have roles so that we can use FILTER
 # with something like a deploy:cold which tries to run deploy:migrate but can't
 # because we filtered out the :db role
@@ -48,6 +49,17 @@ namespace :deploy do
   end
 end
 
+namespace :deploy do
+  namespace :assets do
+    rubber.allow_optional_tasks(self)
+    tasks.values.each do |t|
+      if t.options[:roles]
+        task t.name, t.options, &t.body
+      end
+    end
+  end
+end
+
 # load in the deploy scripts installed by vulcanize for each rubber module
 Dir["#{File.dirname(__FILE__)}/rubber/deploy-*.rb"].each do |deploy_file|
   load deploy_file

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

@@ -67,7 +67,7 @@ namespace :rubber do
         fi
       ENDSCRIPT
     end
-    
+
     task :install_graphite_from_repo, :roles => [:graphite_server, :graphite_web] do
       rubber.sudo_script 'install_graphite_from_repo', <<-ENDSCRIPT
         if [[ ! -d "/opt/graphite" ]]; then

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

@@ -14,7 +14,7 @@ web_tools_proxies:
     role: graphite_web
     port: "#{graphite_web_port}"
     path: /
-    
+
 roles:
   graphite_web:
     packages: [python-django python-django-tagging apache2 libapache2-mod-wsgi python-cairo python-memcache memcached sqlite3 bzr zip]

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

@@ -101,7 +101,7 @@ namespace :rubber do
           end
 
           pairs = {}
-          [*parents, *children].each {|item| pairs[item.uid] ||= [];  pairs[item.uid] << item}
+          (parents + children).each {|item| pairs[item.uid] ||= [];  pairs[item.uid] << item}
           stuck_parents = pairs.select{|item| item.size == 1 && item.first.type == :parent}
           stuck_children = pairs.select{|item| item.size == 1 && item.first.type == :child}
 
@@ -140,7 +140,7 @@ namespace :rubber do
           ages = children.group_by do |item|
             runtime = Time.now.to_i - item.start_time
             runtime = 0 if item.start_time == 0
-            [*times, *slow_times].find {|t| runtime < (t * 60)}
+            (times + slow_times).find {|t| runtime < (t * 60)}
           end
 
           times.each do |t|

data/templates/resque/lib/tasks/resque.rake

@@ -3,7 +3,7 @@ require 'resque/pool/tasks'
 # this task will get called before resque:pool:setup
 # and preload the rails environment in the pool manager
 task "resque:setup" => :environment do
-  # generic worker setup, e.g. Hoptoad for failed jobs
+  # generic worker setup, e.g. Airbrake for failed jobs
 end
 
 task "resque:pool:setup" do
@@ -14,5 +14,7 @@ task "resque:pool:setup" do
   Resque::Pool.after_prefork do |job|
     ActiveRecord::Base.establish_connection
     Resque.redis = YAML.load_file(Rails.root.join('config', 'resque.yml'))[Rails.env]
+
+    NewRelic::Agent.after_fork(:force_reconnect => true) if defined?(NewRelic)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre5
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &27783840 !ruby/object:Gem::Requirement
+  requirement: &8846840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *27783840
+  version_requirements: *8846840
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &27783420 !ruby/object:Gem::Requirement
+  requirement: &8845920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27783420
+  version_requirements: *8845920
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &27782960 !ruby/object:Gem::Requirement
+  requirement: &8844220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27782960
+  version_requirements: *8844220
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &27782540 !ruby/object:Gem::Requirement
+  requirement: &8842980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27782540
+  version_requirements: *8842980
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &27782040 !ruby/object:Gem::Requirement
+  requirement: &8840680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *27782040
+  version_requirements: *8840680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &27781620 !ruby/object:Gem::Requirement
+  requirement: &8839740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27781620
+  version_requirements: *8839740
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &27781160 !ruby/object:Gem::Requirement
+  requirement: &13573900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27781160
+  version_requirements: *13573900
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &27780740 !ruby/object:Gem::Requirement
+  requirement: &13573480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27780740
+  version_requirements: *13573480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &27780320 !ruby/object:Gem::Requirement
+  requirement: &13573060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27780320
+  version_requirements: *13573060
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &27779900 !ruby/object:Gem::Requirement
+  requirement: &13572640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27779900
+  version_requirements: *13572640
 description: ! "    The rubber plugin enables relatively complex multi-instance deployments
   of RubyOnRails applications to\n    Amazon's Elastic Compute Cloud (EC2).  Like
   capistrano, rubber is role based, so you can define a set\n    of configuration
@@ -506,7 +506,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1903448208957765126
+      hash: 509756412491793944
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: