Add init-library and combine init and hello into init-hello (#7)

Author: polytypic

.cppsm/travis-ci

@@ -5,14 +5,29 @@ export PATH="$PWD/bin:$PATH"
 # shellcheck source=../commands/.settings
 . commands/.settings
 
-mkdir self-test && cd "$_"
-
-git init
-cppsm init
-cppsm hello
+# git config
 
+git config --global core.autocrlf false
 git config --global user.email "[email protected]"
 git config --global user.name "CI script"
+
+# init-library
+
+mkdir library && cd "$_"
+
+git init
+cppsm init-library
+CXX='' CC='' cppsm test
+
+cd ..
+
+# self test
+
+mkdir hello && cd "$_"
+
+git init
+cppsm init-hello
+
 git commit -m Initial
 
 ../travis-ci

bash_completion

@@ -18,7 +18,7 @@ __cppsm_complete() {
   case "$PREVIOUS" in
     cppsm)
       # shellcheck disable=SC2207
-      COMPREPLY=($(compgen -W "add build build-watch clone format hello init list remove setup test test-watch update upgrade" -- "$CURRENT"))
+      COMPREPLY=($(compgen -W "add build build-watch clone format init init-hello init-library list remove setup test test-watch update upgrade" -- "$CURRENT"))
       ;;
     add)
       # shellcheck disable=SC2207

commands/init

@@ -3,11 +3,22 @@
 # shellcheck source=.settings
 . "${BASH_SOURCE%/*}/.settings"
 
-if [ "$#" -ne 0 ] || [ ! -d .git ]; then
+if [ -z "$NAME" ]; then
+  export NAME="${PWD##*/}"
+fi
+export VERSION="${VERSION:-v1}"
+
+if [ "$#" -ne 0 ] || [ ! -d .git ] || \
+     [ "$NAME" != "$(echo "$NAME" | grep -o '^[a-zA-Z0-9_]\+')" ] ; then
   CMD="${0##*/}"
   cat << EOF
 Usage: $CMD
 
+Options:
+
+  NAME=$NAME|...
+  VERSION=$VERSION|...
+
 Initializes a new C++ project with cppsm configuration files or updates an
 existing project to use the latest configuration files.  Run $CMD in the
 top-level directory of a fresh git project.
@@ -36,19 +47,24 @@ ln -fs .cppsm/.clang-format .clang-format
 ln -fs .cppsm/.gitignore .gitignore
 ln -fs .cppsm/.prettierrc .prettierrc
 
-if [ ! -e CMakeLists.txt ]; then
-  cat << EOF > CMakeLists.txt
+add-file() {
+  if [[ "$1" =~ / ]]; then mkdir -p "${1%/*}"; fi
+  if [ ! -e "$1" ]; then
+    cat > "$1"
+    git add "$1"
+  fi
+}
+
+add-file CMakeLists.txt << EOF
 cmake_minimum_required(VERSION 3.10)
-project(${PWD##*/})
+project($NAME)
 include(.cppsm/c++17.cmake)
 EOF
-fi
 
 cp "$CPPSM/.travis.yml" .travis.yml
 
 git add \
     .clang-format \
     .gitignore \
     .prettierrc \
-    .travis.yml \
-    CMakeLists.txt
+    .travis.yml

commands/hello commands/init-hellocommands/hello renamed to commands/init-hello

@@ -1,27 +1,9 @@
 #!/bin/bash -e
 
-# shellcheck source=.settings
-. "${BASH_SOURCE%/*}/.settings"
-
-if [ "$#" -ne 0 ] || \
-     [ ! -f CMakeLists.txt ] || \
-     [ -e equipment ] || \
-     [ -e internals ] || \
-     [ -e provides ] || \
-     [ -e requires ] ; then
-  CMD="${0##*/}"
-  cat << EOF
-Usage: $CMD
-
-Creates an example "Hello, world!" program in a freshly initialized project
-directory.
-EOF
-  exit 1
-fi
-
-mkdir -p provides/include/message_v1
+# shellcheck source=init
+. "${BASH_SOURCE%/*}/init"
 
-cat << EOF > provides/include/message_v1/hello.hpp
+add-file provides/include/message_v1/hello.hpp << EOF
 #include <string>
 
 namespace message_v1 {
@@ -31,25 +13,21 @@ std::string hello(const std::string &to);
 }
 EOF
 
-mkdir -p provides/library
-
-cat << EOF > provides/library/hello.cpp
+add-file provides/library/hello.cpp << EOF
 #include "message_v1/hello.hpp"
 
 std::string message_v1::hello(const std::string &to) {
   return "Hello, " + to + "!";
 }
 EOF
 
-cat << EOF > provides/CMakeLists.txt
+add-file provides/CMakeLists.txt << EOF
 add_conventional_library(message_v1)
 EOF
 
 "$CPPSM/commands/add" equipment https://github.com/per-framework/testing.cpp.git v1
 
-mkdir -p internals/testing
-
-cat << EOF > internals/testing/message_test.cpp
+add-file internals/testing/message_test.cpp << EOF
 #include "message_v1/hello.hpp"
 
 #include "testing_v1/test.hpp"
@@ -60,9 +38,7 @@ auto hello_test =
     test([]() { verify("Hello, there!" == message_v1::hello("there")); });
 EOF
 
-mkdir -p internals/program
-
-cat << EOF > internals/program/hello.cpp
+add-file internals/program/hello.cpp << EOF
 #include "message_v1/hello.hpp"
 
 #include <iostream>
@@ -73,11 +49,9 @@ int main() {
 }
 EOF
 
-cat << EOF > internals/CMakeLists.txt
+add-file internals/CMakeLists.txt << EOF
 add_conventional_executable_tests(PRIVATE message_v1 testing_v1)
 
 add_conventional_executable(hello)
 target_link_libraries(hello PRIVATE message_v1)
 EOF
-
-git add internals provides

commands/init-library

@@ -0,0 +1,38 @@
+#!/bin/bash -e
+
+# shellcheck source=init
+. "${BASH_SOURCE%/*}/init"
+
+if [ -z "$VERSION" ]; then
+  FULL_NAME="${NAME}"
+else
+  FULL_NAME="${NAME}_${VERSION}"
+fi
+
+# Library boilerplate
+
+add-file provides/CMakeLists.txt << EOF
+add_conventional_library($FULL_NAME)
+EOF
+
+add-file "provides/include/$FULL_NAME/synopsis.hpp" << EOF
+#pragma once
+
+namespace $FULL_NAME {
+
+// TODO
+
+}
+EOF
+
+# Testing boilerplate
+
+add-file internals/CMakeLists.txt << EOF
+add_conventional_executable_tests(PRIVATE $FULL_NAME)
+EOF
+
+add-file internals/testing/compile_synopsis_test.cpp << EOF
+#include "$FULL_NAME/synopsis.hpp"
+
+int main() { return 0; }
+EOF