Rename client_opts var to client_options (#184)

Author: ca-johnson

plugin.yml

@@ -19,7 +19,7 @@ configuration:
       type: array
     parallel:
       type: string
-    client_opts:
+    client_options:
       type: string
     backup_changelists:
       type: bool

python/buildkite.py

@@ -50,7 +50,7 @@ def get_config():
     conf['stream'] = os.environ.get('BUILDKITE_PLUGIN_PERFORCE_STREAM')
     conf['sync'] = list_from_env_array('BUILDKITE_PLUGIN_PERFORCE_SYNC')
     conf['parallel'] = os.environ.get('BUILDKITE_PLUGIN_PERFORCE_PARALLEL') or 0
-    conf['client_opts'] = os.environ.get('BUILDKITE_PLUGIN_PERFORCE_CLIENT_OPTIONS')
+    conf['client_options'] = os.environ.get('BUILDKITE_PLUGIN_PERFORCE_CLIENT_OPTIONS')
 
     if 'BUILDKITE_PLUGIN_PERFORCE_ROOT' in os.environ and not __LOCAL_RUN__:
         raise Exception("Custom P4 root is for use in unit tests only")

python/perforce.py

@@ -16,21 +16,21 @@
 class P4Repo:
     """A class for manipulating perforce workspaces"""
     def __init__(self, root=None, view=None, stream=None,
-                 sync=None, client_opts=None, parallel=0):
+                 sync=None, client_options=None, parallel=0):
         """
         root: Directory in which to create the client workspace
         view: Client workspace mapping
         stream: Client workspace stream. Overrides view parameter.
         sync: List of paths to sync. Defaults to entire view.
-        client_opts: Additional options to add to client. (e.g. allwrite)
+        client_options: Additional options to add to client. (e.g. allwrite)
         parallel: How many threads to use for parallel sync.
         """
         self.root = os.path.abspath(root or '')
         self.stream = stream
         self.view = self._localize_view(view or [])
         self.sync_paths = sync or ['//...']
         assert isinstance(self.sync_paths, list)
-        self.client_opts = client_opts or ''
+        self.client_options = client_options or ''
         self.parallel = parallel
 
         self.created_client = False
@@ -93,7 +93,7 @@ def _setup_client(self):
 
         # unless overidden, overwrite writeable-but-unopened files
         # (e.g. interrupted syncs, artefacts that have been checked-in)
-        client._options = self.client_opts + ' clobber'
+        client._options = self.client_options + ' clobber'
 
         self.perforce.save_client(client)