wcc-base 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f48f0ff8ea10a3745e77358d4d9bc3c9579646e
-  data.tar.gz: 52e37c4701d4c6ff8d610a80133acc422998c069
+  metadata.gz: 25e00dba3489248a44d4207066b5fa01991e3fa6
+  data.tar.gz: f103d41dfe6881cc08b817327b431a55f3f95a04
 SHA512:
-  metadata.gz: 672d6882f793c86e6a3b40164ea5812a886d12b1c81d6b3acbb544e4912cbb87658ebf113de988931cfb93a31ffc5185fa47efad551b022dbdf332bd0dabe9e4
-  data.tar.gz: 8b9f83aa1bbdd455850446ac9b13585b0f712006ee5e064207bb5f4a3ad6f7d5af52715e1dc688267d085f5cafabea43c59f4200ec7621452cfeaa2a940383c1
+  metadata.gz: b629f11aee75a8c05f5791fd5ef300d947a492a63ee8cdfff22601257e36cc379d0baf7c25c93ecdb4dfa227fa4d5f1398bb6ea731f539e6adb988dfe978b905
+  data.tar.gz: ef9bc249289288925605192504840dd259c46537abf608a8018b3d39c503c16be69b6874f5a9b09a64407b2cf44d351b79f5dd289e59c9df3e77dc8816e9be9c

data/lib/tasks/db/psql.rake

@@ -32,14 +32,27 @@ namespace :db do
   task :restore, :file do |t, args|
     raise "file argument required" unless File.exists?(args[:file])
     db_config = WCC::RakeHelpers.db_config
-    command = [
-      "cat #{args[:file]} |",
-      WCC::RakeHelpers.db_cmd_with_password_string(["psql"], db_config['password']),
-      db_config['username'] ? "--username=#{db_config['username']}" : nil,
-      db_config['host'] ? "--host=#{db_config['host']}" : nil,
-      db_config['database'],
-    ].compact.join(" ")
-    `#{command}`
+    case File.extname(args[:file])
+    when ".sql"
+      command = [
+        "cat #{args[:file]} |",
+        WCC::RakeHelpers.db_cmd_with_password_string(["psql"], db_config['password']),
+        db_config['username'] ? "--username=#{db_config['username']}" : nil,
+        db_config['host'] ? "--host=#{db_config['host']}" : nil,
+        db_config['database'],
+      ].compact.join(" ")
+      `#{command}`
+    when ".dump"
+      command = [
+        "pg_restore",
+        "--verbose", "--clean", "--no-acl", "--no-owner",
+        db_config['username'] ? ["-U", db_config['username']] : nil,
+        db_config['host'] ? ["-h", db_config['host']] : nil,
+        "-d", db_config['database'],
+        args[:file]
+      ].flatten.compact
+      system(*command)
+    end
     Rake::Task['db:after_restore'].invoke(args[:file])
   end
 

data/lib/wcc/version.rb

@@ -1,3 +1,3 @@
 module WCC
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-base
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Watermark Community Church
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler