Dev

.gitignore

@@ -2,6 +2,9 @@
 a.out
 bin
 renzoku
+src/parser/parser
+src/config/renconf
+*.a
 
 # Generated files
 *.in
@@ -22,9 +25,22 @@ src/librenzoku.a
 test-driver
 tests/test-suite.log
 tests/test_runner*
+tests/*.log
+tests/*.trs
+test_れんぞく
 
 # Misc
 *.swo
 *.swp
 LICENSE.new
 coverage
+ignoreme/
+
+build-aux/
+renzoku-0.1.0.tar.gz
+renzoku-0.1.0/
+src/parser/parser.swigcxx
+src/parser/parser_wrap.cxx
+src/parser/renconf.go
+src/parser/renconf_gc.c
+tests/PATH

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tests/bash-tap"]
+	path = tests/bash-tap
+	url = https://github.com/rwhitworth/bash-tap.git

Makefile.am

@@ -1,2 +1,5 @@
+sh_TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
+									                    $(top_srcdir)/build-aux/tap-driver.sh
+
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src doc examples man tests
+SUBDIRS = src src/parser doc examples man tests

configure.ac

@@ -3,6 +3,7 @@
 
 AC_PREREQ([2.69])
 AC_INIT(renzoku, 0.1.0, renzoku@frostyfrog.net)
+AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
 
 # Checks for programs.
@@ -16,9 +17,69 @@ AC_LANG(C++)
 # Checks for header files.
 AC_CHECK_HEADERS([stdint.h stdlib.h sys/time.h unistd.h])
 # http://lists.gnu.org/archive/html/autoconf/2003-11/msg00155.html
-#AC_LANG_PUSH([C++])
+AC_LANG_PUSH([C++])
 AC_CHECK_HEADERS([yaml-cpp/yaml.h boost/shared_ptr.hpp])
-#AC_LANG_POP([C++])
+
+# debug? daemon mode?
+AC_ARG_ENABLE(recursion,
+							[AS_HELP_STRING([--disable-recursion],
+															[Disable recursive directory searching])],
+							[feature_recursion=no], #replace with ac_define
+							[feature_recursion=yes])
+AC_ARG_ENABLE(log-level,
+							[AS_HELP_STRING([--enable-log-level[=level]],
+															[Specify the logging level:\
+															 debug: The most verbose level\
+															 info: A bit less verbose\
+															 warn: Warnings only\
+															 error: Errors only])],
+															[ if test "x$enableval" = "xdebug" ; then
+															 AC_DEFINE([LOGLEVEL], [debug],
+																				 [Logging set to debug level])
+															 elif test "x$enableval" = "xinfo" ; then
+															 AC_DEFINE([LOGLEVEL], [info],
+																				 [Logging set to info level])
+															 elif test "x$enableval" = "xwarn" ; then
+															 AC_DEFINE([LOGLEVEL], [warn],
+																				 [Logging set to warning level])
+															 elif test "x$enableval" = "xerror" ; then
+															 AC_DEFINE([LOGLEVEL], [error],
+																				 [Logging set to error level])
+															 else
+																 AC_MSG_FAILURE(
+																								[Invalid log level]
+																								)
+															 fi
+															 ])
+
+AC_ARG_WITH([yaml],
+						[AS_HELP_STRING([--without-yaml],
+														[Disable yaml config support])],
+						[],
+						[with_yaml=yes])
+LIBYAMLCPP=
+AS_IF([test "x$with_yaml" != xno],
+			[AC_CHECK_LIB([yaml-cpp], [main],
+										[AC_SUBST([LIBYAMLCPP], ["-lyaml-cpp"])
+										AC_DEFINE([HAVE_YAML], [1],
+															[Define if you have libyaml-cpp])
+										],
+										[AC_MSG_FAILURE(
+										 [yaml-cpp test failed (--without-yaml to disable)]
+										)],
+										[]
+										)])
+AC_ARG_ENABLE(debug,
+							AS_HELP_STRING([--enable-debug],
+								[build with additional debugging code]),
+							[case "${enableval}" in
+								yes) debug=true; AC_DEFINE([__DEBUG__]) ;;
+								no) debug=false ;;
+								*)   AC_MSG_ERROR([bad value ${enableval} for --enable-debug])
+								;; esac],
+							[debug=false])
+AM_CONDITIONAL(DEBUG, test x"$debug" = x"true")
+AC_LANG_POP([C++])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_CHECK_HEADER_STDBOOL
@@ -37,7 +98,10 @@ AC_CHECK_FUNCS([getcwd gettimeofday memset select strerror])
 # Static Library
 AC_PROG_RANLIB
 
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+AC_PROG_AWK
+
 #AC_CONFIG_FILES([Makefile])
 AC_OUTPUT(Makefile src/Makefile doc/Makefile examples/Makefile man/Makefile
-					tests/Makefile)
+					tests/Makefile src/parser/Makefile)
 AC_OUTPUT

doc/README

@@ -17,5 +17,4 @@ supposed to do. The goal of this program is as follows:
 
 Yes, there are some programs out there that do similar things (like Grunt), but
 they aren't able to fill my need completely or easily. I just want something
-that I can install and use with a few simple tweaks to a config file (like
-Travis' yaml configs).
+that I can install and use with a few simple tweaks to a config file.

renzoku.conf

@@ -1,14 +1,16 @@
-watch:
-  Filter: ['*.cpp', '*.hpp', '*.c', '*.h', 'include/*.hxx']
-  Include: Makefile
-  Exclude: src/Config.cpp
-compile:
-  Command: make
-  Enabled: yes
-Test:
-  command: make test
-  IgnoreStatus: [2,3,4]
-  Enabled: yes
-program:
-  command: /usr/bin/echo Hello World
-  Enabled: yes
+Watch "れんぞく C++ Code Base" {
+	files = "*.cpp", "*.hpp"
+	exclude = "main.*", "test_driver.*"
+	dir = "src"
+	step Compile {
+		command = "make"
+		enabled = true
+	}
+	step "Build & Run Tests" {
+		command = "make check"
+		enabled = yes
+	}
+	step Run {
+		command = "echo 'It built!'"
+	}
+}

renzoku_old.conf

@@ -0,0 +1,22 @@
+watch = {
+  Filter = ["*.cpp", "*.hpp", "*.c", "*.h", "include/*.hxx", "*.conf",
+	"test_*.sh"]
+  Include = "Makefile"
+  Exclude = "src/Config.cpp"
+}
+compile = {
+  Command = "make"
+  Enabled = true
+}
+Test = {
+  command = "make check"
+  IgnoreStatus = [2,3,4]
+  Enabled = false
+}
+program = {
+  command = "make check"
+  #command = "./test_れんぞく.sh"
+#  command: /usr/bin/echo Hello World
+  Enabled = true
+}
+

src/Makefile.am

@@ -1,7 +1,8 @@
 #CFLAGS = --pedantic -Wall -std=c99 -O2
 #CXXFLAGS = -Wall -g -Isrc/ -static -lyaml-cpp -std=c++11
-AM_CXXFLAGS = --pedantic -Wall -O2 -g -std=c++11
-AM_LDFLAGS = -Bstatic -lyaml-cpp -Bdynamic
+AM_CXXFLAGS = --pedantic -Wall -O2 -g -std=c++11 -Iparser/ -pthread
+AM_LDFLAGS = -Bstatic -Bdynamic
+SUBDIRS = parser
 
 # this lists the binaries to produce, the (non-PHONY, binary) targets in
 # the previous manual Makefile
@@ -15,31 +16,27 @@ librenzoku_adir = $(pkglibdir)/@PACKAGE@
 #											 util.hpp \
 #											 watcher.hpp
 librenzoku_a_SOURCES = \
-											 config.cpp \
-											 config.hpp \
-											 config_sections.hpp \
 											 exceptions.cpp \
 											 exceptions.hpp \
-											 i_configfile.hpp \
 											 log.cpp \
 											 log.hpp \
 											 process.cpp \
 											 process.hpp \
 											 procman.cpp \
 											 procman.hpp \
+											 threadmgr.cpp \
+											 threadmgr.hpp \
 											 signals.cpp \
 											 signals.hpp \
 											 util.cpp \
 											 util.hpp \
 											 watcher.cpp \
 											 watcher.hpp
-#											 tokenizer.cpp
-#											 tokenizer.hpp
 
 
 bin_PROGRAMS = renzoku
 renzokudir = $(pkglibdir)/@PACKAGE@
-renzoku_LDADD = librenzoku.a
+renzoku_LDADD = librenzoku.a parser/libparser.a
 renzoku_SOURCES = \
 									main.hpp \
 									main.cpp