Removing the run command

docs/snapcraft-usage.md

@@ -35,24 +35,12 @@ prompts.
 After installing a summary of installed snaps will be presented, on vanilla
 x86-64 bit system it would look a lot like this:
 
-	Name          Date       Version      Developer 
-	ubuntu-core   2015-09-17 5            ubuntu    
+	Name          Date       Version      Developer
+	ubuntu-core   2015-09-17 5            ubuntu
 	downloader    2015-10-01 ICIEPfXHQOaC sideload  
 	generic-amd64 2015-10-01 1.4          canonical
 
 Take notice of the sideload word in the downloader snap, this indicates that
 the snap did not come signed from the store, if an app is sideloaded, it
 also fakes the version to allow easy iteration without the need to change the
 metadata.
-
-## Using `snapcraft run`
-
-Instead of sideloading your app manually, you can use the following to
-speed up things:
-
-	$ snapcraft run
-
-Run this inside your project and an Ubuntu Core VM will be booted, your last
-successful .snap build will be uploaded to it and you will be connected to it
-via SSH automatically. Type `Ctrl-D` at end of testing your uploaded app and
-you are back to your previous working directory.

examples/tomcat-maven-webapp/snapcraft.yaml

@@ -19,7 +19,7 @@ parts:
         source: git://github.com/lool/snappy-mvn-demo.git
     tomcat:
         plugin: tar-content
-        source: http://mirrors.ircam.fr/pub/apache/tomcat/tomcat-8/v8.0.28/bin/apache-tomcat-8.0.28.tar.gz
+        source: http://mirrors.ircam.fr/pub/apache/tomcat/tomcat-8/v8.0.29/bin/apache-tomcat-8.0.29.tar.gz
     local-files:
         plugin: make
         source: .

integration-tests/units/jobs.pxu

@@ -15,7 +15,7 @@ flags: simple has-leftovers
 id: snapcraft/normal/no-yaml-run
 command:
     set -x
-    OUTPUT=$(${SNAPCRAFT} run 2>&1)
+    OUTPUT=$(${SNAPCRAFT} pull 2>&1)
     test $? = 1 || exit 1
     echo $OUTPUT | grep "Could not find snapcraft\.yaml\."
 flags: simple has-leftovers

snapcraft/cmds.py

@@ -16,22 +16,19 @@
 
 import apt
 import filecmp
-import glob
 import logging
 import os
 import shlex
 import shutil
 import subprocess
 import sys
-import tempfile
 import time
 
 import snapcraft.yaml
 from snapcraft import (
     common,
     lifecycle,
     meta,
-    ssh
 )
 
 logger = logging.getLogger(__name__)
@@ -121,103 +118,6 @@ def assemble(args):
         sys.exit(ret)
 
 
-def run(args):
-    # We are mostly making sure we are operating from the correct location. In
-    # the future this could do more by using target attribute in snapcraft.yaml
-    # to create the correct target image.
-    _load_config()
-    # Find the ssh key that ubuntu-device-flash would use so that we can use it
-    # ourselves as well. This may not be the default key that the user has
-    # configured.
-    # See: https://bugs.launchpad.net/snapcraft/+bug/1486659
-    try:
-        ssh_key = ssh.get_latest_private_key()
-    except LookupError:
-        logger.error('You need to have an SSH key to use this command')
-        logger.error('Please generate one with ssh-keygen(1)')
-        return 1
-    else:
-        logger.info('Using the following ssh key: %s', ssh_key)
-
-    # Find available *.snap files to copy into the test VM
-    snap_dir = os.path.join(os.getcwd())
-    # copy the snap with the largest version number into the test VM
-    snaps = glob.glob(snap_dir + '/*.snap')
-    snaps.sort()
-    if not snaps:
-        logger.error('There are no .snap files ready')
-        logger.error('Perhaps you forgot to run "snapcraft assemble"')
-        return 1
-
-    qemudir = os.path.join(os.getcwd(), 'image')
-    qemu_img = os.path.join(qemudir, '15.04.img')
-    if not os.path.exists(qemu_img):
-        os.makedirs(qemudir, exist_ok=True)
-        logger.info(
-            'Setting up virtual snappy environment, root access required')
-        common.run([
-            'sudo', 'ubuntu-device-flash', 'core', '15.04', '--developer-mode',
-            '--enable-ssh', '-o', os.path.relpath(qemu_img, qemudir)],
-            cwd=qemudir)
-    qemu = None
-    try:
-        # Allow the developer to provide additional arguments to qemu.  This
-        # can be used, for example, to pass through USB devices from the host.
-        # This can enable a lot of hardware-specific use cases directly inside
-        # the snapcraft run workflow.
-        #
-        # For example:
-        # $ export SNAPCRAFT_RUN_QEMU_ARGS=\
-        #       "-usb -device usb-host,hostbus=1,hostaddr=10"
-        # $ snapcraft run
-        qemu_args = os.getenv('SNAPCRAFT_RUN_QEMU_ARGS')
-        if qemu_args is not None:
-            qemu_args = shlex.split(qemu_args)
-        else:
-            qemu_args = []
-        qemu = subprocess.Popen(
-            ['kvm', '-m', '768', '-nographic', '-snapshot', '-redir',
-             'tcp:8022::22', qemu_img] + qemu_args, stdin=subprocess.PIPE)
-        n = tempfile.NamedTemporaryFile()
-        ssh_opts = [
-            # We want to login with the specified ssh identity (key)
-            '-i', ssh_key,
-            # We don't want strict host checking because it's a new VM with a
-            # random key each time.
-            '-oStrictHostKeyChecking=no',
-            # We don't want to pollute the known_hosts file with new entries
-            # all the time so let's use a temporary file for that
-            '-oUserKnownHostsFile={}'.format(n.name),
-            # Don't try keyboard interactive authentication, we're expecting to
-            # login via the key and if that doesn't work then everything else
-            # will fail anyway.
-            '-oKbdInteractiveAuthentication=no',
-        ]
-        while True:
-            ret_code = _call(
-                ['ssh'] + ssh_opts +
-                ['ubuntu@localhost', '-p', '8022', 'true'])
-            if ret_code == 0:
-                break
-            print('Waiting for device')
-            time.sleep(1)
-        # copy the most recent snap into the test VM
-        _check_call(
-            ['scp'] + ssh_opts + [
-                '-P', '8022', snaps[-1], 'ubuntu@localhost:~/'])
-        # install the snap
-        _check_call(
-            ['ssh'] + ssh_opts +
-            ['ubuntu@localhost', '-p', '8022', 'sudo snappy install  *.snap'])
-        # "login"
-        _call(
-            ['ssh'] + ssh_opts + ['-p', '8022', 'ubuntu@localhost'],
-            preexec_fn=os.setsid)
-    finally:
-        if qemu:
-            qemu.kill()
-
-
 def list_plugins(args=None):
     import pkgutil
     import snapcraft.plugins

snapcraft/main.py

@@ -78,10 +78,6 @@ def main():
         help='optional command to run inside staging environment')
     parser.set_defaults(func=snapcraft.cmds.shell)
 
-    parser = subparsers.add_parser('run', help='run snap in kvm',
-                                   add_help=False)
-    parser.set_defaults(func=snapcraft.cmds.run)
-
     parser = subparsers.add_parser(
         'list-plugins',
         help='list the available plugins that handle different types '