deprec 2.2.3 → 3.1.0.rc1

data/CHANGELOG

@@ -1,6 +1,6 @@
 # deprec changelog
 
-= 2.2.2  (Jul 15, 2011)
+= 2.2.3  (Jul 15, 2011)
 
 * deprec now provides rake tasks
 

data/bin/depify

@@ -9,22 +9,17 @@ end
 
 
 caprc = unindent(<<-FILE)
-  # .caprc - Capistrano configs (added by deprec gem [www.deprec.org])
+  # .caprc - Capistrano configs (added by deprec gem [deprec.org])
   #
   # Include settings that you want active whenever you use Capistrano
-  # You can over ride these for particular projects by putting entries
+  # You can override these for particular projects by putting entries
   # into Capfile or deploy.rb for those projects
   #
   # Uncomment any of the following entries to enable them.
   
   # Include deprec - deployment recipes for Capistrano (www.deprec.org)
   #
-  # This loads all recipes minus the ones in rails.rb
-  # The recipes in rails.rb add 'before' and 'after' tasks to
-  # some of the builtin cap deploy tasks which are not appropriate
-  # for deploying a project that isn't setup to use deprec.
-  #
-  require 'deprec_minus_rails'
+  require 'deprec'
 
   # This fixes the following problem on Ubuntu Lucid (and others?)
   #  'sudo: no tty present and no askpass program specified'

data/lib/deprec.rb

@@ -1,8 +1,6 @@
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort "deprec2 requires Capistrano 2"
+require 'deprec-core'
+if defined?(Capistrano)
+  require "#{File.dirname(__FILE__)}/deprec/recipes"
+elsif defined?(Rake)
+  require "#{File.dirname(__FILE__)}/deprec/rake"
 end
-
-require "#{File.dirname(__FILE__)}/deprec/capistrano_extensions"
-require "#{File.dirname(__FILE__)}/vmbuilder_plugins/all"
-require "#{File.dirname(__FILE__)}/deprec/recipes"
-

data/lib/deprec/cap.rb

@@ -0,0 +1,51 @@
+# Copyright 2006-2008 by Mike Bailey. All rights reserved.
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "deprec2 requires Capistrano 2"
+end
+require "#{File.dirname(__FILE__)}/cap/recipes/canonical"
+require "#{File.dirname(__FILE__)}/cap/recipes/deprec"
+require "#{File.dirname(__FILE__)}/cap/recipes/deprecated"
+
+# Updated for deprec3
+
+require "#{File.dirname(__FILE__)}/cap/recipes/users"
+require "#{File.dirname(__FILE__)}/cap/recipes/network"
+require "#{File.dirname(__FILE__)}/cap/recipes/mri"
+require "#{File.dirname(__FILE__)}/cap/recipes/ree"
+require "#{File.dirname(__FILE__)}/cap/recipes/rack"
+require "#{File.dirname(__FILE__)}/cap/recipes/rubygems"
+require "#{File.dirname(__FILE__)}/cap/recipes/nagios3"
+require "#{File.dirname(__FILE__)}/cap/recipes/nrpe"
+require "#{File.dirname(__FILE__)}/cap/recipes/git"
+
+# To be updated for deprec3
+
+require "#{File.dirname(__FILE__)}/cap/recipes/ssh"
+require "#{File.dirname(__FILE__)}/cap/recipes/passenger"
+require "#{File.dirname(__FILE__)}/cap/recipes/mysql"
+require "#{File.dirname(__FILE__)}/cap/recipes/postgresql"
+require "#{File.dirname(__FILE__)}/cap/recipes/apache"
+require "#{File.dirname(__FILE__)}/cap/recipes/haproxy"
+require "#{File.dirname(__FILE__)}/cap/recipes/heartbeat"
+require "#{File.dirname(__FILE__)}/cap/recipes/monit"
+require "#{File.dirname(__FILE__)}/cap/recipes/collectd"
+require "#{File.dirname(__FILE__)}/cap/recipes/ubuntu"
+
+# To be decided...
+
+require "#{File.dirname(__FILE__)}/cap/recipes/ec2"
+require "#{File.dirname(__FILE__)}/cap/recipes/mongrel"
+require "#{File.dirname(__FILE__)}/cap/recipes/sqlite"
+require "#{File.dirname(__FILE__)}/cap/recipes/nginx"
+require "#{File.dirname(__FILE__)}/cap/recipes/bash"
+require "#{File.dirname(__FILE__)}/cap/recipes/php"
+require "#{File.dirname(__FILE__)}/cap/recipes/aoe"
+require "#{File.dirname(__FILE__)}/cap/recipes/lvm"
+require "#{File.dirname(__FILE__)}/cap/recipes/ntp"
+require "#{File.dirname(__FILE__)}/cap/recipes/logrotate"
+require "#{File.dirname(__FILE__)}/cap/recipes/ssl"
+require "#{File.dirname(__FILE__)}/cap/recipes/postfix"
+require "#{File.dirname(__FILE__)}/cap/recipes/syslog"
+require "#{File.dirname(__FILE__)}/cap/recipes/syslog_ng"
+require "#{File.dirname(__FILE__)}/cap/recipes/stunnel"
+require "#{File.dirname(__FILE__)}/cap/recipes/utils"

data/lib/deprec/{recipes → cap/recipes}/deprec.rb

@@ -13,8 +13,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   # deprecated
   alias :default :_cset
 
-  # _cset :rake, 'rake'
-  _cset :rake, 'rakes'
+  _cset :rake, 'rake'
   
   # Deprec checks here for local versions of config templates before it's own
   set :local_template_dir, File.join('config','templates')

data/lib/deprec/{recipes → cap/recipes}/rails.rb

@@ -259,22 +259,22 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Create database"
       task :create, :roles => :app do
-        run "cd #{deploy_to}/current && rake db:create RAILS_ENV=#{rails_env}"
+        run "cd #{deploy_to}/current && #{rake} db:create RAILS_ENV=#{rails_env}"
       end
 
       desc "Run database migrations"
       task :migrate, :roles => :app do
-        run "cd #{deploy_to}/current && rake db:migrate RAILS_ENV=#{rails_env}"
+        run "cd #{deploy_to}/current && #{rake} db:migrate RAILS_ENV=#{rails_env}"
       end
       
       desc "Run database migrations"
       task :schema_load, :roles => :app do
-        run "cd #{deploy_to}/current && rake db:schema:load RAILS_ENV=#{rails_env}"
+        run "cd #{deploy_to}/current && #{rake} db:schema:load RAILS_ENV=#{rails_env}"
       end
 
       desc "Roll database back to previous migration"
       task :rollback, :roles => :app do
-        run "cd #{deploy_to}/current && rake db:rollback RAILS_ENV=#{rails_env}"
+        run "cd #{deploy_to}/current && #{rake} db:rollback RAILS_ENV=#{rails_env}"
       end
 
     end