octopress-ink 1.0.0.rc.11 → 1.0.0.rc.13

data/test/test-plugin-expected/demo/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-group :octopress do
-  gem 'octopress'
-  gem 'test-plugin', path: '../'
-end

data/test/test-theme-expected/demo/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-group :octopress do
-  gem 'octopress'
-  gem 'test-theme', path: '../'
-end

data/test/test.rb

@@ -1,110 +0,0 @@
-require './test_suite'
-ENV['JEKYLL_ENV'] = 'test'
-
-@failures = []
-@git_user_name = `git config user.name`.chomp
-@git_user_email = `git config user.email`.chomp
-
-build
-
-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`
-
-`git config user.name ''`
-`git config user.email ''`
-
-test_cmd({
-  desc: 'New plugin',
-  cmd: [
-    'octopress ink new test-plugin',
-    'rm -rf test-plugin/.git'
-  ]
-})
-
-`git config user.name "#{@git_user_name}"`
-`git config user.email #{@git_user_email}`
-
-test_dirs('New plugin', 'test-plugin', 'test-plugin-expected')
-
-`rm -rf test-plugin`
-
-`git config user.name ''`
-`git config user.email ''`
-
-test_cmd({
-  desc: 'New Theme',
-  cmd: [
-    'octopress ink new test-theme --theme',
-    'rm -rf test-theme/.git'
-  ]
-})
-
-`git config user.name "#{@git_user_name}"`
-`git config user.email #{@git_user_email}`
-
-test_dirs('New plugin', 'test-theme', 'test-theme-expected')
-
-`rm -rf test-theme`
-
-print_results

data/test/test_suite.rb

@@ -1,161 +0,0 @@
-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
-    elsif options[:expect]
-      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
-