capistrano-exts 1.4.0 → 1.5.0

data/README.md

@@ -17,7 +17,7 @@ gem install capistrano-exts
 or add it to your Gemfile
 
 ```ruby
-gem 'capistrano-exts', '>=1.4.0'
+gem 'capistrano-exts', '>=1.5.0'
 ```
 
 Setup

data/lib/capistrano-exts/receipts/contents.rb

@@ -59,19 +59,30 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :export, :roles => :app, :except => { :no_release => true } do
       shared_path = fetch :shared_path
 
-      # Create random file name
-      random_file = random_tmp_file + ".tar.gz"
+      # Find out at which index the file is located ?
+      argv_file_index = ARGV.index("contents:export") + 1
+
+      # The database dump name
+      export_filename_argv = ARGV.try(:[], argv_file_index)
+
+      # Generate the file name
+      if export_filename_argv and not export_filename_argv =~ /.+:.+/ and not File.exists?(export_filename_argv)
+        export_filename = export_filename_argv
+      else
+        export_filename = random_tmp_file + ".tar.gz"
+      end
 
       # Create a tarball of the contents folder
       run <<-CMD
-        cd #{shared_path} &&
-        tar czf #{random_file} --exclude='*~' --exclude='*.tmp' --exclude='*.bak' shared_contents
+        cd #{shared_path}/shared_contents &&
+        tar czf /tmp/#{File.basename export_filename} --exclude='*~' --exclude='*.tmp' --exclude='*.bak' *
       CMD
 
       # Tranfer the contents to the local system
-      get random_file, random_file
+      get "/tmp/#{File.basename export_filename}", export_filename
 
-      puts "Contents has been downloaded to #{random_file}"
+      puts "Contents has been downloaded to #{export_filename}"
+      exit 0
     end
   end
 

data/lib/capistrano-exts/receipts/deploy.rb

@@ -1,4 +1,6 @@
 require 'capistrano'
+require 'capistrano/errors'
+require 'capistrano-exts/receipts/functions'
 
 # Verify that Capistrano is version 2
 unless Capistrano::Configuration.respond_to?(:instance)
@@ -29,9 +31,27 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       run "chmod -R g+w #{fetch :latest_release}" if fetch(:group_writable, true)
     end
+
+    desc "[internal] Symlink htdocs"
+    task :symlink_htdocs do
+      deploy_to = fetch :deploy_to
+      if remote_file_exists?("#{deploy_to}/htdocs")
+        begin
+          run <<-CMD
+            #{try_sudo} mv #{deploy_to}/htdocs #{deploy_to}/old_htdocs &&
+            #{try_sudo} ln -nsf #{fetch :public_path} #{deploy_to}/htdocs
+          CMD
+        rescue Capistrano::CommandError
+          puts "WARNING: I couldn't replace the old htdocs please do so manually"
+        end
+      end
+
+      puts "The htdocs folder has been moved to old_htdocs"
+    end
   end
 
   # Dependencies
   before "deploy", "deploy:check_if_remote_ready"
   after "deploy:restart", "deploy:fix_permissions"
+  after "deploy:setup", "deploy:symlink_htdocs"
 end

data/lib/capistrano-exts/receipts/mysql.rb

@@ -1,5 +1,6 @@
 require 'capistrano'
 require 'capistrano/errors'
+require 'capistrano-exts/receipts/functions'
 require 'capistrano-exts/receipts/deploy'
 
 # Verify that Capistrano is version 2
@@ -13,9 +14,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :backup_db, :roles => :db, :except => { :no_release => true } do
       mysql_credentials = fetch :mysql_credentials
       mysql_db_name = fetch :mysql_db_name
-      MYSQL_DB_BACKUP_PATH = "#{deploy_to}/backups/#{mysql_db_name}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}.sql"
+      deploy_to = fetch :deploy_to
+      set :latest_db_dump, "#{deploy_to}/backups/#{mysql_db_name}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}.sql"
+      latest_db_dump = fetch :latest_db_dump
 
-      on_rollback { run "rm -f #{MYSQL_DB_BACKUP_PATH}" }
+      on_rollback { run "rm -f #{latest_db_dump}" }
 
       if exists?(:mysql_credentials)
         begin
@@ -26,11 +29,11 @@ Capistrano::Configuration.instance(:must_exist).load do
               --password='#{mysql_credentials[:pass]}' \
               --default-character-set=utf8 \
               '#{mysql_db_name}' > \
-              '#{MYSQL_DB_BACKUP_PATH}'
+              '#{latest_db_dump}'
           CMD
 
           run <<-CMD
-            #{try_sudo} bzip2 -9 '#{MYSQL_DB_BACKUP_PATH}'
+            #{try_sudo} bzip2 -9 '#{latest_db_dump}'
           CMD
         rescue Capistrano::CommandError
           puts "WARNING: The database doesn't exist."
@@ -159,9 +162,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         exit 1
       else
         # The database dump name
-        dump_sql_file = ARGV[argv_file_index]
+        import_filename_argv = ARGV[argv_file_index]
         # Read the dump
-        mysql_dump = File.read(dump_sql_file)
+        mysql_dump = File.read(import_filename_argv)
         # Generate a random file
         random_file = random_tmp_file mysql_dump
         # Add a rollback hook
@@ -170,7 +173,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         if mysql_credentials.present?
           drop_db
           create_db
-          put File.read(dump_sql_file), random_file
+          put File.read(import_filename_argv), random_file
 
           run <<-CMD
             mysql \
@@ -193,35 +196,39 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Export a database dump"
     task :export_db_dump, :roles => :db, :except => { :no_release => true } do
-      on_rollback { run "rm -f /tmp/#{File.basename MYSQL_DB_BACKUP_PATH}{,.bz2" }
+      latest_db_dump = fetch :latest_db_dump
+      on_rollback { run "rm -f /tmp/#{File.basename latest_db_dump}{,.bz2" }
 
       mysql_credentials = fetch :mysql_credentials
 
       # Find out at which index the file is located ?
       argv_file_index = ARGV.index("mysql:export_db_dump") + 1
 
-      if ARGV.size < (argv_file_index + 1) or File.exists?(ARGV[argv_file_index])
-        puts "ERROR: please run 'cap mysql:export_db_dump <sql dump>'"
-        puts "       <sql dump> should not exist"
-        exit 1
+      # The database dump name
+      export_filename_argv = ARGV.try(:[], argv_file_index)
+
+      # Generate the file name
+      if export_filename_argv and not export_filename_argv =~ /.+:.+/ and not File.exists?(export_filename_argv)
+        export_filename = export_filename_argv
       else
-        # The database dump name
-        dump_sql_file = ARGV.delete_at(argv_file_index)
+        export_filename = random_tmp_file + ".sql"
+      end
 
-        if mysql_credentials.present?
-          run <<-CMD
-            cp #{MYSQL_DB_BACKUP_PATH}.bz2 /tmp &&
-            bunzip2 /tmp/#{File.basename MYSQL_DB_BACKUP_PATH}.bz2
-          CMD
+      # Get the dump
+      if mysql_credentials.present?
+        run <<-CMD
+          cp #{latest_db_dump}.bz2 /tmp &&
+          bunzip2 /tmp/#{File.basename latest_db_dump}.bz2
+        CMD
 
-          get "/tmp/#{File.basename MYSQL_DB_BACKUP_PATH}", dump_sql_file
+        get "/tmp/#{File.basename latest_db_dump}", export_filename
 
-          run <<-CMD
-            rm -f /tmp/#{File.basename MYSQL_DB_BACKUP_PATH}
-          CMD
+        run <<-CMD
+          rm -f /tmp/#{File.basename latest_db_dump}
+        CMD
 
-          exit 0
-        end
+        puts "Mysql dump has been downloaded to #{export_filename}"
+        exit 0
       end
     end
 

data/lib/capistrano-exts/receipts/servers.rb

@@ -15,6 +15,38 @@ end
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     namespace :server do
+
+      desc "Send SSH key"
+      task :send_ssh_key do
+        # Find out at which index the file is located ?
+        argv_file_index = ARGV.index("deploy:server:send_ssh_key") + 1
+
+        # The database dump name
+        idrsa_filename_argv = ARGV.try(:[], argv_file_index)
+
+        # Generate the file name
+        if idrsa_filename_argv and not idrsa_filename_argv =~ /.+:.+/ and not File.exists?(idrsa_filename_argv)
+          idrsa_filename = idrsa_filename_argv
+        else
+          idrsa_filename = "#{ENV['HOME']}/.ssh/id_rsa.pub"
+        end
+
+        if File.exists?(idrsa_filename)
+          idrsa_filename_contents = File.read(idrsa_filename).chomp
+          random_file = random_tmp_file idrsa_filename_contents
+
+          run <<-CMD
+            mkdir -p ~/.ssh &&
+            touch ~/.ssh/authorized_keys &&
+            echo '#{idrsa_filename_contents}' > #{random_file} &&
+            cat #{random_file} >> ~/.ssh/authorized_keys &&
+            rm -f #{random_file}
+          CMD
+        else
+          abort "The id_rsa or id_dsa file '#{idrsa_filename}' does not exists."
+        end
+      end
+
       namespace :setup do
         desc "Prepare the server (database server, web server and folders)"
         task :default do

data/lib/capistrano-exts/version.rb

@@ -2,7 +2,7 @@ module Capistrano
   module Extensions
     module Version #:nodoc:
       MAJOR = 1
-      MINOR = 4
+      MINOR = 5
       TINY = 0
 
       ARRAY  = [MAJOR, MINOR, TINY]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2155898800 !ruby/object:Gem::Requirement
+  requirement: &2152402160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155898800
+  version_requirements: *2152402160
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152141240 !ruby/object:Gem::Requirement
+  requirement: &2152612760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152141240
+  version_requirements: *2152612760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152140380 !ruby/object:Gem::Requirement
+  requirement: &2152626900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152140380
+  version_requirements: *2152626900
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152139700 !ruby/object:Gem::Requirement
+  requirement: &2152622900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152139700
+  version_requirements: *2152622900
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2152139040 !ruby/object:Gem::Requirement
+  requirement: &2152619820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2152139040
+  version_requirements: *2152619820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152138360 !ruby/object:Gem::Requirement
+  requirement: &2152670800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2152138360
+  version_requirements: *2152670800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152137740 !ruby/object:Gem::Requirement
+  requirement: &2152665220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152137740
+  version_requirements: *2152665220
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com