ricodigo-capistrano-recipes 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/recipes/db.rb

@@ -10,7 +10,7 @@ Capistrano::Configuration.instance.load do
       EOF
       task :dump, :roles => :db, :only => { :primary => true } do
         prepare_from_yaml
-        run "mongodump -u #{db_user} -p #{db_pass} -h #{db_host} --port #{db_port} -d #{db_name} #{db_backup_path}" do |ch, stream, out|
+        run "mongodump #{auth_options} -h #{db_host} --port #{db_port} -d #{db_name} -o #{db_backup_path}" do |ch, stream, out|
           puts out
         end
       end
@@ -18,7 +18,7 @@ Capistrano::Configuration.instance.load do
       desc "|capistrano-recipes| Restores the database from the latest compressed dump"
       task :restore, :roles => :db, :only => { :primary => true } do
         prepare_from_yaml
-        run "mongorestore --drop -d #{db_name} #{db_backup_path}/#{db_name}" do |ch, stream, out|
+        run "mongorestore #{auth_options} --drop -d #{db_name} #{db_backup_path}/#{db_name}" do |ch, stream, out|
           puts out
         end
       end
@@ -26,17 +26,27 @@ Capistrano::Configuration.instance.load do
       desc "|capistrano-recipes| Downloads the compressed database dump to this machine"
       task :fetch_dump, :roles => :db, :only => { :primary => true } do
         prepare_from_yaml
-        download db_remote_file, db_local_file, :via => :scp
+        download db_remote_backup, db_local_file, :via => :scp, :recursive => true
+      end
+
+      def auth_options
+        if db_user && db_pass
+          "-u #{db_user} -p #{db_pass}"
+        end
       end
 
       # Sets database variables from remote database.yaml
       def prepare_from_yaml
         set(:db_backup_path) { "#{shared_path}/backup/" }
-        set(:db_local_file)  { "tmp/#{db_file}" }
-        set(:db_user) { db_config[rails_env]["username"] }
-        set(:db_pass) { db_config[rails_env]["password"] }
-        set(:db_host) { db_config[rails_env]["host"] }
-        set(:db_name) { db_config[rails_env]["database"] }
+
+        set(:db_local_file)  { "tmp/" }
+        set(:db_user) { db_config[rails_env.to_s]["username"] }
+        set(:db_pass) { db_config[rails_env.to_s]["password"] }
+        set(:db_host) { db_config[rails_env.to_s]["host"] }
+        set(:db_port) { db_config[rails_env.to_s]["port"] }
+        set(:db_name) { db_config[rails_env.to_s]["database"] }
+
+        set(:db_remote_backup) { "#{db_backup_path}/#{db_name}" }
       end
 
       def db_config

data/lib/recipes/log.rb

@@ -22,7 +22,7 @@ Capistrano::Configuration.instance.load do
         copytruncate
       }}
       put rotate_script, "#{shared_path}/logrotate_script"
-      "#{sudo} cp #{shared_path}/logrotate_script /etc/logrotate.d/#{application}"
+      sudo "cp #{shared_path}/logrotate_script /etc/logrotate.d/#{application}"
       run "rm #{shared_path}/logrotate_script"
 
       rotate_script = %Q{/var/log/mongodb/*.log {
@@ -35,7 +35,7 @@ Capistrano::Configuration.instance.load do
         copytruncate
       }}
       put rotate_script, "#{shared_path}/logrotate_script"
-      "#{sudo} cp #{shared_path}/logrotate_script /etc/logrotate.d/mongodb"
+      sudo "cp #{shared_path}/logrotate_script /etc/logrotate.d/mongodb"
       run "rm #{shared_path}/logrotate_script"
     end
   end

data/ricodigo-capistrano-recipes.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ricodigo-capistrano-recipes}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David A. Cuadrado"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - David A. Cuadrado
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2593828221356723532
+      hash: 4371687022118033860
       segments: 
       - 0
       version: "0"