capistrano-exts 1.3.1 → 1.3.2

data/README.md

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

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

@@ -34,7 +34,7 @@ Capistrano::Configuration.instance.load do
   end
 
   on :load do
-    if stages.include?(ARGV.first)
+    if stages.include?(ARGV.first.to_sym)
       # Execute the specified stage so that recipes required in stage can contribute to task list
       find_and_execute_task(ARGV.first) if ARGV.any?{ |option| option =~ /-T|--tasks|-e|--explain/ }
     else

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

@@ -153,12 +153,20 @@ Capistrano::Configuration.instance(:must_exist).load do
       mysql_credentials = fetch :mysql_credentials
       mysql_db_name = fetch :mysql_db_name
 
-      unless ARGV.size >=2 and File.exists?(ARGV[1])
+      # Find out at which index the file is located ?
+      stages = fetch :stages
+      if stages.include?(ARGV.first.to_sym)
+        argv_file_index = 2
+      else
+        argv_file_index = 1
+      end
+
+      unless ARGV.size >= (argv_file_index + 1) and File.exists?(ARGV[argv_file_index])
         puts "ERROR: please run 'cap mysql:import_db_dump <sql dump>'"
         exit 1
       else
         # The database dump name
-        dump_sql_file = ARGV.delete_at(1)
+        dump_sql_file = ARGV.delete_at(argv_file_index)
 
         if mysql_credentials.present?
           drop_db
@@ -190,13 +198,21 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       mysql_credentials = fetch :mysql_credentials
 
-      unless ARGV.size >=2 or File.exists?(ARGV[1])
-        puts "ERROR: please run 'cap mysql:import_db_dump <sql dump>'"
+      # Find out at which index the file is located ?
+      stages = fetch :stages
+      if stages.include?(ARGV.first.to_sym)
+        argv_file_index = 2
+      else
+        argv_file_index = 1
+      end
+
+      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
       else
         # The database dump name
-        dump_sql_file = ARGV.delete_at(1)
+        dump_sql_file = ARGV.delete_at(argv_file_index)
 
         if mysql_credentials.present?
           run <<-CMD

data/lib/capistrano-exts/version.rb

@@ -3,7 +3,7 @@ module Capistrano
     module Version #:nodoc:
       MAJOR = 1
       MINOR = 3
-      TINY = 1
+      TINY = 2
 
       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.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2157002400 !ruby/object:Gem::Requirement
+  requirement: &2157539640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157002400
+  version_requirements: *2157539640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157001900 !ruby/object:Gem::Requirement
+  requirement: &2157539140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157001900
+  version_requirements: *2157539140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157001440 !ruby/object:Gem::Requirement
+  requirement: &2157538680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157001440
+  version_requirements: *2157538680
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2157000980 !ruby/object:Gem::Requirement
+  requirement: &2157538220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2157000980
+  version_requirements: *2157538220
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2157000520 !ruby/object:Gem::Requirement
+  requirement: &2157537760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157000520
+  version_requirements: *2157537760
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2157000060 !ruby/object:Gem::Requirement
+  requirement: &2157537300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2157000060
+  version_requirements: *2157537300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156999600 !ruby/object:Gem::Requirement
+  requirement: &2157536840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156999600
+  version_requirements: *2157536840
 description: Handy extensions for Capistrano
 email:
 - wael.nasreddine@gmail.com