capucine 0.2.5 → 0.2.9

data/lib/tools.rb

@@ -105,8 +105,6 @@ module Capucine
 
       thread_sass = @cap.sass.run_watch if do_sass
       thread_coffee = @cap.coffee.run_watch if do_coffee
-      # thread_incloudr = @cap.incloudr.run_watch if do_incloudr
-
 
       thread_sass.join if thread_sass
       thread_coffee.join if thread_coffee
@@ -147,7 +145,7 @@ module Capucine
 
     #======================
     def extract_commands_from_scope(scope)
-      all = ['sass', 'coffee', 'incloudr']
+      all = ['use_compass', 'use_coffeescript', 'use_incloudr']
       todo = [false,false,false]
 
       scope = (scope != 'all') ? scope.split(',') : all # [] or ['sass', 'coffee']

data/spec/capucine/capucine_spec.rb

@@ -32,9 +32,9 @@ describe 'General' do
     @cap.settings.user_config_file.should_not eq(nil)
     @cap.settings.conf.should_not eq(nil)
 
-    @cap.settings.conf['sass'].should eq(true)
-    @cap.settings.conf['coffee'].should eq(false)
-    @cap.settings.conf['incloudr'].should eq(false)
+    @cap.settings.conf['use_compass'].should eq(true)
+    @cap.settings.conf['use_coffeescript'].should eq(false)
+    @cap.settings.conf['use_incloudr'].should eq(false)
   end
 
   it '#init from command line' do
@@ -114,12 +114,12 @@ describe 'General' do
 
     Dir.chdir('capucine')
 
-    @cap.settings.conf['coffee'].should eq(false)
+    @cap.settings.conf['use_coffeescript'].should eq(false)
 
     @cap.run_command(['c', @config_user_coffee])
-
     @cap.settings.user_config_file.should_not eq(nil)
-    @cap.settings.conf['coffee'].should eq(true)
+
+    @cap.settings.conf['use_coffeescript'].should eq(true)
 
     coffee = File.expand_path(File.join @cap.settings.working_dir, 'public/js_generated/app.js')
     coffee2 = File.expand_path(File.join @cap.settings.working_dir, 'public/js_generated/app.min.js')

data/spec/capucine_coffee.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:
-#   - jquery
+incloudr_libs:
+  - name: jquery
 
-# DOCUMENTATION : http:// capucine.dln.name
+# DOCUMENTATION : http:// capucine.dln.name

data/spec/capucine_incloudr.yaml

@@ -1,6 +1,32 @@
-sass: false
-coffee: false
-incloudr: true
+# use_compass: true
+# use_coffeescript: true
+use_incloudr: true
 
+# ---------------[ COMPASS ]------------------------
+compass:
+  sass_dir: sass
+  css_dir: public/css_generated
+
+  # output_style: expanded # compact | expanded | compressed
+  # line_comments: false
+  # sass_options: '{:cache => false}' # please use this format (a string)
+
+# 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

data/spec/capucine_incloudr2.yaml

@@ -1,8 +1,33 @@
-sass: false
-coffee: false
-incloudr: true
+# use_compass: true
+# use_coffeescript: true
+use_incloudr: true
 
+# ---------------[ COMPASS ]------------------------
+compass:
+  sass_dir: sass
+  css_dir: public/css_generated
+
+  # output_style: expanded # compact | expanded | compressed
+  # line_comments: false
+  # sass_options: '{:cache => false}' # please use this format (a string)
+
+# 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
     version: 1.7
 
+# DOCUMENTATION : http:// capucine.dln.name

data/spec/capucine_incloudr3.yaml

@@ -1,6 +1,32 @@
-sass: false
-coffee: false
-incloudr: true
+# use_compass: true
+# use_coffeescript: true
+use_incloudr: true
 
+# ---------------[ COMPASS ]------------------------
+compass:
+  sass_dir: sass
+  css_dir: public/css_generated
+
+  # output_style: expanded # compact | expanded | compressed
+  # line_comments: false
+  # sass_options: '{:cache => false}' # please use this format (a string)
+
+# 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: jque
+  - name: jqu
+
+# DOCUMENTATION : http:// capucine.dln.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capucine
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -189,7 +189,6 @@ files:
 - capucine-logo-mini.png
 - capucine.gemspec
 - content/default.yaml
-- content/options.yaml
 - content/shared/capucine.yaml
 - content/shared/coffeescript/app.coffee
 - content/shared/index.html
@@ -227,7 +226,6 @@ files:
 - examples/with-coffeescript/coffeescript/app.coffee
 - examples/with-coffeescript/public/js_generated/app.js
 - examples/with-coffeescript/public/js_generated/app.min.js
-- examples/with-incloudr/.compass_config.rb
 - examples/with-incloudr/capucine.yaml
 - examples/with-incloudr/public/js_generated/modules/jquery.js
 - examples/with-incloudr/public/js_generated/modules/jquery.min.js
@@ -277,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2235455125154600183
+      hash: 4119978876781162898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/content/options.yaml

@@ -1,11 +0,0 @@
-i: init
-init: init
-
-n: new
-new: new
-
-c: compile
-compile: compile
-
-w: watch
-watch: watch

data/examples/with-incloudr/.compass_config.rb

@@ -1,13 +0,0 @@
-
-
-require "compass-capucine"
-
-
-
-images_dir = "public/images"
-sass_dir = "sass"
-css_dir = "public/css_generated"
-line_comments = false
-output_style = :expanded
-sass_options = {:cache => false}
-