Enhanced init commands

Author: polytypic

.cppsm/testing/add_subdirectory_test

@@ -7,7 +7,6 @@ add_subdirectory(subdir)
 EOF
 
 mkdir subdir && cd "$_"
-git init
 cppsm init-hello
 
 mkdir ../.build && cd "$_"

.cppsm/testing/hello_and_then_some_test

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 git init
-cppsm init-hello
+VERSION=v1 cppsm init-hello
 
 git commit -m Initial
 

.cppsm/testing/init_library_test

@@ -1,5 +1,4 @@
 #!/bin/bash -e
 
-git init
 cppsm init-library
 CXX='' CC='' cppsm test

.cppsm/travis-ci

@@ -40,8 +40,7 @@ done
 
 mkdir travis_ci_test && cd "$_"
 
-git init
-cppsm init-hello
+NAME=hello cppsm init-hello
 git commit -m Initial
 
 ../travis-ci

commands/init

@@ -3,13 +3,26 @@
 # shellcheck source=.settings
 . "${BASH_SOURCE%/*}/.settings"
 
+to-cpp() {
+  echo "$1" | sed -e 's#[^a-zA-Z0-9_]#_#g' -e 's#__*#_#g' -e 's#^_##' -e 's#_$##'
+}
+
 if [ -z "$NAME" ]; then
-  export NAME="${PWD##*/}"
+  NAME="${PWD##*/}"
+fi
+NAME="$(to-cpp "$NAME")"
+
+if [ -z "$VERSION" ]; then
+  if git symbolic-ref --short HEAD > /dev/null 2>&1; then
+    VERSION="$(git symbolic-ref --short HEAD)"
+  fi
+fi
+if [ -z "$VERSION" ]; then
+  VERSION="v1"
 fi
-export VERSION="${VERSION:-v1}"
+VERSION="$(to-cpp "$VERSION")"
 
-if [ "$#" -ne 0 ] || [ ! -d .git ] || \
-     [ "$NAME" != "$(echo "$NAME" | grep -o '^[a-zA-Z0-9_]\+')" ] ; then
+if [ "$#" -ne 0 ]; then
   CMD="${0##*/}"
   cat << EOF
 Usage: $CMD
@@ -19,13 +32,20 @@ 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.
+Initializes a new project with cppsm configuration files when run in an empty
+directory or updates an existing project to use the latest configuration files.
 EOF
   exit 1
 fi
 
+if [ ! -e .git ] || [ -z "$NAME" ] || [ -z "$VERSION" ]; then
+  git init
+fi
+
+if [ "$(git symbolic-ref --short HEAD)" != "$VERSION" ]; then
+  git checkout -b "$VERSION"
+fi
+
 if [ -n "$TRAVIS_BRANCH" ]; then
   CLI_BRANCH="$TRAVIS_BRANCH"
 else
@@ -43,15 +63,31 @@ if [ ! -d .cppsm ]; then
   git submodule "${GIT_QUIET[@]}" add --branch "$BOILERPLATE_BRANCH" "$BOILERPLATE_URL" .cppsm
 fi
 
-ln -fs .cppsm/.clang-format .clang-format
-ln -fs .cppsm/.gitignore .gitignore
-ln -fs .cppsm/.prettierrc .prettierrc
+create-parent-dir() {
+  local FILE="$1"
+  if [[ "$FILE" =~ / ]]; then mkdir -p "${FILE%/*}"; fi
+}
+
+add-link() {
+  local FILE="$1"
+  local LINK="$2"
+  if [ ! -e "$LINK" ]; then
+    create-parent-dir "$LINK"
+    ln -fs "$FILE" "$LINK"
+    git add "$LINK"
+  fi
+}
+
+add-link .cppsm/.clang-format .clang-format
+add-link .cppsm/.gitignore .gitignore
+add-link .cppsm/.prettierrc .prettierrc
 
 add-file() {
-  if [[ "$1" =~ / ]]; then mkdir -p "${1%/*}"; fi
-  if [ ! -e "$1" ]; then
-    cat > "$1"
-    git add "$1"
+  local FILE="$1"
+  if [ ! -e "$FILE" ]; then
+    create-parent-dir "$FILE"
+    cat > "$FILE"
+    git add "$FILE"
   fi
 }
 
@@ -61,10 +97,4 @@ project($NAME)
 include(.cppsm/c++17.cmake)
 EOF
 
-cp "$CPPSM/.travis.yml" .travis.yml
-
-git add \
-    .clang-format \
-    .gitignore \
-    .prettierrc \
-    .travis.yml
+add-file .travis.yml < "$CPPSM/.travis.yml"

commands/init-hello

@@ -3,55 +3,55 @@
 # shellcheck source=init
 . "${BASH_SOURCE%/*}/init"
 
-add-file provides/include/message_v1/hello.hpp << EOF
+add-file "provides/include/message_${VERSION}/hello.hpp" << EOF
 #include <string>
 
-namespace message_v1 {
+namespace message_${VERSION} {
 
 std::string hello(const std::string &to);
 
 }
 EOF
 
 add-file provides/library/hello.cpp << EOF
-#include "message_v1/hello.hpp"
+#include "message_${VERSION}/hello.hpp"
 
-std::string message_v1::hello(const std::string &to) {
+std::string message_${VERSION}::hello(const std::string &to) {
   return "Hello, " + to + "!";
 }
 EOF
 
 add-file provides/CMakeLists.txt << EOF
-add_conventional_library(message_v1)
+add_conventional_library(message_${VERSION})
 EOF
 
 "$CPPSM/commands/add" equipment https://github.com/per-framework/testing.cpp.git v1
 
 add-file internals/testing/message_test.cpp << EOF
-#include "message_v1/hello.hpp"
+#include "message_${VERSION}/hello.hpp"
 
 #include "testing_v1/test.hpp"
 
 using namespace testing_v1;
 
 auto hello_test =
-    test([]() { verify("Hello, there!" == message_v1::hello("there")); });
+    test([]() { verify("Hello, there!" == message_${VERSION}::hello("there")); });
 EOF
 
 add-file internals/program/hello.cpp << EOF
-#include "message_v1/hello.hpp"
+#include "message_${VERSION}/hello.hpp"
 
 #include <iostream>
 
 int main() {
-  std::cout << message_v1::hello("world") << std::endl;
+  std::cout << message_${VERSION}::hello("world") << std::endl;
   return 0;
 }
 EOF
 
 add-file internals/CMakeLists.txt << EOF
-add_conventional_executable_tests(PRIVATE message_v1 testing_v1)
+add_conventional_executable_tests(PRIVATE message_${VERSION} testing_v1)
 
 add_conventional_executable(hello)
-target_link_libraries(hello PRIVATE message_v1)
+target_link_libraries(hello PRIVATE message_${VERSION})
 EOF

commands/init-library

@@ -3,22 +3,16 @@
 # 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)
+add_conventional_library(${NAME}_${VERSION})
 EOF
 
-add-file "provides/include/$FULL_NAME/synopsis.hpp" << EOF
+add-file "provides/include/${NAME}_${VERSION}/synopsis.hpp" << EOF
 #pragma once
 
-namespace $FULL_NAME {
+namespace ${NAME}_${VERSION} {
 
 // TODO
 
@@ -28,11 +22,11 @@ EOF
 # Testing boilerplate
 
 add-file internals/CMakeLists.txt << EOF
-add_conventional_executable_tests(PRIVATE $FULL_NAME)
+add_conventional_executable_tests(PRIVATE ${NAME}_${VERSION})
 EOF
 
 add-file internals/testing/compile_synopsis_test.cpp << EOF
-#include "$FULL_NAME/synopsis.hpp"
+#include "${NAME}_${VERSION}/synopsis.hpp"
 
 int main() { return 0; }
 EOF