Merge ~bloodearnest/snapstore-client:rename into snapstore-client:master

[Simon Davy]

rename snap to snap-store-proxy-client

e41ce07... by Simon Davy on 2018-07-16

remove state files

893e8e5... by Simon Davy on 2018-07-16

remove debugging

[Colin Watson (cjwatson)]

review: Approve

9a61cdb... by Simon Davy on 2018-07-16

add clarifying comment about py3.5

diff --git a/.gitignore b/.gitignore
index 5d2c033..5d9d1bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ __pycache__/
 /.coverage
 /htmlcov
 docs/build
+parts
+prime
+stage
diff --git a/Makefile b/Makefile
index a3b3b78..d8f1bd4 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ $(SNAPSTORE_DEPENDENCY_DIR):
 	git clone $(DEPENDENCY_REPO) $(SNAPSTORE_DEPENDENCY_DIR)
 
 $(ENV)/prod: | $(SNAPSTORE_DEPENDENCY_DIR)
-	virtualenv $(ENV) --python=python3
+	virtualenv $(ENV) --python=python3.5  # pin to 3.5 as that is what core 16 is
 	$(PIP) install -f $(SNAPSTORE_DEPENDENCY_DIR) --no-index -r requirements.txt
 	touch $@
 
diff --git a/docs/en/client.md b/docs/en/client.md
index a1cfc9e..6a23103 100644
--- a/docs/en/client.md
+++ b/docs/en/client.md
@@ -7,7 +7,7 @@ Installation
 
 The snapstore client can be installed from the snap store:
 
-    snap install snapstore-client
+    snap install snap-store-proxy-client
 
 Configuration
 =============
@@ -18,19 +18,19 @@ the [Ubuntu SSO provider](https://login.ubuntu.com).
 
 From the command line on the machine that has the Proxy installed, run:
 
-    sudo snapstore add-admin [e-mail]
+    sudo snap-proxy add-admin [e-mail]
 
 Once the user has been registered, the client can login:
 
-    snapstore-client login
+    snap-store-proxy-client login [address of proxy]
 
 Usage
 =====
 
-snapstore-client provides the same command line interface for managing overrides
+snap-store-proxy-client provides the same command line interface for managing overrides
 as the CLI client installed with the Proxy. It cannot configure any system
 settings for the Proxy.
 
-    snapstore-client list-overrides
-    snapstore-client override foo stable=10
-    snapstore-client delete-override foo
+    snap-store-proxy-client list-overrides
+    snap-store-proxy-client override foo stable=10
+    snap-store-proxy-client delete-override foo
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ff7c8a6..f234ee1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,15 +1,15 @@
-name: snapstore-client
-version: 1.0beta
-summary: Canonical snapstore administration client.
+name: snap-store-proxy-client
+version: 1.0
+summary: Canonical snap store proxy administration client.
 description: |
-  The Canonical snapstore client is used to manage a snapstore.
+  The Canonical snapstore client is used to manage a snap store proxy.
 
 # Defaults, but snapcraft prints ugly yellow messages without them.
 confinement: strict
 grade: stable
 
 apps:
-  snapstore-client:
+  snap-store-proxy-client:
     command: ./snapstore
     plugs:
       - network
@@ -26,3 +26,7 @@ parts:
     stage:
       - ./snapstore
       - ./snapstore_client/
+    override-prime: |
+      snapcraftctl prime
+      /snap/core/current/usr/bin/python3 -m compileall -q -j0 snapstore_client
+
diff --git a/snapstore_client/config.py b/snapstore_client/config.py
index ca7beb9..a01e975 100644
--- a/snapstore_client/config.py
+++ b/snapstore_client/config.py
@@ -12,7 +12,7 @@ from xdg import BaseDirectory
 
 class Config:
 
-    xdg_name = 'snapstore-client'
+    xdg_name = 'snap-store-proxy-client'
 
     def __init__(self):
         self.parser = configparser.ConfigParser()
diff --git a/snapstore_client/logic/overrides.py b/snapstore_client/logic/overrides.py
index 5749988..667bd0a 100644
--- a/snapstore_client/logic/overrides.py
+++ b/snapstore_client/logic/overrides.py
@@ -20,13 +20,13 @@ logger = logging.getLogger(__name__)
 
 def _log_credentials_error(e):
     logger.error('%s', e)
-    logger.error('Try to "snapstore-client login" again.')
+    logger.error('Try to "snap-store-proxy-client login" again.')
 
 
 def _log_authorized_error():
     logger.error(("Perhaps you have not been registered as an "
                   "admin with the proxy."))
-    logger.error("Try 'snapstore add-admin' on the proxy host.")
+    logger.error("Try 'snap-proxy add-admin' on the proxy host.")
 
 
 def _check_default_store(cfg):
@@ -36,7 +36,7 @@ def _check_default_store(cfg):
     if not store.get('gw_url'):
         logger.error(
             'No store configuration found. '
-            'Have you run "snapstore-client login"?')
+            'Have you run "snap-store-proxy-client login"?')
         return None
     return store
 
diff --git a/snapstore_client/logic/tests/test_overrides.py b/snapstore_client/logic/tests/test_overrides.py
index 08a85af..1f2f2d0 100644
--- a/snapstore_client/logic/tests/test_overrides.py
+++ b/snapstore_client/logic/tests/test_overrides.py
@@ -29,7 +29,7 @@ class OverridesTests(TestCase):
         self.assertEqual(
             logger.output,
             'No store configuration found. '
-            'Have you run "snapstore-client login"?\n')
+            'Have you run "snap-store-proxy-client login"?\n')
 
     @responses.activate
     def test_list_overrides(self):
@@ -68,7 +68,7 @@ class OverridesTests(TestCase):
         self.assertEqual(
             logger.output,
             'No store configuration found. '
-            'Have you run "snapstore-client login"?\n')
+            'Have you run "snap-store-proxy-client login"?\n')
 
     @responses.activate
     def test_override(self):
@@ -123,7 +123,7 @@ class OverridesTests(TestCase):
         self.assertEqual(
             logger.output,
             'No store configuration found. '
-            'Have you run "snapstore-client login"?\n')
+            'Have you run "snap-store-proxy-client login"?\n')
 
     @responses.activate
     def test_delete_override(self):
diff --git a/snapstore_client/tests/factory.py b/snapstore_client/tests/factory.py
index b7f77c6..f9d4ba5 100644
--- a/snapstore_client/tests/factory.py
+++ b/snapstore_client/tests/factory.py
@@ -2,7 +2,7 @@
 
 """Test Factory.
 
-Since snapstore-client does not have any database, its persistence layer
+Since snap-store-proxy-client does not have any database, its persistence layer
 consists of making requests to other services in the store.
 
 The test factory therefore makes it easy to create payloads that are
diff --git a/snapstore_client/tests/test_config.py b/snapstore_client/tests/test_config.py
index 2ddbc5c..320b51c 100644
--- a/snapstore_client/tests/test_config.py
+++ b/snapstore_client/tests/test_config.py
@@ -28,7 +28,8 @@ class ConfigTests(TestCase):
 
     def test_save(self):
         xdg_path = self.useFixture(XDGConfigDirFixture()).path
-        config_ini = os.path.join(xdg_path, 'snapstore-client', 'config.ini')
+        config_ini = os.path.join(
+            xdg_path, 'snap-store-proxy-client', 'config.ini')
         self.assertFalse(os.path.exists(config_ini))
 
         cfg = Config()
diff --git a/snapstore_client/tests/testfixtures.py b/snapstore_client/tests/testfixtures.py
index 0342388..10f714e 100644
--- a/snapstore_client/tests/testfixtures.py
+++ b/snapstore_client/tests/testfixtures.py
@@ -50,7 +50,8 @@ class ConfigFixture(Fixture):
 
     def _setUp(self):
         xdg_config_path = self.useFixture(XDGConfigDirFixture()).path
-        app_config_path = os.path.join(xdg_config_path, 'snapstore-client')
+        app_config_path = os.path.join(
+            xdg_config_path, 'snap-store-proxy-client')
         os.makedirs(app_config_path)
         if self.empty:
             return