octopress-ink 1.0.0.alpha.45 → 1.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93de0d96c0c1233b369f703f42e9c5232f6fa122
-  data.tar.gz: 64f81451f17f6c13c9bc614d9996103ba7723a68
+  metadata.gz: e7aaa5bcf89c2f4ee26fe475db4657f9abadf369
+  data.tar.gz: 500a1709b5f6561e18231ea43ac3a69c0c671f59
 SHA512:
-  metadata.gz: 1e2db0a926b6b38952e84f2bf03e873cc1e8826710aed7f0908962f9585ebde1d5ec9025341f4bcf2ab0579933bae79c04e7b0bb84c48349a956b09b85ebdb7d
-  data.tar.gz: 6be1640d06425163015188be229496775d3b31e25258595acaf95028d940aacb4face70c80ccb4e880ad295d96454900419865d60f7d054dd7fceb390ef3c87e
+  metadata.gz: e71e8686034c36d30d288e8be98cdcee95eee9b762ac946a1dbb5679627216ddcf8626a3f6ff175fcb5df78dc120318c2e3dd02c6f0d285d7a8920e18cf92933
+  data.tar.gz: b4135e91764ec41e747e8b514ea22dfa92408045ee35c2c5bc5df8c12f4fbaaa93471707a499628f8443318fccd47670abaf0c76827a43c6828803352cfdbd02

data/assets/docs/plugin-reference.markdown

@@ -19,4 +19,4 @@ The configuration options are as follows:
 
 ### Plugin Assets
 
-You can set `assets_path` to point wherever you like insde your gem file, but in this case we have it pointing to the `assets` directiory in root of the gem. There isn't a directory there yet, so we'll need to add one, and while were at it, add any assets that this plugin will need.
+You can set `assets_path` to point wherever you like inside your gem file, but in this case we have it pointing to the `assets` directory in root of the gem. There isn't a directory there yet, so we'll need to add one, and while were at it, add any assets that this plugin will need.

data/lib/octopress-ink.rb

@@ -1,5 +1,6 @@
 require 'jekyll'
 require 'sass'
+require 'uglifier'
 require 'autoprefixer-rails'
 require 'digest/md5'
 

data/lib/octopress-ink/assets/coffeescript.rb

@@ -6,6 +6,11 @@ module Octopress
           @compiled ||= compile
         end
 
+        def add
+          Plugins.add_js_tag tag
+          Plugins.static_files << StaticFileContent.new(read, destination)
+        end
+
         private
 
         def compile

data/lib/octopress-ink/assets/sass.rb

@@ -21,6 +21,13 @@ module Octopress
           @compiled ||= compile
         end
 
+        def add
+          unless file =~ /^_/
+            Plugins.add_css_tag tag
+            Plugins.static_files << StaticFileContent.new(read, destination)
+          end
+        end
+
         def content
           render
         end

data/lib/octopress-ink/configuration.rb

@@ -10,12 +10,15 @@ module Octopress
         'compress_css' => true,
         'combine_js' => true,
         'compress_js' => true,
+        'uglifier' => {},
         'disable' => [],
         'date_format' => 'ordinal',
+
         'linkpost' => {
           'marker' => "→",
           'marker_position' => 'after'
         },
+
         'post' => {
           'marker' => false,
           'marker_position' => 'before'

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -7,6 +7,7 @@ module Octopress
       def self.compile_css(content)
         configs = sass_converter.sass_configs
         configs[:syntax] = :scss
+        configs[:style] = :compressed if Ink.config['compress_css']
 
         Sass.compile(content, configs)
       end
@@ -155,7 +156,13 @@ module Octopress
 
       def self.write_combined_javascript
         js = combine_javascripts
-        write_files(js, combined_javascript_path) unless js == ''
+        unless js == ''
+          if Ink.config['compress_js']
+            settings = Jekyll::Utils.symbolize_hash_keys(Ink.config['uglifier'])
+            js = Uglifier.new(settings).compile(js)
+          end
+          write_files(js, combined_javascript_path)
+        end
       end
 
       def self.write_files(source, dest)
@@ -163,6 +170,7 @@ module Octopress
       end
 
       def self.fingerprint(paths)
+        return '' if ENV['JEKYLL_ENV'] == 'test'
         paths = [paths] unless paths.is_a? Array
         Digest::MD5.hexdigest(paths.clone.map! { |path| "#{File.mtime(path).to_i}" }.join)
       end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.45"
+    VERSION = "1.0.0.rc.1"
   end
 end

data/octopress-ink.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "jekyll", "~> 2.0"
+  spec.add_runtime_dependency "uglifier", "~> 2.5"
   spec.add_runtime_dependency "autoprefixer-rails", "~> 1.1", ">= 1.1.20140403"
 
   spec.add_development_dependency "octopress"

data/test/_combine_false.yml

@@ -1,4 +1,4 @@
 combine_css: false
 combine_js: false
 compress_css: false
-compress_js: false
+uglify_js: false

data/test/_compress_false.yml

@@ -0,0 +1,2 @@
+compress_css: false
+compress_js: false

data/test/combine_css_false/stylesheets/theme/main.css

@@ -0,0 +1,2 @@
+body {
+  background: black; }

data/test/combine_js_false/javascripts/theme/blah.js

@@ -0,0 +1,4 @@
+(function() {
+  console.log('dang');
+
+}).call(this);

data/test/copy_test/_copy/config.yml

@@ -0,0 +1,2 @@
+test: config from theme
+test_override: also config from theme

data/test/copy_test/_copy/files/test.html

@@ -0,0 +1 @@
+<strong>testing theme/files assets</strong>

data/test/copy_test/_copy/javascripts/blah.coffee

@@ -0,0 +1 @@
+console.log 'dang'

data/test/copy_test/_copy/stylesheets/_colors.scss

@@ -0,0 +1 @@
+$bg: white;

data/test/expected/index.html

@@ -26,6 +26,8 @@
 <li>combine_css</li>
 <li>combine_js</li>
 </ul>
+
+<p>one <span class='separator'></b> two <span class='separator'></b> three <span class='separator'></b> four five</p>
 </div>
 
   </body>

data/test/expected/javascripts/all-.js

@@ -0,0 +1 @@
+console.log("bar"),console.log("omg")(function(){console.log("dang")}).call(this);

data/test/expected/stylesheets/all-.css

@@ -0,0 +1 @@
+body{margin:2px;padding:2px}.main{color:#444}body{background:black}.plugin-widget{background:red;color:#fff}

data/test/expected/stylesheets/print-.css

@@ -0,0 +1 @@
+*{background:none;color:#000}article a:after{content:attr(href)}

data/test/expected/test.html

@@ -0,0 +1 @@
+<strong>testing theme/files assets</strong>

data/test/expected/test_layouts/test_markdown.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title></title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <p><strong>strong</strong> <em>emphasized</em> <a href="http://example.com">a link</a></p>
+
+  </body>
+</html>

data/test/expected/test_tags/return.html

@@ -0,0 +1,23 @@
+
+
+## Simple return
+bar → bar
+
+## Conditional return
+bar → bar
+'' → ''
+
+## Ternary return
+nope → nope
+
+## Cascading return
+nope → nope
+bar → bar
+
+## Test local variables
+yep → yep
+
+## Returns with filters
+2013-07-21T18:59:00-05:00 → 2013-07-21T18:59:00-05:00
+2013-07-21T18:59:00-05:00 → 2013-07-21T18:59:00-05:00
+

data/test/plugins/test-theme/files/test.html

@@ -1 +1 @@
-<strong>test</strong>
+<strong>testing theme/files assets</strong>

data/test/test.rb

@@ -1,175 +1,72 @@
-require 'colorator'
-require 'find'
-require '../lib/octopress-ink.rb'
+require './test_suite'
+ENV['JEKYLL_ENV'] = 'test'
 
-@has_failed = false
 @failures = []
 
-def pout(str)
-  print str
-  $stdout.flush
-end
-
-def test(file, target_dir, source_dir="site")
-  site_file = Dir.glob("#{source_dir}/#{file}").first
-  if site_file && File.exist?(site_file)
-    if diff_file(file, target_dir, source_dir)
-      pout "F".red
-      @has_failed = true
-    else
-      pout ".".green
-    end
-  else
-    @failures << "File: #{source_dir}/#{file}: No such file or directory."
-    @has_failed = true
-    pout "F".red
-  end
-end
-
-def test_missing(file, dir)
-  if File.exist? File.join dir, file 
-    @failures << "File #{file} should not exist".red
-    pout "F".red
-    @has_failed = true
-  else
-    pout ".".green
-  end
-end
-
-def build(options={})
-  config = ['_config.yml'] << options[:config]
-  cmd = "rm -rf site && bundle exec jekyll build --config #{config.join(',')}"
-  #cmd += " --octopress-config #{options[:octopress_config]}" if options[:octopress_config]
-  if options[:octopress_config]
-    FileUtils.cp options[:octopress_config], '_octopress.yml'
-  end
-  `#{cmd}`
-  `rm _octopress.yml`
-end
-
-def diff_file(file, target_dir='expected', source_dir='site')
-  diff = `diff #{target_dir}/#{file} #{source_dir}/#{file}`
-  if diff.size > 0
-    @failures << <<-DIFF
-Failure in #{file}
----------
-#{diff.gsub(/\A.+?\n/,'').gsub(/^(<.+?)$/){|m| m.red}.gsub(/>.+/){|m| m.green}}
----------
-DIFF
-  else
-    false
-  end
-end
-
-def test_tags(dir)
-  tags = %w{content_for abort_false include assign capture wrap render filter}
-  tags.each { |file| test("test_tags/#{file}.html", dir) }
-
-  tags = %w{abort_true, abort_posts}
-  tags.each { |file| test_missing("test_tags/#{file}.html", 'site') }
-end
-
-def test_pages(dir)
-  pages = %w{plugin_page plugin_page_override theme_page three}
-  pages.each { |file| test("test_pages/#{file}.html", dir) }
-  test("test_pages/feed/index.xml", dir)
-end
-
-def test_post(dir)
-  test("2014/02/01/test-post.html", dir)
-end
-
-def test_layouts(dir)
-  layouts = %w{local plugin_layout theme theme_override}
-  layouts.each { |file| test("test_layouts/#{file}.html", dir) }
-end
-
-def test_configs(dir)
-  configs = %w{plugin_config theme_config}
-  configs.each { |file| test("test_config/#{file}.html", dir) }
-end
-
-def test_stylesheets(dir, combine=true)
-  if combine
-    stylesheets = %w{all-* print-*}
-    stylesheets.each { |file| test("stylesheets/#{file}.css", dir) }
-  else
-    plugin_stylesheets = %w{plugin-media-test plugin-test}
-    plugin_stylesheets.each { |file| test("stylesheets/awesome-sauce/#{file}.css", dir) }
-
-    theme_stylesheets = %w{theme-media-test theme-test theme-test2}
-    theme_stylesheets.each { |file| test("stylesheets/theme/#{file}.css", dir) }
-  end
-end
-
-def test_javascripts(dir, combine=true)
-  if combine
-    javascripts = %w{all-*}
-    javascripts.each { |file| test("javascripts/#{file}.js", dir) }
-  else
-    %w{bar foo}.each { |file| test("javascripts/theme/#{file}.js", dir) }
-  end
-end
-
-def test_root_assets(dir)
-  root_assets = %w{favicon.ico favicon.png robots.txt}
-  root_assets.each { |file| test(file, dir) }
-end
-
-def test_copy_assets(dir)
-  Find.find("#{dir}/_copy") do |file|
-    unless File.directory? file
-      test(file.sub("#{dir}"+"/", ''), dir, 'source')
-    end
-  end
-  `rm -rf source/_copy`
-end
-
-def test_disabled(dir)
-  files = %w{
-    stylesheets/theme/disable-this.css
-    stylesheets/theme/disable.css
-    disable-test.html
-    test_pages/disable-test.html
-    javascripts/disable-this.js
-    fonts/font-one.otf
-    fonts/font-two.ttf
-  }
-  files.each { |file| test_missing(file, dir) }
-end
-
-def print_failures
-  puts "\n"
-  if @has_failed
-    @failures.each do |failure|
-      puts failure
-    end
-    abort
-  else
-    puts "All passed!".green
-  end
-end
-
 build
 
-test_post('expected')
-test_tags('expected')
-test_pages('expected')
-test_layouts('expected')
-test_stylesheets('combine_css')
-test_javascripts('combine_js')
-test_configs('expected')
-test_root_assets('expected')
-test_disabled('site')
-
-system "octopress ink copy theme --path _copy --force"
-test_copy_assets('copy_test')
-
-system "octopress ink copy theme --layouts --pages --path _copy --force"
-test_copy_assets('copy_layouts_pages')
-
-build octopress_config: '_combine_false.yml'
-test_stylesheets('combine_css_false', false)
-test_javascripts('combine_js_false', false)
-
-print_failures
+test_dirs('Site build', 'site', 'expected')
+
+build({octopress_config: '_combine_false.yml'})
+
+test_dirs("Don't combine CSS", 'site/stylesheets', 'combine_css_false/stylesheets')
+test_dirs("Don't combine JS", 'site/javascripts', 'combine_js_false/javascripts')
+
+build({octopress_config: '_compress_false.yml'})
+
+test_dirs("Don't compress JS", 'site/javascripts', 'compress_false/javascripts')
+test_dirs("Don't compress CSS", 'site/stylesheets', 'compress_false/stylesheets')
+
+test_cmd({
+  desc: 'Copy all theme assets',
+  cmd: 'octopress ink copy theme --path _copy --force',
+  expect: 'Copied files:
++ source/_copy/layouts/default.html
++ source/_copy/layouts/test.html
++ source/_copy/includes/bar.html
++ source/_copy/includes/greet.html
++ source/_copy/pages/disable-test.html
++ source/_copy/pages/four.xml
++ source/_copy/pages/one.xml
++ source/_copy/pages/three.md
++ source/_copy/pages/two.md
++ source/_copy/stylesheets/_colors.scss
++ source/_copy/stylesheets/disable.sass
++ source/_copy/stylesheets/main.scss
++ source/_copy/stylesheets/disable-this.css
++ source/_copy/stylesheets/theme-media-test@print.css
++ source/_copy/stylesheets/theme-test.css
++ source/_copy/stylesheets/theme-test2.css
++ source/_copy/javascripts/bar.js
++ source/_copy/javascripts/disable-this.js
++ source/_copy/javascripts/foo.js
++ source/_copy/javascripts/blah.coffee
++ source/_copy/fonts/font-one.otf
++ source/_copy/fonts/font-two.ttf
++ source/_copy/files/disabled-file.txt
++ source/_copy/files/favicon.ico
++ source/_copy/files/favicon.png
++ source/_copy/files/test.html
++ source/_copy/config.yml'
+})
+
+test_dirs('Copy theme', 'source/_copy', 'copy_test/_copy')
+`rm -rf source/_copy`
+
+test_cmd({
+  desc: 'Copy theme layouts and pages',
+  cmd: 'octopress ink copy theme --layouts --pages --path _copy --force',
+  expect: 'Copied files:
++ source/_copy/layouts/default.html
++ source/_copy/layouts/test.html
++ source/_copy/pages/disable-test.html
++ source/_copy/pages/four.xml
++ source/_copy/pages/one.xml
++ source/_copy/pages/three.md
++ source/_copy/pages/two.md'
+})
+
+test_dirs('Copy theme', 'source/_copy', 'copy_layouts_pages/_copy')
+`rm -rf source/_copy`
+
+print_results

data/test/test_suite.rb

@@ -0,0 +1,161 @@
+require 'colorator'
+require 'find'
+
+# This is a makeshift integration test-suite.
+# It is unapologetically pragmatic.
+
+
+# Build Jekyll
+#
+def build(options={})
+  if options[:octopress_config]
+    FileUtils.cp options[:octopress_config], '_octopress.yml'
+  end
+
+  config = ['_config.yml'] << options[:config]
+  cmd = "rm -rf site && bundle exec jekyll build --config #{config.join(',')}"
+
+  `#{cmd}`
+  `rm _octopress.yml` if options[:octopress_config]
+end
+
+
+# Find all files in a given directory
+#
+def dir_files(dir)
+  Find.find(dir).to_a.reject!{|f| File.directory?(f) }
+end
+
+# Recursively diff two directories
+#
+# This will walk through dir1 and diff matching paths in dir2
+#
+def test_dirs(desc, dir1, dir2)
+
+  test_missing_files(desc, dir1, dir2)
+
+  dir_files(dir1).each do |file|
+    file2 = file.sub(dir1, dir2)
+    if File.exist?(file2)
+      if diff = diff_file(file, file2)
+        @failures << {
+          desc: "#{desc}\nDiff of file: #{file.sub(dir1+'/', '')}\n",
+          result: format_diff(diff)
+        }
+        pout 'F'.red
+      else
+        pout '.'.green
+      end
+    end
+  end
+end
+
+def format_diff(diff)
+  "#{diff.gsub(/\A.+?\n/,'').gsub(/^[^><].+/,'---').gsub(/^>.+/){|m| 
+    m.green
+  }.gsub(/^(<.+?)$/){ |m| 
+    m.red
+  }}"
+end
+
+# List differences between files in two directories
+#
+def test_missing_files(desc, dir1, dir2)
+  files1 = dir_files(dir1).map {|f| f.sub(dir1,'') }
+  files2 = dir_files(dir2).map {|f| f.sub(dir2,'') }
+
+  missing = []
+
+  (files2 - files1).each do |file|
+    missing << File.join(dir1, file)
+  end
+
+  (files1 - files2).each do |file|
+    missing << File.join(dir2, file)
+  end
+
+  if !missing.empty?
+    @failures << {
+      desc: "#{desc}\nMissing files:\n",
+      result: " - " + missing.join("\n - ")
+    }
+
+    pout 'F'.red
+  else
+    pout '.'.green
+  end
+end
+
+# Diff two files
+#
+def diff_file(file1, file2)
+  diff = `diff #{file1} #{file2}`
+  if diff.size > 0
+    diff
+  else
+    false
+  end
+end
+
+# Test command output
+#
+# Input: options hash, format:
+#   {
+#     desc:   description of task
+#     cmd:    system command to be run, (String or Array)
+#     expect: expected output from command
+#   } 
+#
+def test_cmd(options)
+  if cmd = options[:cmd]
+    cmd = [cmd] unless cmd.is_a? Array
+
+    # In debug mode command output is printed
+    #
+    if options[:debug]
+      system cmd.join('; ')
+    else
+      output = `#{cmd.join('; ')}`.gsub(/#{Dir.pwd}\/*/,'').strip
+
+      # Remove character color codes
+      output = output.gsub("\e",'').gsub(/\[\d+m/,'').gsub("\[0m",'')
+    end
+    if options[:expect] && options[:expect].strip == output
+      pout '.'.green
+    else
+      pout 'F'.red
+      @failures << {
+        desc: options[:desc]+"\n",
+        result: <<-HERE
+expected: #{(options[:expect] || '').strip.green}
+result: #{(output || '').strip.red}
+HERE
+      }
+    end
+  end
+end
+
+
+# Print a single character without a newline
+#
+def pout(str)
+  print str
+  $stdout.flush
+end
+
+# Ouptut nicely formatted failure messages
+#
+def print_results
+  if !@failures.empty?
+    @failures.each do |test|
+      pout "\nFailed: #{test[:desc]}"
+      puts test[:result]
+      # print a newline for easier reading
+      puts ""
+    end
+    abort
+  else
+    puts "All passed!".green
+  end
+end
+

data/test/uglify_js_false/javascripts/all-.js

@@ -0,0 +1,7 @@
+/* Theme: Classic Theme */
+console.log('bar')
+console.log('omg')
+(function() {
+  console.log('dang');
+
+}).call(this);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.45
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -173,21 +187,20 @@ files:
 - octopress-ink.gemspec
 - test/Gemfile
 - test/_combine_false.yml
+- test/_compress_false.yml
 - test/_config.yml
-- test/combine_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
-- test/combine_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/combine_css_false/stylesheets/awesome-sauce/plugin-media-test.css
 - test/combine_css_false/stylesheets/awesome-sauce/plugin-test.css
-- test/combine_css_false/stylesheets/site.css
-- test/combine_css_false/stylesheets/test.css
+- test/combine_css_false/stylesheets/theme/main.css
 - test/combine_css_false/stylesheets/theme/theme-media-test.css
 - test/combine_css_false/stylesheets/theme/theme-test.css
 - test/combine_css_false/stylesheets/theme/theme-test2.css
-- test/combine_js/javascripts/all-d41d8cd98f00b204e9800998ecf8427e.js
-- test/combine_js_false/javascripts/site.js
-- test/combine_js_false/javascripts/test.js
 - test/combine_js_false/javascripts/theme/bar.js
+- test/combine_js_false/javascripts/theme/blah.js
 - test/combine_js_false/javascripts/theme/foo.js
+- test/compress_false/javascripts/all-.js
+- test/compress_false/stylesheets/all-.css
+- test/compress_false/stylesheets/print-.css
 - test/copy_layouts_pages/_copy/layouts/default.html
 - test/copy_layouts_pages/_copy/layouts/test.html
 - test/copy_layouts_pages/_copy/pages/disable-test.html
@@ -195,14 +208,17 @@ files:
 - test/copy_layouts_pages/_copy/pages/one.xml
 - test/copy_layouts_pages/_copy/pages/three.md
 - test/copy_layouts_pages/_copy/pages/two.md
+- test/copy_test/_copy/config.yml
 - test/copy_test/_copy/files/disabled-file.txt
 - test/copy_test/_copy/files/favicon.ico
 - test/copy_test/_copy/files/favicon.png
+- test/copy_test/_copy/files/test.html
 - test/copy_test/_copy/fonts/font-one.otf
 - test/copy_test/_copy/fonts/font-two.ttf
 - test/copy_test/_copy/includes/bar.html
 - test/copy_test/_copy/includes/greet.html
 - test/copy_test/_copy/javascripts/bar.js
+- test/copy_test/_copy/javascripts/blah.coffee
 - test/copy_test/_copy/javascripts/disable-this.js
 - test/copy_test/_copy/javascripts/foo.js
 - test/copy_test/_copy/layouts/default.html
@@ -212,6 +228,7 @@ files:
 - test/copy_test/_copy/pages/one.xml
 - test/copy_test/_copy/pages/three.md
 - test/copy_test/_copy/pages/two.md
+- test/copy_test/_copy/stylesheets/_colors.scss
 - test/copy_test/_copy/stylesheets/disable-this.css
 - test/copy_test/_copy/stylesheets/disable.sass
 - test/copy_test/_copy/stylesheets/main.scss
@@ -223,11 +240,16 @@ files:
 - test/expected/favicon.png
 - test/expected/four/index.xml
 - test/expected/index.html
+- test/expected/javascripts/all-.js
 - test/expected/robots.txt
+- test/expected/stylesheets/all-.css
+- test/expected/stylesheets/print-.css
+- test/expected/test.html
 - test/expected/test_config/plugin_config.html
 - test/expected/test_config/theme_config.html
 - test/expected/test_layouts/local.html
 - test/expected/test_layouts/plugin_layout.html
+- test/expected/test_layouts/test_markdown.html
 - test/expected/test_layouts/theme.html
 - test/expected/test_layouts/theme_override.html
 - test/expected/test_pages/feed/index.xml
@@ -242,6 +264,7 @@ files:
 - test/expected/test_tags/filter.html
 - test/expected/test_tags/include.html
 - test/expected/test_tags/render.html
+- test/expected/test_tags/return.html
 - test/expected/test_tags/wrap.html
 - test/plugins/awesome-sauce/config.yml
 - test/plugins/awesome-sauce/docs/index.html
@@ -318,6 +341,8 @@ files:
 - test/source/test_tags/return.html
 - test/source/test_tags/wrap.html
 - test/test.rb
+- test/test_suite.rb
+- test/uglify_js_false/javascripts/all-.js
 homepage: https://github.com/octopress/ink
 licenses:
 - MIT
@@ -345,21 +370,20 @@ summary: A starting point for creating gem-based Jekyll themes and plugins
 test_files:
 - test/Gemfile
 - test/_combine_false.yml
+- test/_compress_false.yml
 - test/_config.yml
-- test/combine_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
-- test/combine_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/combine_css_false/stylesheets/awesome-sauce/plugin-media-test.css
 - test/combine_css_false/stylesheets/awesome-sauce/plugin-test.css
-- test/combine_css_false/stylesheets/site.css
-- test/combine_css_false/stylesheets/test.css
+- test/combine_css_false/stylesheets/theme/main.css
 - test/combine_css_false/stylesheets/theme/theme-media-test.css
 - test/combine_css_false/stylesheets/theme/theme-test.css
 - test/combine_css_false/stylesheets/theme/theme-test2.css
-- test/combine_js/javascripts/all-d41d8cd98f00b204e9800998ecf8427e.js
-- test/combine_js_false/javascripts/site.js
-- test/combine_js_false/javascripts/test.js
 - test/combine_js_false/javascripts/theme/bar.js
+- test/combine_js_false/javascripts/theme/blah.js
 - test/combine_js_false/javascripts/theme/foo.js
+- test/compress_false/javascripts/all-.js
+- test/compress_false/stylesheets/all-.css
+- test/compress_false/stylesheets/print-.css
 - test/copy_layouts_pages/_copy/layouts/default.html
 - test/copy_layouts_pages/_copy/layouts/test.html
 - test/copy_layouts_pages/_copy/pages/disable-test.html
@@ -367,14 +391,17 @@ test_files:
 - test/copy_layouts_pages/_copy/pages/one.xml
 - test/copy_layouts_pages/_copy/pages/three.md
 - test/copy_layouts_pages/_copy/pages/two.md
+- test/copy_test/_copy/config.yml
 - test/copy_test/_copy/files/disabled-file.txt
 - test/copy_test/_copy/files/favicon.ico
 - test/copy_test/_copy/files/favicon.png
+- test/copy_test/_copy/files/test.html
 - test/copy_test/_copy/fonts/font-one.otf
 - test/copy_test/_copy/fonts/font-two.ttf
 - test/copy_test/_copy/includes/bar.html
 - test/copy_test/_copy/includes/greet.html
 - test/copy_test/_copy/javascripts/bar.js
+- test/copy_test/_copy/javascripts/blah.coffee
 - test/copy_test/_copy/javascripts/disable-this.js
 - test/copy_test/_copy/javascripts/foo.js
 - test/copy_test/_copy/layouts/default.html
@@ -384,6 +411,7 @@ test_files:
 - test/copy_test/_copy/pages/one.xml
 - test/copy_test/_copy/pages/three.md
 - test/copy_test/_copy/pages/two.md
+- test/copy_test/_copy/stylesheets/_colors.scss
 - test/copy_test/_copy/stylesheets/disable-this.css
 - test/copy_test/_copy/stylesheets/disable.sass
 - test/copy_test/_copy/stylesheets/main.scss
@@ -395,11 +423,16 @@ test_files:
 - test/expected/favicon.png
 - test/expected/four/index.xml
 - test/expected/index.html
+- test/expected/javascripts/all-.js
 - test/expected/robots.txt
+- test/expected/stylesheets/all-.css
+- test/expected/stylesheets/print-.css
+- test/expected/test.html
 - test/expected/test_config/plugin_config.html
 - test/expected/test_config/theme_config.html
 - test/expected/test_layouts/local.html
 - test/expected/test_layouts/plugin_layout.html
+- test/expected/test_layouts/test_markdown.html
 - test/expected/test_layouts/theme.html
 - test/expected/test_layouts/theme_override.html
 - test/expected/test_pages/feed/index.xml
@@ -414,6 +447,7 @@ test_files:
 - test/expected/test_tags/filter.html
 - test/expected/test_tags/include.html
 - test/expected/test_tags/render.html
+- test/expected/test_tags/return.html
 - test/expected/test_tags/wrap.html
 - test/plugins/awesome-sauce/config.yml
 - test/plugins/awesome-sauce/docs/index.html
@@ -490,3 +524,5 @@ test_files:
 - test/source/test_tags/return.html
 - test/source/test_tags/wrap.html
 - test/test.rb
+- test/test_suite.rb
+- test/uglify_js_false/javascripts/all-.js

data/test/combine_css_false/stylesheets/site.css

@@ -1 +0,0 @@
-body{display:table}body{background:#aaa111}div{display:table}

data/test/combine_css_false/stylesheets/test.css

@@ -1 +0,0 @@
-.css-plugin { background: #fed; }

data/test/combine_js_false/javascripts/site.js

@@ -1 +0,0 @@
-console.log('local js')

data/test/combine_js_false/javascripts/test.js

@@ -1,10 +0,0 @@
-(function() {
-  var num, _i, _len, _ref;
-
-  _ref = [1, 2, 3];
-  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-    num = _ref[_i];
-    console.log(num);
-  }
-
-}).call(this);