From eab18993348f6b448755ca8bda3965094d4e322a Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 8 Jul 2017 15:30:13 -0400 Subject: [PATCH 1/6] fixup! Fix test on linux --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 09122d498..06ca906ce 100755 --- a/test.sh +++ b/test.sh @@ -29,7 +29,7 @@ cat $file | $prettier_dnc | md5sum | grep 750573a1ced7ec47055a51584e1fcd6e >/dev # Format the file, then make sure than --list-different doesn't fail tmp=.write.test.js -cp $file $tmp && $prettier --write $tmp && $prettier --list-different $tmp | wc -c | grep ' 0$' >/dev/null && rm $tmp +cp $file $tmp && $prettier --write $tmp && $prettier --list-different $tmp | wc -c | grep '\<0$' >/dev/null && rm $tmp # Ensure help message shows prettier_d and only one filename $prettier --help | grep "Usage: prettier_d .opts. .filename.$" >/dev/null From c64dcab89f043696cdd425992b200ff94f2a3259 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 8 Jul 2017 15:28:15 -0400 Subject: [PATCH 2/6] travis: Test Node stable, 6 Once https://github.com/GarthDB/config-attendant/pull/6 is merged/released, we can support Node 4 as well. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..9ff972ed0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: node_js +node_js: + - node + - 6 From 4c433a068e3c8bc9bb8ac7d742bcd835102ff652 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 8 Jul 2017 15:31:38 -0400 Subject: [PATCH 3/6] travis: Cache node_modules, yarn cache --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9ff972ed0..c69678389 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,3 +2,7 @@ language: node_js node_js: - node - 6 +cache: + yarn: true + directories: + - "node_modules" From 93def94c0f19cd45df0061521c3ed743f32b80e6 Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 8 Jul 2017 15:56:51 -0400 Subject: [PATCH 4/6] Add Travis badge to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a0c3f47e1..dcd7b727f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # prettier\_d +[![Build Status](https://travis-ci.org/josephfrazier/prettier_d.svg?branch=master)](https://travis-ci.org/josephfrazier/prettier_d) [![SemVer]](http://semver.org) [![License]](https://github.com/josephfrazier/prettier\_d.js/blob/master/LICENSE) From 610231c1e3d8b4337ea450f3efc48654a08afdaa Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 8 Jul 2017 16:03:52 -0400 Subject: [PATCH 5/6] Test/Fix OSX on Travis It looks like the OSX version of `nc` doesn't support the `-q` flag, so prettier_dnc needs to check nc, and the tests shouldn't use nc directly. --- .travis.yml | 6 ++++++ bin/prettier_dnc.sh | 6 +++++- test.sh | 5 +---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c69678389..e4f301c10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +os: + - linux + - osx language: node_js node_js: - node @@ -6,3 +9,6 @@ cache: yarn: true directories: - "node_modules" + - $HOME/Library/Caches/Homebrew # https://stackoverflow.com/questions/39930171/cache-brew-builds-with-travis-ci/41386136#41386136 +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install md5sha1sum; fi diff --git a/bin/prettier_dnc.sh b/bin/prettier_dnc.sh index 4ebbc9a37..54176da4e 100755 --- a/bin/prettier_dnc.sh +++ b/bin/prettier_dnc.sh @@ -1,4 +1,8 @@ #!/usr/bin/env bash PORT=`cat ~/.prettier_d | cut -d" " -f1` TOKEN=`cat ~/.prettier_d | cut -d" " -f2` -cat <(echo "$TOKEN $PWD --stdin $@") - | nc -q 0 localhost $PORT +if nc 2>&1 | grep -- -q >/dev/null; then + cat <(echo "$TOKEN $PWD --stdin $@") - | nc -q 0 localhost $PORT +else + cat <(echo "$TOKEN $PWD --stdin $@") - | nc localhost $PORT +fi diff --git a/test.sh b/test.sh index 06ca906ce..ee3869e6c 100755 --- a/test.sh +++ b/test.sh @@ -19,9 +19,6 @@ TOKEN=`cat ~/.prettier_d | cut -d" " -f2` md5sum $file | grep f75b2b44fd861a20b69f9a3e1960e419 >/dev/null # Format it using netcat and make sure the output has been formatted -echo "$TOKEN $PWD $file" | nc -q 0 localhost $PORT | md5sum | grep 750573a1ced7ec47055a51584e1fcd6e >/dev/null - -# Pipe it to netcat and get the same output cat $file | $prettier_dnc | md5sum | grep 750573a1ced7ec47055a51584e1fcd6e >/dev/null # Ensure that --list-different prints the filename @@ -48,6 +45,6 @@ echo '{"key":"value"}' | $prettier_dnc --json | md5sum | grep c482e72bc3892b16a4 $prettier --json p.json | md5sum | grep faa3eb7c97ed871f63ec955b9498dee4 >/dev/null # Verify that multiple files are currently not supported -echo "$TOKEN $PWD $file $file" | nc -q 0 localhost $PORT | md5sum | grep 750573a1ced7ec47055a51584e1fcd6e >/dev/null +$prettier $file $file | md5sum | grep 750573a1ced7ec47055a51584e1fcd6e >/dev/null popd >/dev/null From 9200e46709f5efd19897b259593caede75a7955a Mon Sep 17 00:00:00 2001 From: Joseph Frazier <1212jtraceur@gmail.com> Date: Sat, 8 Jul 2017 17:15:48 -0400 Subject: [PATCH 6/6] 5.7.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1cc179241..008819036 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "prettier_d", - "version": "5.7.1", + "version": "5.7.2", "description": "Makes prettier the fastest formatter on the planet", "bin": { "prettier_d": "bin/prettier_d.js",