Decaf Source

.github/workflows/CI.yml

@@ -39,6 +39,8 @@ jobs:
       - if: "!contains(matrix.os, 'windows')"
         name: Run tests 👩🏾‍💻
         run: ./bin/npm test
+        # Q: Why are we using some random test section when the package.json has a test script?
+        # A: So that we ensure we use the bundled version of node to run our tests
 
   Skip:
     if: contains(github.event.head_commit.message, '[skip ci]')

bin/apm

@@ -31,7 +31,7 @@ binDir=`pwd -P`
 # Force npm to use its builtin node-gyp
 unset npm_config_node_gyp
 
-cliPath="$binDir/../lib/cli.js"
+cliPath="$binDir/../src/cli.js"
 if [[ $(uname -r) == *-Microsoft ]]; then
   cliPath="$(echo $cliPath | sed 's/\/mnt\/\([a-z]*\)\(.*\)/\1:\2/')"
   cliPath="${cliPath////\\}"

bin/apm.cmd

@@ -16,7 +16,7 @@ if not defined apm_git_path (
 set npm_config_node_gyp=
 
 if exist "%~dp0\node.exe" (
-  "%~dp0\node.exe" "%~dp0/../lib/cli.js" %*
+  "%~dp0\node.exe" "%~dp0/../src/cli.js" %*
 ) else (
-  node.exe "%~dp0/../lib/cli.js" %*
+  node.exe "%~dp0/../src/cli.js" %*
 )

bin/ppm

@@ -31,7 +31,7 @@ binDir=`pwd -P`
 # Force npm to use its builtin node-gyp
 unset npm_config_node_gyp
 
-cliPath="$binDir/../lib/cli.js"
+cliPath="$binDir/../src/cli.js"
 if [[ $(uname -r) == *-Microsoft ]]; then
   cliPath="$(echo $cliPath | sed 's/\/mnt\/\([a-z]*\)\(.*\)/\1:\2/')"
   cliPath="${cliPath////\\}"

bin/ppm.cmd

@@ -16,7 +16,7 @@ if not defined apm_git_path (
 set npm_config_node_gyp=
 
 if exist "%~dp0\node.exe" (
-  "%~dp0\node.exe" "%~dp0/../lib/cli.js" %*
+  "%~dp0\node.exe" "%~dp0/../src/cli.js" %*
 ) else (
-  node.exe "%~dp0/../lib/cli.js" %*
+  node.exe "%~dp0/../src/cli.js" %*
 )

package.json

@@ -10,21 +10,16 @@
   "bugs": {
     "url": "https://github.com/pulsar-edit/ppm/issues"
   },
-  "main": "./lib/apm.js",
+  "main": "./src/apm.js",
   "bin": {
     "apm": "bin/apm"
   },
   "scripts": {
     "check-version": "node script/check-version.js",
     "clean:bin": "shx rm -rf bin/node_darwin_x64 bin/node.exe bin/node",
-    "clean:lib": "shx rm -rf lib && shx mkdir -p lib",
-    "clean": "npm run clean:lib && npm run clean:bin",
-    "lint": "coffeelint src spec",
-    "coffee": "coffee --compile --output lib src",
-    "build": "npm run clean:lib && npm run coffee",
-    "prepare": "npm run build",
+    "clean": "npm run clean:bin",
     "postinstall": "node script/postinstall.js",
-    "test": "npm run check-version && npm run lint && jasmine-focused --captureExceptions --coffee spec"
+    "test": "npm run check-version && jasmine-focused --captureExceptions spec"
   },
   "dependencies": {
     "@atom/plist": "0.4.4",

spec/apm-cli.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const temp = require('temp');
 const fs = require('fs');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm command line interface', () => {
   beforeEach(() => {

spec/ci-spec.js

@@ -5,7 +5,7 @@ const temp = require('temp');
 const express = require('express');
 const wrench = require('wrench');
 const CSON = require('season');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 const { nodeVersion } = JSON.parse(fs.readFileSync(path.join(__dirname,'config.json')));
 
 describe('apm ci', () => {

spec/clean-spec.js

@@ -4,7 +4,7 @@ const temp = require('temp');
 const express = require('express');
 const http = require('http');
 const wrench = require('wrench');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 const { nodeVersion } = JSON.parse(fs.readFileSync(path.join(__dirname, 'config.json')));
 
 describe('apm clean', () => {

spec/command-spec.js

@@ -1,4 +1,4 @@
-const Command = require('../lib/command');
+const Command = require('../src/command');
 
 describe('Command', () => {
   describe('::spawn', () => {

spec/config-spec.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs-plus');
 const temp = require('temp');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm config', () => {
   let userConfigPath;

spec/develop-spec.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs-plus');
 const temp = require('temp');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm develop', () => {
   let linkedRepoPath, repoPath;
@@ -19,7 +19,7 @@ describe('apm develop', () => {
 
   describe("when the package doesn't have a published repository url", () => {
     it('logs an error', () => {
-      const Develop = require('../lib/develop');
+      const Develop = require('../src/develop');
       spyOn(Develop.prototype, 'getRepositoryUrl').andCallFake((packageName, callback) => {
         callback('Here is the error');
       });
@@ -36,7 +36,7 @@ describe('apm develop', () => {
 
   describe("when the repository hasn't been cloned", () => {
     it('clones the repository to ATOM_REPOS_HOME and links it to ATOM_HOME/dev/packages', () => {
-      const Develop = require('../lib/develop');
+      const Develop = require('../src/develop');
       spyOn(Develop.prototype, 'getRepositoryUrl').andCallFake((packageName, callback) => {
         const repoUrl = path.join(__dirname, 'fixtures', 'repo.git');
         callback(null, repoUrl);

spec/disable-spec.js

@@ -3,7 +3,7 @@ const wrench = require('wrench');
 const path = require('path');
 const temp = require('temp');
 const CSON = require('season');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm disable', () => {
   beforeEach(() => {

spec/docs-spec.js

@@ -1,8 +1,8 @@
 const path = require('path');
 const express = require('express');
 const http = require('http');
-const apm = require('../lib/apm-cli');
-let Docs = require('../lib/docs');
+const apm = require('../src/apm-cli');
+let Docs = require('../src/docs');
 
 describe('apm docs', () => {
   let server = null;
@@ -75,7 +75,7 @@ describe('apm docs', () => {
   });
 
   it('prints the package URL if called with the -p short option (and does not open it)', () => {
-    Docs = require('../lib/docs');
+    Docs = require('../src/docs');
     spyOn(Docs.prototype, 'openRepositoryUrl');
     const callback = jasmine.createSpy('callback');
     apm.run(['docs', '-p', 'wrap-guide'], callback);

spec/enable-spec.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const temp = require('temp');
 const CSON = require('season');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm enable', () => {
   beforeEach(() => {
@@ -15,27 +15,27 @@ describe('apm enable', () => {
     process.env.ATOM_HOME = atomHome;
     const callback = jasmine.createSpy('callback');
     const configFilePath = path.join(atomHome, 'config.cson');
-    
+
     CSON.writeFileSync(configFilePath, {
       '*': {
         core: {
           disabledPackages: ['metrics', 'vim-mode', 'exception-reporting', 'file-icons']
         }
       }
     });
-    
+
     runs(() => {
       apm.run(['enable', 'vim-mode', 'not-installed', 'file-icons'], callback);
     });
-    
+
     waitsFor('waiting for enable to complete', () => callback.callCount > 0);
-    
+
     runs(() => {
       expect(console.log).toHaveBeenCalled();
       expect(console.log.argsForCall[0][0]).toMatch(/Not Disabled:\s*not-installed/);
       expect(console.log.argsForCall[1][0]).toMatch(/Enabled:\s*vim-mode/);
       const config = CSON.readFileSync(configFilePath);
-      
+
       expect(config).toEqual({
         '*': {
           core: {
@@ -51,26 +51,26 @@ describe('apm enable', () => {
     process.env.ATOM_HOME = atomHome;
     const callback = jasmine.createSpy('callback');
     const configFilePath = path.join(atomHome, 'config.cson');
-    
+
     CSON.writeFileSync(configFilePath, {
       '*': {
         core: {
           disabledPackages: ['metrics', 'exception-reporting']
         }
       }
     });
-    
+
     runs(() => {
       apm.run(['enable', 'vim-mode'], callback);
     });
-    
+
     waitsFor('waiting for enable to complete', () => callback.callCount > 0);
-    
+
     runs(() => {
       expect(console.log).toHaveBeenCalled();
       expect(console.log.argsForCall[0][0]).toMatch(/Not Disabled:\s*vim-mode/);
       const config = CSON.readFileSync(configFilePath);
-      
+
       expect(config).toEqual({
         '*': {
           core: {
@@ -85,13 +85,13 @@ describe('apm enable', () => {
     const atomHome = temp.mkdirSync('apm-home-dir-');
     process.env.ATOM_HOME = atomHome;
     const callback = jasmine.createSpy('callback');
-    
+
     runs(() => {
       apm.run(['enable', 'vim-mode'], callback);
     });
-    
+
     waitsFor('waiting for enable to complete', () => callback.callCount > 0);
-    
+
     runs(() => {
       expect(console.error).toHaveBeenCalled();
       expect(console.error.argsForCall[0][0].length).toBeGreaterThan(0);
@@ -102,7 +102,7 @@ describe('apm enable', () => {
     const atomHome = temp.mkdirSync('apm-home-dir-');
     process.env.ATOM_HOME = atomHome;
     const callback = jasmine.createSpy('callback');
-    
+
     runs(() => {
       apm.run(['enable'], callback);
     });

spec/featured-spec.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const express = require('express');
 const http = require('http');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm featured', () => {
   let server = null;
@@ -10,23 +10,23 @@ describe('apm featured', () => {
     silenceOutput();
     spyOnToken();
     const app = express();
-    
+
     app.get('/packages/featured', (request, response) => {
       response.sendFile(path.join(__dirname, 'fixtures', 'packages.json'));
     });
-    
+
     app.get('/themes/featured', (request, response) => {
       response.sendFile(path.join(__dirname, 'fixtures', 'themes.json'));
     });
-    
+
     server = http.createServer(app);
     let live = false;
-    
+
     server.listen(3000, '127.0.0.1', () => {
       process.env.ATOM_API_URL = 'http://localhost:3000';
       live = true;
     });
-    
+
     waitsFor(() => live);
   });
 

spec/help-spec.js

@@ -1,4 +1,4 @@
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('command help', () => {
   beforeEach(() => {

spec/init-spec.js

@@ -1,8 +1,8 @@
 const path = require('path');
 const temp = require('temp');
 const CSON = require('season');
-const apm = require('../lib/apm-cli');
-const fs = require('../lib/fs');
+const apm = require('../src/apm-cli');
+const fs = require('../src/fs');
 
 describe('apm init', () => {
   let languagePath, packagePath, themePath;

spec/install-spec.js

@@ -1,12 +1,12 @@
 const path = require('path');
 const CSON = require('season');
-const fs = require('../lib/fs');
+const fs = require('../src/fs');
 const temp = require('temp');
 const express = require('express');
 const http = require('http');
 const wrench = require('wrench');
-const apm = require('../lib/apm-cli');
-const Install = require('../lib/install');
+const apm = require('../src/apm-cli');
+const Install = require('../src/install');
 const { nodeVersion } = JSON.parse(fs.readFileSync(path.join(__dirname,'config.json')));
 
 describe('apm install', () => {
@@ -15,7 +15,7 @@ describe('apm install', () => {
   beforeEach(() => {
     spyOnToken();
     silenceOutput();
-    
+
     atomHome = temp.mkdirSync('apm-home-dir-');
     process.env.ATOM_HOME = atomHome;
 

spec/link-spec.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const temp = require('temp');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm link/unlink', () => {
   beforeEach(() => {

spec/list-spec.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs-plus');
 const temp = require('temp');
 const wrench = require('wrench');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 const CSON = require('season');
 
 const listPackages = (args, doneCallback) => {

spec/packages-spec.js

@@ -1,4 +1,4 @@
-const Packages = require('../lib/packages');
+const Packages = require('../src/packages');
 
 describe('getRemote', () => {
   it('returns origin if remote could not be determined', () => {

spec/publish-spec.js

@@ -3,7 +3,7 @@ const fs = require('fs-plus');
 const temp = require('temp');
 const express = require('express');
 const http = require('http');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 
 describe('apm publish', () => {
   let server;

spec/rebuild-spec.js

@@ -2,7 +2,7 @@ const path = require('path');
 const temp = require('temp');
 const express = require('express');
 const http = require('http');
-const apm = require('../lib/apm-cli');
+const apm = require('../src/apm-cli');
 const fs = require('fs-plus');
 const { nodeVersion } = JSON.parse(fs.readFileSync(path.join(__dirname,'config.json')));