Fixed issue with 6.0.6.1 opt-out project needing to have component specified for oslcquery to work

Author: barny

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.0
+current_version = 0.8.1
 commit = True
 tag = True
 

README.md

@@ -8,7 +8,7 @@
 
  SPDX-License-Identifier: MIT
 
- version="0.8.0"
+ version="0.8.1"
 
 
 Introduction

elmclient/__meta__.py

@@ -9,7 +9,7 @@
 
 app = 'elmoslcquery'
 description = 'Commandline OSLC query for ELM'
-version = '0.8.0'
+version = '0.8.1'
 license = 'MIT'
 author_name = 'Ian Barnard'
 author_mail = '[email protected]'

elmclient/_config.py

@@ -37,7 +37,7 @@
 class _Config():
     configtype = None
     def __init__(self, *ags, **kwargs ):
-        print( f"Config init {self=}" )
+        logger.info( f"Config init {self=}" )
         pass
     def is_stream(self):
         return self.configtype == STREAM

elmclient/_queryparser.py

@@ -317,7 +317,6 @@ def dottedname(self,s):
 
     def identifier(self, s):
         logger.info( f"Identifier {s=}" )
-        print( f"Identifier {s=}" )
         if len(s) == 1:
             if type(s[0])==str:
                 result = s[0]

elmclient/_rm.py

@@ -379,7 +379,7 @@ def load_components_and_configurations(self,force=False):
         return (ncomps, nconfs)
 
     def get_local_config(self, name_or_uri):
-        print( f"GLC {self=} {name_or_uri=}" )
+        logger.info( f"GLC {self=} {name_or_uri=}" )
         result = None
         filter = None
         if name_or_uri.startswith("S:"):

elmclient/examples/oslcquery.py

@@ -302,6 +302,9 @@ def do_oslc_query(inputargs=None):
                         args.component = args.projectname
         # not all apps support components, and even if the app does this project may not be opt-in
         if app.supports_components and not ( themaindomain == "gc" and args.resourcetype == 'Component'):
+            if not p.singlemode and args.component is None:
+                print( f"Warning - project '{args.projectname}' is opt-out, assuming the component has the same name as the project" )
+                args.component = args.projectname
             if not p.singlemode and args.component is None and args.globalconfiguration is None:
                 raise Exception( f"Project {args.projectname} supports components so you must provide a component name or use a global configuration" )
             if p.singlemode and args.globalconfiguration is None:

elmclient/oslcqueryapi.py

@@ -94,8 +94,8 @@ def do_complex_query(self,queryresource, *, querystring='', searchterms=None, se
                         , pagesize=200
                      ):
         if searchterms and querystring:
-            print( f"{searchterms=}" )
-            print( f"{querystring=}" )
+            logger.info( f"{searchterms=}" )
+            logger.info( f"{querystring=}" )
             raise Exception( "Can't use query and search terms together!" )
         if querystring is None:
             querystring=''