bonethug 0.0.6 → 0.0.7

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+Thumbs.db
 .bundle
 .config
 .yardoc

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 # tell bundler to get stuff from git hub
 gem 'mina',           github: 'nadarei/mina'
 gem 'astrails-safe',  github: 'astrails/safe'
-gem 'whenever',       github: 'javan/whenever' 
+gem 'whenever',       github: 'javan/whenever'
+gem 'sprockets',      github: 'sstephenson/sprockets'

data/ISSUES.txt

@@ -0,0 +1,20 @@
+- Silverstripe compass is broken on windows - the below helps in Rubygems::_run
+
+		// $process = proc_open("HOME='$gempath' GEM_HOME='$gempath' " . (@$_GET['flush'] ? "FLUSH={$_GET['flush']} " : '') . $cmd, $descriptorspec, $pipes);
+		$envs = array('HOME' => $gempath, 'GEM_HOME' => $gempath);
+		if (@$_GET['flush']) $envs['FLUSH'] = $_GET['flush'];
+		if (defined('PATH')) $envs['PATH'] = PATH;
+
+		$process = proc_open($cmd, $descriptorspec, $pipes, null, $envs);
+
+but it still throws:
+
+C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/config_file.rb:77:in `join': can't convert nil into String (TypeError)
+	from C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/config_file.rb:77:in `<class:configfile>'
+	from C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/config_file.rb:30:in `<top (required)="">'
+	from C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/custom_require.rb:36:in `require'
+	from C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/custom_require.rb:36:in `require'
+	from C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/gem_runner.rb:9:in `<top (required)="">'
+	from C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/custom_require.rb:36:in `require'
+	from C:/Ruby193/lib/ruby/site_ruby/1.9.1/rubygems/custom_require.rb:36:in `require'
+	from C:/Ruby193/bin/gem:18:in `<main>'

data/bonethug.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mina'
   spec.add_dependency 'astrails-safe'
   spec.add_dependency 'whenever' 
+  spec.add_dependency 'sprockets'  
 
 end

data/lib/bonethug/installer.rb

@@ -1,3 +1,9 @@
+# Todo
+# ----------------
+# - Have some sort of safe vs forced install - tie in with exlcuded paths
+# - Check that excluded paths is working in manifest
+# ----------------
+
 require File.expand_path(File.dirname(__FILE__)) + '/../../skel/base/lib/conf'
 require 'fileutils'
 require 'find'
@@ -143,17 +149,17 @@ module Bonethug
       @@project_config_files.each do |config|
 
         do_copy       = true
-        example_file  = target + '/config/example.' + config
+        example_file  = target + '/config/example/' + config
         target_file   = target + '/config/' + config
 
         # analyse the config file + build data file
         file_exists           = File.exist?(target_file)
         contents_not_modified = false
-        contents_not_modified = true if file_exists and meta_data and meta_data['config_digests'] and meta_data['config_digests']['example.' + config] == self.contents_md5(target_file) 
+        contents_not_modified = true if file_exists and meta_data and meta_data['config_digests'] and meta_data['config_digests']['example/' + config] == self.contents_md5(target_file) 
 
         # meta_data_is_hash     = meta_data_exists and meta_data.class.name == 'Hash' and meta_data['config_digests'].class.name == 'Hash'
-        # config_digests_found  = meta_data_is_hash and meta_data['config_digests'].methods.include?('has_key?') and meta_data['config_digests'].has_key?('example.' + config)
-        # contents_not_modified = config_digests_found and meta_data['config_digests']['example.' + config] == self.contents_md5(target_file)
+        # config_digests_found  = meta_data_is_hash and meta_data['config_digests'].methods.include?('has_key?') and meta_data['config_digests'].has_key?('example/' + config)
+        # contents_not_modified = config_digests_found and meta_data['config_digests']['example/' + config] == self.contents_md5(target_file)
 
         # don't copy if the file exists...
         do_copy = false if file_exists
@@ -181,7 +187,7 @@ module Bonethug
 
       meta_data = {'config_digests' => {}}
       @@project_config_files.each do |file| 
-        meta_data['config_digests']['example.' + file] = self.contents_md5(base_dir + '/config/example.' + file)
+        meta_data['config_digests']['example/' + file] = self.contents_md5(base_dir + '/config/example/' + file)
       end
       File.open(base_dir + '/.bonethug/data','w') { |file| file.puts meta_data.to_yaml }
 

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/skel/base/config/{example.cnf.yml → example/cnf.yml}

@@ -19,17 +19,20 @@ deploy:
 dbs:
   default:
     development:
-      user: root
+      name: project_development
+      user: project_development
       pass:
       host: localhost
       port: 3306
     staging:
-      user: staging_db
+      name: project_staging
+      user: project_staging
       pass: passw0rd
       host: localhost
       port: 3306    
     production:
-      user: production_db
+      name: project_production
+      user: project_production
       pass: passw0rd
       host: localhost
       port: 3306    
@@ -51,6 +54,21 @@ backup:
     key: key
     secret: secret
     bucket: bucket
+mail:
+  smtp:
+    development:
+    staging:
+    production:
+      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
 apache:
   development:
   staging:
@@ -58,7 +76,6 @@ apache:
     server_aliases:
       - www.staging.domain.com
     env_vars:
-      SS_ENVIRONMENT_TYPE: test
       RAILS_ENV: staging
       APPLICATION_ENV: staging
   production:
@@ -67,12 +84,14 @@ apache:
       - www.production.domain.com
     server_admin: dev@domain.com
     env_vars:
-      SS_ENVIRONMENT_TYPE: live
       RAILS_ENV: production
       APPLICATION_ENV: production
 chown:
   development:
   staging:
+    -
+      path: public/uploads
+      user: www-data  
   production:
     -
       path: public/uploads
@@ -80,6 +99,9 @@ chown:
 chmod:
   development:
   staging:
+    -
+      path: public/uploads
+      mode: 775  
   production:
     -
       path: public/uploads
@@ -87,6 +109,9 @@ chmod:
 chgrp:
   development:
   staging:
+    -
+      path: public/uploads
+      group: www-data  
   production:
     -
       path: public/uploads

data/skel/base/config/{example.deploy.rb → example/deploy.rb}

@@ -34,7 +34,7 @@ log_dirs  = conf.get('log_dirs','Array') || []
 vhost = deploy.get('project_slug') + '_' + env
 
 # composer?
-use_composer = ['silverstripe','drupal','php'].include? deploy.get('project_type')
+use_composer = ['silverstripe','silverstripe3','drupal','php'].include? deploy.get('project_type')
 
 # directories we need to track
 resources += ['backups']
@@ -103,7 +103,7 @@ desc "Updates bundled dependencies"
 task :update_packages => :environment do
   invoke :'bundle:update'
   queue! %[php #{deploy_to}/shared/composer.phar update] if use_composer
-  queue! %[php #{deploy_to}/current/public/framework/cli-script.php dev/build] if deploy.get('project_type') == 'silverstripe'
+  queue! %[php #{deploy_to}/current/public/framework/cli-script.php dev/build] if ['silverstripe','silverstripe3'].include? deploy.get('project_type') 
 end
 
 desc "Restores application state to the most recent backup"
@@ -169,7 +169,8 @@ task :deploy => :environment do
 
   DocumentRoot #{deploy_to}/current/public
 
-  #{env_vars}          
+  #{env_vars}
+  PassEnv PATH
 
   CustomLog #{deploy_to}/shared/log/bytes.log bytes
   CustomLog #{deploy_to}/shared/log/combined.log combined
@@ -202,7 +203,7 @@ 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! %[cd #{deploy_to}/current/#{chown.get('path')} && chown -R #{chown.get('user')} .]
         end
       end
       
@@ -210,7 +211,7 @@ task :deploy => :environment do
       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! %[cd #{deploy_to}/current/#{chgrp.get('path')} && chgrp -R #{chgrp.get('group')} .]
         end
       end      
       
@@ -218,7 +219,7 @@ task :deploy => :environment do
       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! %[cd #{deploy_to}/current/#{chmod.get('path')} && chmod -R #{chmod.get('mode')} .]
         end
       end
 
@@ -226,7 +227,7 @@ task :deploy => :environment do
       queue! %[/etc/init.d/apache2 reload]
       invoke :'whenever:update'
 
-      queue! %[php #{deploy_to}/current/public/framework/cli-script.php dev/build] if deploy.get('project_type') == 'silverstripe'
+      queue! %[php #{deploy_to}/current/public/framework/cli-script.php dev/build] if ['silverstripe','silverstripe3'].include? deploy.get('project_type')
 
     end
   end

data/skel/project_types/silverstripe3/config.ru

@@ -0,0 +1,3 @@
+environment = Sprockets::Environment.new
+environment.append_path 'public/themes/css'
+environment.append_path 'public/javascript'

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

@@ -4,8 +4,19 @@ require '../../vendor/autoload.php';
 
 use Symfony\Component\Yaml\Yaml;
 
+// ss env translation
+$ss_env = array(
+	'development'	=> 'dev',
+	'staging'		=> 'test',
+	'production'	=> 'live'
+);
+
 // Transfer environmental vars to constants
-define('SS_ENVIRONMENT_TYPE', getenv('SS_ENVIRONMENT_TYPE'));
+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;
@@ -14,22 +25,29 @@ global $project, $databaseConfig, $_FILE_TO_URL_MAPPING;
 $project = 'project';
 SSViewer::set_theme('project');
 
-// load db settings
+// load conf
 $cnf = Yaml::parse(__DIR__.'/../../config/cnf.yml');
-$db = $cnf['dbs']['default'];
+
+// load db settings
+$db_cnf = (object) $cnf['dbs']['default'][APPLICATION_ENV];
+
+// load mail settings
+$mail = (object) $cnf['mail']['smtp'][APPLICATION_ENV];
+
+// file to url
+$base_dir = __DIR__ . '/..';
+$url = $cnf['apache'][APPLICATION_ENV]['server_name'];
+$_FILE_TO_URL_MAPPING[$base_dir] = $url;
 
 // Env specific settings
-switch(SS_ENVIRONMENT_TYPE){
+switch(APPLICATION_ENV){
 
-	case 'dev':
+	case 'development':
 
 		// Debug Settings
 		ini_set("display_errors",1);
 		error_reporting(E_ALL & ~E_STRICT);		
 		Director::set_environment_type("dev");
-
-		// load env db conf
-		$db_cnf = (object) $db['development'];	
 		
 		// Ensure that all emails get directed to the developer email address
 		Config::inst()->update('Email', 'send_all_emails_to', SS_SEND_ALL_EMAILS_TO);
@@ -38,33 +56,20 @@ switch(SS_ENVIRONMENT_TYPE){
 		Config::inst()->update('Email', 'admin_email', SS_SEND_ALL_EMAILS_TO);
 		
 		// Log file
-		SS_Log::add_writer(new SS_LogFileWriter(BASE_PATH.'/../logs/log.log'), SS_Log::WARN, '<=');
+		SS_Log::add_writer(new SS_LogFileWriter(BASE_PATH.'/../log/development.log'), SS_Log::WARN, '<=');
 
 		// hard code user / pass
-		Security::setDefaultAdmin('admin', 'admin');		
-		
-		// Smtp Email Conf
-		define('SMTPMAILER_DEFAULT_FROM_NAME', 'dev');
-		define('SMTPMAILER_DEFAULT_FROM_EMAIL', 'abcdigital@abcdigital.co.nz');		
-		define('SMTPMAILER_SMTP_SERVER_ADDRESS', 'smtp.gmail.com'); # SMTP server address
-		define('SMTPMAILER_DO_AUTHENTICATE', true); # Turn on SMTP server authentication. Set to false for an anonymous connection
-		define('SMTPMAILER_USERNAME', 'abcd.testuser@gmail.com'); # SMTP server username, if SMTPAUTH == true
-		define('SMTPMAILER_PASSWORD', 'testing420'); # SMTP server password, if SMTPAUTH == true
-		define('SMTPMAILER_CHARSET_ENCODING', 'utf-8'); # E-mails characters encoding, e.g. : 'utf-8' or 'iso-8859-1'
-		define('SMTPMAILER_USE_SECURE_CONNECTION', 'tls'); # SMTP encryption method : Set to '' or 'tls' or 'ssl'
-		define('SMTPMAILER_SMTP_SERVER_PORT', 587); # SMTP server port. Set to 25 if no encryption or tls. Set to 465 if ssl
+		Security::setDefaultAdmin('admin', 'admin');
 		
 		break;
 
-	case 'test':	
+	case 'staging':	
+
 		// Debug Settings
 		ini_set("display_errors",1);
 		error_reporting(E_ALL & ~E_STRICT);		
 		Director::set_environment_type("test");
 		
-		// load env db conf
-		$db_cnf = (object) $db['staging'];
-		
 		// Ensure that all emails get directed to the developer email address
 		Email::send_all_emails_to(SS_SEND_ALL_EMAILS_TO);
 		
@@ -75,47 +80,17 @@ switch(SS_ENVIRONMENT_TYPE){
 		Security::setDefaultAdmin('admin', 'admin');			
 		
 		// Log file
-		SS_Log::add_writer(new SS_LogFileWriter(BASE_PATH.'/../logs/log.log'), SS_Log::WARN, '<=');
-
-		// Smtp Email Conf
-		define('SMTPMAILER_DEFAULT_FROM_NAME', 'test');
-		define('SMTPMAILER_DEFAULT_FROM_EMAIL', 'abcdigital@abcdigital.co.nz');		
-		define('SMTPMAILER_SMTP_SERVER_ADDRESS', 'smtp.gmail.com'); # SMTP server address
-		define('SMTPMAILER_DO_AUTHENTICATE', true); # Turn on SMTP server authentication. Set to false for an anonymous connection
-		define('SMTPMAILER_USERNAME', 'abcd.testuser@gmail.com'); # SMTP server username, if SMTPAUTH == true
-		define('SMTPMAILER_PASSWORD', 'testing420'); # SMTP server password, if SMTPAUTH == true
-		define('SMTPMAILER_CHARSET_ENCODING', 'utf-8'); # E-mails characters encoding, e.g. : 'utf-8' or 'iso-8859-1'
-		define('SMTPMAILER_USE_SECURE_CONNECTION', 'tls'); # SMTP encryption method : Set to '' or 'tls' or 'ssl'
-		define('SMTPMAILER_SMTP_SERVER_PORT', 587); # SMTP server port. Set to 25 if no encryption or tls. Set to 465 if ssl
-		
-		// Requirements::javascript('http://www.bugherd.com/sidebarv2.js?apikey=lmnw4b6srak6dujqwjqchw');
+		SS_Log::add_writer(new SS_LogFileWriter(BASE_PATH.'/../log/staging.log'), SS_Log::WARN, '<=');
 		
 		break;
 
 	default:
-	case 'live':
+	case 'production':
 
-		Director::set_environment_type("live");		
-		
-		// load env db conf
-		$db_cnf = (object) $db['production'];
+		Director::set_environment_type("live");
 
 		// Log file
-		SS_Log::add_writer(new SS_LogFileWriter(BASE_PATH.'/../logs/log.log'), SS_Log::WARN, '<=');
-		
-		// hard code user / pass
-		Security::setDefaultAdmin('admin', 'admin');		
-		
-		// Smtp Email Conf
-		define('SMTPMAILER_DEFAULT_FROM_NAME', 'live');
-		define('SMTPMAILER_DEFAULT_FROM_EMAIL', 'abcdigital@abcdigital.co.nz');		
-		define('SMTPMAILER_SMTP_SERVER_ADDRESS', 'smtp.gmail.com'); # SMTP server address
-		define('SMTPMAILER_DO_AUTHENTICATE', true); # Turn on SMTP server authentication. Set to false for an anonymous connection
-		define('SMTPMAILER_USERNAME', 'abcd.testuser@gmail.com'); # SMTP server username, if SMTPAUTH == true
-		define('SMTPMAILER_PASSWORD', 'testing420'); # SMTP server password, if SMTPAUTH == true
-		define('SMTPMAILER_CHARSET_ENCODING', 'utf-8'); # E-mails characters encoding, e.g. : 'utf-8' or 'iso-8859-1'
-		define('SMTPMAILER_USE_SECURE_CONNECTION', 'tls'); # SMTP encryption method : Set to '' or 'tls' or 'ssl'
-		define('SMTPMAILER_SMTP_SERVER_PORT', 587); # SMTP server port. Set to 25 if no encryption or tls. Set to 465 if ssl
+		SS_Log::add_writer(new SS_LogFileWriter(BASE_PATH.'/../log/production.log'), SS_Log::WARN, '<=');
 
 		break;
 		
@@ -132,6 +107,17 @@ $databaseConfig = array(
 );	
 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);
+
 // Set the site locale
 i18n::set_locale('en_NZ');
 ini_set("date.timezone","Pacific/Auckland");

data/skel/skel.yml

@@ -4,4 +4,7 @@ project_types:
   php:
   rails3:
   silverstripe3:
-  sinatra:
+  sinatra:
+exlcuded_paths:
+  - Gemfile
+  - composer.json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Project Skeleton Manager
 email:
 - breaks.nz@gmail.com
@@ -101,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- ISSUES.txt
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -115,10 +132,10 @@ files:
 - skel/base/.gitignore
 - skel/base/Gemfile
 - skel/base/README.md
-- skel/base/config/example.backup.rb
-- skel/base/config/example.cnf.yml
-- skel/base/config/example.deploy.rb
-- skel/base/config/example.schedule.rb
+- skel/base/config/example/backup.rb
+- skel/base/config/example/cnf.yml
+- skel/base/config/example/deploy.rb
+- skel/base/config/example/schedule.rb
 - skel/base/lib/conf.rb
 - skel/base/log/.gitkeep
 - skel/base/public/apple-touch-icon-114x114-precomposed.png
@@ -137,7 +154,8 @@ files:
 - skel/project_types/php/composer.json
 - skel/project_types/silverstripe3/.gitignore
 - skel/project_types/silverstripe3/composer.json
-- skel/project_types/silverstripe3/config/example.schedule.rb
+- skel/project_types/silverstripe3/config.ru
+- skel/project_types/silverstripe3/config/example/schedule.rb
 - skel/project_types/silverstripe3/public/.htaccess
 - skel/project_types/silverstripe3/public/abc/_config.php
 - skel/project_types/silverstripe3/public/abc/code/Admin/AbcModelAdmin.php
@@ -1291,10 +1309,13 @@ files:
 - skel/project_types/silverstripe3/public/project/_config.php
 - skel/project_types/silverstripe3/public/project/_config/config.yml
 - skel/project_types/silverstripe3/public/project/code/Pages/Page.php
+- skel/project_types/silverstripe3/public/project/javascript/.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/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
 - skel/project_types/silverstripe3/public/themes/project/templates/Page.ss