bonethug 0.0.17 → 0.0.18

data/Gemfile

@@ -17,12 +17,12 @@ gem 'sass-rails'
 gem 'coffee-rails'
 
 # asset pipeline - guard coffeescript / sass
-# gem 'rake'
-# gem 'guard'
-# gem 'coffee-script'
-# gem 'sass'
-# gem 'guard-sass'
-# gem 'guard-coffeescript'
+gem 'rake'
+gem 'guard'
+gem 'coffee-script'
+gem 'sass'
+gem 'guard-sass'
+gem 'guard-coffeescript'
 # gem 'listen'
 
 if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i

data/README.md

@@ -1,8 +1,10 @@
-# Bonethug
+Bonethug
+========
 
 Project Skeleton Manager
 
-## Installation
+Installation
+------------
 
 Add this line to your application's Gemfile:
 
@@ -10,22 +12,44 @@ 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
+-----
+
 
-## Usage
 
 ### Commands
 
-	$ bonethug install {rails3|silverstripe3|drupal|php|sinatra}
 
-## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+**Set up a project Skeleton**
+
+`bonethug install {rails3|silverstripe3|drupal|php|sinatra}`
+
+
+
+**Add bonethug to an existing project **
+
+if you just want to use the deploy / cron / backup framework
+
+`bonethug init`
+
+
+
+**update the bonethug files in an existing project**
+
+`bonethug update`  
+  
+
+
+Contributing
+------------
+
+1.  Fork it 2. Create your feature branch (`git checkout -b my-new-feature`) 3.
+    Commit your changes (`git commit -am 'Add some feature'`) 4. Push to the
+    branch (`git push origin my-new-feature`) 5. Create new Pull Request

data/Rakefile

@@ -1,4 +1,4 @@
 require "bundler/gem_tasks"
 
 root_path = File.expand_path(File.dirname(__FILE__))
-import root_path+"/lib/tasks/setup.rake"
+# import root_path+"/lib/tasks/setup.rake"

data/bonethug.gemspec

@@ -29,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'whenever'
 
   # asset pipeline - guard coffeescript / sass
-  # spec.add_dependency 'rake'
-  # spec.add_dependency 'guard'
-  # spec.add_dependency 'coffee-script'
-  # spec.add_dependency 'sass'
-  # spec.add_dependency 'guard-sass'
-  # spec.add_dependency 'guard-coffeescript'
+  spec.add_dependency 'rake'
+  spec.add_dependency 'guard'
+  spec.add_dependency 'coffee-script'
+  spec.add_dependency 'sass'
+  spec.add_dependency 'guard-sass'
+  spec.add_dependency 'guard-coffeescript'
   # spec.add_dependency 'listen'  
 
   # asset pipeline guard sprockets

data/config/cnf.yml

@@ -119,6 +119,9 @@ chgrp:
 resources:
   - public/assets
   - public/uploads
+vendor:
+  - vendor
+  - public/vendor
 watch:
   sass:
     -

data/config/deploy.rb

@@ -29,6 +29,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') || []
 
 # vhost name
 vhost = deploy.get('project_slug') + '_' + env
@@ -44,7 +45,7 @@ resources.push 'vendor' if use_composer
 log_dirs.push 'log' unless log_dirs.include? 'log'
 
 # shared paths
-shared = resources + log_dirs + ['tmp']
+shared = resources + log_dirs + vendor_dirs + ['tmp']
 shared.push 'composer.phar' if use_composer
 
 # shared config
@@ -70,7 +71,7 @@ desc "Sets up the Project"
 task :setup => :environment do
 
   # make shared resource dirs
-  (resources + log_dirs).each do |path|
+  (resources + log_dirs + vendor_dirs).each do |path|
     queue! %[mkdir -p "#{deploy_to}/shared/#{path}"]
   end
 
@@ -143,7 +144,7 @@ task :deploy => :environment do
     end
 
     # update composer
-    queue! %[php #{deploy_to}/shared/composer.phar update] if use_composer
+    queue! %[php #{deploy_to}/shared/composer.phar install] if use_composer
 
     # build the vhosts
     vh_cnf = conf.get('apache.'+env)
@@ -211,13 +212,18 @@ task :deploy => :environment do
         queue! %[cd #{deploy_to}/current/config && chown -R www-data:www-data environment.rb]
         queue! %[cd #{deploy_to}/current && chown -R www-data:www-data config.ru]
 
-      end      
+      end
 
-      # ensure that the correct directory permissions are set
+      # 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 .]      
-      queue! %[touch #{deploy_to}/current/tmp/restart.txt]
+      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}"]
+        queue! %[chmod -R 0776 "#{deploy_to}/shared/#{path}"]
+      end
+
       # apply defined permissions
       chowns = conf.get('chown.'+env)
       if chowns
@@ -242,6 +248,10 @@ task :deploy => :environment do
         end
       end
 
+      # trigger a restart on rack based systems   
+      queue! %[touch #{deploy_to}/current/tmp/restart.txt]      
+
+      # handle apache and cron
       queue! %[a2ensite "#{vhost}"]
       queue! %[/etc/init.d/apache2 reload]
       invoke :'whenever:update'

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/skel/project_types/silverstripe3/.gitignore

@@ -2,21 +2,24 @@
 /.bundle
 /vendor
 /bin
-/logs/*
+/log/*
 /backups/*
 /db_dumps
 /tmp/*
 /composer.phar
-!.gitkeep
+.sass-cache
+/public/assets/*
 
 # components tracked by composer
 /public/silverstripe-cache/*
 /public/themes/simple
-/public/vendor
-/public/assets/*
 /public/bootstrap_forms
 /public/cms
+/public/abc-silverstripe
 /public/framework
 /public/html5
-/public/widgets
-/public/compass
+
+# files to keep
+!.gitkeep
+!/public/assets/error-404.html
+!/public/assets/error-500.html

data/skel/project_types/silverstripe3/composer.json

@@ -7,7 +7,8 @@
     "silverstripe-themes/simple"    : "dev-master",
     "silverstripe/installer"        : "3.1.*@dev",
     "silverstripe/bootstrap-forms"  : "dev-master",
-    "silverstripe/html5"            : "dev-master"
+    "silverstripe/html5"            : "dev-master",
+    "azt3k/abc-silverstripe"        : "dev-master"
   },
   "extra": {
     "installer-paths": {
@@ -23,7 +24,8 @@
         "silverstripe/framework",
         "silverstripe/cms",
         "silverstripe/bootstrap-forms",        
-        "silverstripe/html5"
+        "silverstripe/html5",
+        "azt3k/abc-silverstripe"
       ]
     }
   }

data/skel/project_types/silverstripe3/lib/ss_loadconf.php

@@ -0,0 +1,72 @@
+<?php
+
+require '../../vendor/autoload.php';
+
+use Symfony\Component\Yaml\Yaml;
+
+class SS_LoadConf {
+
+	protected static $constants_set = false;
+	// ss env translation
+	protected static $ss_env = array(
+		'development'	=> 'dev',
+		'staging'		=> 'test',
+		'production'	=> 'live'
+	);
+
+	public static function set_constants() {
+
+		if (!self::$constants_set) {
+
+			// Transfer environmental vars to constants
+			if (!defined('APPLICATION_ENV')) 		define('APPLICATION_ENV', getenv('APPLICATION_ENV'));
+			if (!defined('PATH')) 					define('PATH', getenv('PATH'));
+			if (!defined('SS_SEND_ALL_EMAILS_TO'))	define('SS_SEND_ALL_EMAILS_TO', getenv('SS_SEND_ALL_EMAILS_TO'));
+
+			// Set SS env vars
+			if (!getenv('SS_ENVIRONMENT_TYPE')) {		
+				putenv('SS_ENVIRONMENT_TYPE='.self::$ss_env[APPLICATION_ENV]);
+				define('SS_ENVIRONMENT_TYPE', getenv('SS_ENVIRONMENT_TYPE'));
+			}
+
+			self::$constants_set = true;
+		}
+
+	}
+	
+	public static function cnf() {
+
+		// ensure constants are set;
+		self::set_constants();
+
+		// paths
+		$base_dir = realpath(__DIR__ . '/..');
+		$public_dir = realpath($base_dir . '/public');
+
+		// load conf
+		$cnf = Yaml::parse($base_dir . '/config/cnf.yml');
+
+		// expected urls
+		$url = 'http://' . $cnf['apache'][APPLICATION_ENV]['server_name'];		
+
+		// load db settings
+		$db = (object) $cnf['dbs']['default'][APPLICATION_ENV];
+
+		// load mail settings
+		$mail = (object) $cnf['mail']['smtp'][APPLICATION_ENV];
+
+		return (object) array(
+			'cnf'			=> $cnf,
+			'db'			=> $db,
+			'mail'			=> $mail,
+			'base_path'		=> $base_dir,
+			'public_path'	=> $public_dir,
+			'url'			=> $url
+		);
+
+	}
+
+	public static function conf() { return self::cnf(); }
+	public static function config() { return self::cnf(); }	
+
+}

data/skel/project_types/silverstripe3/public/_ss_environment.php

@@ -0,0 +1,8 @@
+<?php
+
+// parse the config file and env vars
+require_once __DIR__ . '/../lib/ss_loadconf.php';
+$ss_cnf = SS_LoadConf::conf();
+
+global $_FILE_TO_URL_MAPPING;
+$_FILE_TO_URL_MAPPING[$ss_cnf->public_path] = $ss_cnf->url;

data/skel/project_types/silverstripe3/public/assets/error-404.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<base href="http://report.loc/index.php/"><!--[if lte IE 6]></base><![endif]-->
+
+		<title>Page not found</title>
+<meta name="generator" content="SilverStripe - http://silverstripe.org" />
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+
+
+		
+	<link rel="stylesheet" type="text/css" href="/index.php/framework/css/debug.css?m=1375863860" />
+</head>
+	<body>
+		<div class="info">
+			<h1>Page not found</h1>
+		</div>
+
+		<div class="options">
+			
+				<p>Sorry, it seems you were trying to access a page that doesn't exist.</p><p>Please check the spelling of the URL you were trying to access and try again.</p>
+				
+			
+		</div>
+	</body>
+</html>

data/skel/project_types/silverstripe3/public/assets/error-500.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<base href="http://report.loc/index.php/"><!--[if lte IE 6]></base><![endif]-->
+
+		<title>Server error</title>
+<meta name="generator" content="SilverStripe - http://silverstripe.org" />
+<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+
+
+		
+	<link rel="stylesheet" type="text/css" href="/index.php/framework/css/debug.css?m=1375863860" />
+</head>
+	<body>
+		<div class="info">
+			<h1>Server error</h1>
+		</div>
+
+		<div class="options">
+			
+				<p>Sorry, there was a problem with handling your request.</p>
+				
+			
+		</div>
+	</body>
+</html>

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

@@ -1,45 +1,22 @@
 <?php
 
-require '../../vendor/autoload.php';
+// Load stuff / set up environment
+// -------------------------------
 
-use Symfony\Component\Yaml\Yaml;
+global $project, $databaseConfig;
 
-// ss env translation
-$ss_env = array(
-	'development'	=> 'dev',
-	'staging'		=> 'test',
-	'production'	=> 'live'
-);
-
-// Transfer environmental vars to constants
-define('APPLICATION_ENV', getenv('APPLICATION_ENV'));
-
-// Set SS env vars
-putenv('SS_ENVIRONMENT_TYPE='+$ss_env[APPLICATION_ENV]);
-define('SS_ENVIRONMENT_TYPE', $ss_env[APPLICATION_ENV]);
-define('SS_SEND_ALL_EMAILS_TO', getenv('SS_SEND_ALL_EMAILS_TO'));
-
-global $project, $databaseConfig, $_FILE_TO_URL_MAPPING;
+// parse the config file and env vars
+require_once __DIR__ . '/../../lib/ss_loadconf.php';
+$ss_cnf = SS_LoadConf::conf();
 
 // Project Specific Settings
 $project = 'project';
 SSViewer::set_theme('project');
 
-// load conf
-$cnf = Yaml::parse(__DIR__.'/../../config/cnf.yml');
 
-// load db settings
-$db_cnf = (object) $cnf['dbs']['default'][APPLICATION_ENV];
+// Env Settings
+// ---------------------------
 
-// load mail settings
-$mail = (object) $cnf['mail']['smtp'][APPLICATION_ENV];
-
-// file to url
-$base_dir = __DIR__ . '/..';
-$url = 'http://'.$cnf['apache'][APPLICATION_ENV]['server_name'];
-$_FILE_TO_URL_MAPPING[$base_dir] = $url;
-
-// Env specific settings
 switch(APPLICATION_ENV){
 
 	case 'development':
@@ -81,6 +58,8 @@ 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;
 
@@ -96,27 +75,36 @@ switch(APPLICATION_ENV){
 		
 }
 
-// set up db
+// DB
+// ---------------------------
+
 $databaseConfig = array(
 	"type" 		=> 'MySQLDatabase',
-	"server" 	=> $db_cnf->host,
-	"username" 	=> $db_cnf->user,
-	"password" 	=> $db_cnf->pass,
-	"database" 	=> $db_cnf->name,
+	"server" 	=> $ss_cnf->db->host,
+	"username" 	=> $ss_cnf->db->user,
+	"password" 	=> $ss_cnf->db->pass,
+	"database" 	=> $ss_cnf->db->name,
 	"path" 		=> '',
 );	
 Config::inst()->update('MySQLDatabase', 'connection_charset', 'utf8');
 
-// set up mail
-define('SMTPMAILER_DEFAULT_FROM_NAME', 		$mail->default_from['name']);
-define('SMTPMAILER_DEFAULT_FROM_EMAIL', 	$mail->default_from['email']);		
-define('SMTPMAILER_SMTP_SERVER_ADDRESS',	$mail->server);
-define('SMTPMAILER_DO_AUTHENTICATE', 		$mail->authenticate);
-define('SMTPMAILER_USERNAME', 				$mail->user);
-define('SMTPMAILER_PASSWORD', 				$mail->pass);
-define('SMTPMAILER_CHARSET_ENCODING', 		$mail->charset_encoding);
-define('SMTPMAILER_USE_SECURE_CONNECTION', 	$mail->secure);
-define('SMTPMAILER_SMTP_SERVER_PORT', 		$mail->port);
+
+// Mail
+// ---------------------------
+
+define('SMTPMAILER_DEFAULT_FROM_NAME', 		$ss_cnf->mail->default_from['name']);
+define('SMTPMAILER_DEFAULT_FROM_EMAIL', 	$ss_cnf->mail->default_from['email']);		
+define('SMTPMAILER_SMTP_SERVER_ADDRESS',	$ss_cnf->mail->server);
+define('SMTPMAILER_DO_AUTHENTICATE', 		$ss_cnf->mail->authenticate);
+define('SMTPMAILER_USERNAME', 				$ss_cnf->mail->user);
+define('SMTPMAILER_PASSWORD', 				$ss_cnf->mail->pass);
+define('SMTPMAILER_CHARSET_ENCODING', 		$ss_cnf->mail->charset_encoding);
+define('SMTPMAILER_USE_SECURE_CONNECTION', 	$ss_cnf->mail->secure);
+define('SMTPMAILER_SMTP_SERVER_PORT', 		$ss_cnf->mail->port);
+
+
+// Misc
+// ---------------------------
 
 // Set the site locale
 i18n::set_locale('en_NZ');
@@ -130,4 +118,4 @@ if (!defined('DOCUMENT_ROOT_PATH'))		define('DOCUMENT_ROOT_PATH', $_SERVER['DOCU
 if (!defined('SS_SITE_DATABASE_NAME'))	define('SS_SITE_DATABASE_NAME', $databaseConfig['database']);
 
 //jpeg quality
-Config::inst()->update('GDBackend', 'default_quality', 80);
+Config::inst()->update('GDBackend', 'default_quality', 80);

data/skel/project_types/silverstripe3/public/themes/project/templates/Page.ss

@@ -27,7 +27,6 @@
     <% require themedCSS('typography') %>
     <% require themedCSS('form') %>
     <% require themedCSS('layout') %>
-    <link rel="stylesheet" href="/abc/lib/bootstrap/css/bootstrap.min.css">
 
     <link rel="icon" type="image/png" href="themes/project/images/favicon.png">
     <link rel="apple-touch-icon" type="image/png" href="themes/project/images/apple-touch-icon.png">
@@ -65,8 +64,6 @@
     <div class="container">
       $Layout
     </div>
-
-    <script src="/abc/lib/bootstrap/css/bootstrap.min.js"></script>
     
   </body>