capedia 0.0.7 → 0.0.8

data/lib/capedia.rb

@@ -1,5 +1,5 @@
 module Capedia
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 
   module Gems
 

data/lib/capedia/{bundler_install.rb → bundler.rb}

@@ -2,17 +2,15 @@ Capistrano::Configuration.instance.load do
 
   namespace :deploy do
 
-    namespace :gems do
+    namespace :bundler do
 
       desc 'Installs all gems for the current release (uses bundler)'
       task :install, :except => { :no_release => true } do
-        run "cd #{current_path}; bundle install --path $GEM_HOME"
+        run "cd #{current_path}; bundle install --path $BUNDLE_PATH"
       end
 
     end
 
   end
 
-  after 'deploy:symlink', 'deploy:gems:install'
-
 end

data/lib/capedia/config.rb

@@ -29,6 +29,6 @@ Capistrano::Configuration.instance.load do
   end
 
   after 'deploy:setup', 'deploy:config:setup'
-  after 'deploy:symlink', 'deploy:config:symlink'
+  after 'deploy:update_code', 'deploy:config:symlink'
 
 end

data/lib/capedia/passenger.rb

@@ -1,7 +1,7 @@
 Capistrano::Configuration.instance.load do
 
   namespace :deploy do
-    
+
     desc "Stub for starting the application"
     task :start do
     end

data/lib/capedia/rails.rb

@@ -1,8 +1,44 @@
 require 'capedia/config'
 require 'capedia/gems'
+require 'capedia/bundler'
+require 'capedia/passenger'
 
 Capistrano::Configuration.instance.load do
-  after 'deploy:symlink', 'deploy:db:create?'
-  after 'deploy:symlink', 'deploy:migrate'
+
+  namespace :deploy do
+
+    namespace :gems do
+
+      desc 'Installs all gems for the current release'
+      task :install, :except => { :no_release => true } do
+        if fetch(:bundler, false)
+          deploy.bundler.install
+        else
+          run "cd #{current_path}; rake gems:install"
+        end
+      end
+
+    end
+
+    namespace :db do
+
+      desc 'Creates the database on the target server if createdb is passed to cap deploy.'
+      task :create, :except => { :no_release => true } do
+        run "cd #{current_path}; rake db:create RAILS_ENV=#{ fetch( :stage ) }"
+      end
+
+      task :create?, :except => { :no_release => true } do
+        # If cap deploy -S createdb=true - create the database on the target server.
+        deploy.db.create if fetch( :createdb, false )
+      end
+
+    end
+
+  end
+
+  after 'deploy:symlink', 'deploy:gems:install'
+  after 'deploy:gems:install', 'deploy:db:create?'
+  after 'deploy:db:create?', 'deploy:migrate'
+
   after 'deploy:restart', 'deploy:cleanup'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capedia
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ryan Wilson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -07:00
+date: 2011-02-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,14 +29,12 @@ extra_rdoc_files: []
 
 files: 
 - lib/capedia/active_messaging.rb
-- lib/capedia/bundler_install.rb
+- lib/capedia/bundler.rb
 - lib/capedia/config.rb
 - lib/capedia/crontab.rb
 - lib/capedia/gems.rb
 - lib/capedia/passenger.rb
 - lib/capedia/rails.rb
-- lib/capedia/rails_db.rb
-- lib/capedia/rails_gems_install.rb
 - lib/capedia.rb
 - lib/Rakefile
 - lib/test/jeff_test.rb
@@ -71,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ""
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Common capistrano plugins and recipes

data/lib/capedia/rails_db.rb

@@ -1,23 +0,0 @@
-Capistrano::Configuration.instance.load do | configuration |
-
-  namespace :deploy do
-
-    namespace :db do
-
-      desc 'Creates the database on the target server if createdb is passed to cap deploy.'
-      task :create, :except => { :no_release => true } do
-        # If cap deploy -S createdb=true is set create the database on the target server.
-        run "cd #{current_path}; rake db:create RAILS_ENV=#{ fetch( :stage ) }"
-      end
-
-      task :create?, :except => { :no_release => true } do
-        deploy.db.create if fetch( :createdb, false ) == true
-      end
-
-    end
-
-  end
-
-  after 'deploy:symlink', 'deploy:gems:install'
-
-end

data/lib/capedia/rails_gems_install.rb

@@ -1,18 +0,0 @@
-Capistrano::Configuration.instance.load do
-
-  namespace :deploy do
-
-    namespace :gems do
-
-      desc 'Installs all gems for the current release (uses rake gems:install)'
-      task :install, :except => { :no_release => true } do
-        run "cd #{current_path}; rake gems:install"
-      end
-
-    end
-
-  end
-
-  after 'deploy:symlink', 'deploy:gems:install'
-
-end