capistrano-exts 1.3.3 → 1.3.4

data/README.md

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

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

@@ -54,15 +54,18 @@ Capistrano::Configuration.instance(:must_exist).load do
     ['%']
   end
 
-  def random_tmp_file(data = nil)
+  def generate_random_file_name(data = nil)
     if data.present?
-      data_hash = Digest::SHA1.hexdigest data
-      "/tmp/#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}_#{data_hash}"
+      "#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}_#{Digest::SHA1.hexdigest data}"
     else
-      "/tmp/#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}"
+      "#{fetch :application}_#{Time.now.strftime('%d-%m-%Y_%H-%M-%S')}"
     end
   end
 
+  def random_tmp_file(data = nil)
+    "/tmp/#{generate_random_file_name data}"
+  end
+
   # Helper for some mysql tasks
   def mysql_credentials_formatted(mysql_credentials)
     return <<-EOS

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

@@ -148,8 +148,6 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Import a database dump"
     task :import_db_dump, :roles => :db, :except => { :no_release => true } do
-      on_rollback { run "rm -f /tmp/#{mysql_db_name}_dump.sql" }
-
       mysql_credentials = fetch :mysql_credentials
       mysql_db_name = fetch :mysql_db_name
 
@@ -161,12 +159,18 @@ Capistrano::Configuration.instance(:must_exist).load do
         exit 1
       else
         # The database dump name
-        dump_sql_file = ARGV.delete_at(argv_file_index)
+        dump_sql_file = ARGV[argv_file_index]
+        # Read the dump
+        mysql_dump = File.read(dump_sql_file)
+        # Generate a random file
+        random_file = random_tmp_file mysql_dump
+        # Add a rollback hook
+        on_rollback { run "rm -f #{random_file}" }
 
         if mysql_credentials.present?
           drop_db
           create_db
-          put File.read(dump_sql_file), "/tmp/#{mysql_db_name}_dump.sql"
+          put File.read(dump_sql_file), random_file
 
           run <<-CMD
             mysql \
@@ -175,11 +179,11 @@ Capistrano::Configuration.instance(:must_exist).load do
               --password='#{mysql_credentials[:pass]}' \
               --default-character-set=utf8 \
               '#{mysql_db_name}' < \
-              /tmp/#{mysql_db_name}_dump.sql
+              #{random_file}
           CMD
 
           run <<-CMD
-            rm -f '/tmp/#{mysql_db_name}_dump.sql'
+            rm -f '#{random_file}'
           CMD
 
           exit 0

data/lib/capistrano-exts/version.rb

@@ -3,7 +3,7 @@ module Capistrano
     module Version #:nodoc:
       MAJOR = 1
       MINOR = 3
-      TINY = 3
+      TINY = 4
 
       ARRAY  = [MAJOR, MINOR, TINY]
       STRING = ARRAY.join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-exts
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000 Z
+date: 2011-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153261160 !ruby/object:Gem::Requirement
+  requirement: &2152783480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153261160
+  version_requirements: *2152783480
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151926960 !ruby/object:Gem::Requirement
+  requirement: &2152683500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151926960
+  version_requirements: *2152683500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151925340 !ruby/object:Gem::Requirement
+  requirement: &2152629920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151925340
+  version_requirements: *2152629920
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2151923700 !ruby/object:Gem::Requirement
+  requirement: &2152451100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2151923700
+  version_requirements: *2152451100
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2151922900 !ruby/object:Gem::Requirement
+  requirement: &2152414620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2151922900
+  version_requirements: *2152414620
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2151922300 !ruby/object:Gem::Requirement
+  requirement: &2156285880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2151922300
+  version_requirements: *2156285880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151921340 !ruby/object:Gem::Requirement
+  requirement: &2151922700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2151921340
+  version_requirements: *2151922700
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com