alcapon 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ad2a04b0b969ddcdd084c811fca9eded8b1c501
-  data.tar.gz: c657ccd1631591f313ecfc06940ca6297cad240e
+  metadata.gz: 94e5f99bef83e6ef54ef050419597162c5f9555c
+  data.tar.gz: 3f0ea644669fc958eebe15a10f811e2d24b07d67
 SHA512:
-  metadata.gz: e0c27c326b6358b238912fab48f0555d9c8899ff7176c8c37252239172472ca48de9d78746a6db000c960468634f783f41a8f52148242ec7333155991b734744
-  data.tar.gz: e12957da18393dac9dbc6ba3d6e089ce0755b410195a1d989ed09c4c1868ac9127db060e4d90e36e2c5034dc03125adfb14f1e49fbe4d4716e63f4e4c60493fa
+  metadata.gz: 333abecc7a62b411da1f24e462121420b3fa6426dcd439aaab253566bf0105fae2bf83dd41a9009f259c288f59fac8c8980f451c0eba0f7d4630142fbad7a461
+  data.tar.gz: 60d1eb64ee2aa6dc0f5a4a5ffe4c35d3c2239d4aeb768fe83f497cc3f722df0f483adf929f470828a0bdbaf2f7dae295f70c0df5e6b9c18ffdf1234152772248

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Arnaud Lafon, http://github.com/alafon
+Copyright (c) 2014 Arnaud Lafon, https://github.com/alafon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/db.rb

@@ -17,14 +17,25 @@ namespace :db do
       files[i] = value
       i += 1
     }
+
     file_to_import = Capistrano::CLI.ui.ask "Which one ?"
-    dbpasswd = fetch( :database_local_passd, "#{database_passd}" )
     if files.has_key?( file_to_import.to_i )
       filename = File.join( backup_dir, files[file_to_import.to_i] )
-      system( "gunzip < #{filename} | mysql -u#{database_uname} -p#{dbpasswd} #{database_name} ")
     else
       abort "Bad index"
     end
+
+    if fetch( :ezdfs_database_name, nil ) != nil && filename =~ /#{ezdfs_database_name}/i
+      thisdbname = fetch( :ezdfs_database_name )
+      thisdbuser = fetch( :ezdfs_database_uname )
+      thisdbpass = fetch( :ezdfs_database_passd )
+    else
+      thisdbname = database_name
+      thisdbuser = database_uname
+      thisdbpass = database_passd
+    end
+    thisdbpass = fetch( :database_local_passd, "#{database_passd}" )
+    system( "gunzip < #{filename} | mysql -u#{thisdbuser} -p#{thisdbpass} #{thisdbname} ")
   end
 
   # Should use :db as :roles

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alcapon
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
 platform: ruby
 authors:
 - Arnaud Lafon
@@ -41,7 +41,7 @@ dependencies:
 description: Capistrano is a utility and framework for executing commands in parallel
   on multiple remote machines, via SSH. This package gives you some tools to deploy
   your eZ Publish projects.
-email: alcapon@arnaudlafon.com
+email: alcapon@phasetwo.fr
 executables:
 - capezit
 extensions: []