deprec 3.1.0.rc13 → 3.1.0.rc15

data/CHANGELOG

@@ -1,6 +1,11 @@
 deprec changelog
 ================
 
+= 3.1.0.rc14  (Jul 28, 2011)
+
+  * Set default roles for apache and git recipes
+  * Move rubygem dependencies out into deprec-core
+
 = 3.1.0.rc13  (Jul 22, 2011)
 
   * temp fix - canonical service names not working

data/docs/README.rails

@@ -5,7 +5,7 @@ The rack recipes should work with any rack app.
 
 *Quickstart*
 
-    $ cap deprec:rack:install_stack
+    $ cap deprec:rack:install_stack HOSTS=mbailey@lucid
 
     $ cd your_rails_app
     $ depify . 
@@ -15,9 +15,9 @@ The rack recipes should work with any rack app.
     # database server that has already been installed.
     $ cap deprec:db:install 
 
-    $ cap deploy:setup HOSTS=mbailey@uat
+    $ cap deploy:setup HOSTS=mbailey@lucid
 
-    $ cap deprec:rack:config HOSTS=mbailey@uat
+    $ cap deprec:rack:config HOSTS=mbailey@lucid
 
     # ssh to git@github.com from uat and accept hostkey
     $ cap deploy 

data/lib/deprec/recipes/apache.rb

@@ -14,7 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         %w(rewrite ssl proxy_balancer proxy_http deflate expires headers)
 
       desc "Install Apache"
-      task :install do
+      task :install, :roles => :web do
         apt.install( 
           {:base => %w(apache2-mpm-prefork apache2-prefork-dev rsync ssl-cert)},
           :stable )
@@ -84,7 +84,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       # Stub so generic tasks don't fail (e.g. deprec:web:config_project)
-      task :config_project do
+      task :config_project, :roles => :web do
         # XXX Need to flesh out generation of custom certs
         # In the meantime we'll just use the snakeoil cert
         #
@@ -152,7 +152,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       }
       set :apache_vhost_rack_env, false
       # 
-      task :vhost do
+      task :vhost, :roles => :web do
         file = { 
           :template => 'vhost.erb',
           :path => "/etc/apache2/sites-available/#{apache_vhost_domain}",

data/lib/deprec/recipes/git.rb

@@ -5,7 +5,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       # Ubuntu lucid has a new enough version of git
       desc "Install git"
-      task :install do
+      task :install, :roles => :app do
         apt.install( {:base => %w(git-core)}, :stable )
       end
 

data/lib/deprec/recipes/mri.rb

@@ -4,16 +4,16 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :mri do
             
-      SRC_PACKAGES['ruby-1.8.7-p330'] = {
-        :md5sum => "50a49edb787211598d08e756e733e42e  ruby-1.8.7-p330.tar.gz",
-        :url => "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p330.tar.gz",
+      SRC_PACKAGES['ruby-1.8.7-p352'] = {
+        :md5sum => "0c33f663a10a540ea65677bb755e57a7  ruby-1.8.7-p352.tar.gz",
+        :url => "http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p352.tar.gz",
         :deps => %w(zlib1g-dev libssl-dev libncurses5-dev libreadline5-dev),
         :configure => "./configure --with-readline-dir=/usr/local;"
       }
 
-      SRC_PACKAGES['ruby-1.9.2-p180'] = {
-        :md5sum => "0d6953820c9918820dd916e79f4bfde8  ruby-1.9.2-p180.tar.gz", 
-        :url => "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p180.tar.gz",
+      SRC_PACKAGES['ruby-1.9.2-p290'] = {
+        :md5sum => "604da71839a6ae02b5b5b5e1b792d5eb  ruby-1.9.2-p290.tar.gz", 
+        :url => "http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p290.tar.gz",
         :deps => %w(zlib1g-dev libssl-dev libncurses5-dev libreadline5-dev),
         :configure => "./configure",
         :post_install => 'sudo gem update --system'

data/lib/deprec/recipes/rack.rb

@@ -8,20 +8,20 @@ Capistrano::Configuration.instance(:must_exist).load do
       desc "Install Rack stack on Ubuntu server (8.04, 10.04)"
       task :install_stack do   
         top.deprec.git.install
-        top.deprec.ruby.install       # Uses ruby_vm_type
+        # top.deprec.ruby.install       # Uses ruby_vm_type
+        top.deprec.mri.install       # Uses ruby_vm_type
         gem2.install 'bundler'
-        # Some things Rails needs
-        apt.install( { :base => %w(libmysqlclient15-dev sqlite3 libsqlite3-ruby libsqlite3-dev libpq-dev) }, :stable)
-
+        install_rails_deps
         # XXX temporary fix
         # top.deprec.web.install        # Uses web_server_type 
         # top.deprec.app.install        # Uses app_server_type
         top.deprec.apache.install        
         top.deprec.passenger.install        
-
-        # top.deprec.rails.install
         top.deprec.logrotate.install  
-        # top.deprec.monit.install    # Not using monit lately
+      end
+
+      task :install_rails_deps, :roles => :app do
+        apt.install( { :base => %w(libmysqlclient15-dev sqlite3 libsqlite3-ruby libsqlite3-dev libpq-dev) }, :stable)
       end
       
       desc "Generate config files for rack app."

data/lib/deprec/templates/bash/bash_global

@@ -10,7 +10,7 @@ function sshdel { perl -i -n -e "print unless (\$. == $1)" ~/.ssh/known_hosts; }
 #########
 
 # Show disk usage in current directory
-alias dus='du -sm * | sort -n'
+alias dm='du -sm * | sort -n'
 
 # ls
 alias ll='ls -alF'
@@ -36,3 +36,12 @@ alias tc='time curl -s -o /dev/null'
 alias irb="irb -I '.' -rubygems"
 
 alias ssm="ssh -l $USER"
+
+# Load bash completion
+. /etc/bash_completion
+
+# Prompt
+parse_git_branch() {
+  git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
+}
+PS1="\[\e]0;\u@\h: \w\a\]${debian_chroot:+($debian_chroot)}\u@\h:\w \$(parse_git_branch)\$ "

data/lib/deprec/version.rb

@@ -1,3 +1,3 @@
 module Deprec
-  VERSION = "3.1.0.rc13"
+  VERSION = "3.1.0.rc15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deprec
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc13
+  version: 3.1.0.rc15
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000 +10:00
+date: 2011-07-28 00:00:00.000000000 +10:00
 default_executable: depify
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deprec-core
-  requirement: &9817220 !ruby/object:Gem::Requirement
+  requirement: &18296880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,29 +22,7 @@ dependencies:
         version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *9817220
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: &9816720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *9816720
-- !ruby/object:Gem::Dependency
-  name: capistrano-ext
-  requirement: &9816240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *9816240
+  version_requirements: *18296880
 description: ! "      This project provides Capistrano and Rake tasks to \n      assist
   with deployment and configuration management\n      on ubuntu linux servers.\n"
 email: mike@bailey.net.au
@@ -66,7 +44,6 @@ files:
 - docs/deprec-1.x/notes.txt
 - docs/README.nagios
 - docs/windows_linux.txt
-- docs/EXAMPLE-installing_tracks.txt
 - docs/xen/xen-tools-notes.txt
 - docs/xen/xen_on_hardy.txt
 - docs/xen/traffic_monitoring_with_vnstat.txt

data/docs/EXAMPLE-installing_tracks.txt

@@ -1,41 +0,0 @@
-#
-# Install tracks locally
-#
-git clone git://github.com/bsag/tracks.git
-cd tracks
-
-cp config/database.yml.tmpl config/database.yml
-cp config/site.yml.tmpl config/site.yml
-cp -r log.tmpl log -u 
-rake db:create
-rake db:migrate
-./script/server  # Test locally
-
-
-#
-# Install deprec
-#
-sudo gem install deprec
-cap deprec:users:passwd HOSTS=192.168.0.135 USER=root # Change root password
-cap deprec:users:add 	HOSTS=192.168.0.135 USER=root # Add personal account
-
-
-#
-# Create deploy.rb file for tracks
-#
-depify .
-curl -o config/deploy.rb http://mbailey.github.com/deprec/deploy.rb-tracks
-# Edit config/deploy.rb specifying the domain name to serve the app on.	
-
-
-#
-# Install on remote server
-# 
-
-cap deprec:rails:install_stack
-cap deprec:db:install
-cap deploy:setup 
-cap deploy 
-cap deploy:migrate
-
-# Tracks is now running on your server. Enjoy!