Merge branch 'next' of github.com:so-fancy/diff-so-fancy into next

Author: scottchiefbaker

.circleci/config.yml

@@ -5,16 +5,15 @@ jobs:
     steps:
       - checkout
       - run:
-          name:  
+          name:
           command: |
             sudo apt-get -y update
             sudo apt-get -y install shellcheck git
-            
-      - run: git clone --depth 1 https://github.com/sstephenson/bats.git 
+
+      - run: git submodule sync
       - run: git submodule update --init
       - run:
           name: tests
           command: |
-            export TERM=dumb && bats/bin/bats test/*.bats 
+            export TERM=dumb && ./test/bats/bin/bats test
             shellcheck *.sh
-            

.gitmodules

@@ -1,6 +1,9 @@
-[submodule "test/test_helper/bats-core"]
+[submodule "test/bats"]
+	path = test/bats
+	url = https://github.com/bats-core/bats-core.git
+[submodule "test/test_helper/bats-support"]
 	path = test/test_helper/bats-support
-	url = https://github.com/ztombol/bats-core
+	url = https://github.com/bats-core/bats-support.git
 [submodule "test/test_helper/bats-assert"]
 	path = test/test_helper/bats-assert
-	url = https://github.com/ztombol/bats-assert
+	url = https://github.com/bats-core/bats-assert.git

.travis.yml

@@ -29,7 +29,8 @@ addons:
     update: true
 
 before_install:
-  - git clone --depth 1 https://github.com/sstephenson/bats.git
+  - git submodule sync
+  - git submodule update --init
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       mkdir -p ~/perl5;
     fi
@@ -44,4 +45,4 @@ install:
   - cpanm --quiet --notest Test::Perl::Critic Perl::Critic::Freenode
 script:
   - perlcritic -1 -q --theme freenode diff-so-fancy
-  - ./bats/bin/bats test/*.bats
+  - ./test/bats/bin/bats test

appveyor.yml

@@ -1,10 +1,8 @@
-install:
-  - git clone --depth 1 https://github.com/sstephenson/bats.git
-
 build: false
 
 before_test:
+  - git submodule sync
   - git submodule update --init
 
 test_script:
-  - C:\cygwin\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; bats/libexec/bats test/*.bats"
+  - C:\cygwin\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./test/bats/bin/bats test"

diff-so-fancy

@@ -1043,11 +1043,11 @@ sub yes_no {
 }
 
 sub init_diff_highlight_colors {
-	$DiffHighlight::NEW_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.newnormal'))    || "\e[1;32m";
-	$DiffHighlight::NEW_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.newhighlight')) || "\e[1;32;48;5;22m";
+	$DiffHighlight::NEW_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.newnormal'))    || color("2_bold");
+	$DiffHighlight::NEW_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.newhighlight')) || color("2_bold") . color("on_22");
 
-	$DiffHighlight::OLD_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.oldnormal'))    || "\e[1;31m";
-	$DiffHighlight::OLD_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.oldhighlight')) || "\e[1;31;48;5;52m";
+	$DiffHighlight::OLD_HIGHLIGHT[0] = git_ansi_color(git_config('color.diff-highlight.oldnormal'))    || color("1_bold");
+	$DiffHighlight::OLD_HIGHLIGHT[1] = git_ansi_color(git_config('color.diff-highlight.oldhighlight')) || color("1_bold") . color("on_52");
 }
 
 # vim: tabstop=4 shiftwidth=4 noexpandtab autoindent softtabstop=4

hacking-and-testing.md

@@ -14,23 +14,18 @@ cd ~/projects/catfabulator && git diff
 
 ### Running tests
 
-You'll need to install [bats](https://github.com/sstephenson/bats#installing-bats-from-source), the Bash automated testing system. It's also available as `brew install bats`
+The tests use [bats-core](https://bats-core.readthedocs.io/en/latest/index.html), the Bash automated testing system.
 
 ```sh
-git submodule sync
-git submodule update --init # pull in the assertion library, bats-assert
+# initalize the bats components
+git submodule sync && git submodule update --init
 
 # run the test suite once:
-bats test
+./test/bats/bin/bats test
 
 # run it on every change with `entr`
 brew install entr
-ls --color=never diff-so-fancy test/*.bats | entr bats test
+find  ./* test/* test/fixtures/* -maxdepth 0 | entr ./test/bats/bin/bats test
 ```
-When writing assertions, you'll likely want to compare to expected output. To grab that reliably, you can use something like `git --no-pager diff | diff-so-fancy > output.txt`
 
-You can lint your scripts via shellcheck, our CI bots will also check.
-
-```sh
-brew install shellcheck
-shellcheck *.sh
+When writing assertions, you'll likely want to compare to expected output. To grab that reliably, you can use something like `git --no-pager diff | ./diff-so-fancy > output.txt`

package.json

@@ -6,7 +6,7 @@
     "diff-so-fancy": "diff-so-fancy"
   },
   "scripts": {
-    "test": "bats test"
+    "test": "./test/bats/bin/bats test"
   },
   "repository": {
     "type": "git",

test/bats

@@ -4,17 +4,15 @@ load 'test_helper/bats-support/load'
 load 'test_helper/bats-assert/load'
 load 'test_helper/util'
 
-
-output=$( load_fixture "chromium-modaltoelement" | $diff_so_fancy )
-
-
-empty_remove_highlight=""
-
 # https://github.com/paulirish/dotfiles/commit/6743b907ff586c28cd36e08d1e1c634e2968893e#commitcomment-13459061
 @test "All removed lines are present in diff" {
-  assert_output --partial "WebInspector.Dialog = function($empty_remove_highlight)"
-  assert_output --partial "show: function($empty_remove_highlight)"
-  assert_output --partial "{!Document} */ (WebInspector.Dialog._modalHostView.element.ownerDocument$empty_remove_highlight)"
+  output=$( load_fixture "chromium-modaltoelement" | $diff_so_fancy )
+	run printf "%s" "$output"
+
+  assert_line --index 7 --partial "WebInspector.Dialog"
+  assert_line --index 7 --partial "5;52m" # red oldhighlight
+  assert_line --index 8 --partial "WebInspector.Dialog"
+  assert_line --index 8 --partial "5;22m" # green newhighlight
 }
 
 @test "File with space in the name (#360)" {
@@ -28,6 +26,6 @@ empty_remove_highlight=""
 	output=$( load_fixture "add_remove_empty_lines" | $diff_so_fancy )
 	run printf "%s" "$output"
 
-	assert_line --index 5 --partial  "[7m[1;32"
-	assert_line --index 8 --partial  "[7m[1;31"
+	assert_line --index 5 --partial  "5;22m" # green added line
+	assert_line --index 8 --partial  "5;52m" # red removed line
 }

test/bugs.bats

@@ -11,7 +11,7 @@ output=$( load_fixture "ls-function" | $diff_so_fancy )
 
 @test "diff-so-fancy runs exits without error" {
 	load_fixture "ls-function" | $diff_so_fancy
-	assert_success
+	run assert_success
 }
 
 @test "index line is removed entirely" {