Merge branch 'master' of git://github.com/toddmotto/public-apis

.github/CONTRIBUTING.md

@@ -20,7 +20,7 @@ Example entry:
 | NASA | NASA data, including imagery | No | Yes | [Go!](https://api.nasa.gov) |
 ```
 
-Currently, the only accepted inputs for this field are as follows:
+\* Currently, the only accepted inputs for this field are as follows:
 
 * `OAuth` - _the API supports OAuth_
 * `apiKey` - _the API uses a private key string/token for authentication - try and use the correct parameter_

build/main.sh

@@ -2,20 +2,31 @@
 
 FORMAT_FILE=../README.md
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-    echo "running on $TRAVIS_BRANCH branch"
-    LINK_FILE=../README.md
+  echo "running on $TRAVIS_BRANCH branch"
+  LINK_FILE=../README.md
 else
-    echo "running on Pull Request #$TRAVIS_PULL_REQUEST"
-    DIFF_URL="https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/$TRAVIS_PULL_REQUEST.diff"
-    curl $DIFF_URL > diff.txt
-    echo "------- BEGIN DIFF -------"
-    cat diff.txt
-    echo "-------- END DIFF --------"
-    cat diff.txt | egrep "\+" > additions.txt
-    echo "------ BEGIN ADDITIONS -----"
-    cat additions.txt
-    echo "------- END ADDITIONS ------"
-    LINK_FILE=additions.txt
+  echo "running on Pull Request #$TRAVIS_PULL_REQUEST"
+  DIFF_URL="https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/$TRAVIS_PULL_REQUEST.diff"
+  curl $DIFF_URL > diff.txt
+  echo "------- BEGIN DIFF -------"
+  cat diff.txt
+  echo "-------- END DIFF --------"
+  cat diff.txt | egrep "\+" > additions.txt
+  echo "------ BEGIN ADDITIONS -----"
+  cat additions.txt
+  echo "------- END ADDITIONS ------"
+  LINK_FILE=additions.txt
+
+  echo "checking if /json was changed..."
+  if egrep "\+{3}\s.\/json\/" diff.txt > json.txt; then
+    echo "JSON files are auto-generated! Please do not update these files:"
+    cat json.txt
+    exit 1
+  else
+    echo "/json check passed!"
+    rm json.txt
+  fi
+
 fi
 
 echo "checking if /json was changed..."
@@ -32,23 +43,23 @@ fi
 echo "running format validation on $FORMAT_FILE..."
 ./validate_format.rb $FORMAT_FILE
 if [[ $? != 0 ]]; then
-    echo "format validation failed!"
-    exit 1
+  echo "format validation failed!"
+  exit 1
 else
-    echo "format validation passed!"
-    ./build.sh && ./deploy.sh
-    if [[ $? != 0 ]]; then
-        echo "JSON build and deploy failed!"
-    else
-        echo "JSON build and deploy success!"
-    fi
+  echo "format validation passed!"
+  ./build.sh && ./deploy.sh
+  if [[ $? != 0 ]]; then
+    echo "JSON build and deploy failed!"
+  else
+    echo "JSON build and deploy success!"
+  fi
 fi
 
 echo "running link validation..."
 ./validate_links.rb $LINK_FILE
 if [[ $? != 0 ]]; then
-    echo "link validation failed!"
-    exit 1
+  echo "link validation failed!"
+  exit 1
 else
-    echo "link validation passed!"
+  echo "link validation passed!"
 fi

build/validate_links.rb

@@ -50,6 +50,8 @@ links.each do |link|
         if !allowed_codes.include?(res.code)
             fails.push("(#{res.code}): #{link}")
         end
+    rescue HTTParty::RedirectionTooDeep
+        fails.push("(RTD): #{link}")
     rescue Net::ReadTimeout
         fails.push("(TMO): #{link}")
     rescue Net::OpenTimeout
@@ -60,6 +62,8 @@ links.each do |link|
         fails.push("(SOK): #{link}")
     rescue Errno::ECONNREFUSED
         fails.push("(CON): #{link}")
+    rescue Errno::ECONNRESET
+        next
     end
     progressbar.increment
 end

json/README.md

+# This directory contains auto-generated JSON. Do not modify.