capucine 0.2.9 → 0.2.10

data/README.md

@@ -56,14 +56,21 @@ You don't need to change anything in your application. Just provide the right pa
 * Ubuntu
 * Windows 7
 
-**Quick install** :
+**Quick install (or update)** :
 	
 	gem uninstall -a -x capucine
 	gem update --system
 	gem install capucine
 
-Troubles ? Read this doc : [Installing Capucine](http://capucine.dln.name)
-
+**Maybe the `capucine.yaml` as change with new version. Please update it :**
+    
+    cd my_project/
+    capucine init
+    
+    (edit capucine.yaml)
+    
+    capucine watch
+    
 # Start
 
 This will generate a full ready-to-use project from scratch :
@@ -205,7 +212,7 @@ Search a library on NPMJS (*example: underscore*) (coming):
 
     capucine js:search:npm underscore
 
-###### When my lib are download ?
+###### When my lib are downloaded ?
 
 When you type `capucine compile`, your Sass and CoffeeScript are compiled, and Incloudr will look at the `capucine.yaml`, download them, and move the files to the `incloudr_output_dir` directory.
 
@@ -214,8 +221,7 @@ When you type `capucine watch`, Capucine will first do a `capucine compile`, and
 # How does it work
 
 Capucine works on top of Compass and CoffeeScript. It use a watcher for compiling CoffeeScript on the fly and uses the official Compass watch for Sass's files.
-So, it generate a configuration file for Compass (`config.rb`). This file is in the TEMP OS directory. (/tmp or Temp).
-
+So, it generate a configuration file for Compass (`config.rb`).
 
 If you activate the `sass_cache` options, Capucine will generate a `.sass-cache/` folder in the working directory.
 
@@ -240,7 +246,6 @@ Quick Help :
 
     capucine help
 
-
 ### There are shortcuts :
 
 	capucine i   == capucine init
@@ -301,7 +306,7 @@ Import:
 
 - Fork the project.
 - Create a branch with the Template name (*example: wordpress*).
-- Add you `capucine.yaml` in the `templates/` directory.
+- Add your `capucine.yaml` in the `templates/` directory.
 - Edit the `templates/README.md` file.
 - Commit.
 - Pull Request.
@@ -321,7 +326,6 @@ Import:
 - Add NPM support for Incloudr
 - Add JSDelivr support for Incloudr
 
-- Add the `clean` option
 - Make rake tasks
 - Switch from FSSM to guard-listen
 

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/capucine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capucine"
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damian Le Nouaille"]
-  s.date = "2012-06-13"
+  s.date = "2012-06-18"
   s.description = "Improve your worlkflow"
   s.email = "dam@dln.name"
   s.executables = ["capucine"]
@@ -96,6 +96,7 @@ Gem::Specification.new do |s|
     "spec/capucine_incloudr3.yaml",
     "spec/spec.rake",
     "spec/spec_helper.rb",
+    "tasks/all.rake",
     "templates/README.md",
     "templates/sinatra.yaml"
   ]

data/content/default.yaml

@@ -3,7 +3,6 @@ use_coffeescript: false
 use_incloudr: false
 
 # ---------------[ COMPASS ]------------------------
-use_libsass: false
 compass:
   sass_dir: sass
   css_dir: public/css_generated
@@ -13,6 +12,7 @@ compass:
   line_comments: false
   sass_options: '{:cache => false}' # please use this format (a string)
 
+use_libsass: false
 compass_plugins: []
 # ---------------[ IMPORT ]------------------------
 sass_import_css: false

data/content/shared/capucine.yaml

@@ -3,16 +3,17 @@ use_compass: true
 # use_incloudr: true
 
 # ---------------[ COMPASS ]------------------------
-use_libsass: false
 compass:
   sass_dir: sass
   css_dir: public/css_generated
-  images_dir: public/images
 
+  # images_dir: public/images
   # output_style: expanded # compact | expanded | compressed
   # line_comments: false
   # sass_options: '{:cache => false}' # please use this format (a string)
 
+# use_libsass: false
+
 # compass_plugins:
   # - compass_twitter_bootstrap
   # - compass-capucine

data/content/shared/index.html

@@ -6,8 +6,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <title>.</title>
 
-  <meta name="description" content="">
-  <meta name="author" content="">
+  <!-- <meta name="description" content=""> -->
+  <!-- <meta name="author" content=""> -->
 
   <!-- <meta property="og:url" content=""/> -->
   <!-- <meta property="og:site_name" content=""/> -->
@@ -29,7 +29,6 @@
 <body>
 <div id="page_wrap">
 
-
 </div>
   <!-- <script src="public/js_generated/app.js"></script> -->
   <!-- <script src="public/js_generated/app.min.js"></script> -->
@@ -39,4 +38,4 @@
     <script defer>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
   <![endif]-->
 </body>
-</html>
+</html>

data/content/shared/sass/screen.scss

@@ -1,5 +1,5 @@
-@import "compass/reset"; // COMPASS RESET
-@import "compass/css3"; // COMPASS CSS3
+@import "compass/reset";
+@import "compass/css3";
 
 @import "./main";
 @import "./responsive";

data/content/templates/cmd_help.erb

@@ -1,4 +1,5 @@
     Capucine - <%= config %>
+
     Usage:
 
         Configure your preferences in capucine.yaml

data/lib/capucine.rb

@@ -57,6 +57,8 @@ module Capucine
         self.settings.set_user_config_file(config_or_name)
         self.tools.update
 
+      elsif %w{h help}.include?(main)
+        self.help
       else
         self.help
       end
@@ -65,51 +67,10 @@ module Capucine
     end
 
     def help
-      puts "
-
-Capucine on Github : http://github.com/damln/Capucine
-
-- Create
-
-      cd my_current_project/
-
-      # Or
-
-      capucine new my_app_name
-      cd my_app_name/
-
-- Initialize
-
-      # Edit the capucine.yaml file.
-      # Or :
-
-      capucine init
-      capucine init:django
-
-- Compile Once
-
-      capucine compile
-      capucine compile:sass
-      capucine compile:coffee
-      capucine compile:incloudr
-
-- Or Watch (Stop with Ctrl + C)
-
-      capucine watch
-      capucine watch:sass
-      capucine watch:coffee
-
-- Search libs :
-
-      capucine js:list
-      capucine js:list:npm # (comming)
-
-
-      capucine js:search jquery
-      capucine js:search:npm jquery  # (comming)
-
-
-      "
+      version = File.open(File.join(self.settings.root_dir, 'VERSION')).read
+      template_file = File.join self.settings.content_dir, 'templates', 'cmd_help.erb'
+      result = self.tools.render_template template_file, version
+      puts result
     end
 
   end

data/lib/compass-sass.rb

@@ -31,6 +31,7 @@ module Capucine
 
       template_file = File.join @cap.settings.content_dir, 'templates', 'compass_config.erb'
       tmp = File.join @cap.settings.working_dir, '.compass_config.rb'
+      FileUtils.rm tmp if File.exist?(tmp)
 
       @tmp_config = tmp
       @cap.settings.conf['compass_custom'] = {}

data/lib/tools.rb

@@ -140,7 +140,8 @@ module Capucine
     end
 
     def clean
-      # TODO
+      file = File.join(@cap.settings.working_dir, '.compass_config.rb')
+      FileUtils.rm file
     end
 
     #======================

data/spec/capucine/capucine_spec.rb

@@ -24,6 +24,11 @@ describe 'General' do
 
   end
 
+
+  it '#init the Capucinewith nothing' do
+    @cap.run_command([''])
+  end
+
   it '#init the Capucine with settings' do
     @cap.settings.set_user_config_file(@config_user)
 

data/tasks/all.rake

@@ -0,0 +1,25 @@
+require File.join File.dirname(__FILE__), '..', 'lib', 'capucine.rb'
+
+namespace :capucine do
+
+  task :init do
+    cap = Capucine::Main.new
+    cap.run_command(['init'])
+  end
+
+  task :new do
+    cap = Capucine::Main.new
+    cap.run_command(['new'])
+  end
+
+  task :compile do
+    cap = Capucine::Main.new
+    cap.run_command(['compile'])
+  end
+
+  task :watch do
+    cap = Capucine::Main.new
+    cap.run_command(['watch'])
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capucine
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fssm
@@ -258,6 +258,7 @@ files:
 - spec/capucine_incloudr3.yaml
 - spec/spec.rake
 - spec/spec_helper.rb
+- tasks/all.rake
 - templates/README.md
 - templates/sinatra.yaml
 homepage: http://capucine.dln.name
@@ -275,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4119978876781162898
+      hash: -3369971096882014548
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: