ros2interface fixes/changes (#308)

* minor changes to ros2interface

Signed-off-by: Siddharth Kucheria <[email protected]>

Author: Siddharth Kucheria

ros2interface/ros2interface/api/__init__.py

@@ -22,7 +22,7 @@ def get_all_interface_packages():
     return get_resources('rosidl_interfaces')
 
 
-def get_interface(package_name):
+def get_interfaces(package_name):
     if not has_resource('packages', package_name):
         raise LookupError('Unknown package {}'.format(package_name))
     try:

ros2interface/ros2interface/verb/list.py

@@ -19,23 +19,23 @@
 
 
 def print_messages():
-    print('Messages: ')
+    print('Messages:')
     message_types = get_all_message_types()
     for package_name in sorted(message_types):
         for message_name in sorted(message_types[package_name]):
             print('    {package_name}/msg/{message_name}'.format_map(locals()))
 
 
 def print_services():
-    print('Services: ')
+    print('Services:')
     service_types = get_all_service_types()
     for package_name in sorted(service_types):
         for service_name in sorted(service_types[package_name]):
             print('    {package_name}/srv/{service_name}'.format_map(locals()))
 
 
 def print_actions():
-    print('Actions: ')
+    print('Actions:')
     action_types = get_all_action_types()
     for package_name in sorted(action_types):
         for action_name in sorted(action_types[package_name]):
@@ -46,24 +46,26 @@ class ListVerb(VerbExtension):
     """List all interface types available."""
 
     def add_arguments(self, parser, cli_name):
-        parser.add_argument('-m', '--only-msgs', action='count',
-                            help='Print out only the message types')
+        parser.add_argument(
+            '-m', '--only-msgs', action='store_true',
+            help='Print out only the message types')
 
-        parser.add_argument('-s', '--only-srvs', action='count',
-                            help='Print out only the srvs types')
+        parser.add_argument(
+            '-s', '--only-srvs', action='store_true',
+            help='Print out only the service types')
 
-        parser.add_argument('-a', '--only-actions', action='count',
-                            help='Print out only the action types')
+        parser.add_argument(
+            '-a', '--only-actions', action='store_true',
+            help='Print out only the action types')
 
     def main(self, *, args):
-        if(args.only_msgs):
-            print_messages()
-            return
-        if(args.only_srvs):
-            print_services()
-            return
-        if(args.only_actions):
-            print_actions()
+        if args.only_msgs or args.only_srvs or args.only_actions:
+            if args.only_msgs:
+                print_messages()
+            if args.only_srvs:
+                print_services()
+            if args.only_actions:
+                print_actions()
             return
         print_messages()
         print_services()

ros2interface/ros2interface/verb/package.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ros2interface.api import get_interface
+from ros2interface.api import get_interfaces
 from ros2interface.api import package_name_completer
 from ros2interface.verb import VerbExtension
 
@@ -28,7 +28,7 @@ def add_arguments(self, parser, cli_name):
 
     def main(self, *, args):
         try:
-            names = get_interface(args.package_name)
+            names = get_interfaces(args.package_name)
         except LookupError as e:
             return str(e)
         for name in names:

ros2interface/ros2interface/verb/show.py

@@ -39,5 +39,5 @@ def main(self, *, args):
             raise RuntimeError('The passed interface type is invalid')
         except LookupError as e:
             return str(e)
-        with open(file_path, 'r') as h:
+        with open(file_path, 'r', encoding='utf-8') as h:
             print(h.read(), end='')

ros2interface/setup.py

@@ -34,8 +34,8 @@
         ],
         'ros2interface.verb': [
             'list = ros2interface.verb.list:ListVerb',
-            'packages = ros2interface.verb.packages:PackagesVerb',
             'package = ros2interface.verb.package:PackageVerb',
+            'packages = ros2interface.verb.packages:PackagesVerb',
             'show = ros2interface.verb.show:ShowVerb',
         ],
     }

ros2interface/test/test_api.py

@@ -17,17 +17,17 @@
 import pytest
 
 from ros2interface.api import get_all_interface_packages
-from ros2interface.api import get_interface
 from ros2interface.api import get_interface_path
+from ros2interface.api import get_interfaces
 
 
 def test_get_interface():
     # check nonexistent package name
     with pytest.raises(LookupError):
-        get_interface('_not_existing_package_name')
+        get_interfaces('_not_existing_package_name')
 
     # check existing package name
-    interface_names = get_interface('std_srvs')
+    interface_names = get_interfaces('std_srvs')
     assert len(interface_names) == 3