pairs coding, renamed to generated, error handling on cp

laughingbiscuit · laughingbiscuit · commit ac221648135a · 2020-06-01T12:57:02.000Z
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,2 @@
-node_modules
+**/node_modules/**
+**/generated/**
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 **/node_modules/**
-**/target/**
+**/generated/**
diff --git a/.travis.yml b/.travis.yml
@@ -32,4 +32,4 @@ deploy:
   keep_history: true
   on:
     branch: master
-  local_dir: ./target/docs
+  local_dir: ./generated
diff --git a/demos/hello-world/generate-docs.sh b/demos/hello-world/generate-docs.sh
@@ -16,6 +16,6 @@
 
 set -e
 
-rm -rf target/docs
-mkdir -p target/docs/
-echo "<html><body>Hello World</body></html>" > target/docs/index.html
+rm -rf ./generated/docs
+mkdir -p ./generated/docs
+echo "<html><body>Hello World</body></html>" > ./generated/docs/index.html
diff --git a/demos/hello-world/package.json b/demos/hello-world/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "lint": "npx eslint -c ../../.eslintrc-node.yml .",
     "deploy" : "npx apigeetool deployproxy -d passthrough-v1 -o $APIGEE_ORG -e $APIGEE_ENV -u $APIGEE_USER -p $APIGEE_PASS -n 'passthrough-v1' -V",
-    "docs": "echo 'hello' > docs.html",
+    "docs": "sh generate-docs.sh",
     "test": "echo 'running tests...'"
   },
   "dependencies": {
diff --git a/run-pipeline.sh b/run-pipeline.sh
@@ -11,16 +11,19 @@
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and # limitations under the License.
+# See the License for the specific language governing permissions and 
+# limitations under the License.
 
 set -e
 set -x
 
 REPORT_FAIL=
 DIR="${1:-$PWD}"
-mkdir -p target/docs/demos
-mkdir -p target/docs/labs
-mkdir -p target/docs/tools
+
+rm -rf ./generated
+mkdir -p ./generated/demos
+mkdir -p ./generated/labs
+mkdir -p ./generated/tools
 
 echo "Running under "$DIR
 
@@ -52,21 +55,21 @@ else
   do
     echo "Running pipeline on /demos/"$D
     (cd ./demos/$D && ./pipeline.sh) || REPORT_FAIL=$REPORT_FAIL$D" "
-    cp -r ./demos/$D/target/docs ./target/docs/demos/$D
+    cp -r ./demos/$D/generated/docs ./generated/demos/$D || true
   done
 
   for D in `ls $DIR/labs`
   do
     echo "Running pipeline on /labs/"$D
     (cd ./labs/$D && ./pipeline.sh) || REPORT_FAIL=$REPORT_FAIL$D" "
-    cp -r ./labs/$D/target/docs ./target/docs/labs/$D
+    cp -r ./labs/$D/generated/docs ./generated/labs/$D || true
   done
 
   for D in `ls $DIR/tools`
   do
     echo "Running pipeline on /tools/"$D
     (cd ./tools/$D && ./pipeline.sh) || REPORT_FAIL=$REPORT_FAIL$D" "
-    cp -r ./tools/$D/target/docs ./target/docs/tools/$D
+    cp -r ./tools/$D/generated/docs ./generated/tools/$D || true
   done
 fi
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-node_modules`
	`1`	`+/node_modules/`
	`2`	`+/generated/`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`/node_modules/`
`2`		`-/target/`
	`2`	`+/generated/`