capucine 0.1.2 → 0.1.5

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
-
 gem 'fssm'
 gem 'compass', '0.12.rc.0'
 gem 'coffee-script'
 gem 'uglifier'
 gem 'packr'
-
+gem 'json'
+gem 'compass-capucine'
 
 group :development do
   # gem "shoulda", ">= 0"

data/Gemfile.lock

@@ -10,6 +10,8 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    compass-capucine (0.1.0)
+      compass
     execjs (1.3.0)
       multi_json (~> 1.0)
     fssm (0.2.8.1)
@@ -39,7 +41,9 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   coffee-script
   compass (= 0.12.rc.0)
+  compass-capucine
   fssm
   jeweler (~> 1.8.3)
+  json
   packr
   uglifier

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.5

data/capucine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capucine"
-  s.version = "0.1.2"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damian Le Nouaille"]
-  s.date = "2012-03-06"
+  s.date = "2012-03-16"
   s.description = "longer description of your gem"
   s.email = "dam@dln.name"
   s.executables = ["capucine"]
@@ -26,20 +26,19 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/capucine",
     "capucine.gemspec",
+    "content/shared/capucine.yaml",
     "content/shared/coffeescript/app.coffee",
-    "content/shared/css/import/YOUR_OLD_CSS",
-    "content/shared/images/favicon/apple-touch-icon-114x114-precomposed.png",
-    "content/shared/images/favicon/apple-touch-icon-57x57-precomposed.png",
-    "content/shared/images/favicon/apple-touch-icon-72x72-precomposed.png",
-    "content/shared/images/favicon/apple-touch-icon-precomposed.png",
-    "content/shared/images/favicon/favicon.png",
-    "content/shared/js/app.js",
-    "content/shared/sass/_main.sass",
-    "content/shared/sass/_responsive.sass",
-    "content/shared/sass/screen.sass",
-    "content/shared/templates/_footer.html",
-    "content/shared/templates/_header.html",
-    "content/shared/templates/index.html.erb",
+    "content/shared/index.html",
+    "content/shared/public/css/import/YOUR_OLD_CSS",
+    "content/shared/public/images/favicon/apple-touch-icon-114x114-precomposed.png",
+    "content/shared/public/images/favicon/apple-touch-icon-57x57-precomposed.png",
+    "content/shared/public/images/favicon/apple-touch-icon-72x72-precomposed.png",
+    "content/shared/public/images/favicon/apple-touch-icon-precomposed.png",
+    "content/shared/public/images/favicon/favicon.png",
+    "content/shared/public/js/app.js",
+    "content/shared/sass/_main.scss",
+    "content/shared/sass/_responsive.scss",
+    "content/shared/sass/screen.scss",
     "content/templates/capucine.yaml",
     "content/templates/cmd_help.erb",
     "content/templates/compass_config.erb",
@@ -49,7 +48,6 @@ Gem::Specification.new do |s|
     "lib/compass-sass.rb",
     "lib/incloudr.rb",
     "lib/settings.rb",
-    "lib/templates.rb",
     "lib/tools.rb",
     "lib/watch.rb"
   ]
@@ -68,6 +66,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<coffee-script>, [">= 0"])
       s.add_runtime_dependency(%q<uglifier>, [">= 0"])
       s.add_runtime_dependency(%q<packr>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<compass-capucine>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
@@ -76,6 +76,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<coffee-script>, [">= 0"])
       s.add_dependency(%q<uglifier>, [">= 0"])
       s.add_dependency(%q<packr>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<compass-capucine>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
@@ -85,6 +87,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<coffee-script>, [">= 0"])
     s.add_dependency(%q<uglifier>, [">= 0"])
     s.add_dependency(%q<packr>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<compass-capucine>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
   end

data/content/shared/capucine.yaml

@@ -0,0 +1,30 @@
+sass: true
+# coffeescript: true
+# 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_config: {}
+# compass_plugins:
+#   - compass-capucine
+
+# sass_import_css: false
+# sass_import_formats: css to sass
+# 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
+
+# incloudr_output_dir: public/js_generated/modules
+# incloudr_libs:
+#   - jquery
+
+# DOCUMENTATION : http:// capucine.dln.name

data/content/shared/coffeescript/app.coffee

@@ -1,3 +1,7 @@
-window.AppCoffee =
+AppCoffee =
   initialize: ->
 
+
+# AppCoffee.initialize()
+# OR
+# jQuery AppCoffee.initialize

data/content/shared/index.html

@@ -0,0 +1,43 @@
+<!doctype html>
+<html class="no-js" dir="ltr" lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:fb="http://www.facebook.com/2008/fbml">
+
+<head>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <title>-</title>
+
+  <meta name="description" content="">
+  <meta name="author" content="">
+
+  <!-- <meta property="og:url" content=""/> -->
+  <!-- <meta property="og:site_name" content=""/> -->
+  <!-- <meta property="og:title" content=""/> -->
+  <!-- <meta property="og:description" content=""/> -->
+  <!-- <meta property="og:image" content=""/> -->
+  <!-- <meta property="og:type" content=""/> -->
+  <!-- <meta property="fb:admins" content=""/> -->
+
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="shortcut icon" href="public/images/favicon/favicon.png">
+  <!-- <link rel="apple-touch-icon" href="public/images/favicon/apple-touch-icon-precomposed.png"> -->
+  <!-- <link rel="apple-touch-icon" href="public/images/favicon/apple-touch-icon-57x57-precomposed.png" sizes="57x57"> -->
+  <!-- <link rel="apple-touch-icon" href="public/images/favicon/apple-touch-icon-72x72-precomposed.png" sizes="72x72"> -->
+  <!-- <link rel="apple-touch-icon" href="public/images/favicon/apple-touch-icon-114x114-precomposed.png" sizes="114x114"> -->
+  <link rel="stylesheet" href="public/css_generated/screen.css">
+</head>
+<body>
+<div class="wrap">
+
+  <div role="main" id="content">
+  </div>
+
+</div>
+  <script src="public/js_generated/app.js"></script>
+  <!-- <script src="public/js_generated/app.min.js"></script> -->
+
+  <!--[if lt IE 7 ]>
+    <script defer src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
+    <script defer>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
+  <![endif]-->
+</body>
+</html>

data/content/shared/public/js/app.js

@@ -0,0 +1,11 @@
+(function() {
+var App = {
+  initialize: function() {
+    console.log('hello');
+  },
+};
+
+// App.initialize();
+// OR
+// jQuery(App.initialize);
+}).call(this);

data/content/shared/sass/_main.scss

@@ -0,0 +1,22 @@
+// @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 { @include pressed-effect;}
+
+p, b, strong, i, blockquote {line-height: 1.5em;}
+
+.wrap {
+  @include centerX;
+  @include min-max-width($WIDTH_MIN, $WIDTH_MAX);
+}

data/content/shared/sass/{_responsive.sass → _responsive.scss}

@@ -1,20 +1,20 @@
 //----------[ MOBILE ONLY ]----
-@media only screen and (max-width: 767px) and (max-device-width: 1000px)
+@media only screen and (max-width: 767px) and (max-device-width: 1000px) {}
 
 //----------[ MOBILE LANDSCAPE ]----
-@media only screen and (min-width: 480px) and (max-width: 767px)
+@media only screen and (min-width: 480px) and (max-width: 767px) {}
 
 //----------[ MOBILE ONLY & LANDSCAPE ]----
-@media only screen and (min-width: 480px) and (max-width: 767px) and (max-device-width: 1023px)
+@media only screen and (min-width: 480px) and (max-width: 767px) and (max-device-width: 1023px) {}
 
 //----------[ IPAD ONLY & PORTRAIT ]----
-@media only screen and (min-width: 768px) and (max-width: 991px) and (max-device-width: 1023px)
+@media only screen and (min-width: 768px) and (max-width: 991px) and (max-device-width: 1023px) {}
 
 //----------[ IPAD PORTRAIT BROWSER ]----
-@media only screen and (min-width: 768px) and (max-width: 991px)
+@media only screen and (min-width: 768px) and (max-width: 991px) {}
 
 //----------[ - 960px ]----
-@media only screen and (max-width: 959px)
+@media only screen and (max-width: 959px) {}
 
 //----------[ - 767px ]----
-@media only screen and (max-width: 767px)
+@media only screen and (max-width: 767px) {}

data/content/shared/sass/screen.scss

@@ -0,0 +1,6 @@
+@import "compass"; // COMPASS CORE
+@import "compass-capucine/normalize";
+@import "compass-capucine"; // CAPUCINE HELPERS =>
+
+@import "./main";
+@import "./responsive";

data/content/templates/capucine.yaml

@@ -1,49 +1,31 @@
-sass_enable: true
-coffeescript_enable: true
-incloudr_enable: true
-templates_enable: true
+sass: false
+coffeescript: false
+incloudr: false
+templates: false
 
 # ----------------------------------------
-sass_images_dir: 'images'
-sass_files_dir: 'sass'
-sass_output_dir: 'css_generated'
+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_css_generated_style: expanded # compact | expanded | compressed
 sass_options: '{:cache => false}'
-# compass_config:
-#   '': ''
-compass_plugins:
-  sass-capucine:
-  # gem-name: plugin-name
-  # OR simply
-  # plugin-name:      if gem-anem = plugin-name
 
-  # twitter-bootstrap: twitter_bootstrap
+compass_config: {}
+compass_plugins:
+  - compass-capucine
 
 sass_import_css: false
-sass_import_formats: 'css to sass'
-sass_import_css_dir: 'css/import'
-sass_import_output_dir: 'sass/converted'
+sass_import_formats: css to sass
+sass_import_css_dir: public/css/import
+sass_import_output_dir: sass/converted
 
 coffeescript_bare: false
-coffeescript_files_dir: 'coffeescript'
-coffeescript_output_dir: 'js_generated'
-
-incloudr_output_dir: 'js_generated/modules'
-incloudr_libs:
-  -
-    name: jquery
-    source: http://code.jquery.com/jquery.min.js
-
-  -
-    name: underscore
-    source: http://documentcloud.github.com/underscore/underscore-min.js
-
-  -
-    name: backbone
-    source: http://documentcloud.github.com/backbone/backbone-min.js
+coffeescript_files_dir: coffeescript
+coffeescript_output_dir: public/js_generated
 
-templates_erb_files_dir: 'templates'
+incloudr_output_dir: public/js_generated/modules
+incloudr_libs: []
 
 # DOCUMENTATION :
 # http:// capucine.dln.name

data/lib/compass-sass.rb

@@ -23,17 +23,18 @@ module Capucine
       plugins = settings.config['compass_plugins']
 
       if plugins.size > 0
-        plugins.each do |key, value|
-          settings.config['compass_plugins_list'].push key
-
-          if value and value.length > 0
-            plugins_gems.push value
+        plugins.each do |p|
+          p = p.split('|')
+          settings.config['compass_plugins_list'].push p[0]
+          if p[1]
+            plugins_gems.push p[1]
           else
-            plugins_gems.push key
+            plugins_gems.push p[0]
           end
 
         end
       end
+
       config_ = settings.config
       result = Capucine::Tools.render_template template_file, config_
 

data/lib/incloudr.rb

@@ -3,9 +3,10 @@ module Capucine
     require 'open-uri'
     require 'fileutils'
     require 'json'
-    # require 'uglifier'
     require 'packr'
+
     @@noderoot = 'http://registry.npmjs.org/'
+    @@cdnjsroot = 'https://raw.github.com/cdnjs/cdnjs/master/ajax/libs/'
 
     def self.run_once
       files = Capucine.settings.config['incloudr_libs']
@@ -14,34 +15,58 @@ module Capucine
       FileUtils.rm_r dir if File.exist?(dir)
       FileUtils.mkdir_p dir
 
+      @file = nil
       files.each {|file| self.pack file}
       puts "[incloudr] - Packaged"
     end
 
     def self.pack file
-      type = file['type'] || 'url'
-      self.url(file) if type == 'url'
+      @file = file
+
+      if @file.kind_of? String # CDNJS
+        @file = {}
+        @file['name'] = file
+        @file['type'] = 'cdnjs'
+      else
+        @file['type'] = 'npm' unless @file['source'] # NPM
+      end
+
+      @file['type'] = @file['type'] || 'url' # URL
+
+      @output = File.join(Capucine.settings.working_dir, Capucine.settings.config['incloudr_output_dir'], @file['name'].gsub(/$/, '.js'))
+      @output_min = File.join(Capucine.settings.working_dir, Capucine.settings.config['incloudr_output_dir'], @file['name'].gsub(/$/, '.min.js'))
+
+      self.cdnjs if @file['type'] == 'cdnjs'
+      self.url if @file['type'] == 'url'
       # self.npm(file) if type == 'npm'
     end
 
 
-    def self.url file
-      output = File.join(Capucine.settings.working_dir, Capucine.settings.config['incloudr_output_dir'], file['name'].gsub(/$/, '.js'))
-      output_min = File.join(Capucine.settings.working_dir, Capucine.settings.config['incloudr_output_dir'], file['name'].gsub(/$/, '.min.js'))
-
-      content = open(file['source']).read
+    def self.url raw_content = nil
+      content = raw_content || open(@file['source']).read
       content_min = ""
       content_min << Packr.pack(content)
 
-      f1 = File.open(output, 'w+')
+      f1 = File.open(@output, 'w+')
       f1.write(content)
       f1.close
 
-      f2 = File.open(output_min, 'w+')
+      f2 = File.open(@output_min, 'w+')
       f2.write(content_min)
       f2.close
     end
 
+
+    def self.cdnjs
+      cdnjs_url_pkg = "#{@@cdnjsroot}#{@file['name']}/package.json"
+      content = JSON.parse open(cdnjs_url_pkg).read
+      version = @file['version'] || content['version']
+      filename = content['filename']
+      raw_file_url = "#{@@cdnjsroot}#{@file['name']}/#{version}/#{filename}"
+      raw_content = open(raw_file_url).read
+      self.url raw_content
+    end
+
     def self.npm file
       # infos = JSON.parse open("#{@@noderoot}#{file['name']}").read
       # version = file['version'] || infos['dist-tags']['lastest']
@@ -50,55 +75,9 @@ module Capucine
 
       # tarball = open(tarball_url).read
 
-      p version
+      # p version
 
     end
 
-
-    # def self.pack files
-    #   s = Capucine.settings
-    #   out = File.join s.working_dir, s.config['incloudr_output_dir']
-
-    #   output_file = File.join out, base
-    #   output_file_min = File.join out, base.gsub('.js', '.min.js')
-
-    #   FileUtils.mkdir_p out if not File.exist?(out)
-
-    #   content = ""
-
-    #   files.each do |js_file|
-    #     extended = File.join s.working_dir, js_file
-    #     content << File.read(extended) if File.exist?(extended)
-    #   end
-
-    #   f = File.open(output_file, 'w')
-    #   f.write('')
-    #   f.write(content)
-    #   f.close
-    # end
-
-    # def self.lib_root
-    #   return "http://dln.name/"
-    # end
-
-    # def self.compress file
-    #   return if not File.exist?(file)
-    #   file_name = file.gsub '.js', ''
-    #   output_file = "#{file_name}.js"
-    #   output_file_min = "#{file_name}.min.js"
-    # end
-
-    # def self.get_lib lib
-    #   lib_name = lib[0]
-    #   lib_version = lib[1]
-    #   lib_url = "#{self.lib_root}#{lib_name}/#{lib_version}"
-    #   lib_url_min = "#{lib_url}/min"
-    #   lib_url_cdn = open(lib_url).read
-    #   lib_url_cdn_min = open(lib_url_min).read
-    #   lib_content = open(lib_url_cdn).read
-    #   lib_content_min = open(lib_url_cdn_min).read
-    #   total = [lib_content, lib_content_min]
-    # end
-
   end
 end

data/lib/tools.rb

@@ -8,7 +8,6 @@ module Capucine
     require "compass-sass.rb"
     require "coffeescript.rb"
     require "incloudr.rb"
-    require "templates.rb"
 
     def self.new_project name = nil
 
@@ -27,24 +26,14 @@ module Capucine
     end
 
     def self.init all = nil
-      files = []
-      content_files = []
-
       self.archive_file File.join Capucine.settings.working_dir, 'capucine.yaml'
 
       if all
-        content_files = Dir.glob("#{Capucine.settings.gem_content_dir}/shared/**")
-        content_files.each do |file|
-          relative_path = file.gsub(File.join(Capucine.settings.gem_content_dir, 'shared', '/'),'')
-          destination = File.join Capucine.settings.working_dir, relative_path
-          self.archive_file destination
-        end
+        files = Dir.glob File.join(Capucine.settings.gem_content_dir, 'shared', '**')
+        self.archive_file Capucine.settings.working_dir
+        FileUtils.cp_r files, Capucine.settings.working_dir
       end
 
-      files << File.join(Capucine.settings.gem_content_dir, 'templates', 'capucine.yaml')
-      content_files.each {|file| files << file}
-
-      FileUtils.cp_r files, Capucine.settings.working_dir
       Capucine::Watchr.compile if all
       Capucine.settings.reset_working_dir
     end

data/lib/watch.rb

@@ -3,7 +3,6 @@ module Capucine
     require 'compass-sass.rb'
     require 'coffeescript.rb'
     require 'incloudr.rb'
-    require "templates.rb"
 
     def self.watch config_file = nil
       self.compile config_file
@@ -16,13 +15,11 @@ module Capucine
 
       @config = Capucine.settings.config
 
-      sass_proc = Capucine::CompassSass.proc_watch if @config['sass_enable']
-      coffeescript_proc = Capucine::Coffee.proc_watch if @config['coffeescript_enable']
-      templates_proc = Capucine::Templates.proc_watch if @config['templates_enable']
+      sass_proc = Capucine::CompassSass.proc_watch if @config['sass']
+      coffeescript_proc = Capucine::Coffee.proc_watch if @config['coffeescript']
 
       sass_proc.join if sass_proc
       coffeescript_proc.join if coffeescript_proc
-      templates_proc.join if templates_proc
     end
 
     def self.compile config_file = nil
@@ -34,10 +31,9 @@ module Capucine
 
       @config = Capucine.settings.config
 
-      Capucine::CompassSass.run_once if @config['sass_enable']
-      Capucine::Coffee.run_once if @config['coffeescript_enable']
-      Capucine::Templates.run_once if @config['templates_enable']
-      Capucine::Incloudr.run_once if @config['incloudr_enable']
+      Capucine::CompassSass.run_once if @config['sass']
+      Capucine::Coffee.run_once if @config['coffeescript']
+      Capucine::Incloudr.run_once if @config['incloudr']
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capucine
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70140593993640 !ruby/object:Gem::Requirement
+  requirement: &70353584068020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140593993640
+  version_requirements: *70353584068020
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70140593993100 !ruby/object:Gem::Requirement
+  requirement: &70353584066420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.rc.0
   type: :runtime
   prerelease: false
-  version_requirements: *70140593993100
+  version_requirements: *70353584066420
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70140593992540 !ruby/object:Gem::Requirement
+  requirement: &70353584065120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140593992540
+  version_requirements: *70353584065120
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70140593991820 !ruby/object:Gem::Requirement
+  requirement: &70353584064200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140593991820
+  version_requirements: *70353584064200
 - !ruby/object:Gem::Dependency
   name: packr
-  requirement: &70140593999040 !ruby/object:Gem::Requirement
+  requirement: &70353584063380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140593999040
+  version_requirements: *70353584063380
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70353584062240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70353584062240
+- !ruby/object:Gem::Dependency
+  name: compass-capucine
+  requirement: &70353584061120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70353584061120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70140593998380 !ruby/object:Gem::Requirement
+  requirement: &70353584075540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70140593998380
+  version_requirements: *70353584075540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70140593997400 !ruby/object:Gem::Requirement
+  requirement: &70353584073060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +109,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70140593997400
+  version_requirements: *70353584073060
 description: longer description of your gem
 email: dam@dln.name
 executables:
@@ -105,20 +127,19 @@ files:
 - VERSION
 - bin/capucine
 - capucine.gemspec
+- content/shared/capucine.yaml
 - content/shared/coffeescript/app.coffee
-- content/shared/css/import/YOUR_OLD_CSS
-- content/shared/images/favicon/apple-touch-icon-114x114-precomposed.png
-- content/shared/images/favicon/apple-touch-icon-57x57-precomposed.png
-- content/shared/images/favicon/apple-touch-icon-72x72-precomposed.png
-- content/shared/images/favicon/apple-touch-icon-precomposed.png
-- content/shared/images/favicon/favicon.png
-- content/shared/js/app.js
-- content/shared/sass/_main.sass
-- content/shared/sass/_responsive.sass
-- content/shared/sass/screen.sass
-- content/shared/templates/_footer.html
-- content/shared/templates/_header.html
-- content/shared/templates/index.html.erb
+- content/shared/index.html
+- content/shared/public/css/import/YOUR_OLD_CSS
+- content/shared/public/images/favicon/apple-touch-icon-114x114-precomposed.png
+- content/shared/public/images/favicon/apple-touch-icon-57x57-precomposed.png
+- content/shared/public/images/favicon/apple-touch-icon-72x72-precomposed.png
+- content/shared/public/images/favicon/apple-touch-icon-precomposed.png
+- content/shared/public/images/favicon/favicon.png
+- content/shared/public/js/app.js
+- content/shared/sass/_main.scss
+- content/shared/sass/_responsive.scss
+- content/shared/sass/screen.scss
 - content/templates/capucine.yaml
 - content/templates/cmd_help.erb
 - content/templates/compass_config.erb
@@ -128,7 +149,6 @@ files:
 - lib/compass-sass.rb
 - lib/incloudr.rb
 - lib/settings.rb
-- lib/templates.rb
 - lib/tools.rb
 - lib/watch.rb
 homepage: http://capucine.dln.name
@@ -146,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2029649888001666821
+      hash: -1628039647774186190
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/content/shared/js/app.js

@@ -1,6 +0,0 @@
-window.AppJS = {
-  initialize: function() {
-
-
-  }
-}

data/content/shared/sass/_main.sass

@@ -1,26 +0,0 @@
-// +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
-
-// TAGS
-
-body
-  font: normal 12px $FONT_0
-  color: $COLOR_0
-
-a
-  +pressed-effect
-
-p, b, strong, i, blockquote
-  line-height: 1.5em
-
-// CLASS
-
-.wrap
-  +centerX
-  +min-max-width($WIDTH_MIN, $WIDTH_MAX)

data/content/shared/sass/screen.sass

@@ -1,5 +0,0 @@
-@import "compass"
-@import "sass-capucine"
-
-@import "main"
-@import "responsive"

data/content/shared/templates/_footer.html

@@ -1,11 +0,0 @@
-
-</div>
-  <script src="js_generated/app.js"></script>
-  <!-- <script src="js_generated/app.min.js"></script> -->
-
-  <!--[if lt IE 7 ]>
-    <script defer src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
-    <script defer>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
-  <![endif]-->
-</body>
-</html>

data/content/shared/templates/_header.html

@@ -1,29 +0,0 @@
-<!doctype html>
-<html class="no-js" dir="ltr" lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:fb="http://www.facebook.com/2008/fbml">
-
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title>-</title>
-
-  <meta name="description" content="">
-  <meta name="author" content="">
-
-  <!-- <meta property="og:url" content=""/> -->
-  <!-- <meta property="og:site_name" content=""/> -->
-  <!-- <meta property="og:title" content=""/> -->
-  <!-- <meta property="og:description" content=""/> -->
-  <!-- <meta property="og:image" content=""/> -->
-  <!-- <meta property="og:type" content=""/> -->
-  <!-- <meta property="fb:admins" content=""/> -->
-
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="shortcut icon" href="images/favicon/favicon.png">
-  <!-- <link rel="apple-touch-icon" href="images/favicon/apple-touch-icon-precomposed.png"> -->
-  <!-- <link rel="apple-touch-icon" href="images/favicon/apple-touch-icon-57x57-precomposed.png" sizes="57x57"> -->
-  <!-- <link rel="apple-touch-icon" href="images/favicon/apple-touch-icon-72x72-precomposed.png" sizes="72x72"> -->
-  <!-- <link rel="apple-touch-icon" href="images/favicon/apple-touch-icon-114x114-precomposed.png" sizes="114x114"> -->
-  <link rel="stylesheet" href="css_generated/screen.css">
-</head>
-<body>
-<div class="wrap">

data/content/shared/templates/index.html.erb

@@ -1,7 +0,0 @@
-<%= File.read("#{config}/_header.html") %>
-
-  <div role="main" id="main">
-
-  </div>
-
-<%= File.read("#{config}/_footer.html") %>

data/lib/templates.rb

@@ -1,55 +0,0 @@
-module Capucine
-  class Templates
-
-    def self.run_once
-      settings = Capucine.settings
-
-      files_to_watch = "#{settings.working_dir}/#{settings.config['templates_erb_files_dir']}/*.erb"
-      templates = Dir.glob(files_to_watch)
-
-      templates.each do |template|
-        return if not File.exist? template
-        html_name = File.basename(template).gsub('.erb', '')
-        new_file = File.join settings.working_dir, html_name
-        template_root = File.join settings.working_dir, settings.config['templates_erb_files_dir'] #for ERB binding
-        
-        result = Capucine::Tools.render_template template, template_root
-
-        f = File.open(new_file, 'w+')
-        f.write(result)
-        f.close
-
-      end
-      
-      puts "[template] - Rendered"
-
-    end
-    
-    def self.proc_watch
-      require 'fssm'
-      
-      watchr_thread = Thread.new {
-        files_to_lookat = File.join Capucine.settings.working_dir, Capucine.settings.config['templates_erb_files_dir']
-
-        FSSM.monitor(files_to_lookat, :directories => true) do
-          update do |b, r|
-            Capucine::Templates.run_once
-          end
-
-          create do |b, r|
-            Capucine::Templates.run_once
-          end
-
-          delete do |b, r|
-            Capucine::Templates.run_once
-          end
-        end
-      }
-      return watchr_thread
-
-    end
-
-
-
-  end
-end