Fix sls plugin install -n @scoped/package

lib/plugins/plugin/install/install.js

@@ -47,7 +47,13 @@ class PluginInstall {
   }
 
   install() {
-    const pluginInfo = _.split(this.options.name, '@', 2);
+    let pluginInfo;
+    if (this.options.name.startsWith('@')) {
+      pluginInfo = _.split(this.options.name.slice(1), '@', 2);
+      pluginInfo[0] = `@${pluginInfo[0]}`;
+    } else {
+      pluginInfo = _.split(this.options.name, '@', 2);
+    }
     this.options.pluginName = pluginInfo[0];
     this.options.pluginVersion = pluginInfo[1] || 'latest';
 

lib/plugins/plugin/install/install.test.js

@@ -22,6 +22,11 @@ describe('PluginInstall', () => {
   let consoleLogStub;
   let serverlessErrorStub;
   const plugins = [
+    {
+      name: '@scope/serverless-plugin-1',
+      description: 'Scoped Serverless Plugin 1',
+      githubUrl: 'https://github.com/serverless/serverless-plugin-1',
+    },
     {
       name: 'serverless-plugin-1',
       description: 'Serverless Plugin 1',
@@ -157,6 +162,28 @@ describe('PluginInstall', () => {
       });
     });
 
+    it('should install a scoped plugin if it can be found in the registry', () => {
+      // serverless.yml
+      const serverlessYml = {
+        service: 'plugin-service',
+        provider: 'aws',
+      };
+      serverless.utils
+        .writeFileSync(serverlessYmlFilePath, YAML.dump(serverlessYml));
+
+      pluginInstall.options.name = '@scope/serverless-plugin-1';
+
+      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
+        expect(validateStub.calledOnce).to.equal(true);
+        expect(getPluginsStub.calledOnce).to.equal(true);
+        expect(pluginInstallStub.calledOnce).to.equal(true);
+        expect(consoleLogStub.called).to.equal(true);
+        expect(serverlessErrorStub.calledOnce).to.equal(false);
+        expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
+        expect(installPeerDependenciesStub.calledOnce).to.equal(true);
+      });
+    });
+
     it('should not install the plugin if it can not be found in the registry', () => {
       // serverless.yml
       const serverlessYml = {
@@ -192,6 +219,21 @@ describe('PluginInstall', () => {
       });
     });
 
+    it('should apply the latest version if you can not get the ' +
+       'version from name option even if scoped', () => {
+      const serverlessYml = {
+        service: 'plugin-service',
+        provider: 'aws',
+      };
+      serverless.utils
+        .writeFileSync(serverlessYmlFilePath, YAML.dump(serverlessYml));
+      pluginInstall.options.name = '@scope/serverless-plugin-1';
+      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
+        expect(pluginInstall.options.pluginName).to.be.equal('@scope/serverless-plugin-1');
+        expect(pluginInstall.options.pluginVersion).to.be.equal('latest');
+      });
+    });
+
     it('should apply the specified version if you can get the version from name option', () => {
       const serverlessYml = {
         service: 'plugin-service',