Revert "update master (#22)"

This reverts commit 228c7bb.

README.md

@@ -11,13 +11,9 @@ developers.
 
 ## Installation & Quick start
 
-Official `rosmon` packages are available. On ROS Kinetic or Melodic (Ubuntu) simply do:
+Official `rosmon` are available. On ROS Kinetic or Melodic (Ubuntu) simply do:
 
-    sudo apt install ros-${ROS_DISTRO}-rosmon
-
-In case you don't need the rqt GUI, you can install the core package only:
-
-    sudo apt install ros-${ROS_DISTRO}-rosmon-core
+    sudo apt install ros-${ROSDISTRO}-rosmon
 
 Afterwards, try
 

rosmon/CHANGELOG.rst

@@ -2,17 +2,6 @@
 Changelog for package rosmon
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.3.2 (2020-05-29)
-------------------
-
-2.3.1 (2020-05-28)
-------------------
-
-2.3.0 (2020-05-28)
-------------------
-* Fix Issue "Can not handle arguments with spaces" (PR #110)
-* Contributors: Kazuhiro Hiratsuka, Max Schwarz
-
 2.2.1 (2019-11-08)
 ------------------
 

rosmon/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 2.8)
 project(rosmon)
 
 find_package(catkin)

rosmon/package.xml

@@ -5,7 +5,7 @@
 		for the roslaunch tool, focused on performance, remote
 		monitoring, and usability.
 	</description>
-	<version>2.3.2</version>
+	<version>2.2.1</version>
 	<license>BSD</license>
 	<author email="max.schwarz@uni-bonn.de">Max Schwarz</author>
 	<maintainer email="max.schwarz@uni-bonn.de">Max Schwarz</maintainer>

rosmon/src/rosmon

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec rosrun rosmon_core rosmon "$@"
+exec rosrun rosmon_core rosmon $*

rosmon_core/CHANGELOG.rst

@@ -2,37 +2,6 @@
 Changelog for package rosmon_core
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-2.3.2 (2020-05-29)
-------------------
-* rosmon_core: cmake: increase minimum version to address policy warnings
-* rosmon_core: *really* fix search for boost_python for python 3
-* Contributors: Max Schwarz
-
-2.3.1 (2020-05-28)
-------------------
-* Fix build issues on Debian connected to Boost & Python 3
-* Contributors: Max Schwarz
-
-2.3.0 (2020-05-28)
-------------------
-* Optionally filter stdout (INFO/DEBUG, PR #119)
-* Capture stderr separately and correctly do output=log (PR #119)
-* Prevent infinite coredump aggregation & support systemd-coredump (PR #125)
-* Support certain rosmon-* attributes on all scopes (fixes #116)
-* ui: UI DrawStatus optimized to only refresh on events (PR #121)
-* Adding fix for rosparam parsing to equivilate with undocumented behavior of roslaunch (PR #118)
-* depend on python2/3 conditioned on ROS_PYTHON_VERSION (PR #123)
-* Add YAML merge key parsing functionality (PR #117)
-* test: unit tests for the warnings we trigger
-* LaunchConfig warnings to stderr & make them captureable
-* rosmon_core: Handle empty yaml file (PR #114)
-* Improved support for nodes with terminal UI (PR #112)
-* Fix Issue "Can not handle arguments with spaces" (PR #111)
-* Option to obey output=XY tags (PR #109)
-* fix a lot of whitespace issues introduced in #76
-* Handle nesting with $(anon) subst correctly (PR #101)
-* Contributors: Carl Colena, Kazuhiro Hiratsuka, Max Schwarz, marco-tranzatto
-
 2.2.1 (2019-11-08)
 ------------------
 * correctly terminate execvp() arguments (issue: #102, PR: #103).

rosmon_core/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 2.8)
 project(rosmon_core)
 
 find_package(catkin REQUIRED COMPONENTS
@@ -33,15 +33,7 @@ else()
 	message(WARNING "Please install libpython-dev (or equivalent) for $(eval ...) support")
 endif()
 
-# Newer boost versions need a specific python version
-if(${PYTHON_VERSION_MAJOR} GREATER 2)
-	set(boost_python_component "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-else()
-	set(boost_python_component "python")
-endif()
-message(STATUS "Searching for boost_python with keyword '${boost_python_component}'")
-
-find_package(Boost REQUIRED COMPONENTS ${boost_python_component} REQUIRED)
+find_package(Boost REQUIRED COMPONENTS python REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # Specific feature tests
@@ -120,12 +112,6 @@ endif()
 add_executable(abort
 	src/util/abort.cpp
 )
-add_executable(dump_param
-	src/util/dump_param.cpp
-)
-target_link_libraries(dump_param
-	${catkin_LIBRARIES}
-)
 
 add_executable(abort_really_long_executable
 	src/util/abort.cpp
@@ -163,11 +149,9 @@ if(CATKIN_ENABLE_TESTING)
 	else()
 		message(WARNING "Install catch_ros to enable XML unit tests")
 	endif()
-
-	install(DIRECTORY test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 endif()
 
-# Version 1.6 (increment this comment to trigger a CMake update)
+# Version 1.5 (increment this comment to trigger a CMake update)
 catkin_add_env_hooks(50-rosmon
 	SHELLS bash zsh
 	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks

rosmon_core/env-hooks/50-rosmon.bash

@@ -10,7 +10,7 @@ function mon() {
 	case $1 in
 		launch)
 			shift
-			rosrun rosmon_core rosmon "$@"
+			rosrun rosmon_core rosmon $*
 			;;
 	esac
 }
@@ -68,7 +68,7 @@ function _mon() {
 			# If we have no launch file yet, offer launch files
 			elif [[ ( ! -f $package_name ) && -z $launch_name ]]; then
 				local package_dir="$(rospack find ${COMP_WORDS[2]})"
-				local launchfiles=$(find -L "$package_dir" -name '*.launch' -type f -printf "%f\n")
+				local launchfiles=$(find "$package_dir" -name '*.launch' -type f -printf "%f\n")
 				COMPREPLY=( $(compgen -W "${launchfiles} ${FLAGS[*]} ${OPTS[*]}" -- $cur) )
 
 			# Only arguments now

rosmon_core/env-hooks/50-rosmon.zsh

@@ -43,7 +43,7 @@ function _launch_file() {
 		_launch_arg
 	else
 		package=${line[2]}
-		files=("${(@f)$(find -L $(rospack find ${package}) -name '*.launch' -type f -printf "%f\n")}")
+		files=("${(@f)$(find $(rospack find ${package}) -name '*.launch' -type f -printf "%f\n")}")
 		if [[ $#files -gt 0 ]]; then
 			_values 'launch files' $files
 		fi

rosmon_core/package.xml

@@ -1,18 +1,17 @@
-<package format="3">
+<package format="2">
 	<name>rosmon_core</name>
 	<description>
 		Node launcher and monitor for ROS. rosmon is a replacement
 		for the roslaunch tool, focused on performance, remote
 		monitoring, and usability.
 	</description>
-	<version>2.3.2</version>
+	<version>2.2.1</version>
 	<license>BSD</license>
 	<author email="max.schwarz@uni-bonn.de">Max Schwarz</author>
 	<maintainer email="max.schwarz@uni-bonn.de">Max Schwarz</maintainer>
 
 	<buildtool_depend>catkin</buildtool_depend>
 	<depend>boost</depend>
-	<depend>libboost-python-dev</depend>
 	<depend>cmake_modules</depend>
 	<depend>libncurses-dev</depend>
 	<depend>rosfmt</depend>
@@ -25,12 +24,10 @@
 	<depend>tinyxml</depend>
 	<depend>yaml-cpp</depend>
 	<depend>diagnostic_msgs</depend>
+
+	<build_depend>python</build_depend>
 
-	<build_depend condition="$ROS_PYTHON_VERSION == 2">python</build_depend>
-	<build_depend condition="$ROS_PYTHON_VERSION == 3">python3</build_depend>
-
-	<test_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</test_depend>
-	<test_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</test_depend>
+	<test_depend>python-rospkg</test_depend>
 	<test_depend>rostest</test_depend>
 	<test_depend>catch_ros</test_depend>
 </package>

rosmon_core/src/diagnostics_publisher.cpp

@@ -85,17 +85,10 @@ void DiagnosticsPublisher::publish(const std::vector<NodeMonitor::Ptr>& state)
 		}
 		else
 		{
-			if (nodeState->state() == NodeMonitor::STATE_IDLE)
-			{
-				msg = "node idle ";
-			}
-
-			if(nodeState->numRespawnsAllowed() >= 0 &&
-				 nodeState->restartCount() > static_cast<unsigned int>(nodeState->numRespawnsAllowed()))
+			if(nodeState->restartCount() > 0)
 			{
 				nodeStatus.level = diagnostic_msgs::DiagnosticStatus::WARN;
-				msg += "restart count > " + std::to_string(nodeState->numRespawnsAllowed()) +
-							"! (" + std::to_string(nodeState->restartCount()) + ")";
+				msg = "restart count > 0! (" + std::to_string(nodeState->restartCount()) + ")";
 			}
 
 			if(nodeState->memory() > nodeState->memoryLimit())

rosmon_core/src/launch/bytes_parser.h

@@ -4,8 +4,6 @@
 #ifndef ROSMON_LAUNCH_BYTES_PARSER_H
 #define ROSMON_LAUNCH_BYTES_PARSER_H
 
-#include <cstdint>
-#include <string>
 #include <tuple>
 
 namespace rosmon