bonethug 0.0.73 → 0.0.75

data/README.md

@@ -121,24 +121,6 @@ settings in your config/cnf.yml file*
 
 ### Remote Commands
 
-*UPDATE:* Bonethug now supports interactive prompts so this may no longer be
-necessary
-
-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.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Host *
-    StrictHostKeyChecking no
-    UserKnownHostsFile=/dev/null
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
 
 **Setup a remote server**
 
@@ -210,20 +192,17 @@ wipe the files from your deploy copy.
 
 *Sync local application state from another application environment*
 
-`thug sync-local-from {local-environment} {environment-to-pull-data-from}`
+`thug sync-state push-to-local {local-environment} pull-from-remote {environment-to-pull-data-from}`
 
 *Sync another application's state in another environment to the local application state*
 
-`thug sync-local-to {local-environment} {environment-to-push-data-to}`
+`thug sync-state pull-from-local {local-environment} push-to-remote {environment-to-push-data-to}`
 
 
 *Sync remote application state with the application state environment - this wraps mina to trigger the sync actions above on a remote server*
 
-`thug sync-remote-from {environment-to-pull-data-from} {environment-to-push-data-to}`
-
-*Sync another application's state in another environment to the local application state*
+`thug sync-state pull-from-remote {environment-to-pull-data-from} push-to-remote {environment-to-push-data-to}`
 
-`thug sync-backup-to {environment-to-push-data-to} {environment-to-pull-data-from}`
 
 
 Example Workflow
@@ -246,6 +225,9 @@ bower install
 
 # --> edit the config/cnf.yml file!!
 
+# setup local db
+thug init-db local
+
 # watch for changes to sass and coffeescript
 thug watch
 
@@ -262,6 +244,12 @@ thug setup-env staging
 thug init-db staging
 thug setup staging
 thug deploy staging
+
+# push the db and assets up to staging
+thug sync-state pull-from-local development push-to-remote staging
+
+# pull the db and assets up down to local
+thug sync-state pull-from-remote staging push-to-local development
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
@@ -291,45 +279,12 @@ What isn't implemented yet?
 ---------------------------
 
 
-
-### Setup an existing project and mirror a remote environment (WIP)
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# clone the repo and install the gems
-git clone git@git.domain.com:namespace/project-name.git .
-bundle install --path vendor
-
-# setup local db
-thug init-local-db staging
-
-# add ssh key
-thug auth staging
-
-# do file sync
-thug sync-from staging
-
-# do db sync
-thug sync-local-db staging development
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-### Push local assets etc to a remote (WIP)
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# add ssh key
-thug auth staging
-
-# do file sync
-thug sync-to staging
-
-# do db sync
-thug sync-remote-db development staging
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- sync of just db between envs
+- sync of just files between envs
+- remove a deployment from a target
+- support for more project types
+- support for other OSes
+- support for nginx
 
 
 

data/TODO.txt

@@ -1,5 +1,6 @@
 - Create front end skeleton
 - Need to have project specific cnf.yml files
-- Local sync for assets
 - thug auth {staging|production} - this would inject your ssh pub key into the authorized_keys file
-- need to allow support for other environment types
+- need to allow support for other environment types
+- have some sort of composer.json merge
+- thug update needs stil needs to be run twice because the current version gets loaded into memory - need to run some sort of two phase update

data/config/deploy.rb

@@ -24,8 +24,14 @@ require 'mina/whenever'
 # Config
 # ---------------------------------------------------------------
 
-# load the conf
-conf = Bonethug::Conf.new
+# exec env
+exec_path   = File.expand_path(File.dirname(__FILE__) + '/..')
+
+# load config
+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'
+
+# generate a hash
 cnf = conf.to_hash
 
 # pull config from environment vars
@@ -146,15 +152,16 @@ end
 
 desc "init a db based on the settings in your cnf file"
 task :init_db => :environment do
-
-  conf.get('dbs').each do |name,envs|
-
-    db = envs.get env
-    cmd = Bonethug::Installer.init_mysql_db_script db, deploy_to + 'current', ENV['admin_user']
-    queue! %[#{cmd}]
-
+  dbs = conf.get 'dbs'
+  if dbs
+    dbs.each do |name,envs|
+      if envs
+        db = envs.get env
+        cmd = Bonethug::Installer.init_mysql_db_script db, deploy_to + '/current', ENV['admin_user']
+        queue! %[#{cmd}]
+      end
+    end
   end
-
 end
 
 desc "Initialises the db"
@@ -163,12 +170,17 @@ task :setup_db => :environment do
   #rails
   queue! %[cd #{deploy_to}/current && bundle exec rake db:reset RAILS_ENV="#{env}"] if deploy.get('project_type') =~ /rails[0-9]?/
 
-  # drpual
+  # drupal
   if deploy.get('project_type') =~ /drupal[0-9]?/
-    conf.get('dbs').each do |name,envs|
-      db = envs.get env
-      db_url = "mysql://#{db.get('user')}:#{db.get('pass')}@#{db.get('host')}/#{db.get('name')}"
-      queue! %[export APPLICATION_ENV=#{env} && cd #{deploy_to}/current/public && ../vendor/bin/drush site-install standard --account-name=admin --account-pass=admin --db-url=#{db_url}"]
+    dbs = conf.get 'dbs'
+    if dbs
+      dbs.each do |name,envs|
+        if envs
+          db = envs.get env
+          db_url = "mysql://#{db.get('user')}:#{db.get('pass')}@#{db.get('host')}/#{db.get('name')}"
+          queue! %[export APPLICATION_ENV=#{env} && cd #{deploy_to}/current/public && ../vendor/bin/drush site-install standard --account-name=admin --account-pass=admin --db-url=#{db_url}"]
+        end
+      end
     end
   end
 
@@ -180,7 +192,7 @@ task :backup => :environment do
 end
 
 desc "Syncs application state between two remote environments"
-task :sync_remote_from => :environment do
+task :sync_state => :environment do
 
   remote_env = ENV['remote_env']
 
@@ -189,20 +201,9 @@ task :sync_remote_from => :environment do
     exit
   end
 
-  queue! %[cd #{deploy_to}/current && bundle exec thug sync-local-from #{env} #{remote_env}]
-end
-
-desc "Syncs application state between two remote environments"
-task :sync_remote_to => :environment do
-
-  remote_env = ENV['remote_env']
-
-  unless conf.get('deploy.environments').has_key? remote_env
-    puts 'could not find remote deployment environment'
-    exit
-  end
+  #queue! %[cd #{deploy_to}/current && ruby .bonethug/syncer.rb local #{env} remote #{remote_env}]
+  queue! %[cd #{deploy_to}/current && bundle exec thug sync-state pull-from-local #{env} push-to-remote #{remote_env}]
 
-  queue! %[cd #{deploy_to}/current && bundle exec thug sync-local-to #{env} #{remote_env}]
 end
 
 desc "Syncs backup with a location"
@@ -413,7 +414,7 @@ task :deploy => :environment do
 
       # run cache flushes / manifest rebuilds
       queue! %[export APPLICATION_ENV=#{env} && php #{deploy_to}/current/public/framework/cli-script.php dev/build] if ['silverstripe','silverstripe3'].include? deploy.get('project_type')
-      queue! %[export APPLICATION_ENV=#{env} && cd #{deploy_to}/current/lib && php flush_drupal_cache.php] if ['drupal','drupal6','drupal7','drupal8'].include? deploy.get('project_type')
+      queue! %[export APPLICATION_ENV=#{env} && cd #{deploy_to}/current/lib && php drupal_flush_cache.php] if ['drupal','drupal6','drupal7','drupal8'].include? deploy.get('project_type')
 
       # run any project scripts
       # purge combined files for ss

data/lib/bonethug/cli.rb

@@ -158,31 +158,78 @@ module Bonethug
 
         end
 
-      when  'sync-local-to',
-            'sync-local-from',
-            'sync-remote-to',
-            'sync-remote-from'
+      when  'sync-state'
+
+        # operation whitelist
+        operations = ['pull-from-local', 'push-to-local', 'pull-from-remote', 'push-to-remote']
 
         # args
-        env_local  = ARGV[1]
-        env_remote = ARGV[2]
+        operation1 = ARGV[1]
+        env1       = ARGV[2]
+        operation2 = ARGV[3]
+        env2       = ARGV[4]
+
+        puts
+
+        # validate operation whitelist
+        valid_operation = operations.include?(operation1) and operations.include?(operation2)
+
+        # ensure there is both a pull and push operation
+        if valid_operation
+          has_pull = (operation1 == 'pull-from-local' or operation2 == 'pull-from-local' or operation1 == 'pull-from-remote' or operation2 == 'pull-from-remote')
+          has_push = (operation1 == 'push-to-local'   or operation2 == 'push-to-local'   or operation1 == 'push-to-remote'   or operation2 == 'push-to-remote')
+          valid_operation = has_push and has_push
+        end
 
         # validate
-        unless env_local and env_remote
-          puts 'Usage: thug #{task} [local_environment] [remote_environment]'
-          return
+        unless operation1 and operation2 and env1 and env2 and valid_operation
+          puts 'Usage: thug sync-state [pull-from-{local|remote}] [environment] [push-to-{local|remote}] [environment]'
+          exit
+        end
+
+        # process env data
+        pull_env = (operation1 == 'pull-from-remote' or operation1 =='pull-from-local') ? env1 : env2
+        push_env = (operation1 == 'push-to-remote'   or operation1 =='push-to-local')   ? env1 : env2
+
+        # process operation1
+        case operation1
+        when 'pull-from-local'
+          pull_operation = 'local'
+        when 'pull-from-remote'
+          pull_operation = 'remote'
+        when 'push-to-local'
+          push_operation = 'local'
+        when 'push-to-remote'
+          push_operation = 'remote'
+        end
+
+        # process operation2
+        case operation2
+        when 'pull-from-local'
+          pull_operation = 'local'
+        when 'pull-from-remote'
+          pull_operation = 'remote'
+        when 'push-to-local'
+          push_operation = 'local'
+        when 'push-to-remote'
+          push_operation = 'remote'
+        end
+
+        # stop here if its a local to local because we wont know the file system location of the non-calling local
+        if pull_operation == 'local' and push_operation == 'local'
+          puts 'local to local sync is not supported at this time'
+          exit
         end
 
         # Do Sync
-        case task
-        when 'sync-local-to', 'sync-local-from'
-          exec "ruby .bonethug/syncer.rb #{task} #{env_local} #{env_remote}"
-        when 'sync-remote-to'
-          exec "export to=#{env_local} && export remote_env=#{env_remote} && bundle exec mina -f .bonethug/deploy.rb sync_remote_to --verbose"
-        when 'sync-remote-from'
-          exec "export to=#{env_local} && export remote_env=#{env_remote} && bundle exec mina -f .bonethug/deploy.rb sync_remote_from --verbose"
+        if pull_operation == 'local' or push_operation == 'local'
+          Syncer.sync pull_operation, pull_env, push_operation, push_env
+        else
+          # this will call ruby .bonethug/syncer.rb local #{pull_env} remote #{push_env}
+          exec "export to=#{pull_env} && export remote_env=#{push_env} && bundle exec mina -f .bonethug/deploy.rb sync_state --verbose"
         end
 
+
       when  'deploy',
             'setup',
             'remote-backup',
@@ -242,7 +289,7 @@ module Bonethug
       when 'clean'
 
         location = ARGV[1] || '.'
-        Installer.clean location   
+        Installer.clean location
 
       else
 

data/lib/bonethug/installer.rb

@@ -24,7 +24,7 @@ module Bonethug
     @@bonthug_gem_dir = File.expand_path(File.dirname(__FILE__) + '/../..')
     @@skel_dir = @@bonthug_gem_dir + '/skel'
     @@conf = Conf.new.add(@@skel_dir + '/skel.yml')
-    @@project_config_files = {editable: ['cnf.yml','schedule.rb'], generated: ['syncer.rb','backup.rb','deploy.rb']}
+    @@project_config_files = {editable: ['cnf.yml','schedule.rb'], generated: ['backup.rb','deploy.rb']}
 
     def self.install(type, target = '.')
 
@@ -137,7 +137,7 @@ module Bonethug
 
       script_content = "
         CREATE DATABASE IF NOT EXISTS " + db.get('name') + ";
-        GRANT ALL ON " + db.get('name') + ".* TO " + db.get('user') + "@" + db.get('host') + (db.get('pass') ? " IDENTIFIED BY " + db.get('pass') : "") + ";     
+        GRANT ALL ON " + db.get('name') + ".* TO " + db.get('user') + "@" + db.get('host') + (db.get('pass') ? " IDENTIFIED BY '" + db.get('pass') + "'" : "") + ";     
         FLUSH PRIVILEGES;
       "
       cmd = 'cd ' + path + ' && ' +
@@ -335,7 +335,7 @@ module Bonethug
 
           if gem_reg =~ gemfile_contents
             puts 'Found '+gem_name+' in gem file.'
-            if github 
+            if github
               puts 'Requires github version, checking...'
               unless git_reg =~ gemfile_contents
                 puts 'Couldn\'t find '+gem_name+' (github) in gem file adding...'

data/lib/bonethug/syncer.rb

@@ -0,0 +1,113 @@
+
+require 'rubygems'
+require 'bonethug/conf'
+
+module Bonethug
+
+  class Syncer
+
+    def self.sync(pull, pull_env, push, push_env)
+
+      # exec env
+      exec_path   = File.expand_path('.')
+
+      # load config
+      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'
+
+      # extract some data
+      cnf  = conf.to_hash
+      envs = conf.get('deploy.environments').to_hash
+
+      # validate
+      unless pull and pull_env and push and push_env
+        puts 'Usage: syncer.rb [pull target] [pull environment] [push target] [push environment]'
+        exit
+      end
+
+      unless envs.has_key? pull_env
+        puts 'could not find pull environment'
+        exit
+      end
+
+      unless envs.has_key? push_env
+        puts 'could not find push environment'
+        exit
+      end
+
+      if pull == 'local' and push == 'local'
+        puts 'local to local sync is not supported at this time'
+        exit
+      end
+
+      if pull == 'remote' and push == 'remote'
+        puts 'remote to remote sync is not supported via this interface'
+        exit
+      end
+
+      # identify the local and the remote
+      env_local  = pull == 'local' ? pull_env : push_env
+      env_remote = pull == 'local' ? push_env : pull_env
+
+      # build config
+      dbs           = conf.get 'dbs'
+      remote_deploy = conf.node_merge 'deploy.common', 'deploy.environments.' + env_remote
+      local_deploy  = conf.node_merge 'deploy.common', 'deploy.environments.' + env_local
+      resources     = conf.get('resources','Array') || []
+      log_dirs      = conf.get('log_dirs','Array') || []
+      remote_vhost  = remote_deploy.get('project_slug') + '_' + env_remote
+
+      # directories we need to track
+      resources += ['backups']
+
+      # logs
+      log_dirs.push 'log' unless log_dirs.include? 'log'
+
+      # do the common work
+      remote_path = remote_deploy.get('base_dir') + '/' + remote_vhost
+      remote_ssh  = "ssh -p #{remote_deploy.get 'port'} #{remote_deploy.get 'user'}@#{remote_deploy.get 'domain'}"
+
+      # output
+      puts "Cloning Databases... "
+
+      # output
+      dbs.each do |index, db|
+
+        db_remote = db.get env_remote
+        db_local  = db.get env_local
+
+        if push == 'local' and pull == 'remote'
+          cmd = "#{remote_ssh} \"mysqldump -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'} --verbose | bzip2 -c\" | bunzip2 -c | mysql -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'}"
+        elsif pull == 'local' and push == 'remote'
+          cmd = "mysqldump -u #{db_local.get 'user'} -p#{db_local.get 'pass'} #{db_local.get 'name'} --verbose | bzip2 -c | #{remote_ssh} \"bunzip2 -c | mysql -u #{db_remote.get 'user'} -p#{db_remote.get 'pass'} #{db_remote.get 'name'}\""
+        end
+
+        puts cmd
+        system cmd
+
+      end
+
+      puts "Done."
+      puts "Syncing Files... "
+
+      # sync the files
+      (resources + log_dirs).each do |item|
+
+        if push == 'local' and pull == 'remote'
+          cmd = "rsync -zrav -e \"ssh -p #{remote_deploy.get('port')} -l #{remote_deploy.get('user')}\" --delete --copy-dirlinks #{remote_deploy.get('domain')}:#{remote_path}/current/#{item}/ #{exec_path}/#{item}/"
+        elsif pull == 'local' and push == 'remote'
+          cmd = "rsync -zrav -e \"ssh -p #{remote_deploy.get('port')} -l #{remote_deploy.get('user')}\" --delete --copy-dirlinks #{exec_path}/#{item}/ #{remote_deploy.get('domain')}:#{remote_path}/current/#{item}/"
+        end
+
+        puts cmd
+        system cmd
+
+      end
+
+      puts "Done."
+
+    end
+
+  end
+
+end

data/lib/bonethug/utils.rb

@@ -1,24 +1,24 @@
-require 'fileutils'
-
-module Bonethug
-
-  #arguments can be for example db:migrate
-  def self.call_rake(arguments)
-    if RUBY_PLATFORM =~ /mswin/
-      rake_cmd = "rake.bat" #very important because windows will break with just "rake"
-    else
-      rake_cmd = "rake"
-    end
-    puts "calling #{rake_cmd} " + arguments
-    puts system("#{rake_cmd} " + arguments)
-    puts $?
-  end
-
-  def self.setup_gitpull(target = '.')
-
-    path = File.expand_path target
-    `chown www-data #{path}`
-    
-  end
-
+require 'fileutils'
+
+module Bonethug
+
+  #arguments can be for example db:migrate
+  def self.call_rake(arguments)
+    if RUBY_PLATFORM =~ /mswin/
+      rake_cmd = "rake.bat" #very important because windows will break with just "rake"
+    else
+      rake_cmd = "rake"
+    end
+    puts "calling #{rake_cmd} " + arguments
+    puts system("#{rake_cmd} " + arguments)
+    puts $?
+  end
+
+  def self.setup_gitpull(target = '.')
+
+    path = File.expand_path target
+    `chown www-data #{path}`
+
+  end
+
 end

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
         module Bonethug
-          VERSION = "0.0.73"
-          BUILD_DATE = "2014-03-17 13:26:15 +1300"
+          VERSION = "0.0.75"
+          BUILD_DATE = "2014-04-01 11:10:26 +1300"
         end
       

data/lib/bonethug.rb

@@ -1,6 +1,7 @@
 require "bonethug/version"
 require "bonethug/installer"
 require "bonethug/watcher"
+require "bonethug/syncer"
 require "bonethug/cli"
 
 module Bonethug