rubber 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f1c83f794e79e016feb8710ab271980a85ab60
-  data.tar.gz: 0c300423e3fbfaea269f3a78461873a4fdfc1f0c
+  metadata.gz: 22e517ff32f6b1a5ebb0bbc229d619493e377d1a
+  data.tar.gz: 117569a34d40c27d17d0f62c587109b4aa32c1e9
 SHA512:
-  metadata.gz: 1054053c44ae3c830e37f39de2d39e26693eed0095043662a2b5bf3e962ec35386d222b13b929d45f226fa114491c1ae9e3731f1b1732f5dcf5c8798d51cc04b
-  data.tar.gz: 21381ae46616fe1fd9f5d32d76e2f220e96782a45d827e5bf635b9803a159fd481dfcdef170597fed0e034507ec007bcfaced14e2361ae45a0fac4f788aa35f7
+  metadata.gz: 06b55aeb4476092dc3d9d6fab6d7bf8819228a086afed91c2a014970d196ce6970761961d74c3274192d0e0f80df42003f7f4d80eeccedf3d78b2f3cac50fd92
+  data.tar.gz: e769eecb972f75a414f9bf3b04d670d335fa0822bd8ec2c3eae7578fff8ca5258a0940a3f5d2a46356aae3a6a82a2abb2863d5d5aa353cfa2a4b8c8aa8c641d4

data/CHANGELOG

@@ -1,3 +1,12 @@
+2.4.2 (06/01/2013)
+------------------
+
+Bug Fixes:
+=========
+
+[core, base] Tweaked the asset precompilation interop code to work in all cases now <c24b72e>
+
+
 2.4.1 (05/30/2013)
 ------------------
 
@@ -17,12 +26,12 @@ New Features:
 [core] DigitalOcean is now supported as a cloud provider
 [core] Added a "generic" cloud provider for connecting to dedicated hardware, VMs, and otherwise unsupported cloud providers
 
-
 Bug Fixes:
 =========
 
 [core] Trigger rubber:config after deploy:update_code so machines with both a DB and the asset pipeline can bootstrap properly <dc5d0b2>
 
+
 2.3.1 (05/12/2013)
 ------------------
 

data/lib/rubber/recipes/rubber/deploy.rb

@@ -24,8 +24,9 @@ namespace :rubber do
   task :post_stop do
   end
 
-  after "deploy:symlink", "rubber:config"
+  after "deploy:update", "rubber:config"
   after "deploy:rollback_code", "rubber:config"
+  before "deploy:migrate", "rubber:config"
 
   desc <<-DESC
     Configures the deployed rails application by running the rubber configuration process

data/lib/rubber/recipes/rubber/utils.rb

@@ -229,9 +229,7 @@ namespace :rubber do
     unless (fetch(:rubber_code_was_updated, false))
       deploy.setup
       logger.info "updating code for bootstrap"
-      set :rubber_updating_code_for_bootstrap_db, true
       deploy.update_code
-      set :rubber_updating_code_for_bootstrap_db, false
     end
   end
   

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

data/templates/base/config/deploy.rb

@@ -89,18 +89,14 @@ task :cleanup, :except => { :no_release => true } do
   CMD
 end
 
+# We need to ensure that rubber:config runs before asset precompilation in Rails, as Rails tries to boot the environment,
+# which means needing to have DB access.  However, if rubber:config hasn't run yet, then the DB config will not have
+# been generated yet.  Rails will fail to boot, asset precompilation will fail to complete, and the deploy will abort.
 if Rubber::Util.has_asset_pipeline?
-  # load asset pipeline task, disable precompile from being triggered
-  # by deploy:update_code during bootstrap_db, and reorder to run after
-  # rubber:config has generated database.yml/etc.
   load 'deploy/assets'
+
   callbacks[:after].delete_if {|c| c.source == "deploy:assets:precompile"}
-  task :_skip_assets_precompile_if_bootstrapping_db do
-    if fetch(:rubber_updating_code_for_bootstrap_db, false)
-      logger.info "Skipping assets precompilation"
-    else
-      deploy.assets.precompile
-    end
-  end
-  after 'deploy:update_code', '_skip_assets_precompile_if_bootstrapping_db'
+  callbacks[:before].delete_if {|c| c.source == "deploy:assets:symlink"}
+  before "deploy:assets:precompile", "deploy:assets:symlink"
+  after "rubber:config", "deploy:assets:precompile"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano