pave 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc3ce562a85f80a29df6d8359eca010a44ace1a
-  data.tar.gz: b9f6ac25a2b4c927616b8acb3ebfc62b8a63e3be
+  metadata.gz: 92bc7d3b71cb5170eff91764d6aec3371d4569bf
+  data.tar.gz: a994335d36950a0e571481bf7c7d251ddde93ab2
 SHA512:
-  metadata.gz: 5488fc7ddf18e1033e34e4eaa4d1f346bc4d8edbba15945f3ac6c7cb0232738b1987abc029249e9ac16ab18f7570753c08df41b007900b271afcbaa8f9315cd1
-  data.tar.gz: 795986496c1b2f1e2a95549379f98b1dec48bfb5acfc95802832f7c1795da6fd0b86c1f83d6f6ef791f38be0cf084c5cd06d9c975cb4627260bd76aa5d133a18
+  metadata.gz: 35094277dbd738dfbcc043c89637f05a9a38ba79d0febe9c50bbe8358b49c01c7403ee4ace7d713b4be22de2a820dcc285a4333336f9fff80679d23bfd40efb2
+  data.tar.gz: c9fbe417578f21221f27a29e5b1752ce590d0129448f79cd0cb58a27658bfcf37a9d2dc3e2349fe0942ae4727ad7f05d3795034b36c0ce02e9b599a2e4597cb1

data/lib/pave/database.rb

@@ -42,8 +42,8 @@ module Pave
       "#{Pave::Remote.server(remote)}:#{Pave::Remote.directory(remote)}"
     end
 
-    def dump_file
-      "#{Time.now.strftime("%Y-%m-%d")}-#{name}.sql.gz"
+    def dump_file(which_db)
+      "#{Time.now.strftime("%Y-%m-%d")}-#{name}-#{which_db}.sql.gz"
     end
 
     def dump
@@ -53,52 +53,54 @@ module Pave
         sh "echo 'deny from all' > ./db/.htaccess"
         sh "sudo chmod -R 700 ./db/"
       end
-      say "Creating dump of #{name} at #{Dir.pwd}/db/#{dump_file}"
-      sh "mysqldump -uroot #{name} | gzip > ./db/#{dump_file}"
+      say "Creating dump of #{name} at #{Dir.pwd}/db/#{dump_file(:local)}"
+      sh "mysqldump -uroot #{name} | gzip > ./db/#{dump_file(:local)}"
     end
 
     def dump_remote(remote="live")
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
       db = remote_db
-      say "Remotely creating dump of #{db['name']} at #{server}:#{directory}/db/#{dump_file}"
-      sh "ssh #{server} \"cd #{directory}/db; mysqldump -u#{db['user']} -p#{db['pass']} #{db['name']} | gzip > #{dump_file}\""
+      say "Remotely creating dump of #{db['name']} at #{server}:#{directory}/db/#{dump_file(:remote)}"
+      sh "ssh #{server} \"cd #{directory}/db; mysqldump -u#{db['user']} -p#{db['pass']} #{db['name']} | gzip > #{dump_file(:remote)}\""
     end
 
     def execute
-      say "Executing #{dump_file} on #{name}"
-      sh "gzip -dc ./db/#{dump_file} | mysql -uroot #{name}"
+      say "Executing #{dump_file(:local)} on #{name}"
+      sh "gzip -dc ./db/#{dump_file(:local)} | mysql -uroot #{name}"
     end
 
     def execute_remote(remote="live")
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
       db = remote_db
-      say "Remotely executing #{dump_file} on live #{db['name']}"
-      sh "ssh #{server} \"cd #{directory}/db; gzip -dc #{dump_file} | mysql -u#{db['user']} -p#{db['pass']} #{db['name']}\""
+      say "Remotely executing #{dump_file(:remote)} on live #{db['name']}"
+      sh "ssh #{server} \"cd #{directory}/db; gzip -dc #{dump_file(:remote)} | mysql -u#{db['user']} -p#{db['pass']} #{db['name']}\""
     end
 
     def upload(remote="live")
       # Upload the project's local database dump to remotes db directory.
-      say "Uploading SQL dump to #{remote_url}/db/#{dump_file}"
-      sh "scp ./db/#{dump_file} #{remote_url}/db"
+      say "Uploading ./db/#{dump_file(:local)} SQL dump to #{remote_url}/db/#{dump_file(:remote)}"
+      sh "scp ./db/#{dump_file(:local)} #{remote_url}/db/#{dump_file(:remote)}"
     end
 
     def download(remote="live")
       # Download the project's live database dump to local db directory.
-      say "Downloading SQL dump from #{remote_url}/db/#{dump_file}"
-      sh "scp #{remote_url}/db/#{dump_file} ./db"
+      say "Downloading SQL dump from #{remote_url}/db/#{dump_file(:remote)} to ./db/#{dump_file(:local)}"
+      sh "scp #{remote_url}/db/#{dump_file(:remote)} ./db/#{dump_file(:local)}"
     end
 
     def push(remote="live")
       # Upload the project's local database and replace the live database.
       dump
+      dump_remote(remote) # for backup purposes
       upload(remote)
       execute_remote(remote)
     end
 
     def pull(remote="live")
       # Download the project's live database and replace local database.
+      dump # for backup purposes
       dump_remote(remote)
       download(remote)
       execute

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jamon Holmgren