bonethug 0.0.23 → 0.0.24

data/README.md

@@ -12,11 +12,11 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-    \$ bundle
+    bundle
 
 Or install it yourself as:
 
-    \$ gem install bonethug
+    gem install bonethug
 
 Usage
 -----
@@ -33,7 +33,7 @@ Usage
 
 
 
-**Add bonethug to an existing project **
+**Add bonethug to an existing project**
 
 *If you just want to use the deploy / cron / backup framework*
 
@@ -65,16 +65,18 @@ argument*
 *Uses astrails-safe to make a backup using the .bonethug/backup.rb file.  Uses
 the info contained in cnf.yml*
 
-`bonethug backup {development|staging|production}`
+`bonethug local-backup {development|staging|production}`
 
 
 
 ### Remote Commands
 
-For these commands to work you need to have the desired host already added to
-your known hosts file:  ~/.ssh/known_hosts which means you can either connect to
-the host first, manually add it or switch off the checking by adding the
-following to ~/.ssh/config.
+Most of these are piped through mina.  Mina uses SSH to send a bash script to
+the remote server where it is executed.  For these commands to work you need to
+have the desired host already added to your known hosts file:
+~/.ssh/known_hosts which means you can either connect to the host first,
+manually add it or switch off the checking by adding the following to
+~/.ssh/config.
 
 
 
@@ -95,7 +97,7 @@ Host *
 
 
 
-**Trigger a Backup from the Remote Server**
+**Trigger a Snapshot Backup from the Remote Server**
 
 *This wraps mina and runs the backup task in the local .bonethug/deploy.rb file.
 It calls astrails-safe on the remote server and using the remote
@@ -105,6 +107,22 @@ backup.*
 
 `bonethug remote-backup {develoment|staging|production}`
 
+
+
+**Trigger a Sync to or from the Remote Sync Location**
+
+*This wraps mina and runs rsync on the remote server.  It uses the info defined
+in the local copy of config/cnf.yml under backup.rsync.  If you have already set
+up an ssh key with no pass on the remote server so it can talk to the sync
+location then you wont need to provide a pass in the cnf.yml.  this is prefereed
+as it keeps the password out of the log files.*
+
+BE CAREFUL USING SYNC-TO - if there are no files in the source location it will wipe the files from your deploy copy.
+
+`bonethug sync-from {develoment|staging|production}`
+
+`bonethug sync-to {develoment|staging|production}`
+
   
 
 

data/config/cnf.yml

@@ -8,6 +8,7 @@ deploy:
     domain: domain.com
     user: root
     port: 22
+    keep: 2
   environments:
     development:
     staging:

data/config/deploy.rb

@@ -4,9 +4,14 @@
 # - 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
+# - we run into problems if there is stuff that needs to be tracked by git in the vendor dirs 
+#   -> if we add vendor to the shared paths stuff doesn't get updated properly
+#   -> if we dont it means that composer downloads stuff every deployment
+#   -> looks like composer breaks if we use symlniked paths
 
 # Requires
 # ---------------------------------------------------------------
+
 require 'rubygems'
 require 'bonethug/conf'
 require 'mina/bundler'
@@ -30,7 +35,7 @@ raise 'could not find deployment environment' unless conf.get('deploy.environmen
 deploy    = conf.node_merge('deploy.common','deploy.environments.'+env)
 resources = conf.get('resources','Array') || []
 log_dirs  = conf.get('log_dirs','Array') || []
-vendor_dirs  = conf.get('vendor','Array') || []
+vendor  = conf.get('vendor','Array') || []
 
 # vhost name
 vhost = deploy.get('project_slug') + '_' + env
@@ -46,10 +51,11 @@ resources += ['backups']
 log_dirs.push 'log' unless log_dirs.include? 'log'
 
 # shared paths
-shared = resources + log_dirs + vendor_dirs + ['tmp']
+shared = resources + log_dirs + vendor + ['tmp']
 shared.push 'composer.phar' if use_composer
 
 # shared config
+set :keep,          deploy.get('keep') || 2
 set :deploy_to,     deploy.get('base_dir') + '/' + vhost
 set :repository,    deploy.get('repository')
 set :branch,        ENV['branch'] || deploy.get('default_branch')
@@ -72,7 +78,7 @@ desc "Sets up the Project"
 task :setup => :environment do
 
   # make shared resource dirs
-  (resources + log_dirs + vendor_dirs).each do |path|
+  (resources + log_dirs + vendor).each do |path|
     queue! %[mkdir -p "#{deploy_to}/shared/#{path}"]
   end
 
@@ -126,12 +132,14 @@ end
 
 desc "Syncs files to a location"
 task :sync_from => :environment do
-  if rsync = conf.get('backup.rsync')  
+  if rsync = conf.get('backup.rsync') 
     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'
@@ -145,7 +153,9 @@ task :sync_to => :environment do
     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'

data/config/syncer.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+# Requires
+# ---------------------------------------------------------------
+require 'rubygems'
+require 'bonethug/conf'
+
+# Config
+# ---------------------------------------------------------------
+
+# load the conf
+conf = Bonethug::Conf.new
+cnf = conf.to_hash
+
+# args
+env = ARGV[1]
+type = ARGV[0]
+
+# pull config from environment vars
+raise 'could not find deployment environment' unless conf.get('deploy.environments').has_key? env
+
+# build config
+deploy    = conf.node_merge('deploy.common','deploy.environments.'+env)
+resources = conf.get('resources','Array') || []
+log_dirs  = conf.get('log_dirs','Array') || []
+vendor  = conf.get('vendor','Array') || []
+
+# vhost name
+vhost = deploy.get('project_slug') + '_' + env
+
+# composer?
+use_composer = ['silverstripe','silverstripe3','drupal','php'].include? deploy.get('project_type')
+
+# directories we need to track
+resources += ['backups']
+
+# logs
+log_dirs.push 'log' unless log_dirs.include? 'log'
+
+# do the common work
+path = deploy.get('base_dir') + '/' + vhost
+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|
+  case type
+  when "sync-local-from"
+    exec "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks #{rsync.get('host')}:#{path}/current/#{item} ./"
+  when "sync-local-to"
+    exec "rsync -r -a -v -e \"#{ssh_pass} ssh -l #{rsync.get('user')}\" --delete --copy-dirlinks ./#{item} #{rsync.get('host')}:#{path}/current/"
+  end
+end

data/lib/bonethug/cli.rb

@@ -41,7 +41,7 @@ module Bonethug
         # run the initaliser
         Installer.bonethugise(location, task.to_sym)
 
-      when 'deploy', 'setup', 'remote-backup', 'local-backup', 'sync-to', 'sync-from'
+      when 'deploy', 'setup', 'remote-backup', 'local-backup', 'sync-backup-to', 'sync-backup-from', 'sync-local-to', 'sync-local-from'
 
         # handle args
         environment = ARGV[1]
@@ -53,18 +53,29 @@ module Bonethug
         end
 
         case task
+
+        # Setup and Deploy
         when 'deploy'
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb deploy --verbose"
         when 'setup'
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb setup --verbose"
+
+        # Snapshot Backup
         when 'remote-backup'
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb backup --verbose"                   
         when 'local-backup'
           exec "export to=#{environment} && bundle exec astrails-safe .bonethug/backup.rb"
-        when 'sync-to'
+
+        # Synchronised backup
+        when 'sync-backup-to'
           exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_to --verbose"
-        when 'sync-from'
-          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_from --verbose"          
+        when 'sync-backup-from'
+          exec "export to=#{environment} && bundle exec mina -f .bonethug/deploy.rb sync_from --verbose"
+
+        when 'sync-local-to'
+          exec "ruby .bonethug/syncer.rb sync_local_to #{environment}"
+        when 'sync-local-from'
+          exec "ruby .bonethug/syncer.rb sync_local_from #{environment}"                 
         end 
 
       when 'watch'

data/lib/bonethug/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,6 +287,7 @@ files:
 - config/cnf.yml
 - config/deploy.rb
 - config/schedule.rb
+- config/syncer.rb
 - lib/bonethug.rb
 - lib/bonethug/cli.rb
 - lib/bonethug/conf.rb