bonethug 0.0.67 → 0.0.68

data/.gitignore

@@ -15,6 +15,7 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
+.ruby-version
 tmp
 *.sublime-project
 *.sublime-workspace

data/TODO.txt

@@ -1,4 +1,5 @@
-- 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
+- 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

data/config/cnf.yml

@@ -1,178 +1,185 @@
-deploy:
-  common:
-    project_type: rails3 | rails4 | silverstripe3 | drupal6 | drupal7 | drupal8 | php | sinatra
-    base_dir: /var/www
-    repository: git@gitlab.....
-    project_slug: tradespot
-    default_branch: master
-    domain: domain.com
-    user: root
-    port: 22
-    keep: 2
-  environments:
-    development:
-    staging:
-      domain: staging.domain.com
-      default_branch: master
-    production:
-      domain: production.domain.com
-      default_branch: stable
-dbs:
-  default:
-    development:
-      name: project_development
-      user: project_development
-      pass:
-      host: localhost
-      port: 3306
-    staging:
-      name: project_staging
-      user: project_staging
-      pass: passw0rd
-      host: localhost
-      port: 3306    
-    production:
-      name: project_production
-      user: project_production
-      pass: passw0rd
-      host: localhost
-      port: 3306    
-backup:
-  local:
-    keep:2
-  ftp:
-    keep: 10
-    host: backup-host.com
-    user: remote_backup
-    pass: passw0rd
-  sftp:
-    keep: 10
-    host: backup-host.com
-    user: remote_backup
-    pass: passw0rd
-  s3:
-    keep: 10
-    key: key
-    secret: secret
-    bucket: bucket
-  rsync:
-    host: backup-host.com
-    user: remote_backup
-    pass: passw0rd  
-mail:
-  smtp:
-    development:
-      default_from:
-        name: dev
-        email: dev@domain.com
-      server: smtp.gmail.com
-      domain: gmail.com
-      authenticate: true
-      user: username@domain.com
-      pass: passw0rd
-      secure: tls
-      charset_encoding: utf-8
-      port: 587    
-    staging:
-      default_from:
-        name: staging
-        email: dev@domain.com
-      server: smtp.gmail.com
-      domain: gmail.com
-      authenticate: true
-      user: username@domain.com
-      pass: passw0rd
-      secure: tls
-      charset_encoding: utf-8
-      port: 587    
-    production:
-      default_from:
-        name: production
-        email: dev@domain.com
-      server: smtp.gmail.com
-      domain: gmail.com
-      authenticate: true
-      user: username@domain.com
-      pass: passw0rd
-      secure: tls
-      charset_encoding: utf-8
-      port: 587
-apache:
-  development:
-    version: 2.4
-    server_name: development.domain.local
-    server_aliases:
-      - www.development.domain.local
-    env_vars:
-      RAILS_ENV: development
-      APPLICATION_ENV: development  
-  staging:
-    version: 2.2  
-    server_name: staging.domain.com
-    server_aliases:
-      - www.staging.domain.com
-    env_vars:
-      RAILS_ENV: staging
-      APPLICATION_ENV: staging
-  production:
-    version: 2.4
-    server_name: production.domain.com
-    server_aliases:
-      - www.production.domain.com
-    server_admin: dev@domain.com
-    env_vars:
-      RAILS_ENV: production
-      APPLICATION_ENV: production
-chown:
-  development:
-  staging:
-    -
-      path: public/uploads
-      user: www-data  
-  production:
-    -
-      path: public/uploads
-      user: www-data
-chmod:
-  development:
-  staging:
-    -
-      path: public/uploads
-      mode: 775  
-  production:
-    -
-      path: public/uploads
-      mode: 775
-chgrp:
-  development:
-  staging:
-    -
-      path: public/uploads
-      group: www-data  
-  production:
-    -
-      path: public/uploads
-      group: www-data
-resources:
-  - public/assets
-  - public/uploads
-vendor:
-  - vendor
-  - public/vendor
-watch:
-  sass:
-    -
-      src: public/themes/project/scss
-      dest: public/themes/project/css
-      filter: !ruby/regexp '/main\.scss$/'
-    -
-      src: public/themes/project/scss
-      dest: public/themes/project/css
-      filter: !ruby/regexp '/typography\.scss$/'   
-  coffee:
-    -
-      src: public/project/coffee
-      dest: public/project/javascript
-      filter: !ruby/regexp '/^.+\.coffee$/'
-log_dirs:
+deploy:
+  common:
+    project_type: rails3 | rails4 | silverstripe3 | drupal6 | drupal7 | drupal8 | php | sinatra
+    base_dir: /var/www
+    repository: git@gitlab.....
+    project_slug: tradespot
+    default_branch: master
+    domain: domain.com
+    user: root
+    port: 22
+    keep: 2
+  environments:
+    development:
+    staging:
+      domain: staging.domain.com
+      default_branch: master
+    production:
+      domain: production.domain.com
+      default_branch: stable
+dbs:
+  default:
+    development:
+      name: project_development
+      user: project_development
+      pass:
+      host: localhost
+      port: 3306
+    staging:
+      name: project_staging
+      user: project_staging
+      pass: passw0rd
+      host: localhost
+      port: 3306
+    production:
+      name: project_production
+      user: project_production
+      pass: passw0rd
+      host: localhost
+      port: 3306
+backup:
+  local:
+    keep:2
+  ftp:
+    keep: 10
+    host: backup-host.com
+    user: remote_backup
+    pass: passw0rd
+  sftp:
+    keep: 10
+    host: backup-host.com
+    user: remote_backup
+    pass: passw0rd
+  s3:
+    keep: 10
+    key: key
+    secret: secret
+    bucket: bucket
+  rsync:
+    host: backup-host.com
+    user: remote_backup
+    pass: passw0rd
+mail:
+  smtp:
+    development:
+      default_from:
+        name: dev
+        email: dev@domain.com
+      server: smtp.gmail.com
+      domain: gmail.com
+      authenticate: true
+      user: username@domain.com
+      pass: passw0rd
+      secure: tls
+      charset_encoding: utf-8
+      port: 587
+    staging:
+      default_from:
+        name: staging
+        email: dev@domain.com
+      server: smtp.gmail.com
+      domain: gmail.com
+      authenticate: true
+      user: username@domain.com
+      pass: passw0rd
+      secure: tls
+      charset_encoding: utf-8
+      port: 587
+    production:
+      default_from:
+        name: production
+        email: dev@domain.com
+      server: smtp.gmail.com
+      domain: gmail.com
+      authenticate: true
+      user: username@domain.com
+      pass: passw0rd
+      secure: tls
+      charset_encoding: utf-8
+      port: 587
+apache:
+  development:
+    version: 2.4
+    server_name: development.domain.local
+    server_aliases:
+      - www.development.domain.local
+    env_vars:
+      RAILS_ENV: development
+      APPLICATION_ENV: development
+  staging:
+    version: 2.2
+    server_name: staging.domain.com
+    server_aliases:
+      - www.staging.domain.com
+    env_vars:
+      RAILS_ENV: staging
+      APPLICATION_ENV: staging
+    basic_auth:
+      -
+        user: username1
+        pass: passw0rd1
+      -
+        user: username2
+        pass: passw0rd2
+  production:
+    version: 2.4
+    server_name: production.domain.com
+    server_aliases:
+      - www.production.domain.com
+    server_admin: dev@domain.com
+    env_vars:
+      RAILS_ENV: production
+      APPLICATION_ENV: production
+chown:
+  development:
+  staging:
+    -
+      path: public/uploads
+      user: www-data
+  production:
+    -
+      path: public/uploads
+      user: www-data
+chmod:
+  development:
+  staging:
+    -
+      path: public/uploads
+      mode: 775
+  production:
+    -
+      path: public/uploads
+      mode: 775
+chgrp:
+  development:
+  staging:
+    -
+      path: public/uploads
+      group: www-data
+  production:
+    -
+      path: public/uploads
+      group: www-data
+resources:
+  - public/assets
+  - public/uploads
+vendor:
+  - vendor
+  - public/vendor
+watch:
+  sass:
+    -
+      src: public/themes/project/scss
+      dest: public/themes/project/css
+      filter: !ruby/regexp '/main\.scss$/'
+    -
+      src: public/themes/project/scss
+      dest: public/themes/project/css
+      filter: !ruby/regexp '/typography\.scss$/'
+  coffee:
+    -
+      src: public/project/coffee
+      dest: public/project/javascript
+      filter: !ruby/regexp '/^.+\.coffee$/'
+log_dirs:
   - log

data/config/deploy.rb

@@ -36,7 +36,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  = conf.get('vendor','Array') || []
+vendor    = conf.get('vendor','Array') || []
 
 # vhost name
 vhost = deploy.get('project_slug') + '_' + env
@@ -44,7 +44,7 @@ vhost = deploy.get('project_slug') + '_' + env
 # composer?
 use_composer = ['silverstripe','silverstripe3','drupal','drupal6','drupal7','drupal8','php'].include? deploy.get('project_type')
 
-# composer?
+# bower?
 use_bower = ['silverstripe','silverstripe3','drupal','drupal6','drupal7','drupal8','php'].include? deploy.get('project_type')
 
 # directories we need to track
@@ -72,7 +72,7 @@ set :user,          deploy.get('user')
 set :port,          deploy.get('port')
 set :rails_env,     env
 set :shared_paths,  shared
- 
+
 
 # Tasks
 # ---------------------------------------------------------------
@@ -94,7 +94,7 @@ task :setup => :environment do
   resources.each do |path|
     queue! %[chown -R www-data:www-data "#{deploy_to}/shared/#{path}"]
     queue! %[chmod -R 0775 "#{deploy_to}/shared/#{path}"]
-  end  
+  end
 
   # set appropriate permissions on the logs
   log_dirs.each do |path|
@@ -109,11 +109,11 @@ task :setup => :environment do
   queue! %[mkdir -p "#{deploy_to}/shared/tmp"]
   queue! %[touch "#{deploy_to}/shared/tmp/restart.txt"]
   queue! %[cd #{deploy_to}/shared/tmp && chown -R www-data:www-data . && chmod -R 775 .]
- 
+
   # init composer
   if use_composer
     queue! %[mkdir -p "#{deploy_to}/shared/vendor"]
-    queue! %[cd #{deploy_to}/shared && curl -s http://getcomposer.org/installer | php] 
+    queue! %[cd #{deploy_to}/shared && curl -s http://getcomposer.org/installer | php]
   end
 
   # create the backup folder
@@ -130,7 +130,7 @@ end
 
 desc "Sets up an environment"
 task :setup_env => :environment do
-  Bonethug::Installer.get_setup_env_cmds.each do |cmd| 
+  Bonethug::Installer.get_setup_env_cmds.each do |cmd|
     queue! %[#{cmd}]
   end
 end
@@ -159,7 +159,7 @@ task :init_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
   if deploy.get('project_type') =~ /drupal[0-9]?/
     conf.get('dbs').each do |name,envs|
@@ -178,18 +178,18 @@ 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'
-  end  
+  end
 end
 
 desc "Restores files from a location"
@@ -201,7 +201,7 @@ task :sync_to => :environment do
     (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'
@@ -272,7 +272,7 @@ task :deploy => :environment do
     Order allow,deny
     Allow from all
     #{vh_cnf.get('version').to_f > 2.4 ? 'Require all granted' : ''}
-    
+
   </Directory>
 
 </VirtualHost>
@@ -296,7 +296,7 @@ task :deploy => :environment do
       # ensure that the correct directory permissions are set - public is a bit heavy handed
       queue! %[cd #{deploy_to}/current/public && chown -R www-data:www-data . && chmod -R 775 .]
       queue! %[cd #{deploy_to}/shared/tmp && chown -R www-data:www-data . && chmod -R 775 .]
-      
+
       # set appropriate permissions on the resource dirs - if they just need read / write - should prob be 0666
       resources.each do |path|
         queue! %[chown -R www-data:www-data "#{deploy_to}/shared/#{path}"]
@@ -307,23 +307,23 @@ task :deploy => :environment do
       chowns = conf.get('chown.'+env)
       if chowns
         chowns.each do |index, chown|
-          queue! %[cd #{deploy_to}/current/#{chown.get('path')} && chown -R #{chown.get('user')} .]
+          queue! %[chown -R #{chown.get('user')} #{deploy_to}/current/#{chown.get('path')}]
         end
       end
-      
+
       # apply defined permissions
       chgrps = conf.get('chgrp.'+env)
       if chgrps
         chgrps.each do |index, chgrp|
-          queue! %[cd #{deploy_to}/current/#{chgrp.get('path')} && chgrp -R #{chgrp.get('group')} .]
+          queue! %[chgrp -R #{chgrp.get('group')} #{deploy_to}/current/#{chgrp.get('path')}]
         end
-      end      
-      
+      end
+
       # apply defined permissions
       chmods = conf.get('chmod.'+env)
       if chmods
         chmods.each do |index, chmod|
-          queue! %[cd #{deploy_to}/current/#{chmod.get('path')} && chmod -R #{chmod.get('mode')} .]
+          queue! %[chmod -R #{chmod.get('mode')} #{deploy_to}/current/#{chmod.get('path')}]
         end
       end
 
@@ -331,17 +331,59 @@ task :deploy => :environment do
       queue! %[php #{deploy_to}/shared/composer.phar install] if use_composer
 
       # update bower
-      queue! %[cd #{deploy_to}/current && bower install --allow-root] if use_bower      
+      queue! %[cd #{deploy_to}/current && bower install --allow-root] if use_bower
+
+      # trigger a restart on rack based systems
+      queue! %[touch #{deploy_to}/current/tmp/restart.txt]
+
+      # handle basic auth
+      if vh_cnf.get 'basic_auth'
+
+        # handle auto creation of .htaccess
+        htaccess = "
+          ## BONETHUG ##
+          AuthName \"test\"
+          AuthType Basic
+          AuthUserFile #{deploy_to}/current/.htpasswd
+          require valid-user
+          ## END_BONETHUG ##
+        "
+
+        # htaccess
+        htpass = ""
+        vh_cnf.get('basic_auth').each do |index, cred|
+          htpass += cred.get('user').to_s + ":" + cred.get('pass').to_s.crypt('bonethugisreallydope') + "\n"
+        end
+
+        # write the to the .haccess file
+        queue! %[touch #{deploy_to}/current/public/.htaccess]
+        clean = File.read("#{deploy_to}/current/public/.htaccess").gsub(/\n?## BONETHUG ##.+## END_BONETHUG ##\n?/m, '');
+        escaped = (clean.to_s + htaccess).gsub(/"/, '\"')
+        queue! %[echo "#{escaped}" > #{deploy_to}/current/public/.htaccess]
 
-      # trigger a restart on rack based systems   
-      queue! %[touch #{deploy_to}/current/tmp/restart.txt]      
+        # write to the .htpasswd file
+        queue! %[touch #{deploy_to}/current/.htpasswd]
+        queue! %[echo "#{htpass}" > #{deploy_to}/current/.htpasswd]
+      else
 
-      # handle apache and cron
+        # write the to the .haccess file
+        queue! %[touch #{deploy_to}/current/public/.htaccess]
+        clean = File.read("#{deploy_to}/current/public/.htaccess").gsub(/\n?## BONETHUG ##.+## END_BONETHUG ##\n?/m, '');
+        escaped = (clean.to_s).gsub(/"/, '\"')
+        queue! %[echo "#{escaped}" > #{deploy_to}/current/public/.htaccess]
+
+      end
+
+      # handle apache
       queue! %[a2ensite #{vhost}.conf]
       queue! %[/etc/init.d/apache2 reload]
+
+      # handle cron
       invoke :'whenever:update'
+      queue "echo \"\nPlease review the crontab below!!\n\n\""
+      queue 'crontab -l'
 
-      # run chache flushes / manifest rebuilds
+      # 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! %[cd #{deploy_to}/current/lib && php flush_drupal_cache.php] if ['drupal','drupal6','drupal7','drupal8'].include? deploy.get('project_type')
 
@@ -350,7 +392,7 @@ task :deploy => :environment do
 
       # cleanup!
       invoke :'deploy:cleanup'
-      
+
     end
   end
 end