capucine 0.2.5 → 0.2.9

data/examples/with-all/sass/_main.scss

@@ -1,22 +1,9 @@
-// @include font-face('my_font',font-files('../fonts/my_font.ttf', truetype, '../fonts/my_font.otf', opentype), '../fonts/my_font.eot')
-
-$WIDTH_MIN: 320px;
-$WIDTH_MAX: 960px;
-
 $FONT_0: "Lucida Grande", "Tahoma", Arial, sans-serif;
 $COLOR_0: #111;
 
-
 body {
   font: normal 12px $FONT_0;
   color: $COLOR_0;
 }
 
-a, .pressed { @include pressed-effect;}
-
-p, b, strong, i, blockquote {line-height: 1.5em;}
-
-.wrap {
-  @include centerX;
-  @include min-max-width($WIDTH_MIN, $WIDTH_MAX);
-}
+// FREEDOM

data/examples/with-all/sass/screen.scss

@@ -1,8 +1,5 @@
-// @import "compass"; // COMPASS ALL
-@import "compass/css3"; // COMPASS CSS3
 @import "compass/reset"; // COMPASS RESET
-
-@import "compass-capucine"; // CAPUCINE HELPERS =>
+@import "compass/css3"; // COMPASS CSS3
 
 @import "./main";
-@import "./responsive";
+@import "./responsive";

data/examples/with-coffeescript/capucine.yaml

@@ -1,30 +1,32 @@
-# sass: true
-coffee: true
-# incloudr: true
+# use_compass: true
+use_coffeescript: true
+# use_incloudr: true
 
-# # ----------------------------------------
-# sass_images_dir: public/images
-# sass_files_dir: sass
-# sass_output_dir: public/css_generated
-# sass_line_comments: false
-# sass_css_generated_style: expanded # compact | expanded | compressed
-# sass_options: '{:cache => false}'
+# ---------------[ COMPASS ]------------------------
+# compass:
+  # sass_dir: sass
+  # css_dir: public/css_generated
 
-# compass_config: {}
-# compass_plugins:
-#   - compass-capucine
+  # output_style: expanded # compact | expanded | compressed
+  # line_comments: false
+  # sass_options: '{:cache => false}' # please use this format (a string)
 
-# sass_import_css: false
-# sass_import_formats: css to sass
+# compass_plugins:
+  # - compass_twitter_bootstrap
+# ---------------[ IMPORT ]------------------------
+# sass_import_css: true
+# sass_import_formats: css to scss
 # sass_import_css_dir: public/css/import
 # sass_import_output_dir: sass/converted
 
-# coffeescript_bare: false
-# coffeescript_files_dir: coffeescript
-# coffeescript_output_dir: public/js_generated
+# ---------------[ COFFEESCRIPT ]--------------------------
+coffeescript_bare: false
+coffeescript_files_dir: coffeescript
+coffeescript_output_dir: public/js_generated
 
+# ---------------[ INCLOUDR ]------------------------
 # incloudr_output_dir: public/js_generated/modules
 # incloudr_libs:
 #   - name: jquery
 
-# DOCUMENTATION : http:// capucine.dln.name
+# DOCUMENTATION : http:// capucine.dln.name

data/examples/with-incloudr/capucine.yaml

@@ -1,30 +1,32 @@
-# sass: true
-# coffee: true
-incloudr: true
+# use_compass: true
+# use_coffeescript: true
+use_incloudr: true
 
-# # ----------------------------------------
-# sass_images_dir: public/images
-# sass_files_dir: sass
-# sass_output_dir: public/css_generated
-# sass_line_comments: false
-# sass_css_generated_style: expanded # compact | expanded | compressed
-# sass_options: '{:cache => false}'
+# ---------------[ COMPASS ]------------------------
+# compass:
+  # sass_dir: sass
+  # css_dir: public/css_generated
 
-# compass_config: {}
-# compass_plugins:
-#   - compass-capucine
+  # output_style: expanded # compact | expanded | compressed
+  # line_comments: false
+  # sass_options: '{:cache => false}' # please use this format (a string)
 
-# sass_import_css: false
-# sass_import_formats: css to sass
+# compass_plugins:
+  # - compass_twitter_bootstrap
+# ---------------[ IMPORT ]------------------------
+# sass_import_css: true
+# sass_import_formats: css to scss
 # sass_import_css_dir: public/css/import
 # sass_import_output_dir: sass/converted
 
+# ---------------[ COFFEESCRIPT ]--------------------------
 # coffeescript_bare: false
 # coffeescript_files_dir: coffeescript
 # coffeescript_output_dir: public/js_generated
 
-# incloudr_output_dir: public/js_generated/modules
+# ---------------[ INCLOUDR ]------------------------
+incloudr_output_dir: public/js_generated/modules
 incloudr_libs:
   - name: jquery
 
-# DOCUMENTATION : http:// capucine.dln.name
+# DOCUMENTATION : http:// capucine.dln.name

data/examples/with-sass-and-compass/.compass_config.rb

@@ -1,13 +1,18 @@
+# !!!! NEVER EDIT THIS FILE !!!!
+# ALWAYS EDIT : capucine.yaml
 
 
-require "compass-capucine"
 
+project_type = :stand_alone
 
 
-images_dir = "public/images"
 sass_dir = "sass"
+
 css_dir = "public/css_generated"
+
+output_style = :compressed
+
 line_comments = false
-output_style = :expanded
+
 sass_options = {:cache => false}
 

data/examples/with-sass-and-compass/capucine.yaml

@@ -1,30 +1,32 @@
-sass: true
-# coffee: true
-# incloudr: true
+use_compass: true
+# use_coffeescript: true
+# use_incloudr: true
 
-# # ----------------------------------------
-# sass_images_dir: public/images
-# sass_files_dir: sass
-# sass_output_dir: public/css_generated
-# sass_line_comments: false
-# sass_css_generated_style: expanded # compact | expanded | compressed
-# sass_options: '{:cache => false}'
+# ---------------[ COMPASS ]------------------------
+compass:
+  sass_dir: sass
+  css_dir: public/css_generated
 
-# compass_config: {}
-# compass_plugins:
-#   - compass-capucine
+  # output_style: expanded # compact | expanded | compressed
+  # line_comments: false
+  # sass_options: '{:cache => false}' # please use this format (a string)
 
-# sass_import_css: false
-# sass_import_formats: css to sass
+# compass_plugins:
+  # - compass_twitter_bootstrap
+# ---------------[ IMPORT ]------------------------
+# sass_import_css: true
+# sass_import_formats: css to scss
 # sass_import_css_dir: public/css/import
 # sass_import_output_dir: sass/converted
 
+# ---------------[ COFFEESCRIPT ]--------------------------
 # coffeescript_bare: false
 # coffeescript_files_dir: coffeescript
 # coffeescript_output_dir: public/js_generated
 
+# ---------------[ INCLOUDR ]------------------------
 # incloudr_output_dir: public/js_generated/modules
 # incloudr_libs:
 #   - name: jquery
 
-# DOCUMENTATION : http:// capucine.dln.name
+# DOCUMENTATION : http:// capucine.dln.name

data/examples/with-sass-and-compass/public/css_generated/screen.css

@@ -1,105 +1 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-size: 100%;
-  font: inherit;
-  vertical-align: baseline;
-}
-
-body {
-  line-height: 1;
-}
-
-ol, ul {
-  list-style: none;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-caption, th, td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-
-q, blockquote {
-  quotes: none;
-}
-q:before, q:after, blockquote:before, blockquote:after {
-  content: "";
-  content: none;
-}
-
-a img {
-  border: none;
-}
-
-article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
-  display: block;
-}
-
-/* */
-.unselectable {
-  -moz-user-select: -moz-none;
-  -khtml-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.cf {
-  clear: both;
-  display: block;
-  *zoom: 1;
-}
-.cf:before, .cf:after {
-  content: "\0020";
-  display: table;
-}
-.cf:after {
-  clear: both;
-}
-
-.scale {
-  max-width: 100%;
-  height: auto;
-}
-
-body {
-  font: normal 12px "Lucida Grande", "Tahoma", Arial, sans-serif;
-  color: #111111;
-}
-
-a:active, .pressed:active {
-  position: relative;
-  top: 1px;
-}
-
-p, b, strong, i, blockquote {
-  line-height: 1.5em;
-}
-
-.wrap {
-  margin: 0 auto;
-  text-align: left;
-  min-width: 320px;
-  width: auto !important;
-  width: 320px;
-  max-width: 960px;
-  width: expression(document.body.clientWidth > parseInt("960px") ? "960px" : "auto");
-}
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}body{font:normal 12px "Lucida Grande","Tahoma",Arial,sans-serif;color:#111}

data/examples/with-sass-and-compass/sass/_main.scss

@@ -1,22 +1,9 @@
-// @include font-face('my_font',font-files('../fonts/my_font.ttf', truetype, '../fonts/my_font.otf', opentype), '../fonts/my_font.eot')
-
-$WIDTH_MIN: 320px;
-$WIDTH_MAX: 960px;
-
 $FONT_0: "Lucida Grande", "Tahoma", Arial, sans-serif;
 $COLOR_0: #111;
 
-
 body {
   font: normal 12px $FONT_0;
   color: $COLOR_0;
 }
 
-a, .pressed { @include pressed-effect;}
-
-p, b, strong, i, blockquote {line-height: 1.5em;}
-
-.wrap {
-  @include centerX;
-  @include min-max-width($WIDTH_MIN, $WIDTH_MAX);
-}
+// FREEDOM

data/examples/with-sass-and-compass/sass/screen.scss

@@ -1,8 +1,5 @@
-// @import "compass"; // COMPASS ALL
-@import "compass/css3"; // COMPASS CSS3
 @import "compass/reset"; // COMPASS RESET
-
-@import "compass-capucine"; // CAPUCINE HELPERS =>
+@import "compass/css3"; // COMPASS CSS3
 
 @import "./main";
-@import "./responsive";
+@import "./responsive";

data/lib/coffeescript.rb

@@ -10,7 +10,7 @@ module Capucine
     def run_once(file = nil)
 
       unless file
-        files = Dir.glob(File.join @cap.settings.working_dir, @cap.settings.conf['coffeescript_output_dir'], '*')
+        files = Dir.glob(File.join @cap.settings.working_dir, @cap.settings.conf['coffeescript_output_dir'], '*.js')
         FileUtils.rm_r files
         self.compile_dir @cap.settings.conf['coffeescript_files_dir'], @cap.settings.conf['coffeescript_output_dir']
       else

data/lib/compass-sass.rb

@@ -27,19 +27,31 @@ module Capucine
     end
 
     def update_config
-      # require 'tempfile'
-      # require 'digest/md5'
+
 
       template_file = File.join @cap.settings.content_dir, 'templates', 'compass_config.erb'
       tmp = File.join @cap.settings.working_dir, '.compass_config.rb'
 
-      # md5 = Digest::MD5.hexdigest(@cap.settings.working_dir.to_s)
-      # tmp = Tempfile.new('capucine_'+md5)
       @tmp_config = tmp
+      @cap.settings.conf['compass_custom'] = {}
+
+      boolean = %w{disable_warnings line_comments relative_assets sass_options}
+      symbol = %w{output_style}
+
+      for k, v in @cap.settings.conf['compass']
+        if boolean.include?(k)
+          v = "#{v}"
+        elsif symbol.include?(k)
+          v = ":#{v}"
+        else
+          v = "\"#{v}\""
+        end
+        @cap.settings.conf['compass_custom'][k] = v
+
+      end
 
       @cap.settings.conf['compass_plugins_list'] = []
       plugins_gems = []
-
       plugins = @cap.settings.conf['compass_plugins']
 
       if plugins.size > 0

data/lib/settings.rb

@@ -47,10 +47,18 @@ module Capucine
         additional = YAML::load_file(self.user_config_file)
       end
 
-
       if additional
+        blocs = %w{compass}
+
         additional.each do |k, v|
-          self.conf[k] = v
+
+          if blocs.include?(k)
+            for k2, v2 in v
+              self.conf[k][k2] = v2
+            end
+          else
+            self.conf[k] = v
+          end
         end
       end
 
@@ -59,23 +67,24 @@ module Capucine
     end
 
     def check_valid
+      # puts self.conf['use_compass']
 
-      expand_coffee_out = File.join self.working_dir, self.conf['coffeescript_output_dir']
-      expand_coffee_in = File.join self.working_dir, self.conf['coffeescript_files_dir']
+      # expand_coffee_out = File.join self.working_dir, self.conf['coffeescript_output_dir']
+      # expand_coffee_in = File.join self.working_dir, self.conf['coffeescript_files_dir']
 
-      expand_sass_out = File.join self.working_dir, self.conf['sass_output_dir']
-      expand_sass_in = File.join self.working_dir, self.conf['sass_files_dir']
+      # expand_sass_out = File.join self.working_dir, self.conf['compass']
+      # expand_sass_in = File.join self.working_dir, self.conf['compass']
 
-      if expand_coffee_out == self.working_dir or expand_coffee_in == self.working_dir or expand_coffee_in == expand_coffee_out
-        puts 'Illegal path for CoffeeScript'
-        Process.exit
-      end
+      # if expand_coffee_out == self.working_dir or expand_coffee_in == self.working_dir or expand_coffee_in == expand_coffee_out
+      #   puts 'Illegal path for CoffeeScript'
+      #   Process.exit
+      # end
 
 
-      if expand_sass_out == self.working_dir or expand_sass_in == self.working_dir or expand_sass_in == expand_sass_out
-        puts 'Illegal path for Sass'
-        Process.exit
-      end
+      # if expand_sass_out == self.working_dir or expand_sass_in == self.working_dir or expand_sass_in == expand_sass_out
+      #   puts 'Illegal path for Sass'
+      #   Process.exit
+      # end
     end
 
   end