capobvious 0.3.pre19 → 0.3.pre20

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTcxOTQ1NDhlMDE2MWViNjM2YTJlZmU1NDVmZGI0MTljZTZkOGM1Yw==
-  data.tar.gz: !binary |-
-    N2E0NDViOTliYTY2YjViNjcyOTdmMDZjYjNlZjk4NGFlZTk2ODFlYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NjViMmU5NThmMmRkNDJmOGRjMGQ5ZjA3YWQzODgzYThlNmRhZTM4MWExYmJh
-    MTE1NmM4ZGVlMjM5ZWY3MmJlOTE3ODc5YWRkNTg2Y2EyZjc3MjZiMTgzYzA5
-    MjkwYWZjNjBjOTcxMzBiMjU2OWUzMzdiNzc5OTNmYWY4MTYwZTU=
-  data.tar.gz: !binary |-
-    Y2UwZWNjNmQ5NWY2YzFjZDE4MDNiYTg4Njc5OTIwNTVhYTNjNTJmYmI4ODNl
-    MzBkY2IwYTRiYmJkOWIzMzhiYjkyNjA1NjY3Nzc3Yzk5YzcxYWNlZDFlZDIw
-    MTY5NGQ2YTQxZjRhYWMwOTI0MWE2NzQwYmY3ZjExODA5ODAwMTQ=
+SHA1:
+  metadata.gz: 5298c0d742a0213839998e0a4b5b77c1be67ec7e
+  data.tar.gz: b08bed09cccf60623fe104c8ad132f7029511b9a
+SHA512:
+  metadata.gz: 5349f784aa918732aec4eac7f5e063e8e0b1ac217bfeeaf9f146e7048a3b4384ae1ecca014bd5aab24ed24a958055807544982716bad21aea7457e8c056ce9c2
+  data.tar.gz: 0ae8015b23022ddb9b14ccea0b2a16bc82decbbd30cdc6a91008fec25ac65e1eed527268782efbcad695f3db54032c44841fb149d16d181a2ac1079cf8395efa

data/lib/capobvious/recipes/backup.rb

@@ -19,7 +19,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       if yml[:adapter] == "postgresql"
         logger.info("Backup database #{yml[:database]}", "Backup:db")
         command << "export PGPASSWORD=\"#{yml[:password]}\""
-        command << "pg_dump -U #{yml[:username]} #{yml[:database]} | bzip2 -c | cat"
+        options = {'-U' => yml[:username]}
+        options['host'] = yml[:host] if yml[:host]
+
+        options_s = ""
+        options.each do |k,v|
+          options_s += "#{k} #{v}"
+        end
+        command << "pg_dump #{options_s} #{yml[:database]} | bzip2 -c | cat"
       else
         puts "Cannot backup, adapter #{yml[:adapter]} is not implemented for backup yet"
       end
@@ -60,7 +67,17 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "mkdir -p #{shared_path}/backup"
       if yml[:adapter] == "postgresql"
         logger.important("Backup database #{yml[:database]}", "Backup:db")
-        run "export PGPASSWORD=\"#{yml[:password]}\" && pg_dump -U #{yml[:username]} --no-owner #{yml[:database]} > #{dump_file_path}"
+
+        options = {'-U' => yml[:username]}
+        options['-h'] = yml[:host] if yml[:host]
+        options['-p'] = yml[:port] if yml[:port]
+        options_s = []
+        options.each do |k,v|
+          options_s << "#{k} #{v}"
+        end
+        options_s = options_s.join(' ')
+
+        run "export PGPASSWORD=\"#{yml[:password]}\" && pg_dump #{options_s} --no-owner #{yml[:database]} > #{dump_file_path}"
         run "cd #{shared_path}/backup && #{arch_create} #{output_file} #{file_name} && rm #{dump_file_path}"
       else
         puts "Cannot backup, adapter #{yml[:adapter]} is not implemented for backup yet"

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = '0.3.pre19'
+  VERSION = '0.3.pre20'
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.3.pre19
+  version: 0.3.pre20
 platform: ruby
 authors:
 - Dmitry Gruzd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -18,24 +19,23 @@ dependencies:
         version: 2.15.4
   type: :runtime
   prerelease: false
-  name: capistrano
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.15.4
 - !ruby/object:Gem::Dependency
+  name: rvm-capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  name: rvm-capistrano
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Capfile that we use every day
@@ -77,17 +77,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: capobvious
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Cap recipes