bonethug 0.0.24 → 0.0.25

data/config/cnf.yml

@@ -1,6 +1,6 @@
 deploy:
   common:
-    project_type: rails3 | silverstripe3 | drupal | php | sinatra
+    project_type: rails3 | rails4 | silverstripe3 | drupal | php | sinatra
     base_dir: /var/www
     repository: git@gitlab.....
     project_slug: tradespot
@@ -62,10 +62,30 @@ backup:
 mail:
   smtp:
     development:
+      default_from:
+        name: dev
+        email: dev@domain.com
+      server: smtp.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
+      authenticate: true
+      user: username@domain.com
+      pass: passw0rd
+      secure: tls
+      charset_encoding: utf-8
+      port: 587    
     production:
       default_from:
-        name: dev
+        name: production
         email: dev@domain.com
       server: smtp.gmail.com
       authenticate: true
@@ -76,6 +96,12 @@ mail:
       port: 587
 apache:
   development:
+    server_name: development.domain.local
+    server_aliases:
+      - www.development.domain.local
+    env_vars:
+      RAILS_ENV: development
+      APPLICATION_ENV: development  
   staging:
     server_name: staging.domain.com
     server_aliases:

data/config/deploy.rb

@@ -122,7 +122,7 @@ end
 
 desc "Restores application state to the most recent backup"
 task :init_db => :environment do
-  queue! %[cd #{deploy_to}/current && bundle exec rake db:reset RAILS_ENV="#{env}"] if deploy.get('project_type') == 'rails'
+  queue! %[cd #{deploy_to}/current && bundle exec rake db:reset RAILS_ENV="#{env}"] if deploy.get('project_type') =~ /rails[0-9]?/
 end
 
 desc "Restores application state to the most recent backup"
@@ -172,7 +172,7 @@ task :deploy => :environment do
     invoke :'bundle:install'
 
     # rails deploy tasks
-    if deploy.get('project_type') == 'rails'
+    if deploy.get('project_type') =~ /rails[0-9]?/
       invoke :'rails:db_migrate'
       invoke :'rails:assets_precompile'
     end
@@ -240,7 +240,7 @@ task :deploy => :environment do
 
     to :launch do
 
-      if ['rails3'].include? deploy.get('project_type')
+      if deploy.get('project_type') =~ /rails[0-9]?/
 
         # make sure passenger runs the app as apache
         queue! %[cd #{deploy_to}/current/config && chown -R www-data:www-data environment.rb]
@@ -290,7 +290,9 @@ task :deploy => :environment do
       queue! %[/etc/init.d/apache2 reload]
       invoke :'whenever:update'
 
+      # run chache 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')
 
     end
   end

data/lib/bonethug/installer.rb

@@ -4,6 +4,7 @@
 # - Check that excluded paths is working in manifest
 # - bonethug init seems doesn't seem to update gemfile if there is one
 # - Gemfile, .gitignore, composer.json need to be no go zones
+# - for rails it should copy the gem file call bundle install, do a cleanup then call bundle exec rails new application_name
 # ----------------
 
 require 'rubygems'
@@ -55,8 +56,8 @@ module Bonethug
 
       # build the file set
       puts 'Building ' + type + ' skeleton...'
+      FileUtils.cp_r @@skel_dir + '/base/.', tmp_dir      
       FileUtils.cp_r @@skel_dir + '/project_types/' + type + '/.', tmp_dir
-      FileUtils.cp_r @@skel_dir + '/base/.', tmp_dir
 
       # build the manifest
       puts 'Creating manifest...'
@@ -265,7 +266,7 @@ module Bonethug
       end
 
       # run bundler
-      exec 'bundle install --path vendor --binstubs' + (mode == :update ? ' && bundle update bonethug' : '')
+      exec 'bundle install --path vendor' + (mode == :update ? ' && bundle update bonethug' : '')
 
       # self
 

data/lib/bonethug/utils.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Bonethug
 
   #arguments can be for example db:migrate
@@ -12,4 +14,11 @@ module Bonethug
     puts $?
   end
 
+  def self.setup_gitpull(target = '.')
+
+    path = File.expand_path target
+    `chown www-data #{path}`
+    
+  end
+
 end

data/lib/bonethug/version.rb

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

data/skel/base/README.md

@@ -1,5 +1,5 @@
-Bonethug Silverstripe Project Skeleton
-======================================
+Bonethug Project Skeleton
+=========================
 
 
 
@@ -25,7 +25,7 @@ Overview
 
 -   Cron handled wtih whenever. [https://github.com/javan/whenever]
 
--   Backups handled with astrails-safe. see https://github.com/astrails/safe
+-   Backups handled with astrails-safe. [see https://github.com/astrails/safe]
 
 -   Ruby dependency management handled with bundler. see
 
@@ -92,13 +92,13 @@ This only works on \*nix based OSes
 
 1.  Setup the project
 
-`export to={staging|production} && bundle exec mina setup`
+`bundle exec bonethug setup {staging|production}`
 
 
 
 1.  Deploy the project
 
-`export to={staging|production} && bundle exec mina deploy`
+`bundle exec bonethug deploy {staging|production}`
 
 
 

data/skel/project_types/drupal/lib/flush_drupal_cache.php

@@ -0,0 +1,5 @@
+<?php
+chdir(__DIR__ . '/../public');
+require_once 'includes/bootstrap.inc';
+drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+drupal_flush_all_caches();

data/skel/project_types/rails3/Gemfile

@@ -0,0 +1,49 @@
+require 'rbconfig'
+
+source "https://rubygems.org"
+
+gem 'mina',             github: 'nadarei/mina'
+gem 'astrails-safe',    github: 'astrails/safe'
+gem 'whenever',         github: 'javan/whenever'
+gem 'bonethug'
+
+gem 'rails', '3.2.13'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails'
+  gem 'compass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
+  gem "therubyracer", :require => 'v8', :platforms => :ruby
+end
+
+# Gems used only for development / not needed on production / staging
+group :development do
+  gem 'sextant'
+  gem "mina", github: "nadarei/mina"  
+end
+
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem 'bootstrap-sass'
+gem 'modernizr-rails'
+gem 'slim-rails'
+gem 'simple_form'
+
+# validation
+gem 'obscenity'
+gem 'validate_as_email'
+gem 'honeypot-captcha'
+
+# mysql
+if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+  gem 'mysql2', '0.3.11'
+else
+  gem 'mysql2'
+end
+
+# To use ActiveModel has_secure_password
+gem 'bcrypt-ruby'
+gem 'cancan'

data/skel/project_types/rails3/README.md

@@ -0,0 +1,102 @@
+Bonethug Project Skeleton
+=========================
+
+
+
+Requirements
+------------
+
+-   Ruby 1.9.3 +
+
+-   PHP 5.3 +
+
+-   Linux / OSX
+
+-   Apache
+
+-   MySQL 5.5 +
+
+
+
+Overview
+--------
+
+-  	Deployment, cron and backups handled with bonethug. see [https://github.com/azt3k/bonethug]
+
+-   Ruby dependency management handled with bundler.
+
+
+
+Set Up
+------
+
+
+
+### Pre-requisites
+
+
+
+1.  If you are windows you'll need some better unix command support this helps:
+    http://www.robvanderwoude.com/unixports.php
+
+2.  Firstly you need an MAMP / LAMP / WAMP etc stack, ruby 1.9.3 and curl for
+    composer, if you're on windows there's an installer for composer
+
+3.  You need to have bundler and composer installed
+
+
+
+**bundler**
+
+`gem install bundler`
+
+
+
+### Development - Setup
+
+
+
+1.  clone the repo
+
+2.  run:
+
+`bundle install –path vendor –binstubs`
+
+2.  create the db for the development environment
+
+4.  configure config/database.yml
+
+3.  run:
+
+`bundle exec rake db:migrate`
+
+`bundle exec rake db:seed`
+
+
+
+### Development - 
+
+
+
+
+### Deployment
+
+
+
+This only works on \*nix based OSes
+
+
+
+1.  Setup the project
+
+`bundle exec bonethug setup {staging|production}`
+
+
+
+1.  Deploy the project
+
+`bundle exec bonethug deploy {staging|production}`
+
+
+
+

data/skel/project_types/rails4/Gemfile

@@ -0,0 +1,44 @@
+require 'rbconfig'
+
+source "https://rubygems.org"
+
+gem 'mina',             github: 'nadarei/mina'
+gem 'astrails-safe',    github: 'astrails/safe'
+gem 'whenever',         github: 'javan/whenever'
+gem 'bonethug'
+
+gem 'rails', '>= 4'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails'
+  gem 'compass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
+  gem "therubyracer", :require => 'v8', :platforms => :ruby
+end
+
+# Gems used only for development / not needed on production / staging
+group :development do
+  gem 'sextant'
+  gem "mina", github: "nadarei/mina"  
+end
+
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem 'bootstrap-sass'
+gem 'modernizr-rails'
+gem 'slim-rails'
+gem 'simple_form'
+
+# mysql
+if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+  gem 'mysql2', '0.3.11'
+else
+  gem 'mysql2'
+end
+
+# To use ActiveModel has_secure_password
+gem 'bcrypt-ruby'
+gem 'cancan'

data/skel/project_types/rails4/README.md

@@ -0,0 +1,101 @@
+Bonethug Project Skeleton
+=========================
+
+
+
+Requirements
+------------
+
+-   Ruby 1.9.3 +
+
+-   PHP 5.3 +
+
+-   Linux / OSX
+
+-   Apache
+
+-   MySQL 5.5 +
+
+
+
+Overview
+--------
+
+-  	Deployment, cron and backups handled with bonethug. see [https://github.com/azt3k/bonethug]
+
+-   Ruby dependency management handled with bundler.
+
+
+
+Set Up
+------
+
+
+
+### Pre-requisites
+
+
+
+1.  If you are windows you'll need some better unix command support this helps:
+    http://www.robvanderwoude.com/unixports.php
+
+2.  Firstly you need an MAMP / LAMP / WAMP etc stack, ruby 1.9.3 and curl for
+    composer, if you're on windows there's an installer for composer
+
+3.  You need to have bundler and composer installed
+
+
+
+**bundler**
+
+`gem install bundler`
+
+
+
+### Development - Setup
+
+
+
+1.  clone the repo
+
+2.  run:
+
+`bundle install –path vendor –binstubs`
+
+2.  create the db for the development environment
+
+4.  configure config/database.yml
+
+3.  run:
+
+`bundle exec rake db:migrate`
+`bundle exec rake db:seed`
+
+
+
+### Development - 
+
+
+
+
+### Deployment
+
+
+
+This only works on \*nix based OSes
+
+
+
+1.  Setup the project
+
+`bundle exec bonethug setup {staging|production}`
+
+
+
+1.  Deploy the project
+
+`bundle exec bonethug deploy {staging|production}`
+
+
+
+

data/skel/project_types/silverstripe3/composer.json

@@ -1,31 +1,24 @@
 {
-  "name" : "insight/report-framework",
+  "name" : "bonethug/ss3-skel",
   "require" : {
-    "symfony/yaml"                  : "2.3.*@dev",     
-    "silverstripe/framework"        : "3.1.*@dev",
-    "silverstripe/cms"              : "3.1.*@dev",
-    "silverstripe-themes/simple"    : "dev-master",
-    "silverstripe/installer"        : "3.1.*@dev",
-    "silverstripe/bootstrap-forms"  : "dev-master",
-    "silverstripe/html5"            : "dev-master",
-    "azt3k/abc-silverstripe"        : "dev-master"
+    "symfony/yaml"                      : "2.3.*@dev",     
+    "silverstripe/framework"            : "3.1.*@dev",
+    "silverstripe/cms"                  : "3.1.*@dev",
+    "silverstripe/html5"                : "dev-master",
+    "phpmailer/phpmailer"               : "dev-master",
+    "azt3k/abc-silverstripe"            : "dev-master",
+    "azt3k/abc-silverstripe-mailer"     : "dev-master"  
   },
   "extra": {
     "installer-paths": {
         "public/vendor/{$name}": [
       ],
-      "public/themes/{$name}": [
-        "silverstripe-themes/simple"
-      ],
-      "public": [
-        "silverstripe/installer"
-      ],
       "public/{$name}": [
         "silverstripe/framework",
-        "silverstripe/cms",
-        "silverstripe/bootstrap-forms",        
+        "silverstripe/cms",     
         "silverstripe/html5",
-        "azt3k/abc-silverstripe"
+        "azt3k/abc-silverstripe",
+        "azt3k/abc-silverstripe-mailer"
       ]
     }
   }

data/skel/project_types/silverstripe3/public/.htaccess

@@ -22,7 +22,7 @@ ErrorDocument 500 /assets/error-500.html
 
 <IfModule mod_alias.c>
 	RedirectMatch 403 /silverstripe-cache(/|$)
-	RedirectMatch 403 /vendor(/|$)
+	RedirectMatch 403 ^/vendor(/|$)
 	RedirectMatch 403 /composer\.(json|lock)
 </IfModule>
 

data/skel/project_types/silverstripe3/public/project/_config.php

@@ -58,8 +58,6 @@ switch(APPLICATION_ENV){
 		
 		// Log file
 		SS_Log::add_writer(new SS_LogFileWriter(BASE_PATH.'/../log/staging.log'), SS_Log::WARN, '<=');
-
-		Requirements::javascript('http://www.bugherd.com/sidebarv2.js?apikey=pt0wdpdahlzyroate2lnbg');
 		
 		break;
 

data/skel/project_types/silverstripe3/public/project/code/Pages/Page.php

@@ -1,7 +1,7 @@
 <?php
 class Page extends SiteTree {
 
-	private static $can_be_root = false;	
+	private static $can_be_root = true;	
 
 	private static $db = array(
 	);

data/skel/project_types/silverstripe3/public/themes/project/css/editor.css

@@ -0,0 +1,14 @@
+/** 
+ * This support file is used to style the WYSIWYG editor in the CMS
+ */
+ 
+@import "typography.css";
+ 
+body.mceContentBody {
+    min-height: 200px;
+    font-size: 62.5%;
+}
+body.mceContentBody a.broken {
+    background-color: #FF7B71;
+    border: 1px red solid;
+}

data/skel/project_types/silverstripe3/public/themes/project/css/typography.css

@@ -0,0 +1 @@
+*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.typography .left{text-align:left}.typography .center{text-align:center}.typography .right{text-align:right}.typography img.right,.typography div.right{float:right}.typography img.left,.typography div.right{float:left}.typography .caption{display:block;font-size:0.75em;text-align:left}.typography div.captionImage,.typography .side-image-right{float:right;margin:0 0 1em 1em}.typography div.captionImage img,.typography .side-image-right img{border:5px solid #E8E7DE;-webkit-box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2);box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2)}.typography .side-image-left{float:left;margin:0 1em 1em 0}.typography .side-image-left img{border:5px solid #E8E7DE;-webkit-box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2);box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2)}.typography img.side-image-right,.typography img.side-image-left{border:5px solid #E8E7DE;-webkit-box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2);box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2)}.typography figure{display:inline-block;vertical-align:baseline;zoom:1;*display:inline;*vertical-align:auto;margin:0 0 1em 1em}.typography figure div{position:relative;max-width:100%;float:left;margin:0 0 0.5em 0}.typography figure div img{float:left;min-width:100%}.typography figure div::before{content:"";position:absolute;top:0;bottom:0;left:0;right:0;-webkit-box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2);box-shadow:inset 1px 2px 2px rgba(0,0,0,0.2);border:5px solid #e8e7de}.typography figure div.side-image{float:right;margin:0 0 1em 1em}.typography figure figcaption{display:block;font-size:0.75em;text-align:left}.typography p.MsoNormal,.typography p.MsoBodyText{margin:0}

data/skel/project_types/silverstripe3/public/themes/project/scss/typography.css.scss

@@ -0,0 +1,27 @@
+.typography {
+
+	// default editor styles
+	
+	.left {
+		text-align:left;
+	}
+	.center {
+		text-align:center;
+	}
+	.right {
+		text-align:right;
+	}
+	img.right,
+	div.right {
+		float:right;
+	}
+	img.left,
+	div.right {
+		float:left;
+	}
+
+	p.MsoNormal,  
+	p.MsoBodyText {
+		margin: 0;
+	}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -309,12 +309,17 @@ files:
 - skel/base/public/robots.txt
 - skel/project_types/drupal/.gitignore
 - skel/project_types/drupal/composer.json
+- skel/project_types/drupal/lib/flush_drupal_cache.php
 - skel/project_types/drupal/public/sites/default/development.settings.php
 - skel/project_types/drupal/public/sites/default/production.settings.php
 - skel/project_types/drupal/public/sites/default/settings.php
 - skel/project_types/drupal/public/sites/default/staging.settings.php
 - skel/project_types/php/.gitignore
 - skel/project_types/php/composer.json
+- skel/project_types/rails3/Gemfile
+- skel/project_types/rails3/README.md
+- skel/project_types/rails4/Gemfile
+- skel/project_types/rails4/README.md
 - skel/project_types/silverstripe3/.gitignore
 - skel/project_types/silverstripe3/composer.json
 - skel/project_types/silverstripe3/lib/ss_loadconf.php
@@ -336,11 +341,14 @@ files:
 - skel/project_types/silverstripe3/public/project/javascript/.gitkeep
 - skel/project_types/silverstripe3/public/silverstripe-cache/.gitkeep
 - skel/project_types/silverstripe3/public/themes/project/css/.gitkeep
-- skel/project_types/silverstripe3/public/themes/project/images/apple-touch-icon-114x114-precomposed.png
-- skel/project_types/silverstripe3/public/themes/project/images/apple-touch-icon-72x72-precomposed.png
-- skel/project_types/silverstripe3/public/themes/project/images/apple-touch-icon.png
-- skel/project_types/silverstripe3/public/themes/project/images/favicon.png
+- skel/project_types/silverstripe3/public/themes/project/css/editor.css
+- skel/project_types/silverstripe3/public/themes/project/css/typography.css
+- skel/project_types/silverstripe3/public/themes/project/images/favicons/apple-touch-icon-114x114-precomposed.png
+- skel/project_types/silverstripe3/public/themes/project/images/favicons/apple-touch-icon-72x72-precomposed.png
+- skel/project_types/silverstripe3/public/themes/project/images/favicons/apple-touch-icon.png
+- skel/project_types/silverstripe3/public/themes/project/images/favicons/favicon.png
 - skel/project_types/silverstripe3/public/themes/project/scss/application.css.scss
+- skel/project_types/silverstripe3/public/themes/project/scss/typography.css.scss
 - skel/project_types/silverstripe3/public/themes/project/templates/Includes/.gitkeep
 - skel/project_types/silverstripe3/public/themes/project/templates/Layout/Page.ss
 - skel/project_types/silverstripe3/public/themes/project/templates/Layout/Security.ss