winton-ubistrano 1.2.4 → 1.2.6

data/changelog.markdown

@@ -1,3 +1,19 @@
+Version 1.2.6
+-------------
+
+* Sinatra projects should have their own config.ru present, getting rid of sinatra:install
+
+Version 1.2.5
+-------------
+
+* Removing unnecessary tmp/restart.txt touch for PHP apps
+* Fixed some of the mysql:backup tasks
+
+Version 1.2.4
+-------------
+
+* Complete EC2/Ubuntu Hardy provision and deploy tested with Rails and Sinatra
+
 Version 1.2.3
 -------------
 

data/lib/ubistrano/deploy.rb

@@ -3,7 +3,10 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     desc "Restart application"
     task :restart, :roles => :app, :except => { :no_release => true } do
-      run_each "touch #{current_path}/tmp/restart.txt"
+      case platform
+      when :rails, :sinatra
+        run_each "touch #{current_path}/tmp/restart.txt"
+      end
     end
 
     desc "Start application"
@@ -34,7 +37,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       when :sinatra
         sinatra.config.default
         deploy.update
-        sinatra.install
       end
       apache.virtual_host.create
       deploy.start

data/lib/ubistrano/mysql.rb

@@ -46,10 +46,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :backup do
       desc "Upload local backup to remote"
       task :local_to_server, :roles => :db do
-        from = File.expand_path("~/db_backups/#{stage}/#{application}/#{backup_name}.bz2")
+        from = File.expand_path("backups/#{backup_name}.bz2", FileUtils.pwd)
         if File.exists?(from)
-          run_each "mkdir -p #{shared_path}/db_backups"
-          upload from, "#{shared_path}/db_backups/#{backup_name}.bz2"
+          run_each "mkdir -p #{shared_path}/backups"
+          upload from, "#{shared_path}/backups/#{backup_name}.bz2"
         else
           puts "Does not exist: #{from}"
         end
@@ -57,7 +57,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Restore remote database from backup"
       task :restore, :roles => :db do
-        run_each "bunzip2 < #{shared_path}/db_backups/#{backup_name}.bz2 | mysql -u #{application} --password=#{mysql_app_password} #{db_table}"
+        run_each "bunzip2 < #{shared_path}/backups/#{backup_name}.bz2 | mysql -u #{application} --password=#{mysql_app_password} #{db_table}"
       end
       
       desc "Backup database to local"
@@ -71,7 +71,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :to_server, :roles => :db do
         run_each [
           "mkdir -p #{shared_path}/db_backups",
-          "mysqldump --add-drop-table -u #{application} -p#{mysql_app_password} #{db_table}_production | bzip2 -c > #{shared_path}/db_backups/#{backup_name}.bz2"
+          "mysqldump --add-drop-table -u #{application} -p#{mysql_app_password} #{db_table} | bzip2 -c > #{shared_path}/db_backups/#{backup_name}.bz2"
         ]
       end
       

data/lib/ubistrano/rails.rb

@@ -30,7 +30,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Configure asset_packager" 
       task :asset_packager do
-        run "source ~/.bash_profile && cd #{release_path} && rake RAILS_ENV=production asset:packager:build_all"
+        run "cd #{release_path} && rake RAILS_ENV=production asset:packager:build_all"
       end
       
       desc "Configure rails_widget"

data/lib/ubistrano/sinatra.rb

@@ -1,34 +1,15 @@
 Capistrano::Configuration.instance(:must_exist).load do
   
-  namespace :sinatra do
-    desc "Runs install.rb if exists"
-    task :install do
-      if yes(msg(:sinatra_install))
-        run_puts "if [ -e #{current_path}/install.rb ]; then sudo ruby #{current_path}/install.rb; fi"
-      end
-    end
-    
+  namespace :sinatra do    
     namespace :config do
       desc "Creates config.ru in shared config"
       task :default do
-        run "mkdir -p #{shared_path}/config"
-        upload_from_erb "#{shared_path}/config/config.ru", binding, :folder => 'sinatra'
-      end
-      
-      desc "Creates database.yml in the shared config"
-      task :database, :roles => :app do
         run "mkdir -p #{shared_path}/config"
         Dir[File.expand_path('../../templates/rails/*', File.dirname(__FILE__))].each do |f|
           upload_from_erb "#{shared_path}/config/#{File.basename(f, '.erb')}", binding, :folder => 'rails'
         end
       end
       
-      desc "Creates config.ru in shared config"
-      task :rack, :roles => :app do
-        run "mkdir -p #{shared_path}/config"
-        upload_from_erb "#{shared_path}/config/config.ru", binding, :folder => 'sinatra'
-      end
-      
       desc "Copies files in the shared config folder into our app"
       task :to_app, :roles => :app do
         run "cp -Rf #{shared_path}/config/* #{release_path}"

data/ubistrano.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = 'ubistrano'
-  s.version = '1.2.4'
-  s.date    = '2008-02-22'
+  s.version = '1.2.6'
+  s.date    = '2008-06-27'
   
   s.summary     = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
   s.description = "Provision and deploy to an Ubuntu/God/Apache/Passenger stack using Capistrano"
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
     templates/apache/virtual_host.erb
     templates/log/rotate.conf.erb
     templates/rails/database.yml.erb
-    templates/sinatra/config.ru.erb
     templates/ubuntu/apache.god.erb
     templates/ubuntu/god.erb
     templates/ubuntu/god.god.erb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: winton-ubistrano
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-22 00:00:00 -08:00
+date: 2008-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,6 @@ files:
 - templates/apache/virtual_host.erb
 - templates/log/rotate.conf.erb
 - templates/rails/database.yml.erb
-- templates/sinatra/config.ru.erb
 - templates/ubuntu/apache.god.erb
 - templates/ubuntu/god.erb
 - templates/ubuntu/god.god.erb

data/templates/sinatra/config.ru.erb

@@ -1,19 +0,0 @@
-require 'sinatra'
-require 'rubygems'
-
-Sinatra::Application.default_options.merge!(
-  :run => false,
-  :env => :production,
-  :raise_errors => true,
-  :app_file => 'init.rb',
-  :root => '<%= deploy_to %>/current',
-  :views => '<%= deploy_to %>/current/views',
-  :public => '<%= deploy_to %>/current/public'
-)
-
-log = File.new('<%= deploy_to %>/shared/log/sinatra.log', 'a')
-STDOUT.reopen(log)
-STDERR.reopen(log)
-
-require 'init'
-run Sinatra.application