bonethug 0.0.20 → 0.0.21

data/README.md

@@ -60,6 +60,15 @@ argument*
 
 
 
+**Trigger Backup on Local Copy**
+
+*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}`
+
+
+
 ### Remote Commands
 
 For these commands to work you need to have the desired host already added to
@@ -81,8 +90,19 @@ Host *
 
 *This wraps mina and deploys using the information contained in cnf.yml*
 
-`bonethug setup {develoment|staging|production}`  
-`bonethug deploy {develoment|staging|production}`  
+`bonethug setup {development|staging|production}`  
+`bonethug deploy {develoment|staging|production}`
+
+
+
+**Trigger a Backup from the Remote Server**
+
+*This wraps mina and runs the backup task in the bonethug deploy.rb file. Uses
+the info contained in cnf.yml*
+
+`bonethug remote-backup {develoment|staging|production}`
+
+  
 
 
 Contributing

data/config/backup.rb

@@ -16,7 +16,8 @@ exec_path   = File.expand_path(File.dirname(__FILE__))
 env         = ENV['to']
 
 # load config
-conf = Bonethug::Conf.new.add(exec_path + '/config/cnf.yml').add(exec_path + '/config/database.yml' => { root: 'dbs.default' })
+conf = Bonethug::Conf.new.add(exec_path + '/config/cnf.yml')
+conf.add(exec_path + '/config/database.yml' => { root: 'dbs.default' }) if File.exist? exec_path + '/config/database.yml'
 
 # do a check
 raise 'could not find deployment environment' unless conf.get('deploy.environments').has_key? env
@@ -28,6 +29,8 @@ log_dirs    = conf.get('log_dirs','Array')
 backup      = conf.get('backup')
 backup_slug = deploy.get('project_slug') + "_" + env + "_backup"
 
+raise "No backup configuraton available" unless backup
+
 # add in any standard folders
 log_dirs.push('log') unless log_dirs.include? 'log'
 
@@ -39,7 +42,7 @@ safe do
 
   verbose true
 
-  local :path => "#{exec_path}/backups/:kind/:id"  
+  local :path => "#{exec_path}/backups/:kind/:id"
 
   # use ftp to back stuff up
   if backup.get('ftp')  
@@ -71,13 +74,14 @@ safe do
     end 
   end
 
-  # how many days are we holding on to backups?
-  keep do
-    local backup.get('local.keep')
-    ftp   backup.get('ftp.keep')
-    sftp  backup.get('sftp.keep')
-    s3    backup.get('s3.keep')    
-  end  
+  # # how many days are we holding on to backups?
+  # keep expects a hash - just don't now why??
+  # keep do
+  #   local backup.get('local.keep')
+  #   ftp   backup.get('ftp.keep') if backup.get('ftp')
+  #   sftp  backup.get('sftp.keep') if backup.get('sftp')
+  #   s3    backup.get('s3.keep') if backup.get('s3')  
+  # end  
 
   # backup mysql databases with mysqldump
   mysqldump do

data/config/cnf.yml

@@ -54,6 +54,10 @@ backup:
     key: key
     secret: secret
     bucket: bucket
+  rsync:
+    host: backup-host.com
+    user: remote_backup
+    pass: passw0rd  
 mail:
   smtp:
     development:

data/config/deploy.rb

@@ -123,9 +123,25 @@ task :backup => :environment do
   queue! %[cd #{deploy_to}/current && export to=#{env} && bundle exec astrails-safe .bonethug/backup.rb]
 end
 
-desc "Restores application state to the most recent backup"
-task :restore_backup => :environment do
-  # to be implemented
+desc "Syncs files to a location"
+task :sync_to => :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}/ ]
+  else
+    raise 'no rsync conf'
+  end  
+end
+
+desc "Restores files from a location"
+task :sync_from => :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}/ .]
+  else
+    raise 'no rsync conf'
+  end
 end
 
 desc "Deploys the current version to the server."

data/lib/bonethug/cli.rb

@@ -19,7 +19,7 @@ module Bonethug
         location = ARGV[2] || '.'
 
         # validate
-        if type.empty?
+        unless type
           puts 'Usage: bonethug install [type] [location]'
           return
         end
@@ -33,7 +33,7 @@ module Bonethug
         location = ARGV[1] || '.'
 
         # validate
-        if location.empty?
+        unless location
           puts 'Usage: bonethug #{task} [location]'
           return
         end
@@ -41,13 +41,13 @@ module Bonethug
         # run the initaliser
         Installer.bonethugise(location, task.to_sym)
 
-      when 'deploy', 'setup', 'remote-backup', 'local-backup'
+      when 'deploy', 'setup', 'remote-backup', 'local-backup', 'rsync-to-backup', 'rsync-from-backup'
 
         # handle args
         environment = ARGV[1]
 
         # validate
-        if environment.empty?
+        unless environment
           puts 'Usage: bonethug #{task} [environment]' 
           return
         end
@@ -60,7 +60,7 @@ module Bonethug
         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" 
+          exec "export to=#{environment} && bundle exec astrails-safe .bonethug/backup.rb"
         end 
 
       when 'watch'

data/lib/bonethug/installer.rb

@@ -235,15 +235,14 @@ module Bonethug
 
           add_gem = false;
           gem_reg = Regexp.new('gem[^"\']+["\']'+gem_name+'["\']')
-          git_reg = Regexp.new('gem[^"\']+["\']'+gem_name+'["\'],[^,]+github: ["\']'+github+'["\'],') if github
+          git_reg = Regexp.new('gem[^"\']+["\']'+gem_name+'["\'],[^,]+github: ["\']'+github+'["\']') if github
 
           if gem_reg =~ gemfile_contents
-            if !github
-              puts 'Found '+gem_name+' in gem file'
-            else
+            puts 'Found '+gem_name+' in gem file.'
+            if github 
               puts 'Requires github version, checking...'
               unless git_reg =~ gemfile_contents
-                puts 'Couldn\'t find '+gem_name+' in gem file adding...'
+                puts 'Couldn\'t find '+gem_name+' (github) in gem file adding...'
                 gemfile_contents.gsub(gem_reg,'')
                 add_gem = true;
               end

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors: