remove .sh extensions, add test

Author: hillalex

NEWS.md

@@ -1,7 +1,7 @@
 # orderly 1.5.0
 
 * Add `prepare_git_example_from_source` which can be used to generate a git controlled orderly directory
-from a source, and another entrypoint `run_orderly_demo.sh` that exposes this function, for use in testing OrderlyWeb (mrc-3665)
+from a source, and another entrypoint `run_orderly_demo` that exposes this function, for use in testing OrderlyWeb (mrc-3665)
 
 # orderly 1.4.7
 

docker/Dockerfile

@@ -52,8 +52,8 @@ ENV ORDERLY_VERSION $ORDERLY_VERSION
 COPY . /orderly
 RUN R CMD INSTALL /orderly && \
   Rscript -e 'orderly:::write_script("/usr/bin")' && \
-  cp /orderly/inst/create_orderly_demo.sh /usr/bin/ && \
-  cp /orderly/inst/run_orderly_demo.sh /usr/bin/ && \
+  cp /orderly/inst/create_orderly_demo /usr/bin/ && \
+  cp /orderly/inst/run_orderly_demo /usr/bin/ && \
   rm -rf /orderly
 
 ENTRYPOINT ["/usr/bin/orderly"]

docker/README.md

@@ -3,7 +3,7 @@
 Create a demo orderly store (change `demo` to put it elsewhere - `"."` should be fine if the current directory is empty)
 
 ```
-docker run --rm --entrypoint create_orderly_demo.sh \
+docker run --rm --entrypoint create_orderly_demo \
     -u ${UID} \
     -v ${PWD}:/orderly \
     -w /orderly \

docker/create_demo

@@ -13,7 +13,7 @@ rm -rf $DEST
 # In case we switch agents between steps
 [ ! -z $(docker images -q $TAG_SHA) ] || docker pull $TAG_SHA
 
-docker run --rm --entrypoint create_orderly_demo.sh \
+docker run --rm --entrypoint create_orderly_demo \
        --user "$USER_STR" \
        --env HOME=/tmp \
        -v "${PWD}":/orderly \

docker/teamcity-demo.sh

@@ -54,7 +54,7 @@ path <- orderly:::create_orderly_demo()
 which will create a new directory with all the output in it.  This is also run on teamcity to create an artefact `demo`, and also run via docker as
 
 ```sh
-docker run --entrypoint create_orderly_demo.sh \
+docker run --entrypoint create_orderly_demo \
   -v $projectDir:/orderly \
   -w /orderly vimc/orderly:master \
   demo

inst/create_orderly_demo.sh inst/create_orderly_demoinst/create_orderly_demo.sh renamed to inst/create_orderly_demo

@@ -16,3 +16,15 @@ test_that("create_orderly_demo can create a git repo", {
   expect_true(file.exists(file.path(path, ".git")))
   expect_true(same_path(gert::git_pull(repo = path), path))
 })
+
+
+test_that("can create an orderly git repo from given source", {
+  skip_on_cran()
+  path <- tempfile()
+  dir.create(file.path(path))
+  source <- system.file("examples/demo", package = "orderly")
+  prepare_git_example_from_source(source, path)
+  expect_true(file.exists(file.path(path, ".git")))
+  expect_true(dir.exists(file.path(path, "archive")))
+  expect_true(same_path(gert::git_pull(repo = path), path))
+})