Support adding components after creating library instance.

Main use case is easing creating libraries that extend other libs that
use the library core.

Author: pekkaklarck

atest/ExtendExistingLibrary.py

@@ -0,0 +1,15 @@
+from HybridLibrary import HybridLibrary, keyword
+
+
+class ExtendExistingLibrary(HybridLibrary):
+
+    def __init__(self):
+        HybridLibrary.__init__(self)
+        self.add_library_components([ExtendingComponent()])
+
+
+class ExtendingComponent(object):
+
+    @keyword
+    def keyword_in_extending_library(self):
+        pass

atest/run.py

@@ -8,22 +8,21 @@
 from robotstatuschecker import process_output
 
 
+library_variants = ['Hybrid', 'Dynamic', 'Static', 'ExtendExisting']
 curdir = dirname(abspath(__file__))
 outdir = join(curdir, 'results')
 tests = join(curdir, 'tests.robot')
 sys.path.insert(0, join(curdir, '..', 'src'))
-for variant in ['Hybrid', 'Dynamic', 'Static']:
+for variant in library_variants:
     output = join(outdir, variant + '.xml')
     rc = run(tests, name=variant, variable='LIBRARY:%sLibrary' % variant,
              output=output, report=None, log=None)
     if rc > 250:
         sys.exit(rc)
     process_output(output, verbose=False)
 print('\nCombining results.')
-rc = rebot(join(outdir, 'Hybrid.xml'),
-           join(outdir, 'Dynamic.xml'),
-           join(outdir, 'Static.xml'),
-           name='Acceptance Tests', outputdir=outdir)
+rc = rebot(*(join(outdir, variant + '.xml') for variant in library_variants),
+           **dict(name='Acceptance Tests', outputdir=outdir))
 if rc == 0:
     print('\nAll tests passed/failed as expected.')
 else:

atest/tests.robot

@@ -12,6 +12,8 @@ Keyword names
     Method
     Custom name
     Cust omna me
+    Run Keyword If    $LIBRARY == "ExtendExistingLibrary"
+    ...    Keyword in extending library
 
 Method without @keyword are not keyowrds
     [Documentation]    FAIL    No keyword with name 'Not keyword' found.

src/robotlibcore.py

@@ -37,33 +37,34 @@ def decorator(func):
 
 PY2 = sys.version_info < (3,)
 
-__version__ = '1.0rc1'
+__version__ = '1.0rc2'
 
 
 class HybridCore(object):
 
-    def __init__(self, libraries):
-        self.keywords = dict(self._find_keywords(*libraries))
-        self.keywords.update(self._find_keywords(self))
+    def __init__(self, library_components):
+        self.keywords = {}
+        self.add_library_components(library_components)
+        self.add_library_components([self])
 
-    def _find_keywords(self, *libraries):
-        for library in libraries:
-            for name, func in self._get_members(library):
+    def add_library_components(self, library_components):
+        for component in library_components:
+            for name, func in self._get_members(component):
                 if callable(func) and hasattr(func, 'robot_name'):
                     kw_name = func.robot_name or name
-                    yield kw_name, getattr(library, name)
+                    self.keywords[kw_name] = getattr(component, name)
 
-    def _get_members(self, library):
-        if inspect.ismodule(library):
-            return inspect.getmembers(library)
-        if inspect.isclass(library):
+    def _get_members(self, component):
+        if inspect.ismodule(component):
+            return inspect.getmembers(component)
+        if inspect.isclass(component):
             raise TypeError('Libraries must be modules or instances, got '
-                            'class {!r} instead.'.format(library.__name__))
-        if type(library) != library.__class__:
+                            'class {!r} instead.'.format(component.__name__))
+        if type(component) != component.__class__:
             raise TypeError('Libraries must be modules or new-style class '
                             'instances, got old-style class {!r} instead.'
-                            .format(library.__class__.__name__))
-        return self._get_members_from_instannce(library)
+                            .format(component.__class__.__name__))
+        return self._get_members_from_instannce(component)
 
     def _get_members_from_instannce(self, instance):
         # Avoid calling properties by getting members from class, not instance.

utest/test_robotlibcore.py

@@ -29,6 +29,7 @@ def test_keyword_names():
 def test_dir():
     expected = ['Custom name',
                 'Embedded arguments "${here}"',
+                'add_library_components',
                 'all_arguments',
                 'class_attribute',
                 'defaults',