test/test.rb in octopress-ink-1.0.0.alpha.33 vs test/test.rb in octopress-ink-1.0.0.alpha.34

@@ -1,61 +1,70 @@
 require 'colorator'
+require 'find'
+require '../lib/octopress-ink.rb'
 
 @has_failed = false
-@failures = {}
+@failures = []
 
 def pout(str)
   print str
   $stdout.flush
 end
 
-def test(file, dir)
-  if diff = diff_file(file, dir)
-    @failures[file] = diff
-    pout "F".red
-    @has_failed = true
+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
-    pout ".".green
+    @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 #{file} should not exist"
+    @failures << "File #{file} should not exist".red
     pout "F".red
     @has_failed = true
   else
     pout ".".green
   end
 end
 
-def build(config='')
-  config = ['_config.yml'] << config
-  `rm -rf site && bundle exec jekyll build --config #{config.join(',')}`
+def build(options={})
+  config = ['_config.yml'] << options[:config]
+  cmd = "rm -rf site && bundle exec octopress build --config #{config.join(',')}"
+  cmd += " --octopress-config #{options[:octopress_config]}" if options[:octopress_config]
+  `#{cmd}`
 end
 
-def diff_file(file, dir='expected')
-  if File.exist?(Dir.glob("site/#{file}").first)
-    diff = `diff #{dir}/#{file} site/#{file}`
-    if diff.size > 0
-      diff
-    else
-      false
-    end
+def diff_file(file, target_dir='expected', source_dir='site')
+  diff = `diff #{target_dir}/#{file} #{source_dir}/#{file}`
+  if diff =~ /(<.+?\n)?(---\n)?(>.+)/
+    @failures << <<-DIFF
+Failure in #{file}
+---------
+#{($1||'').red + $3.green}
+---------
+DIFF
   else
-    "File: site/#{file}: No such file or directory."
+    false
   end
 end
 
-build
-
 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", dir) }
+  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) }
@@ -74,60 +83,101 @@
 def test_configs(dir)
   configs = %w{plugin_config theme_config}
   configs.each { |file| test("test_config/#{file}.html", dir) }
 end
 
-def test_stylesheets(dir, concat_css=true)
-  if concat_css
+def test_stylesheets(dir, concat=true)
+  if concat
     stylesheets = %w{all-* print-*}
     stylesheets.each { |file| test("stylesheets/#{file}.css", dir) }
   else
     local_stylesheets = %w{site test}
     local_stylesheets.each { |file| test("stylesheets/#{file}.css", dir) }
 
     plugin_stylesheets = %w{plugin-media-test plugin-test}
-    plugin_stylesheets.each { |file| test("awesome-sauce/stylesheets/#{file}.css", dir) }
+    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("theme/stylesheets/#{file}.css", dir) }
+    theme_stylesheets.each { |file| test("stylesheets/theme/#{file}.css", dir) }
   end
 end
 
+def test_javascripts(dir, concat=true)
+  if concat
+    javascripts = %w{all-*}
+    javascripts.each { |file| test("javascripts/#{file}.js", dir) }
+  else
+    javascripts = %w{bar foo}
+    javascripts.each { |file| test("javascripts/theme/#{file}.js", dir) }
+    test("javascripts/site.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 |name, diff|
-      puts "Failure in #{name}:".red
-      puts "---------"
-      puts diff
-      puts "---------"
+    @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('concat_css')
+test_javascripts('concat_js')
 test_configs('expected')
 test_root_assets('expected')
 
-build '_concat_css_false.yml'
+Octopress::Ink.copy_plugin_assets('theme', '_copy', {'force'=> true})
+test_copy_assets('copy_test')
+
+Octopress::Ink.copy_plugin_assets('theme', '_copy', {'force'=> true, 'layouts' => true, 'pages' => true})
+test_copy_assets('copy_layouts_pages')
+
+build octopress_config: '_concat_false.yml'
 test_stylesheets('concat_css_false', false)
+test_javascripts('concat_js_false', false)
+#test_disabled('site')
 
-build '_sass_compact.yml'
-test_stylesheets('sass_compact')
+#build config: '_sass_compact.yml'
+#test_stylesheets('sass_compact')
 
-build '_sass_expanded.yml'
-test_stylesheets('sass_expanded')
+#build config: '_sass_expanded.yml'
+#test_stylesheets('sass_expanded')
 
 print_failures