naifa 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7dd8770b81f31bf68ccefd8075c47684e96e673
-  data.tar.gz: 83d07884667956748f511303493df74252d1f69b
+  metadata.gz: c623b56e8b1b23e3ca479d9e0e08cae05bd4cab6
+  data.tar.gz: 573aefda165ae23988186c683ba09572b044953f
 SHA512:
-  metadata.gz: 16f3c9bbbde9428b2687903b42652d49ce459999d3b33718787292446c0dd939f7b0fa84988bf164731313b6a43d4c5086e83e3ba28154385ee612b6dcabf363
-  data.tar.gz: 796136b7e1980256f88b147e0b92acd52e09b796a988c35690d8efd059f66a9c5db2085eca5ed6fcd5e2e14197534c94b1cf06ceb701c5379b8c1f0e9c640272
+  metadata.gz: 2cec7af63cf9322d8159186d367ff754fd3244b6f4b14705c580e591d4b954a5f20c27ff21a66432607e10c7421874bad9c37013fc5992b402629f45476db4e7
+  data.tar.gz: 3cf47b6f7471e72ee749213ed9d9ec280821c123eaf7825519fe4e0528423b40302f70ae5d7c442e9aa09c68d8c54dc959f81cb9acfc17ec85fd487ad8657460

data/CHANGELOG.md

@@ -1,3 +1,32 @@
-## 0.1.0, unreleased
+## 0.2.0
+* Adds support for postgres command options in the naifa file
+    * NOTE: If you use the postgres plugin, please update you .naifa file to add the default backup_options and restore_options. Ex of adding those to the a development environment setting:
+```
+...
+db:
+  plugin: postgres
+  settings:
+    ...
+    environments:
+      ...
+      development:
+        backup_options:
+        - "-Fc"
+        restore_options:
+        - "--verbose"
+        - "--clean"
+        - "--no-acl"
+        - "--no-owner"
+...
+```
+
+## 0.1.1
+* Adds S3 bucket sync support
+* Restructure configuration and the CLI
+* Removes defaults. Settings must come from the configuration file
+* Fixes some postgres plugin bugs
+* Adds some validations and error messages
+
+## 0.1.0
 * First version!
 * Adds postgresql sync between environment database, backup and restore

data/README.md

@@ -56,6 +56,13 @@ db:
         database: ''
         username: "\\$POSTGRES_USER"
         path: "/db_dumps/"
+        backup_options:
+        - "-Fc"
+        restore_options:
+        - "--verbose"
+        - "--clean"
+        - "--no-acl"
+        - "--no-owner"
     backup:
       environment: :staging
     restore:
@@ -158,6 +165,13 @@ db:
         database: ''
         username: "\\$POSTGRES_USER"
         path: "/db_dumps/"
+        backup_options:
+        - "-Fc"
+        restore_options:
+        - "--verbose"
+        - "--clean"
+        - "--no-acl"
+        - "--no-owner"
     backup:
       environment: :staging
     restore:
@@ -180,6 +194,13 @@ db_local:
         username: "\\$POSTGRES_USER"
         password: pass
         path: "/db_dumps/"
+        backup_options:
+        - "-Fc"
+        restore_options:
+        - "--verbose"
+        - "--clean"
+        - "--no-acl"
+        - "--no-owner"
     backup:
       environment: :staging
     restore:

data/lib/naifa/plugins/postgres.rb

@@ -80,7 +80,8 @@ module Naifa
             File.join(
               environment_settings[:path].presence || options[:path].presence,
               filename
-            )
+            ),
+            environment_settings[:backup_options]
           )
           Kernel.system(command_line)
         when :local
@@ -98,7 +99,8 @@ module Naifa
             File.join(
               environment_settings[:path].presence || options[:path].presence,
               filename
-            )
+            ),
+            environment_settings[:backup_options]
           )
           Kernel.system(command_line)
         when :heroku
@@ -129,7 +131,8 @@ module Naifa
             File.join(
               environment_settings[:path].presence || options[:path].presence,
               filename
-            )
+            ),
+            environment_settings[:backup_options]
           )
           Utils.docker_compose_exec_command(
             environment_settings[:app_name].presence,
@@ -173,7 +176,8 @@ module Naifa
             File.join(
               environment_settings[:path].presence || options[:path].presence,
               filename
-            )
+            ),
+            environment_settings[:restore_options]
           )
           Kernel.system(command_line)
         when :local
@@ -191,7 +195,8 @@ module Naifa
             File.join(
               environment_settings[:path] || options[:path],
               filename
-            )
+            ),
+            environment_settings[:restore_options]
           )
           Kernel.system(command_line)
         when :docker
@@ -210,7 +215,8 @@ module Naifa
             File.join(
               environment_settings[:path].presence || options[:path].presence,
               filename
-            )
+            ),
+            environment_settings[:restore_options]
           )
           Utils.docker_compose_exec_command(
             environment_settings[:app_name],
@@ -223,14 +229,18 @@ module Naifa
 
       private_class_method :_restore
 
-      def self.build_restore_command(host, username, database, filename)
-        "pg_restore --verbose --clean --no-acl --no-owner -h #{host} -U #{username} -d #{database} #{filename}"
+      def self.build_restore_command(host, username, database, filename, options={})
+        command = "pg_restore"
+        command << " #{options.join(' ')}" if options.present?
+        command << " -h #{host} -U #{username} -d #{database} #{filename}"
       end
 
       private_class_method :build_restore_command
 
-      def self.build_backup_command(host, username, database, filename)
-        "pg_dump -Fc -h #{host} -U #{username} -d #{database} > #{filename}"
+      def self.build_backup_command(host, username, database, filename, options={})
+        command = "pg_dump "
+        command << " #{options.join(' ')}" if options.present?
+        command << " -h #{host} -U #{username} -d #{database} > #{filename}"
       end
 
       private_class_method :build_backup_command

data/lib/naifa/plugins/postgres/settings.rb

@@ -14,12 +14,29 @@ module Naifa
             type: :heroku,
             remote: 'staging'
           },
+          remote_example: {
+            type: :remote,
+            host: '',
+            database: '',
+            username: '',
+            backup_options: ['-Fc'],
+            restore_options: ['--verbose', '--clean', '--no-acl', '--no-owner']
+          },
+          local_example: {
+            type: :local,
+            database: '',
+            username: '',
+            backup_options: ['-Fc'],
+            restore_options: ['--verbose', '--clean', '--no-acl', '--no-owner']
+          },
           development: {
             type: :docker,
             app_name: 'db',
             database: '',
             username: '\$POSTGRES_USER',
-            path: '/db_dumps/'
+            path: '/db_dumps/',
+            backup_options: ['-Fc'],
+            restore_options: ['--verbose', '--clean', '--no-acl', '--no-owner']
           }
         },
         backup: {

data/lib/naifa/version.rb

@@ -1,3 +1,3 @@
 module Naifa
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naifa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Filipe Dias
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Naifa is a tool aimed at providing a collection of commands that simplify