deprec 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,5 +1,22 @@
 == git
 
+
+== 2.0.1 (February 20, 2009)
+
+Newly created ~/.caprc does not load Rails recipes.
+
+This solves the problem of Capistrano's default deploy tasks
+having 'before' and 'after' tasks added when you're deploying
+a project that isn't setup to use deprec.
+
+Existing users can update their existing ~/.caprc, replacing:
+
+    require 'deprec'
+
+with:
+
+    require 'deprec_minus_rails'
+
 == 2.0.0 (February 14, 2009)
 
 * Official deprec-2.0 Rubyforge release!

data/bin/depify

@@ -43,10 +43,15 @@ caprc = unindent(<<-FILE)
   # 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)
   #
-  require 'deprec'
+  # 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'
 
 FILE
 
@@ -69,10 +74,10 @@ files = {
     # your SCM below:
     set :scm, :git
    
-    set :ruby_vm_type,      :ree
-    set :web_server_type,   :apache
-    set :app_server_type,   :passenger
-    set :db_server_type,    :mysql
+    set :ruby_vm_type,      :ree        # :ree, :mri
+    set :web_server_type,   :apache     # :apache, :nginx
+    set :app_server_type,   :passenger  # :passenger, :mongrel
+    set :db_server_type,    :mysql      # :mysql, :postgresql, :sqlite
     
     # set :packages_for_project, %w(libmagick9-dev imagemagick libfreeimage3) # list of packages to be installed
     # set :gems_for_project, %w(rmagick mini_magick image_science) # list of gems to be installed

data/lib/deprec/recipes/rails.rb

@@ -47,6 +47,14 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :rails do
       
+      #
+      # If database.yml is not kept in scm and it is present in local
+      # config dir then push it out to server.
+      #
+      before 'deprec:rails:symlink_database_yml', :roles => :app do
+        push_database_yml unless database_yml_in_scm
+      end
+      
       task :setup_database, :roles => :db do
         if ! roles[:db].servers.empty? # Some apps don't use database!
           deprec2.read_database_yml
@@ -80,13 +88,13 @@ Capistrano::Configuration.instance(:must_exist).load do
       DESC
       task :install_stack do   
 
-        top.deprec.ruby.install    
-        top.deprec.web.install        # Uses value of web_server_type 
+        top.deprec.ruby.install
+        top.deprec.rails.install
         top.deprec.svn.install
         top.deprec.git.install
+        top.deprec.web.install        # Uses value of web_server_type 
         top.deprec.app.install        # Uses value of app_server_type
         top.deprec.monit.install
-        top.deprec.rails.install
         top.deprec.logrotate.install  
         
         # We not longer install database server as part of this task.
@@ -199,6 +207,7 @@ Capistrano::Configuration.instance(:must_exist).load do
             if path != '.'
               deprec2.mkdir("#{current_path}/#{path}")
             end
+            sudo "test -d #{current_path}/#{dir} && mv #{current_path}/#{dir} #{current_path}/#{dir}.moved_by_deprec; exit 0"
             run "ln -nfs #{shared_path}/#{dir} #{current_path}/#{dir}" 
           end
         end
@@ -273,6 +282,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
       end
       
+      desc "Copy database.yml to shared/config/database.yml. Useful if not kept in scm"
+      task :push_database_yml, :roles => :app do
+        if File.exists?('config/database.yml')
+          put(File.read('config/database.yml'), "#{shared_path}/config/database.yml")
+        end
+      end
+      
     end
 
     namespace :database do

data/lib/deprec/recipes/ssl.rb

@@ -44,9 +44,10 @@ Capistrano::Configuration.instance(:must_exist).load do
         deprec2.push_configs(:ssl, PROJECT_CONFIG_FILES[:ssl])
       end
       
-      task :generate_snakeoil_cert, :roles => :web do
-        sudo "/usr/sbin/make-ssl-cert generate-default-snakeoil"
-      end
+      # WOn't run without controlling terminal! :-(
+      # task :generate_snakeoil_cert, :roles => :web do
+      #   sudo "/usr/sbin/make-ssl-cert generate-default-snakeoil"
+      # end
       
     end
     

data/lib/deprec/recipes/web/apache.rb

@@ -55,11 +55,23 @@ Capistrano::Configuration.instance(:must_exist).load do
         # In the meantime we'll just use the snakeoil cert
         #
         # top.deprec.ssl.config_gen if apache_ssl_enabled
-        top.deprec.ssl.generate_snakeoil_cert if apache_ssl_enabled
+        top.deprec.ssl.config_gen if apache_ssl_enabled
       end
       
       desc "Push apache config files to server"
       task :config, :roles => :web do
+        config_system
+      end
+      
+      desc "Generate initial configs and copy direct to server."
+      task :initial_config, :roles => :web do
+        SYSTEM_CONFIG_FILES[:apache].each do |file|
+          deprec2.render_template(:apache, file.merge(:remote => true))
+        end
+      end
+      
+      desc "Push apache config files to server"
+      task :config_system, :roles => :web do
         deprec2.push_configs(:apache, SYSTEM_CONFIG_FILES[:apache])
       end
       
@@ -68,7 +80,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         # XXX Need to flesh out generation of custom certs
         # In the meantime we'll just use the snakeoil cert
         #
-        # top.deprec.ssl.config if apache_ssl_enabled
+        top.deprec.ssl.config if apache_ssl_enabled
       end
       
       task :enable_modules, :roles => :web do

data/lib/deprec/recipes_minus_rails.rb

@@ -0,0 +1,62 @@
+# Copyright 2006-2008 by Mike Bailey. All rights reserved.
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "deprec2 requires Capistrano 2"
+end
+
+# Don't load the rails recipes in ~/.caprc
+#
+# This excludes the 'before' and 'after' tasks deprec adds to 
+# facilitate rails setup.
+#
+#require "#{File.dirname(__FILE__)}/recipes/rails"
+
+require "#{File.dirname(__FILE__)}/recipes/canonical"
+require "#{File.dirname(__FILE__)}/recipes/deprec"
+require "#{File.dirname(__FILE__)}/recipes/deprecated"
+
+require "#{File.dirname(__FILE__)}/recipes/app/mongrel"
+require "#{File.dirname(__FILE__)}/recipes/app/passenger"
+require "#{File.dirname(__FILE__)}/recipes/db/mysql"
+require "#{File.dirname(__FILE__)}/recipes/db/postgresql"
+require "#{File.dirname(__FILE__)}/recipes/db/sqlite"
+require "#{File.dirname(__FILE__)}/recipes/ruby/mri"
+require "#{File.dirname(__FILE__)}/recipes/ruby/ree"
+require "#{File.dirname(__FILE__)}/recipes/web/apache"
+require "#{File.dirname(__FILE__)}/recipes/web/nginx"
+
+require "#{File.dirname(__FILE__)}/recipes/git"
+require "#{File.dirname(__FILE__)}/recipes/gitosis"
+require "#{File.dirname(__FILE__)}/recipes/svn"
+
+require "#{File.dirname(__FILE__)}/recipes/users"
+require "#{File.dirname(__FILE__)}/recipes/ssh"
+require "#{File.dirname(__FILE__)}/recipes/php"
+# require "#{File.dirname(__FILE__)}/recipes/scm/trac"
+
+require "#{File.dirname(__FILE__)}/recipes/aoe"
+
+require "#{File.dirname(__FILE__)}/recipes/xen"
+require "#{File.dirname(__FILE__)}/recipes/xentools"
+
+require "#{File.dirname(__FILE__)}/recipes/ddclient"
+require "#{File.dirname(__FILE__)}/recipes/ntp"
+require "#{File.dirname(__FILE__)}/recipes/logrotate"
+require "#{File.dirname(__FILE__)}/recipes/ssl"
+
+require "#{File.dirname(__FILE__)}/recipes/postfix"
+require "#{File.dirname(__FILE__)}/recipes/memcache"
+require "#{File.dirname(__FILE__)}/recipes/monit"
+require "#{File.dirname(__FILE__)}/recipes/network"
+require "#{File.dirname(__FILE__)}/recipes/nagios"
+require "#{File.dirname(__FILE__)}/recipes/heartbeat"
+
+require "#{File.dirname(__FILE__)}/recipes/ubuntu"
+require "#{File.dirname(__FILE__)}/recipes/lvm"
+require "#{File.dirname(__FILE__)}/recipes/vnstat"
+require "#{File.dirname(__FILE__)}/recipes/sphinx"
+require "#{File.dirname(__FILE__)}/recipes/utils"
+require "#{File.dirname(__FILE__)}/recipes/apt_mirror"
+# require "#{File.dirname(__FILE__)}/recipes/wordpress" Not working
+require "#{File.dirname(__FILE__)}/recipes/wpmu"
+require "#{File.dirname(__FILE__)}/recipes/ar_sendmail"
+require "#{File.dirname(__FILE__)}/recipes/starling"

data/lib/deprec_minus_rails.rb

@@ -0,0 +1,12 @@
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "deprec2 requires Capistrano 2"
+end
+
+require "#{File.dirname(__FILE__)}/deprec/capistrano_extensions"
+require "#{File.dirname(__FILE__)}/vmbuilder_plugins/all"
+
+# Don't load the rails recipes in ~/.caprc
+#
+# This excludes the 'before' and 'after' tasks deprec adds to 
+# facilitate rails setup.
+require "#{File.dirname(__FILE__)}/deprec/recipes_minus_rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Mike Bailey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 +11:00
+date: 2009-02-20 00:00:00 +11:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,7 @@ files:
 - lib/deprec/recipes/xen.rb
 - lib/deprec/recipes/xentools.rb
 - lib/deprec/recipes.rb
+- lib/deprec/recipes_minus_rails.rb
 - lib/deprec/templates
 - lib/deprec/templates/aoe
 - lib/deprec/templates/aoe/aoe-init
@@ -222,6 +223,7 @@ files:
 - lib/deprec/templates/xentools/xm.tmpl.erb
 - lib/deprec.rb
 - lib/deprec_cmd_completion.sh
+- lib/deprec_minus_rails.rb
 - lib/vmbuilder_plugins
 - lib/vmbuilder_plugins/all.rb
 - lib/vmbuilder_plugins/apt.rb