bonethug 0.0.22 → 0.0.23

data/config/deploy.rb

@@ -3,6 +3,7 @@
 # - implement a cleanup task when a deploy fails - its not good if the apache conf gets malformed
 # - review directory permissions
 # - passenger executes rails as the user that owns evironment.rb - if root owns it it runs as nobody
+# - certain parts break if it can't find the config entries - should just check for them and skip if it can't find them
 
 # Requires
 # ---------------------------------------------------------------
@@ -39,7 +40,7 @@ use_composer = ['silverstripe','silverstripe3','drupal','php'].include? deploy.g
 
 # directories we need to track
 resources += ['backups']
-resources.push 'vendor' if use_composer
+# resources.push 'vendor' if use_composer
 
 # logs
 log_dirs.push 'log' unless log_dirs.include? 'log'
@@ -124,21 +125,28 @@ task :backup => :environment do
 end
 
 desc "Syncs files to a location"
-task :sync_to => :environment do
+task :sync_from => :environment do
   if rsync = conf.get('backup.rsync')  
-    rsync = conf.get('backup.rsync')
-    path = deploy.get('project_slug') + "_" + env + "_backup/sync"
-    queue! %[cd #{deploy_to}/current && rsync -r -a -v -e "ssh -l #{rsync.user}" --delete . #{rsync.host}:/#{path}/ ]
+    path = deploy.get('project_slug') + "_" + env + "_sync"
+    ssh_pass = rsync.get('pass') ? "sshpass -p #{rsync.get('pass')}" : ""
+    queue! %[#{ssh_pass} ssh #{rsync.get('user')}@#{rsync.get('host')} mkdir -p #{path}]
+    (resources + log_dirs).each do |item|
+      queue! %[cd #{deploy_to}/current && rsync -r -a -v -e "#{ssh_pass} ssh -l #{rsync.get('user')}" --delete --copy-dirlinks ./#{item} #{rsync.get('host')}:#{path}/]
+    end
   else
     raise 'no rsync conf'
   end  
 end
 
 desc "Restores files from a location"
-task :sync_from => :environment do
+task :sync_to => :environment do
   if rsync = conf.get('backup.rsync')
-    path = deploy.get('project_slug') + "_" + env + "_backup/sync"
-    queue! %[cd #{deploy_to}/current && rsync -r -a -v -e "ssh -l #{rsync.user}" --delete #{rsync.host}:/#{path}/ .]
+    path = deploy.get('project_slug') + "_" + env + "_sync"
+    ssh_pass = rsync.get('pass') ? "sshpass -p #{rsync.get('pass')}" : ""
+    queue! %[#{ssh_pass} ssh #{rsync.get('user')}@#{rsync.get('host')} mkdir -p #{path}]
+    (resources + log_dirs).each do |item|
+      queue! %[cd #{deploy_to}/current && rsync -r -a -v -e "#{ssh_pass} ssh -l #{rsync.get('user')}" --delete --copy-dirlinks #{rsync.get('host')}:#{path}/#{item} ./]
+    end
   else
     raise 'no rsync conf'
   end

data/lib/bonethug/installer.rb

@@ -265,7 +265,7 @@ module Bonethug
       end
 
       # run bundler
-      exec 'bundle install --path vendor --binstubs'
+      exec 'bundle install --path vendor --binstubs' + (mode == :update ? ' && bundle update bonethug' : '')
 
       # self
 

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler