bonethug 0.0.31 → 0.0.32

data/.gitignore

@@ -16,3 +16,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.sublime-project
+*.sublime-workspace

data/config/cnf.yml

@@ -165,11 +165,11 @@ watch:
     -
       src: public/themes/project/scss
       dest: public/themes/project/css
-      filter: !ruby/regexp '/typography\.scss$/'      
+      filter: !ruby/regexp '/typography\.scss$/'   
   coffee:
     -
       src: public/project/coffee
       dest: public/project/javascript
-      filter: !ruby/regexp '/main\.coffee$/'
+      filter: !ruby/regexp '/^.+\.coffee$/'
 log_dirs:
   - log

data/lib/bonethug/installer.rb

@@ -37,7 +37,10 @@ module Bonethug
       puts 'Installing '+ type + ' to ' + target + '...'
 
       # load the configuration
-      raise "Unsupported type: " + type.to_s unless @@conf.get('project_types').has_key? type.to_s
+      unless @@conf.get('project_types').has_key? type.to_s
+        puts "Unsupported type: " + type.to_s 
+        exit
+      end
       conf = @@conf.node_merge 'base', 'project_types.' + type
 
       # set the tmp dir
@@ -199,10 +202,15 @@ module Bonethug
       @@project_config_files.each do |type, dirs|
         dirs.each do |config|
 
+          # vars
           src_file      = @@bonthug_gem_dir + '/config/' + config
           example_file  = target + '/config/example/' + config if type == :editable
           target_file   = type == :editable ? target + '/config/' + config : target + '/.bonethug/' + config
 
+          # output
+          puts 'Handling ' + target_file
+
+          # what mode are we in?
           if mode == :init
             FileUtils.cp src_file, example_file if type == :editable and !File.exist?(example_file)
             FileUtils.cp src_file, target_file unless File.exist?(target_file)
@@ -210,12 +218,35 @@ module Bonethug
             FileUtils.cp src_file, example_file if type == :editable
             FileUtils.cp src_file, target_file if type == :generated or !File.exist?(target_file)          
           else
-            raise "invalid bonethugise mode"
+            puts "Invalid bonethugise mode"
+            exit
           end
 
         end
       end
 
+      # Handle project type specific files
+      if mode == :update
+        target_cnf = target + '/config/cnf.yml'
+        project_conf = Conf.new.add target_cnf
+        project_type = project_conf.get('deploy.common.project_type')
+        if project_type
+          bonethug_files = @@conf.get 'project_types.' + project_type + '.bonethug_files'
+          bonethug_files.each do |index, file|
+            puts 'Handling ' + index.to_s + ':' + file.to_s
+            src_file =  @@bonthug_gem_dir + 
+                        '/skel/project_types/' + 
+                        project_type + 
+                        '/' + 
+                        file
+            dst_file = target + '/' + file
+            FileUtils.cp src_file, dst_file
+          end
+        else
+          puts "Couldn't find project type in " + target_cnf
+        end
+      end
+
       # handle gemfile
       gemfile_path = target + '/Gemfile'
       if File.exist? gemfile_path

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.31"
+  VERSION = "0.0.32"
 end

data/skel/base/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 gem 'mina',             github: 'nadarei/mina'
 gem 'astrails-safe',    github: 'astrails/safe'
 gem 'whenever',         github: 'javan/whenever'
-gem 'bonethug'
+gem 'bonethug',         '>=0.0.31'

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

@@ -33,6 +33,14 @@ class SS_LoadConf {
 		}
 
 	}
+
+	public static function translate_env($env) {
+		if (!empty(self::$ss_env[$env])) {
+			return self::$ss_env[$env];
+		} else {
+			return $env;
+		}
+	}
 	
 	public static function cnf() {
 

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

@@ -73,6 +73,13 @@ switch(APPLICATION_ENV){
 		
 }
 
+// Allow override in dev and stage mode for testing asset pipeline
+// ---------------------------
+
+if (!empty($_GET['env']) && (APPLICATION_ENV == 'staging' || APPLICATION_ENV == 'development')) {
+	Director::set_environment_type(SS_LoadConf::translate_env($_GET['env']));
+}
+
 // DB
 // ---------------------------
 
@@ -119,29 +126,58 @@ if (!defined('SS_SITE_DATABASE_NAME'))	define('SS_SITE_DATABASE_NAME', $database
 Config::inst()->update('GDBackend', 'default_quality', 80);
 
 
-// JS Assets
+// Assets
 // ---------------------------
 
-Config::inst()->update('Requirements', 'write_js_to_body', false);
-Requirements::combine_files(
-    'application.js',
-    array(
-    	'vendor/jquery/jquery.min.js',
-    	'project/javascript/main.js',
-    	'vendor/selectivizr/selectivizr.min.js',
-    	'vendor/respond/respond.min.js',
-    	'vendor/modernizr/modernizr.js'      
-    )
+Requirements::set_write_js_to_body(true);
+Requirements::set_combined_files_enabled(true);
+
+// CSS
+// ---
+
+$cssRequirements = array(
+    'themes/project/css/styles.css',
+    'themes/project/css/typography.css'   
 );
+Requirements::combine_files('application.css', $cssRequirements);
 
+// Primary JS
+// ----------
 
-// CSS Assets
-// ---------------------------
+$jsRequirements = array(
+    'vendor/jquery/jquery.min.js',
+    'project/javascript/main.js',
+    'project/javascript/forms.js'
+);
+Requirements::combine_files('application.js', $jsRequirements);
 
-Requirements::combine_files(
-    'application.css',
+// HTML5 Shims
+// -----------
+
+$shimRequirments = array(
+    'vendor/selectivizr/selectivizr.min.js',
+    'vendor/respond/respond.min.js',
+    'vendor/modernizr/modernizr.js'      
+);
+Requirements::combine_files('lte-ie8-shims.js',$shimRequirments);
+RequirementsHelper::require_block(array_merge(
+    array('assets/_combinedfiles/lte-ie8-shims.js'),
+    $shimRequirments
+));
+Requirements::insertHeadTags('
+    <!--[if (gte IE 6)&(lte IE 8)]>
+        <script src="/assets/_combinedfiles/lte-ie8-shims.js"></script>
+    <![endif]--> 
+');
+
+// block all front end requirements from the cms
+LeftAndMainHelper::require_block(array_merge(
     array(
-    	'themes/project/main.css',
-    	'themes/project/typography.css'   
-    )
-);
+        'assets/_combinedfiles/application.css',
+        'assets/_combinedfiles/application.js',
+        'assets/_combinedfiles/lte-ie8-shims.js'
+    ),   
+    $cssRequirements,
+    $jsRequirements,
+    $shimRequirments
+));

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

@@ -44,14 +44,6 @@ class Page_Controller extends ContentController {
 
 	public function init() {
 		parent::init();
-
-		// Note: you should use SS template require tags inside your templates 
-		// instead of putting Requirements calls here.  However these are 
-		// included so that our older themes still work
-		Requirements::themedCSS('reset');
-		Requirements::themedCSS('layout'); 
-		Requirements::themedCSS('typography'); 
-		Requirements::themedCSS('form'); 
 	}
 
 }

data/skel/project_types/silverstripe3/public/themes/project/scss/_functions.scss

@@ -0,0 +1,15 @@
+@function image-path($file) {
+  @return $image-path + '/' + $file;
+}
+
+@function font-path($file) {
+  @return $font-path + '/' + $file;;
+}
+
+@function image-url($file) {
+  @return url(image-path($file));
+}
+
+@function font-url($file) {
+  @return url(font-path($file));
+}

data/skel/project_types/silverstripe3/public/themes/project/scss/_mixins.scss

@@ -0,0 +1,10 @@
+@mixin define-font($font-name, $font) {
+  @font-face {  
+    font-family: $font-name;
+    src: url(font_path('#{$font}.eot'));
+    src: url(font_path('#{$font}.eot')) format('embedded-opentype'),
+      url(font_path('#{$font}.woff')) format('woff'),
+      url(font_path('#{$font}.ttf')) format('truetype'),
+      url(font_path('#{$font}.svg')) format('svg');
+  }
+}

data/skel/project_types/silverstripe3/public/themes/project/scss/_vars.scss

@@ -0,0 +1,2 @@
+$image_path: '/themes/project/images';
+$font_path: '/themes/project/fonts';

data/skel/project_types/silverstripe3/public/themes/project/scss/main.scss

@@ -0,0 +1,3 @@
+@import 'vars',
+		'functions',
+		'mixins';

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

@@ -19,13 +19,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     $MetaTags(false)
 
-    <!--[if lt IE 9]>
-      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <% require themedCSS('application') %>
-    <% require themedCSS('typography') %>
-
     <link rel="shortcut icon" href="themes/project/images/favicon.ico" type="image/x-icon" />
     <link rel="apple-touch-icon" href="themes/project/images/apple-touch-icon.png" />
     <link rel="apple-touch-icon" sizes="57x57" href="themes/project/images/apple-touch-icon-57x57.png" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -384,6 +384,9 @@ files:
 - skel/project_types/silverstripe3/public/themes/project/images/favicons/apple-touch-icon.png
 - skel/project_types/silverstripe3/public/themes/project/images/favicons/favicon.ico
 - skel/project_types/silverstripe3/public/themes/project/images/favicons/iconifier-readme.txt
+- skel/project_types/silverstripe3/public/themes/project/scss/_functions.scss
+- skel/project_types/silverstripe3/public/themes/project/scss/_mixins.scss
+- skel/project_types/silverstripe3/public/themes/project/scss/_vars.scss
 - skel/project_types/silverstripe3/public/themes/project/scss/main.scss
 - skel/project_types/silverstripe3/public/themes/project/scss/typography.scss
 - skel/project_types/silverstripe3/public/themes/project/templates/Includes/.gitkeep