clash 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a969d31ec8e0bcf1c77d5e833a0c26c64d64943
-  data.tar.gz: 74eb10c9644a5dd2fbcfe0850bdfa535cb669ed8
+  metadata.gz: 13ac19a35a839e89433534afd9ad62d50043423a
+  data.tar.gz: 850cef298bfd22ed9a9890473b1397da86a15e23
 SHA512:
-  metadata.gz: aa5e1e84f305381673abfbb14796d040306910af540af05439eee4a21d85dd75afaa8c6e549ef9457043f67b1d2bfe579394714676196f3f852d68d05ce9ce7c
-  data.tar.gz: 7a312c1e095626a8a984cac7503340c0e46376656bb4a3e92b12bd44522c6ca76ac3d6f8ec83930460a24d568110e72693a8736ce4936e6bfe696a7e4f1a1ec6
+  metadata.gz: eebbea76d8eae56c606b4e78eb48603a3b7a7ead4ed2a7720b91bc325ff9e11f7279bd7c2f0e5782638e1a8f235d3056987fa11f654e316d87a7886bd5945a1c
+  data.tar.gz: 3d157c408778103392fc5d50062e607cf1a330e3b8181edf2d2c24d1cdfb0b72d39b1983e0656ddf5a5f2b026122af862ed8a76f07708d6216048a32c5ecbf1f

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+_site
+_output

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+script: cd test && bundle exec ruby test.rb

data/README.md

@@ -2,6 +2,10 @@
 
 Clash is a diff based testing framework for static sites.
 
+[![Build Status](https://travis-ci.org/imathis/clash.svg)](https://travis-ci.org/imathis/clash)
+[![Gem Version](http://img.shields.io/gem/v/clash.svg)](https://rubygems.org/gems/clash)
+[![License](http://img.shields.io/:license-mit-blue.svg)](http://imathis.mit-license.org)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/bin/clash

@@ -7,111 +7,59 @@ require 'optparse'
 
 options = {}
 
-OptionParser.new do |opts|
-  opts.banner = "Usage: clash [options]"
-
-  opts.on("-f FILE", "--file FILE", "Set test file (default: .clash.yml).") do |f|
-    options[:file] = f
-  end
-
-  opts.on("-c", "--context NUMBER", Integer, "Number of lines of context on a diff") do |context|
-    options[:context] = context
-  end
-
-  opts.on("-h", "--help", "Show help message") do |h|
-    options[:help] = h
-  end
-
-end.parse!
-
-if !ARGV.empty?
-  # Parse input `clash 1 2 3` and `clash 1,2,3` the same
-  #
-  options[:only] = ARGV.join(',').split(',').map{ |n| n.to_i }
-end
-
-if options[:help]
-  puts <<-HELP
+banner = <<-BANNER
 clash #{Clash::VERSION} -- Clash is a diff based testing suite for static sites.
 
 Usage:
 
-  clash [test(s)] [options]
+  clash [tests] [options]
 
   To run only specific tests, pass test numbers separated by commas.
 
-    `clash 1`   # run only the first test
-    `clash 2,3` # run the second and third tests
+    $ clash 1     # run only the first test
+    $ clash 2,3   # run the second and third tests
 
 Options:
-  
-  -f, --file    FILE      Use a specific test file (default: .clash.yml)
-  -c, --context NUMBER    On diff errors, show NUMBER of lines of surrounding context (default: 2)
-  -h, --help              show this message
-
-Configuration:
-  
-  Clash reads its configuration from a .clash.yml file in the root of your project. Use the --file
-  option to choose a different configuration file.
-
-  Simple configuration:
-  Clash will build the site with Jekyll, and compare the contents of _site/ to expected/.
-
-    build: true
-    compare: _site, expected
-
-  Full configuration:
-
-  | Option           | Type           | Description                                              |
-  |:-----------------|:---------------|:---------------------------------------------------------|
-  | before           | String/Array   | Run system command(s) before running tests.              |
-  | build            | Boolean        | Build the site with Jekyll.                              |
-  | config           | Hash           | Configure Jekyll, Octopress or Ink plugins. (Info below) |
-  | compare          | String/Array   | Compare files or directories. e.g. "a.md, b.md"          |
-  | enforce_missing  | String/Array   | Ensure that these files are not found.                   |
-  | after            | String/Array   | Run system command(s) after running tests.               |
-
-  Note: in the table above, String/Array means a single argument can be a string, but mutliples
-  can be passed as an array. For example:
 
-    compare: _site, expected                      # Compare two directories
-    compare:                                      # Compare mutiple items
-      - _site/index.html, expected/index.html
-      - _site/atom.xml, expected/atom.xml
-      - _site/posts, expected/posts
+BANNER
 
+config_info = <<-CONFIG
 
-  To run multiple tests each test should be an array, for example:
+Configuration:
 
-    -
-      name: Check site build
-      build: true
-      compare: _site, _expected
-    -
-      name: Check asset compression
-      compare: _cdn_build, _cdn_expected
+  Clash reads its configuration from a .clash.yml file in the root of your project. Use the --file
+  option to choose a different configuration file.
+  
+  View the README or visit https://github.com/imathis/clash for configuration info.
 
-  Note: When running multiple tests, adding a name can help the reading of test failures.
+CONFIG
 
+OptionParser.new do |opts|
+  opts.banner = banner
 
-  Configuring Jekyll, Octopress and Octopress Ink plugins:
+  opts.on("-f FILE", "--file FILE", "Use a specific test file (default: .clash.yml)") do |f|
+    options[:file] = f
+  end
 
-    build: true
-    config:
-      jekyll:    
-        - _configs/config.yml
-        - _configs/test1.yml
-      octopress: _configs/octopress.yml
-      feed:      _configs/feed.yml
+  opts.on("-c", "--context NUMBER", Integer, "On diff errors, show NUMBER of lines of surrounding context (default: 2)") do |context|
+    options[:context] = context
+  end
+  
+  opts.on("-h", "--help", "Show this message") do |h|
+    puts opts
+    puts config_info
+    options[:help] = h
+  end
 
-    In this example:
+end.parse!
 
-      - Jekyll will build with `--config _configs/config.yml,_configs/test1.yml`
-      - _configs/octopress.yml will be copied to ./_octopress.yml (and removed after tests)
-      - _configs/feed.yml will be copied to ./_plugins/feed/config.yml (and removed after tests)
+unless ARGV.empty?
+  # Parse input `clash 1 2 3` and `clash 1,2,3` the same
+  #
+  options[:only] = ARGV.join(',').split(',').map{ |n| n.to_i }
+end
 
-    This will not overwrite existing files as they will be backed up an restored after tests.
-HELP
-else
-  Clash::Tests.new(options).run
+unless options[:help]
+  tests = Clash::Tests.new(options)
+  tests.run
 end

data/clash.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "jekyll"
   spec.add_development_dependency "pry-debugger"
 end

data/lib/clash.rb

@@ -5,9 +5,9 @@ require 'safe_yaml'
 require 'diffy'
 
 module Clash
-
   autoload :Tests,   'clash/tests'
   autoload :Test,    'clash/test'
   autoload :Diff,    'clash/diff'
   autoload :Helpers, 'clash/helpers'
 end
+

data/lib/clash/diff.rb

@@ -2,11 +2,14 @@ module Clash
   class Diff
     include Helpers
 
+    attr_accessor :test_failures
+
     def initialize(a, b, options={})
       @diffs   = {}
       @a       = a
       @b       = b
       @context = options[:context] || 2
+      @test_failures = []
     end
 
     def diff
@@ -26,7 +29,7 @@ module Clash
 
         if !file_diff.empty?
           file_diff = format_diff(file_diff)
-          @diffs["Compared #{colorize(a, 'yellow')} to #{colorize(b,'yellow')}"] = file_diff 
+          @diffs[yellowit("\nCompared #{a} to #{b}:\n")] = file_diff 
         end
       end
     end
@@ -44,13 +47,13 @@ module Clash
     # Return files that exist in both directories (without dir names)
     #
     def mattching_dir_files(dir1, dir2)
-      dir1_files = dir_files(dir1).map {|f| f.sub(dir1,'') }
-      dir2_files = dir_files(dir2).map {|f| f.sub(dir2,'') }
+      dir1_files = dir_files(dir1).map {|f| f.sub("#{dir1}/",'') }
+      dir2_files = dir_files(dir2).map {|f| f.sub("#{dir2}/",'') }
 
       matches = dir1_files & dir2_files
 
-      unique_files(dir1, dir1_files, matches)
-      unique_files(dir2, dir2_files, matches)
+      unique_files(dir1, dir2_files, matches)
+      unique_files(dir2, dir1_files, matches)
 
       matches
     end
@@ -66,8 +69,12 @@ module Clash
     def unique_files(dir, dir_files, common_files)
       unique = dir_files - common_files
       if !unique.empty?
-        @test_failures << colorize("Files missing from #{dir}/", 'red')
-        unique.each {|f| @test_failures << "- #{f}"}
+        @test_failures << yellowit("\nMissing from directory #{dir}:\n")
+        unique.each do |f| 
+          failure = "  - #{f}"
+          failure << "\n" if unique.last == f
+          @test_failures << failure
+        end
       end
     end
 
@@ -75,7 +82,7 @@ module Clash
       file_exists = File.exists?(f)
 
       if !file_exists
-        @test_failures << "#{colorize('File not found:', 'red')} #{f}"
+        @test_failures << "#{redit('File not found:')} #{f}"
       end
 
       file_exists
@@ -89,17 +96,17 @@ module Clash
         case line
         when /^\+/ then 
           count = 0
-          colorize(line, 'green')
+          "  #{greenit(line)}"
         when /^-/ then 
           count = 0
-          colorize(line, 'red')
+          "  #{redit(line)}"
         else 
           if count == @context
             count = 0
-            "...\n#{line}"
+            "...\n  #{line}"
           else
             count += 1
-            line
+            "  #{line}"
           end
         end
       }

data/lib/clash/helpers.rb

@@ -23,12 +23,28 @@ module Clash
       end
     end
 
+    def greenit(str)
+      colorize(str, 'green')
+    end
+
+    def yellowit(str)
+      colorize(str, 'yellow')
+    end
+    
+    def redit(str)
+      colorize(str, 'red')
+    end
+
+    def boldit(str)
+      colorize(str, 'bold')
+    end
+
     def print_fail
-      pout colorize('F', 'red')
+      pout redit('F')
     end
 
     def print_pass
-      pout colorize('.', 'green')
+      pout greenit('.')
     end
   end
 end

data/lib/clash/test.rb

@@ -1,9 +1,9 @@
 module Clash
   class Test
-    attr_accessor :title
-
     include Helpers
 
+    attr_accessor :title
+
     def initialize(options={})
       @test_failures = []
       @options  = options
@@ -15,11 +15,11 @@ module Clash
       system_cmd(@options['before'])
       config
       build if @options['build']
-      cleanup_config
       compare
       enforce_missing
-      print_result
       system_cmd(@options['after'])
+      cleanup_config
+      print_result
       results
     end
 
@@ -86,7 +86,12 @@ module Clash
     def compare
       default_array(@options['compare']).each do |files|
         f = files.split(',')
-        diff = Diff.new(f[0].strip, f[1].strip, context: @options['context']).diff
+
+        differ = Diff.new(f[0].strip, f[1].strip, context: @options['context'])
+        diff = differ.diff
+
+        @test_failures.concat differ.test_failures
+
         diff.each do |title, diff|
           @test_failures << "#{title}\n#{diff}\n"
         end
@@ -94,9 +99,10 @@ module Clash
     end
 
     def enforce_missing
-      default_array(@options['enforce_missing']).each do |files|
+      default_array(@options['enforce_missing']).each do |file|
         if File.exists?(file)
-          @test_failures << "File #{file} shouldn't exist."
+          message = yellowit("\nFile #{file} shouldn't exist.") + "\n  But it does!"
+          @test_failures << message
         end
       end
     end
@@ -117,10 +123,10 @@ module Clash
     end
 
     def test_title
-      title = colorize("Test ##{@options['index']}", 'bold')
-      title << " - #{@options['title']}" unless @options['title'].nil?
+      title = boldit("#{@options['index']})")
+      title << " #{@options['title']}" unless @options['title'].nil?
       <<-HERE
-Failed #{title}
+#{title}
 ========================================================
 HERE
     end

data/lib/clash/tests.rb

@@ -1,57 +1,89 @@
 module Clash
   class Tests
     include Helpers
+
+    attr_accessor :tests
     
     def initialize(options={})
       @options = options
+      @results = []
+      @passed = []
+      @failed = []
 
       @options[:file]    ||= '.clash.yml'
-      @options[:context] ||= 2
-      @options[:only]      = default_array(@options[:only])
+      @options[:only]    ||= []
+      @options[:exit]    ||= true
 
-      @tests = default_array(SafeYAML.load_file(@options[:file]))
+      @tests = read_tests
     end
 
     def run
-      @results = {}
-      @passed = []
-      @failed = []
       @tests.each_with_index do |options, index|
-
         # If tests are limited, only run specified tests
         #
-        next if !@options[:only].empty? && !@options[:only].include?(index + 1)
+        next if options.nil?
+        run_test(options, index)
+      end
 
-        options['index'] = index + 1
-        options['context'] = @options[:context]
+      print_results
+    end
+
+    def run_test(options, index)
+
+      options['index'] = index + 1
+      options['context'] = @options[:context]
 
-        results = Test.new(options).run
+      results = Test.new(options).run
 
-        if results.nil?
-          @passed << index + 1
+      if results.nil?
+        @passed << index + 1
+      else
+        @failed << index + 1
+        @results << results
+      end
+    end
+
+    def read_tests
+      tests = SafeYAML.load_file(@options[:file])
+      index = 0
+
+      default_array(tests).map do |test|
+        index += 1
+
+        # Admit all tests if no tests are excluded
+        if @options[:only].empty?
+          test
+        # Only admit selected tests
+        elsif @options[:only].include?(index)
+          test
+        # Remove tests not selected
         else
-          @failed << index + 1
-          @results[index + 1] = results
+          nil
         end
       end
-
-      print_results
     end
 
     def print_results
-      puts "" # newline
 
-      if @results.empty?
-        puts colorize("Passed #{@passed.size} of #{@passed.size} tests", "green")
-      else
-        @results.each do |test, results|
-          if !results.empty?
-            puts "\n#{results.join('')}"
-          end
-        end
 
-        puts "#{colorize("Passed #{@passed.size}", "green")}: Tests: #{@passed.join(',')}"
-        puts "#{colorize("Failed #{@failed.size}", "red")}: Tests: #{@failed.join(',')}"
+      puts boldit("\n\nFailures:") unless @results.empty?
+      @results.each do |results|
+        puts "\n#{results.join('')}"
+      end
+
+      puts boldit("\n\nTest summary:")
+      puts yellowit(" Tests run: #{@passed.dup.concat(@failed).size}")
+      puts "#{greenit(" Passed #{@passed.size}")} #{list_tests(@passed)}"
+      puts "#{redit(" Failed #{@failed.size}")} #{list_tests(@failed)}"
+
+      exit 1 if @options[:exit] && !@results.empty?
+    end
+
+    def list_tests(tests)
+      if tests.empty?
+        ''
+      else
+        "- Tests: #{tests.join(',')}"
       end
     end
   end

data/lib/clash/version.rb

@@ -1,3 +1,3 @@
 module Clash
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/test/.clash.yml

@@ -1,14 +1,52 @@
 -
-  title: Checking a and b
-  compare: 'a.txt, b.txt'
+  title: Standard build
+  build: true
+  compare: _site/index.html, _expected/default.html
 -
-  title: Checking a and c
-  compare: 'a.txt, c.txt'
+  title: Build Jekyll with alternate configuration
+  build: true
   config:
-    feed: _test.yml
+    jekyll: 
+      - _config.yml
+      - _test1.yml
+  compare: _site/index.html, _expected/alternate.html
 -
-  title: Checking dirs a and b
-  compare: 'a, b'
+  title: Test Octopress configuration
+  config:
+    octopress: _test1.yml
+  before: cat _octopress.yml
+  after: 
+    - cat _octopress.yml
+    - cat _octopress.yml.bak
+-
+  title: Test Octopress Ink configuration
+  config:
+    feed: _test1.yml
+  before: cat _plugins/feed/config.yml
+  after: 
+    - cat _plugins/feed/config.yml
+    - cat _plugins/feed/config.yml.bak
+-
+  title: Compare matching files
+  compare:
+    - a/1.txt, _site/a/1.txt
+    - a/2.txt, _site/a/2.txt
+-
+  title: (Should fail) Compare files with differences
+  compare:
+    - a/1.txt, _c/1.txt
+    - _site/a/1.txt, _c/1.txt
+-
+  title: Compare two matching dirs
+  compare: a, _site/a
+-
+  title: (Should fail) Compare two dirs with differences
+  compare: a, _c
+-
+  title: File shouldn't exist.
+  enforce_missing:
+    - unicorns.txt
+    - dragons.txt
 -
-  title: Checking dirs a and c
-  compare: 'a, c'
+  title: (Should fail) File shouldn't exist (and does)
+  enforce_missing: a/1.txt

data/test/.test.yml

@@ -0,0 +1 @@
+compare: _output, _expected_output

data/test/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 gem "clash", path: "../"
 gem "pry-debugger"
+gem "jekyll"

data/test/_c/1.txt

@@ -0,0 +1,16 @@
+Bacon ipsum dolor sit amet shank landjaeger duis, eu laboris beef fugiat meatball
+short loin ribeye occaecat cow. Eiusmod swine hamburger biltong qui pork belly fu
+giat. Duis corned beef hamburger eu short loin. Nisi spare ribs sed quis eu salam
+i. Non strip steak pork t-bone fatback, commodo ball tip capicola anim. Biltong p
+ork loin quis corned beef, in landjaeger esse bacon short loin brisket andouille.
+
+Biltong magna excepteur pork dolore, turducken laboris veniam eiusmod shank. Cons
+ectetur consequat exercitation pork belly tri-tip in. Biltong meatball velit, rep
+rehenderit turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+nsequat ground round ham beef ribs bresaola et tail hamburger commodo bacon. Eius
+mod capicola pancetta ham nisi turkey tempor qui hamburger.
+
+Ribeye kevin irure, consectetur jowl tenderloin nulla. Nulla chuck ground round o
+fficia, kevin shankle corned beef anim salami spare ribs. Landjaeger p
+astrami aliquip andouille. Proident in venison bresaola drumstick landjaeger occa
+ecat. Pork spare ribs consectetur sint flank veniam.

data/test/_config.yml

@@ -0,0 +1,4 @@
+name: Clash test
+exclude:
+  - Gemfile*
+  - test.rb

data/test/_expected/alternate.html

@@ -0,0 +1 @@
+Site name is: Clashing

data/test/_expected/default.html

@@ -0,0 +1 @@
+Site name is: Clash test

data/test/_expected_output/1

@@ -0,0 +1,11 @@
+Configuration file: _config.yml
+            Source: test
+       Destination: _site
+      Generating... 
+                    done.
+.
+
+Test summary:
+ Tests run: 1
+ Passed 1 - Tests: 1
+ Failed 0 

data/test/_expected_output/10

@@ -0,0 +1,15 @@
+F
+
+Failures:
+
+10) (Should fail) File shouldn't exist (and does)
+========================================================
+
+File a/1.txt shouldn't exist.
+  But it does!
+
+
+Test summary:
+ Tests run: 1
+ Passed 0 
+ Failed 1 - Tests: 10

data/test/_expected_output/2

@@ -0,0 +1,12 @@
+Configuration file: _config.yml
+Configuration file: _test1.yml
+            Source: test
+       Destination: _site
+      Generating... 
+                    done.
+.
+
+Test summary:
+ Tests run: 1
+ Passed 1 - Tests: 2
+ Failed 0 

data/test/_expected_output/3

@@ -0,0 +1,9 @@
+name: Octopress clashing
+name: Clashing
+name: Octopress clashing
+.
+
+Test summary:
+ Tests run: 1
+ Passed 1 - Tests: 3
+ Failed 0 

data/test/_expected_output/4

@@ -0,0 +1,9 @@
+name: Feed Clashing
+name: Clashing
+name: Feed Clashing
+.
+
+Test summary:
+ Tests run: 1
+ Passed 1 - Tests: 4
+ Failed 0 

data/test/_expected_output/5

@@ -0,0 +1,6 @@
+.
+
+Test summary:
+ Tests run: 1
+ Passed 1 - Tests: 5
+ Failed 0 

data/test/_expected_output/6

@@ -0,0 +1,46 @@
+F
+
+Failures:
+
+6) (Should fail) Compare files with differences
+========================================================
+
+Compared a/1.txt to _c/1.txt:
+
+   Biltong magna excepteur pork dolore, turducken laboris veniam eiusmod shank. Cons
+   ectetur consequat exercitation pork belly tri-tip in. Biltong meatball velit, rep
+  -rehenderit culpa turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+  +rehenderit turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+   nsequat ground round ham beef ribs bresaola et tail hamburger commodo bacon. Eius
+   mod capicola pancetta ham nisi turkey tempor qui hamburger.
+...
+   
+   Ribeye kevin irure, consectetur jowl tenderloin nulla. Nulla chuck ground round o
+  -fficia, prosciutto kevin shankle corned beef anim salami spare ribs. Landjaeger p
+  +fficia, kevin shankle corned beef anim salami spare ribs. Landjaeger p
+   astrami aliquip andouille. Proident in venison bresaola drumstick landjaeger occa
+   ecat. Pork spare ribs consectetur sint flank veniam.
+
+
+Compared _site/a/1.txt to _c/1.txt:
+
+   Biltong magna excepteur pork dolore, turducken laboris veniam eiusmod shank. Cons
+   ectetur consequat exercitation pork belly tri-tip in. Biltong meatball velit, rep
+  -rehenderit culpa turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+  +rehenderit turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+   nsequat ground round ham beef ribs bresaola et tail hamburger commodo bacon. Eius
+   mod capicola pancetta ham nisi turkey tempor qui hamburger.
+...
+   
+   Ribeye kevin irure, consectetur jowl tenderloin nulla. Nulla chuck ground round o
+  -fficia, prosciutto kevin shankle corned beef anim salami spare ribs. Landjaeger p
+  +fficia, kevin shankle corned beef anim salami spare ribs. Landjaeger p
+   astrami aliquip andouille. Proident in venison bresaola drumstick landjaeger occa
+   ecat. Pork spare ribs consectetur sint flank veniam.
+
+
+
+Test summary:
+ Tests run: 1
+ Passed 0 
+ Failed 1 - Tests: 6

data/test/_expected_output/7

@@ -0,0 +1,6 @@
+.
+
+Test summary:
+ Tests run: 1
+ Passed 1 - Tests: 7
+ Failed 0 

data/test/_expected_output/8

@@ -0,0 +1,35 @@
+F
+
+Failures:
+
+8) (Should fail) Compare two dirs with differences
+========================================================
+
+Missing from directory a:
+  - 3.txt
+
+Missing from directory _c:
+  - 2.txt
+
+Compared a/1.txt to _c/1.txt:
+
+   Biltong magna excepteur pork dolore, turducken laboris veniam eiusmod shank. Cons
+   ectetur consequat exercitation pork belly tri-tip in. Biltong meatball velit, rep
+  -rehenderit culpa turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+  +rehenderit turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+   nsequat ground round ham beef ribs bresaola et tail hamburger commodo bacon. Eius
+   mod capicola pancetta ham nisi turkey tempor qui hamburger.
+...
+   
+   Ribeye kevin irure, consectetur jowl tenderloin nulla. Nulla chuck ground round o
+  -fficia, prosciutto kevin shankle corned beef anim salami spare ribs. Landjaeger p
+  +fficia, kevin shankle corned beef anim salami spare ribs. Landjaeger p
+   astrami aliquip andouille. Proident in venison bresaola drumstick landjaeger occa
+   ecat. Pork spare ribs consectetur sint flank veniam.
+
+
+
+Test summary:
+ Tests run: 1
+ Passed 0 
+ Failed 1 - Tests: 8

data/test/_expected_output/9

@@ -0,0 +1,6 @@
+.
+
+Test summary:
+ Tests run: 1
+ Passed 1 - Tests: 9
+ Failed 0 

data/test/_octopress.yml

@@ -0,0 +1 @@
+name: Octopress clashing

data/test/_plugins/feed/config.yml

@@ -1 +1 @@
-name: Clashing
+name: Feed Clashing

data/test/_test1.yml

@@ -0,0 +1 @@
+name: Clashing

data/test/a/1.txt

@@ -1,17 +1,16 @@
-This is a file.
-There is some content.
-It's not particularly imaginative.
+Bacon ipsum dolor sit amet shank landjaeger duis, eu laboris beef fugiat meatball
+short loin ribeye occaecat cow. Eiusmod swine hamburger biltong qui pork belly fu
+giat. Duis corned beef hamburger eu short loin. Nisi spare ribs sed quis eu salam
+i. Non strip steak pork t-bone fatback, commodo ball tip capicola anim. Biltong p
+ork loin quis corned beef, in landjaeger esse bacon short loin brisket andouille.
 
+Biltong magna excepteur pork dolore, turducken laboris veniam eiusmod shank. Cons
+ectetur consequat exercitation pork belly tri-tip in. Biltong meatball velit, rep
+rehenderit culpa turkey tempor deserunt. Pork belly andouille sirloin ham hock co
+nsequat ground round ham beef ribs bresaola et tail hamburger commodo bacon. Eius
+mod capicola pancetta ham nisi turkey tempor qui hamburger.
 
-
-
-asdf
-asdf
-asdf
-asdf
-awesome
-
-asdfa
-dsfa
-sdfasdf
-adsf
+Ribeye kevin irure, consectetur jowl tenderloin nulla. Nulla chuck ground round o
+fficia, prosciutto kevin shankle corned beef anim salami spare ribs. Landjaeger p
+astrami aliquip andouille. Proident in venison bresaola drumstick landjaeger occa
+ecat. Pork spare ribs consectetur sint flank veniam.

data/test/a/2.txt

@@ -1,2 +1,17 @@
-This file is fantastic.
-It has words and everything.
+Ribeye kevin irure, consectetur jowl tenderloin nulla. Nulla chuck ground round o
+fficia, prosciutto kevin shankle corned beef anim salami spare ribs. Landjaeger p
+astrami aliquip andouille. Proident in venison bresaola drumstick landjaeger occa
+ecat. Pork spare ribs consectetur sint flank veniam.
+
+Turkey cillum short loin nisi non. Jerky irure quis, occaecat venison nisi ball t
+ip ex do kevin ribeye. Mollit turkey cillum eu boudin in ham andouille. Biltong n
+isi cow, nostrud prosciutto shank t-bone minim deserunt. Rump chuck occaecat dolo
+re.
+
+Short loin corned beef eu, exercitation consectetur do pork chop ullamco adipisic
+ing nisi spare ribs. Shankle id cillum consequat aliquip, jerky qui beef ribs str
+ip steak eu frankfurter brisket in ribeye filet mignon. Brisket voluptate bresaol
+a filet mignon short ribs. Kielbasa in dolore ex ribeye officia. Ground round ess
+e capicola, rump sausage in id filet mignon bresaola t-bone eiusmod sunt meatloaf
+. Swine drumstick kevin turkey pork loin short ribs commodo culpa flank salami po
+rchetta. Shank tail aliqua shankle ut, landjaeger kevin proident.

data/test/index.html

@@ -0,0 +1,3 @@
+---
+---
+Site name is: {{ site.name }}

data/test/test.rb

@@ -0,0 +1,22 @@
+require 'clash'
+
+count = Clash::Tests.new().tests.size
+FileUtils.mkdir_p('_output')
+
+(1..count).each do |t|
+  system("clash #{t} > _output/#{t}")
+end
+
+# substitute paths output from Jekyll
+%w{1 2}.each do |f|
+  content = File.open("_output/#{f}").read
+  content = content.gsub(/Configuration file: .+\//, 'Configuration file: ') 
+    .gsub(/Source: .+\//, 'Source: ') 
+    .gsub(/Destination: .+\//, 'Destination: ')
+
+  File.open("_output/#{f}", 'w') { |f| f.write(content) }
+end
+
+test = Clash::Tests.new(file: ".test.yml")
+test.run
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Brandon Mathis
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,18 +131,30 @@ files:
 - lib/clash/tests.rb
 - lib/clash/version.rb
 - test/.clash.yml
+- test/.test.yml
 - test/Gemfile
+- test/_c/1.txt
+- test/_c/3.txt
+- test/_config.yml
+- test/_expected/alternate.html
+- test/_expected/default.html
+- test/_expected_output/1
+- test/_expected_output/10
+- test/_expected_output/2
+- test/_expected_output/3
+- test/_expected_output/4
+- test/_expected_output/5
+- test/_expected_output/6
+- test/_expected_output/7
+- test/_expected_output/8
+- test/_expected_output/9
+- test/_octopress.yml
 - test/_plugins/feed/config.yml
-- test/_test.yml
-- test/a.txt
+- test/_test1.yml
 - test/a/1.txt
 - test/a/2.txt
-- test/b.txt
-- test/b/1.txt
-- test/b/2.txt
-- test/c.txt
-- test/c/1.txt
-- test/c/2.txt
+- test/index.html
+- test/test.rb
 homepage: https://github.com/imathis/clash
 licenses:
 - MIT
@@ -154,15 +181,27 @@ specification_version: 4
 summary: A diff based testing framework for static sites.
 test_files:
 - test/.clash.yml
+- test/.test.yml
 - test/Gemfile
+- test/_c/1.txt
+- test/_c/3.txt
+- test/_config.yml
+- test/_expected/alternate.html
+- test/_expected/default.html
+- test/_expected_output/1
+- test/_expected_output/10
+- test/_expected_output/2
+- test/_expected_output/3
+- test/_expected_output/4
+- test/_expected_output/5
+- test/_expected_output/6
+- test/_expected_output/7
+- test/_expected_output/8
+- test/_expected_output/9
+- test/_octopress.yml
 - test/_plugins/feed/config.yml
-- test/_test.yml
-- test/a.txt
+- test/_test1.yml
 - test/a/1.txt
 - test/a/2.txt
-- test/b.txt
-- test/b/1.txt
-- test/b/2.txt
-- test/c.txt
-- test/c/1.txt
-- test/c/2.txt
+- test/index.html
+- test/test.rb

data/test/_test.yml

@@ -1 +0,0 @@
-name: Clash

data/test/a.txt

@@ -1,5 +0,0 @@
-this is awesome
-you guys
-it's pretty great
-you should have
-lots of fun

data/test/b.txt

@@ -1,5 +0,0 @@
-this is awesome
-you guys
-it's pretty great
-you should have
-lots of fun

data/test/b/1.txt

@@ -1,17 +0,0 @@
-This is a file.
-There is some content.
-It's not particularly imaginative.
-
-
-
-
-asdf
-asdf
-asdf
-asdf
-awesome
-
-asdfa
-dsfa
-sdfasdf
-adsf

data/test/c.txt

@@ -1,4 +0,0 @@
-this is awesome
-it's pretty great
-you should have
-lots of fun

data/test/c/1.txt

@@ -1,17 +0,0 @@
-This is a file.
-There is content.
-It's not particularly imaginative.
-
-
-
-
-asdf
-asdf
-asdf
-asdf
-awesome
-sweet
-asdfa
-dsfa
-sdfasdf
-adsf

data/test/c/2.txt

@@ -1,3 +0,0 @@
-This file is fantastic.
-It has words and things.
-Ladies…