capun 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a815db59ea3b4bc8b75e7a27eb8f203231b6d0e
-  data.tar.gz: 1a9ed3965826b7229e1ab265c52b5dd08c98c536
+  metadata.gz: 48564e3d27dfa07b2c7c69c82591df3fdbf1481a
+  data.tar.gz: 46d4f6d11124ca86cd183e48bf040bedfd0dbbcc
 SHA512:
-  metadata.gz: 35cf23110c74487c6101881cd9dfed493fb95ad50046c3937115b38da62101c02a532e7b0f99b479d76e3f3acd27d056f4f8005fb45d9d224da3f980c0b18ec7
-  data.tar.gz: 202925e2ea484a551e049da1505413b4401afa8b9905dc94c4a4f75cb30eda175ac1b3cc95a4e6aeddb25cd2fb200ae89332b64f7b2246945f03e53b35f3dfaf
+  metadata.gz: f630c1b238a500c58e06ae528a95018b9025974ec58f419dd17b80e2e82bfea2c14c7a5be59feafd043dc9eea32e23e2b2d79fe5f0b9f92886d318db23eabbdf
+  data.tar.gz: bf0048f9be24a7d40402d0390f1287708c4fee503e850686f01567a925c0564244b5503caf8693c160eb0e8ba8133c0f0e1bcfa4d97b104f1316bae61ea6b64d

data/lib/capun/version.rb

@@ -1,3 +1,3 @@
 module Capun
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

data/lib/generators/capun/templates/backup.sh.erb

@@ -8,15 +8,15 @@ zip -u -0 -r -s 1000 "backuping/version-$curdate/assets.zip" <% (fetch(:backupFo
 
 adapter=$(cat config/database.yml | grep adapter | sed s/adapter://g | xargs)
 if [ "$adapter" = "sqlite3" ]; then
-  DATA_BASE_TYPE="SQLite3"
+  DATA_BASE_TYPE="<%=fetch(:stage)%>.sqlite3"
   cp "<%=fetch(:stage)%>.sqlite3" "backuping/version-$curdate/database.sqlite3"
 fi
 if [ "$adapter" = "mysql2" ]; then
-DATA_BASE_TYPE="MySQL"
+DATA_BASE_TYPE="<%=fetch(:stage)%>.sql"
 username=$(cat config/database.yml | grep username | sed s/username://g | xargs)
 password=$(cat config/database.yml | grep password | sed s/password://g | xargs)
 database=$(cat config/database.yml | grep database | sed s/database://g | xargs)
-mysqldump --user="$username" --password="$password" $database > "backuping/version-$curdate/database.dump"
+mysqldump --user="$username" --password="$password" $database > "backuping/version-$curdate/<%=fetch(:stage)%>.sql"
 fi
 
 python drivesink.py upload "backuping" <%= fetch(:backupDestinationFolder) || "backups/firstdedic-server/" + fetch(:application)  %>
@@ -24,9 +24,7 @@ python drivesink.py upload "backuping" <%= fetch(:backupDestinationFolder) || "b
 if [ $? -eq 0 ]; then
 SIZE=$(du -sh backuping | awk '{print $1}')
 curl -X POST -H 'Content-type: application/json' \
-
 --data "{'attachments': [{'mrkdwn_in': ['text'],'text': 'Успешо создан бэкап для *<%= fetch(:application) %>*\n<% (fetch(:backupFolders) || []).each do |folder|%><%= "-" +folder + '\n' %><% end %>Тип базы данных: *$DATA_BASE_TYPE*\nРазмер *$SIZE*','color': '#3AA3E3', 'title': 'Amazon Backup System'}]<%=", \'channel\': \'#{fetch(:slack_channel)}\' " if !fetch(:slack_channel).nil? %>}" \
-
 <%= fetch(:slack_hook) %>
 else
 curl -X POST -H 'Content-type: application/json' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capun
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Ivan Zamylin