smallvictories 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 305cf251d788e9e1d865ed14affc8df4eba8dba7
-  data.tar.gz: 3f5aa5da6a816bcfd06d7de06e405e3cf162b98d
+  metadata.gz: 7ec4b9886a3ede16fc3d173852d14e53fd762a38
+  data.tar.gz: 925234d3af8439d6f45381a4701f7c0331192ea9
 SHA512:
-  metadata.gz: 07899a9f1e18d45b4d513e569d9956d9de9e27d9d4dda5a98a98347e606a4cd242c4aee1941a3631f4c3780e5b02d75704cad5b220c02eda978fb5a517cea1ac
-  data.tar.gz: ceb4600d91812a6b4ec7fbf2b61b8614b343cc7994466d95d3a738dd17128870520f2252b0813aa162992a5bf42a352f5dc6c931decdc3c69ab861de5b23bd48
+  metadata.gz: 43e26f3eec4ca433f45e629dddb541e1a39cbfeadb87187d1c3628b886d92260018c6f0b15d8077d9bad0886b832b1d6a94476b46163cd02c62120ed7b83b23b
+  data.tar.gz: a91f54da2046b2cff5dff279ad4c644354e801a2ff4cf0e900c060186fd9feadab22adb3ebfb4519cdba4b0d90caf459b4a02a546858d6252806b01c62de9ba2

data/README.md

@@ -4,8 +4,44 @@ A command line utility for building websites.
 
 ## What does it do?
 
-The Small Victories gem packages Sass/CSS and JS/CoffeeScript files into a single Stylesheet and
-Javascript file using [Sprockets](https://github.com/rails/sprockets).
+The Small Victories gem compiles Sass/CSS and JS/CoffeeScript files into a single Stylesheet and
+Javascript file and renders HTML and Liquid files into a destination folder.
+ 
+[Sprockets](https://github.com/rails/sprockets) looks for main Sass/CSS and JS/CoffeeScript files and compiles
+multiple Sass/CSS and JS/CoffeeScript files into a single CSS and JS file.
+ 
+You can structure your folder however you want, Sprockets will find the files
+you reference and compile them in the order you require them.
+ 
+[Liquid](https://github.com/Shopify/liquid/) looks for a single layout file and
+renders all HTML and Liquid files through this, including snippets from the
+includes folder.
+ 
+You don't have to use a layout file if you don't want to, the files will still
+be copied over to the destination folder.
+
+### Basic Folder Structure
+
+```text
+project
+├── _includes
+├── _layout.liquid
+├── _sv_custom.css
+├── _sv_custom.js
+│
+└── index.html
+```
+
+## How does it work with Small Victories?
+
+This gem allows you to build a site using the tools you're used to and compile a
+version directly into a Small Victories folder.
+
+To do this, create a `_config.yml` file and set the destination to your Small
+Victories site folder e.g. `~/Dropbox/Small Victories/liberal coyote`.
+
+Now when you watch or build your site it will output the files into your Dropbox
+folder, which in turn will trigger Small Victories to rebuild your site.
 
 ## Installation
 
@@ -18,29 +54,52 @@ gem install smallvictories
 Small Victories looks for a `_config.yml` file in the directory where `sv` is
 run from.
 
-+ `source`: Relative path to find and watch files for compiling and packaging.
++ `source`: Relative path to find and watch files for compiling and compiling.
 + `destination`: Relative path for where to save final files.
-+ `stylesheets_dir`: Folder within source to compiles Sass and Css from.
-+ `javascripts_dir`: Folder within source to package JS and CoffeeScript from.
-+ `stylesheet`: Filename for packaged CSS file that is saved in destination.
-+ `javascript`: Filename for packaged JS file that is saved in destination.
++ `stylesheet`: Main stylesheet (Sass or CSS) to be compiled into destination.
++ `javascript`: Main javascript file (JS or CoffeeScript) to be compiled into destination.
++ `layout`: Liquid layout file to render all other html and liquid files through.
++ `includes`: Directory where liquid rendered should expect to find snippets.
 
 ### Default Configuration
 
 ```
 source: ''
 destination: '_site'
-stylesheets_dir: '_stylesheets'
-javascripts_dir: '_javascripts'
 stylesheet: '_sv_custom.css'
 javascript: '_sv_custom.js'
+layout: '_layout.liquid'
+includes: '_includes'
 ```
 
 ## Commands
 
+### Bootstrap
+
+Sets up default files in a folder.
+ 
+
+Pass no name to setup in the current folder:
+ 
+Command: `sv bootstrap`
+ 
+Pass a folder name to setup in a new/existing folder:
+ 
+Command: `sv bootstrap my-folder`
+ 
+
+### Compile
+
+Compile files.
+ 
+Renders Sass/CSS, JavaScript/CoffeeScript, HTML/Liquid in the destination
+folder.
+ 
+Command: `sv compile`
+
 ### Watch
 
-Watch for changes and compile and package files.
+Watch for changes and compile files.
  
 Command: `sv watch`
 

data/bin/sv

@@ -5,20 +5,38 @@ require 'smallvictories'
 def help
   %Q(
   Usage: sv [COMMAND] [OPTIONS]
+
   Commands:
-    watch               Watch for changes and compile files
-    help                Prints this help document
-    version             Prints the small victories gem version
+    bootstrap, bootstrap FOLDER     Setup folder with default files
+    compile                         Compile files
+    watch                           Watch for changes and compile files
+    help                            Prints this help document
+    version                         Prints the small victories gem version
+
   Options:
-    -h, --help          Prints this help document
-    -v, --version       Prints the siteleaf gem version
+    -h, --help                      Prints this help document
+    -v, --version                   Prints the siteleaf gem version
+
   See https://github.com/xxix/smallvictories-gem for additional documentation.
   )
 end
 
+def bootstrap folder=nil
+  config = SmallVictories::Configuration.new
+  builder = SmallVictories::Builder.new(config: config)
+  builder.setup folder
+end
+
+def compile
+  config = SmallVictories::Configuration.new
+  compiler = SmallVictories::Compiler.new(config: config)
+  compiler.compile_css
+  compiler.compile_js
+  compiler.compile_html
+end
+
 def watch
   config = SmallVictories::Configuration.new
-  config.setup
   compiler = SmallVictories::Compiler.new(config: config)
   watcher = SmallVictories::Watcher.new(compiler: compiler)
   watcher.watch
@@ -29,8 +47,10 @@ when '-v', '--version', 'version'
   puts SmallVictories::VERSION
 when '-h', '--help', 'help'
   puts help
-when 'hello'
-  hello
+when 'bootstrap'
+  bootstrap ARGV[1]
+when 'compile'
+  compile
 when 'watch'
   watch
 else

data/lib/smallvictories.rb

@@ -5,9 +5,6 @@ require "smallvictories/version"
 require "smallvictories/constants"
 require "smallvictories/logger"
 require "smallvictories/configuration"
+require "smallvictories/builder"
 require "smallvictories/compiler"
 require "smallvictories/watcher"
-require 'yaml'
-require 'sassc'
-require 'sprockets'
-require 'listen'

data/lib/smallvictories/builder.rb

@@ -0,0 +1,73 @@
+require 'yaml'
+
+module SmallVictories
+  class Builder
+    attr_accessor :config
+    attr_accessor :folder
+
+    def initialize attributes={}
+      self.config = attributes[:config]
+    end
+
+    def setup folder=nil
+      self.folder = "#{folder.chomp("/").reverse.chomp("/").reverse}/" if folder
+      setup_directory folder_path
+      setup_config
+      setup_stylesheet
+      setup_javascript
+      setup_html
+    end
+
+    def folder_path
+      "#{config.full_source_path}#{folder}"
+    end
+
+    private
+
+    def src_directory
+      spec = Gem::Specification.find_by_name("smallvictories")
+      "#{spec.gem_dir}/src/"
+    end
+
+    def create_src_file source, destination
+      unless File.exists?(destination)
+        contents = File.open("#{src_directory}#{source}").read
+        File.open(destination, 'w') { |file| file.write(contents) }
+        SmallVictories.logger.info "created #{destination}"
+      end
+    end
+
+    def setup_directory path
+      unless File.exists?(path)
+        Dir.mkdir(path)
+        SmallVictories.logger.info "created #{path}"
+      end
+    end
+
+    def setup_config
+      d = YAML::load_file("#{src_directory}config.yml")
+      d['source'] = DEFAULT_SOURCE
+      d['destination'] = DEFAULT_DESTINATION
+      d['stylesheet'] = DEFAULT_STYLESHEET
+      d['javascript'] = DEFAULT_JAVASCRIPT
+      d['layout'] = DEFAULT_LAYOUT
+      d['includes'] = DEFAULT_INCLUDES
+      File.open("#{folder_path}#{CONFIG_FILE}", 'w') {|f| f.write d.to_yaml }
+    end
+
+    def setup_stylesheet
+      create_src_file('stylesheet.css', "#{folder_path}#{config.stylesheet}")
+    end
+
+    def setup_javascript
+      create_src_file('javascript.js', "#{folder_path}#{config.javascript}")
+    end
+
+    def setup_html
+      setup_directory("#{folder_path}#{config.includes}")
+      create_src_file('layout.liquid', "#{folder_path}#{config.layout}")
+      create_src_file('index.liquid', "#{folder_path}/index.liquid")
+      create_src_file('head.liquid', "#{folder_path}#{config.includes}/_head.liquid")
+    end
+  end
+end

data/lib/smallvictories/compiler.rb

@@ -1,3 +1,7 @@
+require 'sprockets'
+require 'autoprefixer-rails'
+require 'liquid'
+
 module SmallVictories
   class Compiler
     attr_accessor :config
@@ -6,26 +10,93 @@ module SmallVictories
       self.config = attributes[:config]
     end
 
-    def package
+    def compile_css
+      package  [config.stylesheet]
+      prefix_css
+    end
+
+    def compile_js
+      package  [config.javascript]
+    end
+
+    def compile_html
+      liquid
+    end
+
+    def liquid
+      begin
+        Liquid::Template.file_system = Liquid::LocalFileSystem.new("#{config.full_source_path}/#{config.includes}")
+        layout_path = "#{config.full_source_path}/#{config.layout}"
+        if File.exists?(layout_path)
+          layout_file = File.open(layout_path).read
+          layout = Liquid::Template.parse(layout_file)
+        end
+      rescue => e
+        SmallVictories.logger.error "Liquid Error\n#{e}"
+        return
+      end
+
+      Dir.glob(["#{config.full_source_path}/*.html", "#{config.full_source_path}/*.liquid"]) do |path|
+        begin
+          file_name = Pathname.new(path).basename.to_s.split('.').first
+          next if file_name =~ /^_/ # do not render partials
+
+          file = File.open(path).read
+          liquid = Liquid::Template.parse(file)
+          content = liquid.render('config' => { 'stylesheet' => config.stylesheet, 'javascript' => config.javascript })
+          output_file_name = file_name.concat('.html')
+          output_path = "#{config.full_destination_path}#{output_file_name}"
+          if layout
+            html = layout.render('content_for_layout' => liquid.render, 'config' => { 'stylesheet' => config.stylesheet, 'javascript' => config.javascript })
+          else
+            html = liquid.render('config' => { 'stylesheet' => config.stylesheet, 'javascript' => config.javascript })
+          end
+          File.open("#{config.full_destination_path}#{output_file_name}", 'w') { |file| file.write(html) }
+          SmallVictories.logger.info "compiled #{config.destination}/#{output_file_name}"
+        rescue => e
+          SmallVictories.logger.error "#{path}\n#{e}"
+        end
+      end
+    end
+    def package bundles=[config.stylesheet, config.javascript]
       sprockets = Sprockets::Environment.new(ROOT) do |environment|
         environment.js_compressor  = :uglify
         environment.css_compressor = :scss
       end
 
-      sprockets.append_path(config.full_stylesheets_path)
-      sprockets.append_path(config.full_javascripts_path)
-
-      [config.stylesheet, config.javascript].each do |bundle|
+      sprockets.append_path(config.full_source_path)
+      bundles.each do |bundle|
         begin
-          assets = sprockets.find_asset(bundle)
-          prefix, basename = assets.pathname.to_s.split('/')[-2..-1]
-          FileUtils.mkpath config.full_destination_path
-          assets.write_to "#{config.full_destination_path}#{basename}"
-          SmallVictories.logger.info "👍  packaged #{config.destination}/#{basename}"
+          if assets = sprockets.find_asset(bundle)
+            prefix, basename = assets.pathname.to_s.split('/')[-2..-1]
+            FileUtils.mkpath config.full_destination_path
+            assets.write_to "#{config.full_destination_path}#{basename}"
+            SmallVictories.logger.info "compiled #{config.destination}/#{basename}"
+          end
         rescue => e
-          SmallVictories.logger.error "🔥 🔥 🔥 \n#{e}"
+          SmallVictories.logger.error "#{bundle}\n#{e}"
         end
       end
     end
+
+    def prefix_css
+      begin
+        path = "#{config.full_destination_path}#{config.stylesheet}"
+        css = File.open(path).read
+        prefixed = AutoprefixerRails.process(css, browsers: ['last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1'], cascade: false)
+        File.open(path, 'w') { |file| file.write(prefixed.css) }
+
+        sprockets = Sprockets::Environment.new(ROOT) do |environment|
+          environment.css_compressor = :scss
+        end
+        sprockets.append_path(config.full_destination_path)
+        assets = sprockets.find_asset(config.stylesheet)
+        assets.write_to "#{config.full_destination_path}#{config.stylesheet}"
+
+        SmallVictories.logger.info "prefixed #{config.destination}/#{config.stylesheet}"
+      rescue => e
+        SmallVictories.logger.error "#{path}\n#{e}"
+      end
+    end
   end
 end

data/lib/smallvictories/configuration.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module SmallVictories
   class Configuration
     attr_accessor :config
@@ -10,12 +12,12 @@ module SmallVictories
       end
     end
 
-    def config_folder key
+    def config_file key
       config[key.to_s].chomp("/").reverse.chomp("/").reverse if config.has_key?(key.to_s)
     end
 
     def source
-      config_folder(:source) || DEFAULT_SOURCE
+      config_file(:source) || DEFAULT_SOURCE
     end
 
     def full_source_path
@@ -23,74 +25,27 @@ module SmallVictories
     end
 
     def destination
-      config_folder(:destination) || DEFAULT_DESTINATION
+      config_file(:destination) || DEFAULT_DESTINATION
     end
 
     def full_destination_path
       "#{ROOT}/#{destination}/"
     end
 
-    def stylesheets_dir
-      config_folder(:stylesheets_dir) || DEFAULT_STYLESHEET_DIR
-    end
-
-    def full_stylesheets_path
-      "#{full_source_path}/#{stylesheets_dir}/"
-    end
-
-    def javascripts_dir
-      config_folder(:javascripts_dir) || DEFAULT_JAVASCRIPT_DIR
-    end
-
-    def full_javascripts_path
-      "#{full_source_path}/#{javascripts_dir}/"
-    end
-
     def javascript
-      config_folder(:javascript) || DEFAULT_JAVASCRIPT
-    end
-
-    def full_javascript_path
-      "#{full_javascripts_path}/#{javascript}"
+      config_file(:javascript) || DEFAULT_JAVASCRIPT
     end
 
     def stylesheet
-      config_folder(:stylesheet) || DEFAULT_STYLESHEET
+      config_file(:stylesheet) || DEFAULT_STYLESHEET
     end
 
-    def full_stylesheet_path
-      "#{full_stylesheets_path}/#{stylesheet}"
+    def layout
+      config_file(:layout) || DEFAULT_LAYOUT
     end
 
-    def setup
-      setup_stylesheet
-      setup_javascript
-    end
-
-    private
-
-    def create_src_file source, destination
-      spec = Gem::Specification.find_by_name("smallvictories")
-      contents = File.open("#{spec.gem_dir}/src/#{source}").read
-      File.open(destination, 'w') { |file| file.write(contents) }
-    end
-
-    def setup_directory path
-      Dir.mkdir(path) unless File.exists?(path)
-    end
-
-    def setup_stylesheet
-      setup_directory(full_stylesheets_path)
-      unless File.exists?(full_stylesheet_path)
-        create_src_file('stylesheet.css', full_stylesheet_path)
-      end
-    end
-
-    def setup_javascript
-      setup_directory(full_javascripts_path)
-      unless File.exists?(full_javascript_path)
-        create_src_file('javascript.js', full_javascript_path)
-      end
+    def includes
+      config_file(:includes) || DEFAULT_INCLUDES
     end
   end
 end

data/lib/smallvictories/constants.rb

@@ -1,9 +1,10 @@
 module SmallVictories
+  CONFIG_FILE = '_config.yml'
   DEFAULT_SOURCE = ''
   DEFAULT_DESTINATION = '_site'
   DEFAULT_STYLESHEET = '_sv_custom.css'
-  DEFAULT_STYLESHEET_DIR = '_stylesheets'
   DEFAULT_JAVASCRIPT = '_sv_custom.js'
-  DEFAULT_JAVASCRIPT_DIR = '_javascripts'
+  DEFAULT_LAYOUT = '_layout.liquid'
+  DEFAULT_INCLUDES = '_includes'
   ROOT = Dir.pwd
 end

data/lib/smallvictories/logger.rb

@@ -5,6 +5,16 @@ module SmallVictories
     def logger
       @logger ||= Logger.new($stdout).tap do |log|
         log.progname = self.name
+        log.formatter = proc do |severity, datetime, progname, msg|
+          string = "Small Victories: "
+          case severity
+          when 'INFO'
+            string.concat("👍  ")
+          when 'ERROR'
+            string.concat("🔥  ")
+          end
+          string.concat("#{msg}\n")
+        end
       end
     end
   end

data/lib/smallvictories/version.rb

@@ -1,3 +1,3 @@
 module SmallVictories
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/smallvictories/watcher.rb

@@ -1,3 +1,5 @@
+require 'listen'
+
 module SmallVictories
   class Watcher
     attr_accessor :compiler
@@ -21,8 +23,12 @@ module SmallVictories
         extensions = paths.map{ |path| File.extname(path) }
         extensions.uniq.each do |ext|
           case ext
-          when '.scss', '.sass', '.css', '.coffee', '.js'
-            compiler.package
+          when '.scss', '.sass', '.css'
+            compiler.compile_css
+          when '.coffee', '.js'
+            compiler.compile_js
+          when '.liquid', '.html'
+            compiler.compile_html
           else
           end
         end
@@ -32,12 +38,12 @@ module SmallVictories
     def watch
       listener = build_listener
       listener.start
-      SmallVictories.logger.info "👋"
-      SmallVictories.logger.info "👀"
+      SmallVictories.logger.debug "👋"
+      SmallVictories.logger.debug "👀"
 
       trap("INT") do
         listener.stop
-        SmallVictories.logger.info "✋  Halting auto-regeneration."
+        SmallVictories.logger.warn "✋  Halting auto-regeneration."
         exit 0
       end
 

data/smallvictories.gemspec

@@ -19,8 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'sassc', "~> 1.6"
-  spec.add_runtime_dependency 'sprockets', '~> 3.4', '>= 3.4.0'
-  spec.add_runtime_dependency 'listen', '~> 3.0', '>= 3.0.3'
+  spec.add_runtime_dependency 'sprockets', '~> 3.4'
+  spec.add_runtime_dependency 'listen', '~> 3.0'
+  spec.add_runtime_dependency 'uglifier', '~> 2.7'
+  spec.add_runtime_dependency 'coffee-script', '~> 2.4'
+  spec.add_runtime_dependency 'liquid', "~> 3.0"
+  spec.add_runtime_dependency 'autoprefixer-rails', "~> 6.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/builder_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe SmallVictories do
+  let(:builder) { SmallVictories::Builder.new(config: SmallVictories::Configuration.new) }
+
+  context 'with no folder' do
+    it 'sets up default files' do
+      builder.setup 'spec/fixtures/new'
+      expect(File.exists?('fixtures/new/_config.yml')).to eq true
+      expect(File.exists?('fixtures/new/_layout.liquid')).to eq true
+      expect(File.exists?('fixtures/new/index.liquid')).to eq true
+      expect(File.exists?('fixtures/new/_includes/_head.liquid')).to eq true
+      expect(File.exists?('fixtures/new/_sv_custom.js')).to eq true
+      expect(File.exists?('fixtures/new/_sv_custom.css')).to eq true
+    end
+
+    after do
+      %w(fixtures/new/_config.yml fixtures/new/index.liquid fixtures/new/_sv_custom.css fixtures/new/_sv_custom.js fixtures/new/_includes/_head.liquid fixtures/new/_layout.liquid).each { |path| clean_file(path) }
+    end
+  end
+end

data/spec/compiler_spec.rb

@@ -1,27 +1,93 @@
 require 'spec_helper'
 
 describe SmallVictories do
+  let(:destination_css) { './fixtures/destination/_sv_custom.css' }
+  let(:destination_js) { './fixtures/destination/_sv_custom.js' }
+  let(:destination_html) { './fixtures/destination/index.html' }
   let(:compiler) { SmallVictories::Compiler.new(config: SmallVictories::Configuration.new) }
 
   before do
-    allow_any_instance_of(SmallVictories::Configuration).to receive(:source).and_return('./spec/fixtures')
-    allow_any_instance_of(SmallVictories::Configuration).to receive(:destination).and_return('./spec/fixtures')
+    allow_any_instance_of(SmallVictories::Configuration).to receive(:source).and_return('./spec/fixtures/source')
+    allow_any_instance_of(SmallVictories::Configuration).to receive(:destination).and_return('./spec/fixtures/destination')
   end
 
   describe '#package' do
     context 'with valid css' do
-      it 'packages the css file' do
+      it 'package the css file' do
         compiler.package
-        expect(File.open('./fixtures/_sv_custom.css').read).to include 'html{background:white}.bootstrap{color:black}body div{background:red}'
-        FileUtils.rm('./fixtures/_sv_custom.css')
+        expect(File.open(destination_css).read).to include '.bootstrap{color:black;box-sizing:content-box}html{background:white}body div{background:red}p{font-size:30px}'
       end
     end
 
-    it 'invalid sass does not generate a file' do
-      allow_any_instance_of(SmallVictories::Configuration).to receive(:source).and_return('./spec/fixtures/invalid')
+    context 'with valid js' do
+      it 'package the js file' do
+        compiler.package
+        expect(File.open(destination_js).read).to include '(function(){alert("hi")}).call(this),console.log("hi");'
+      end
+    end
+  end
+
+  describe '#prefix' do
+    before do
+      FileUtils.cp('fixtures/_sv_custom.css', 'fixtures/destination')
+    end
+
+    it 'prefixes the css file' do
+      compiler.prefix_css
+      expect(File.open(destination_css).read).to include 'html{background:red;-webkit-box-sizing:content-box;box-sizing:content-box}'
+    end
+  end
+
+  describe '#compile_css' do
+    it 'compules and prefixes the css file' do
+      compiler.compile_css
+      expect(File.open(destination_css).read).to include '.bootstrap{color:black;-webkit-box-sizing:content-box;box-sizing:content-box}html{background:white}body div{background:red}p{font-size:30px}'
+    end
+  end
+
+  describe '#compile_js' do
+    it 'compules the js file' do
+      compiler.compile_js
+      expect(File.open(destination_js).read).to include '(function(){alert("hi")}).call(this),console.log("hi");'
+    end
+  end
 
+  describe '#compile_html' do
+    it 'compiles the liquid files' do
+      compiler.compile_html
+      expect(File.open(destination_html).read).to include "<html>\n<h1>Index</h1>\n<p>My snippet</p>\n\n\n</html>"
+    end
+
+    context 'with no layout' do
+      before do
+        allow_any_instance_of(SmallVictories::Configuration).to receive(:layout).and_return('no-file-here')
+      end
+
+      it 'compiles the liquid files' do
+        compiler.compile_html
+        expect(File.open(destination_html).read).to include "<h1>Index</h1>\n<p>My snippet</p>\n\n"
+      end
+    end
+  end
+
+  context 'with invalid files' do
+    before do
+        allow_any_instance_of(SmallVictories::Configuration).to receive(:source).and_return('./spec/fixtures/invalid')
+    end
+
+    it 'does not generate a css file' do
       compiler.package
-      expect(File.exists?('./fixtures/_sv_custom.css')).to eq false
+      expect(File.exists?(destination_css)).to eq false
+    end
+
+    it 'does not package the js file' do
+      compiler.package
+      expect(File.exists?(destination_js)).to eq false
+    end
+
+    it 'shows the error in html' do
+      compiler.compile_html
+      expect(File.open(destination_html).read).to include "<html>\n<h1>Index</h1>\nLiquid error: No such template 'snippet'\n\n</html>"
     end
   end
 end

data/spec/configuration_spec.rb

@@ -16,18 +16,22 @@ describe SmallVictories do
       expect(configuration.stylesheet).to eq '_sv_custom.css'
     end
 
-    it 'defaults to _stylesheets directory' do
-      expect(configuration.stylesheets_dir).to eq '_stylesheets'
+    it 'defaults javascript file' do
+      expect(configuration.javascript).to eq '_sv_custom.js'
     end
 
-    it 'defaults to _javascripts directory' do
-      expect(configuration.javascripts_dir).to eq '_javascripts'
+    it 'defaults layout file' do
+      expect(configuration.layout).to eq '_layout.liquid'
+    end
+
+    it 'defaults includes folder' do
+      expect(configuration.includes).to eq '_includes'
     end
   end
 
   context 'with config file' do
     before do
-      FileUtils.cp('fixtures/_config.yml', './')
+      FileUtils.cp('fixtures/source/_config.yml', './')
     end
 
     it 'reads the source folder' do
@@ -38,24 +42,20 @@ describe SmallVictories do
       expect(configuration.destination).to eq 'my-site-folder'
     end
 
-    it 'reads the _stylesheets directory' do
-      expect(configuration.stylesheets_dir).to eq 'my-sass-folder'
-    end
-
     it 'reads the output css file' do
       expect(configuration.stylesheet).to eq 'my-stylesheet.css'
     end
 
-    it 'reads the _javascripts directory' do
-      expect(configuration.javascripts_dir).to eq 'my-js-folder'
-    end
-
     it 'reads the output js file' do
       expect(configuration.javascript).to eq 'my-javascript.js'
     end
 
-    after do
-      FileUtils.rm('./_config.yml')
+    it 'reads layout file' do
+      expect(configuration.layout).to eq '_my-template.liquid'
+    end
+
+    it 'reads includes folder' do
+      expect(configuration.includes).to eq 'snippets'
     end
   end
 end

data/spec/fixtures/_sv_custom.css

@@ -0,0 +1,4 @@
+html {
+  background: red;
+  box-sizing: content-box;
+}

data/spec/fixtures/invalid/_layout.liquid

@@ -0,0 +1,3 @@
+<html>
+{{content_for_layout}}
+</html>

data/spec/fixtures/invalid/index.html

@@ -0,0 +1,2 @@
+<h1>Index</h1>
+{% include 'snippet' %}

data/spec/fixtures/{_config.yml → source/_config.yml}

@@ -1,6 +1,6 @@
 source: '/my-source-folder/'
 destination: 'my-site-folder/'
-stylesheets_dir: 'my-sass-folder/'
-javascripts_dir: 'my-js-folder/'
 stylesheet: 'my-stylesheet.css'
 javascript: 'my-javascript.js'
+layout: '_my-template.liquid'
+includes: 'snippets'

data/spec/fixtures/source/_includes/_snippet.liquid

@@ -0,0 +1 @@
+<p>My snippet</p>

data/spec/fixtures/source/_javascripts/scripts.coffee

@@ -0,0 +1 @@
+alert 'hi'

data/spec/fixtures/source/_javascripts/scripts.js

@@ -0,0 +1 @@
+console.log('hi');

data/spec/fixtures/source/_layout.liquid

@@ -0,0 +1,3 @@
+<html>
+{{content_for_layout}}
+</html>

data/spec/fixtures/{_stylesheets → source/_stylesheets}/bootstrap.scss

@@ -1,3 +1,4 @@
 .bootstrap {
   color: black;
+  box-sizing: content-box;
 }

data/spec/fixtures/source/_sv_custom.css

@@ -0,0 +1,19 @@
+/* Small Victories Sprockets File
+ *
+ * Any CSS and SCSS file within this directory and your sass directory
+ * can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ * Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+ * about supported directives.
+ *
+ *= require_tree .
+ */
+
+p {
+  font-size: 30px;
+}

data/spec/fixtures/source/_sv_custom.js

@@ -0,0 +1,14 @@
+// Small Victories Sprockets File
+//
+// For more details see
+// https://github.com/rails/sprockets#the-directive-processor
+// Any JavaScript/Coffee file within this directory
+// can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/spec/fixtures/source/index.html

@@ -0,0 +1,2 @@
+<h1>Index</h1>
+{% include 'snippet' %}

data/spec/spec_helper.rb

@@ -7,4 +7,12 @@ RSpec.configure do |config|
   config.before do
     FileUtils.cd File.dirname(__FILE__)
   end
+
+  config.after do
+    %w(./fixtures/destination/_sv_custom.css ./fixtures/destination/_sv_custom.js ./fixtures/destination/index.html ./_config.yml).each { |path| clean_file(path) }
+  end
+end
+
+def clean_file path
+  FileUtils.rm(path) if File.exists?(path)
 end

data/src/config.yml

@@ -0,0 +1,6 @@
+source: ''
+destination: '_site'
+stylesheet: '_sv_custom.css'
+javascript: '_sv_custom.js'
+layout: '_layout.liquid'
+includes: '_includes'

data/src/head.liquid

@@ -0,0 +1,20 @@
+<head>
+  <title></title>
+
+  <meta name="author" content="">
+  <meta name="description" content="">
+
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
+
+  <link rel="stylesheet" href="{{ config.stylesheet }}" />
+
+  <!--[if lt IE 9]>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+</head>

data/src/index.liquid

@@ -0,0 +1 @@
+<h1>Hello World!</h1>

data/src/layout.liquid

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en" class="no-js">
+  {% include 'head' %}
+  <body>
+    {{content_for_layout}}
+    <script type="text/javascript" src="{{ config.javascript }}"></script>
+  </body>
+</html>

data/src/stylesheet.css

@@ -8,6 +8,8 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_self
+ * Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+ * about supported directives.
+ *
  *= require_tree .
  */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smallvictories
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Dijkstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -31,9 +31,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -51,19 +45,69 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ">="
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: autoprefixer-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +165,7 @@ files:
 - Rakefile
 - bin/sv
 - lib/smallvictories.rb
+- lib/smallvictories/builder.rb
 - lib/smallvictories/compiler.rb
 - lib/smallvictories/configuration.rb
 - lib/smallvictories/constants.rb
@@ -128,16 +173,31 @@ files:
 - lib/smallvictories/version.rb
 - lib/smallvictories/watcher.rb
 - smallvictories.gemspec
+- spec/builder_spec.rb
 - spec/compiler_spec.rb
 - spec/configuration_spec.rb
-- spec/fixtures/_config.yml
-- spec/fixtures/_stylesheets/_sv_custom.css
-- spec/fixtures/_stylesheets/bootstrap.scss
-- spec/fixtures/_stylesheets/extra.scss
-- spec/fixtures/_stylesheets/stylesheet.scss
+- spec/fixtures/_sv_custom.css
+- spec/fixtures/destination/.gitkeep
+- spec/fixtures/invalid/_layout.liquid
 - spec/fixtures/invalid/_sass/stylesheet.scss
+- spec/fixtures/invalid/index.html
+- spec/fixtures/source/_config.yml
+- spec/fixtures/source/_includes/_snippet.liquid
+- spec/fixtures/source/_javascripts/scripts.coffee
+- spec/fixtures/source/_javascripts/scripts.js
+- spec/fixtures/source/_layout.liquid
+- spec/fixtures/source/_stylesheets/bootstrap.scss
+- spec/fixtures/source/_stylesheets/extra.scss
+- spec/fixtures/source/_stylesheets/stylesheet.scss
+- spec/fixtures/source/_sv_custom.css
+- spec/fixtures/source/_sv_custom.js
+- spec/fixtures/source/index.html
 - spec/spec_helper.rb
+- src/config.yml
+- src/head.liquid
+- src/index.liquid
 - src/javascript.js
+- src/layout.liquid
 - src/stylesheet.css
 homepage: https://github.com/xxix/smallvictories-gem
 licenses:
@@ -164,12 +224,23 @@ signing_key:
 specification_version: 4
 summary: A command line utility for building websites.
 test_files:
+- spec/builder_spec.rb
 - spec/compiler_spec.rb
 - spec/configuration_spec.rb
-- spec/fixtures/_config.yml
-- spec/fixtures/_stylesheets/_sv_custom.css
-- spec/fixtures/_stylesheets/bootstrap.scss
-- spec/fixtures/_stylesheets/extra.scss
-- spec/fixtures/_stylesheets/stylesheet.scss
+- spec/fixtures/_sv_custom.css
+- spec/fixtures/destination/.gitkeep
+- spec/fixtures/invalid/_layout.liquid
 - spec/fixtures/invalid/_sass/stylesheet.scss
+- spec/fixtures/invalid/index.html
+- spec/fixtures/source/_config.yml
+- spec/fixtures/source/_includes/_snippet.liquid
+- spec/fixtures/source/_javascripts/scripts.coffee
+- spec/fixtures/source/_javascripts/scripts.js
+- spec/fixtures/source/_layout.liquid
+- spec/fixtures/source/_stylesheets/bootstrap.scss
+- spec/fixtures/source/_stylesheets/extra.scss
+- spec/fixtures/source/_stylesheets/stylesheet.scss
+- spec/fixtures/source/_sv_custom.css
+- spec/fixtures/source/_sv_custom.js
+- spec/fixtures/source/index.html
 - spec/spec_helper.rb

data/spec/fixtures/_stylesheets/_sv_custom.css

@@ -1,5 +0,0 @@
-/* Small Victories Sprockets File
- *
- *= require extra
- *= require_tree .
- */