From df0b3dedd7e2f4d092fef94dcb602f543b525e90 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 25 May 2016 11:02:29 +0200 Subject: [PATCH] browser -> main-process --- build/tasks/generate-module-cache-task.coffee | 2 +- build/tasks/spec-task.coffee | 2 +- package.json | 2 +- spec/atom-portable-spec.coffee | 2 +- spec/{browser => main-process}/mocha-test-runner.js | 0 spec/spawner-spec.coffee | 4 ++-- spec/squirrel-update-spec.coffee | 12 ++++++------ .../application-menu.coffee | 0 .../atom-application.coffee | 0 src/{browser => main-process}/atom-portable.coffee | 0 .../atom-protocol-handler.coffee | 0 src/{browser => main-process}/atom-window.coffee | 0 .../auto-update-manager.coffee | 0 .../auto-updater-win32.coffee | 0 src/{browser => main-process}/context-menu.coffee | 0 src/{browser => main-process}/main.coffee | 6 +++--- src/{browser => main-process}/spawner.coffee | 0 src/{browser => main-process}/squirrel-update.coffee | 0 src/{browser => main-process}/win-powershell.coffee | 0 src/{browser => main-process}/win-registry.coffee | 0 20 files changed, 15 insertions(+), 15 deletions(-) rename spec/{browser => main-process}/mocha-test-runner.js (100%) rename src/{browser => main-process}/application-menu.coffee (100%) rename src/{browser => main-process}/atom-application.coffee (100%) rename src/{browser => main-process}/atom-portable.coffee (100%) rename src/{browser => main-process}/atom-protocol-handler.coffee (100%) rename src/{browser => main-process}/atom-window.coffee (100%) rename src/{browser => main-process}/auto-update-manager.coffee (100%) rename src/{browser => main-process}/auto-updater-win32.coffee (100%) rename src/{browser => main-process}/context-menu.coffee (100%) rename src/{browser => main-process}/main.coffee (97%) rename src/{browser => main-process}/spawner.coffee (100%) rename src/{browser => main-process}/squirrel-update.coffee (100%) rename src/{browser => main-process}/win-powershell.coffee (100%) rename src/{browser => main-process}/win-registry.coffee (100%) diff --git a/build/tasks/generate-module-cache-task.coffee b/build/tasks/generate-module-cache-task.coffee index d21f53336..e2a92981e 100644 --- a/build/tasks/generate-module-cache-task.coffee +++ b/build/tasks/generate-module-cache-task.coffee @@ -22,7 +22,7 @@ module.exports = (grunt) -> 'exports' 'spec' 'src' - 'src/browser' + 'src/main-process' 'static' 'vendor' ] diff --git a/build/tasks/spec-task.coffee b/build/tasks/spec-task.coffee index 8cfc9f6f9..800344645 100644 --- a/build/tasks/spec-task.coffee +++ b/build/tasks/spec-task.coffee @@ -107,7 +107,7 @@ module.exports = (grunt) -> runMainProcessSpecs = (callback) -> appPath = getAppPath() resourcePath = process.cwd() - mainProcessSpecsPath = path.resolve('spec/browser') + mainProcessSpecsPath = path.resolve('spec/main-process') if process.platform in ['darwin', 'linux'] options = diff --git a/package.json b/package.json index 628dca168..3ae80f967 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Atom", "version": "1.9.0-dev", "description": "A hackable text editor for the 21st Century.", - "main": "./src/browser/main.js", + "main": "./src/main-process/main.js", "repository": { "type": "git", "url": "https://github.com/atom/atom.git" diff --git a/spec/atom-portable-spec.coffee b/spec/atom-portable-spec.coffee index 0601ff126..8f45f314e 100644 --- a/spec/atom-portable-spec.coffee +++ b/spec/atom-portable-spec.coffee @@ -1,7 +1,7 @@ path = require 'path' fs = require 'fs-plus' temp = require 'temp' -AtomPortable = require '../src/browser/atom-portable' +AtomPortable = require '../src/main-process/atom-portable' portableModeCommonPlatformBehavior = (platform) -> describe "with ATOM_HOME environment variable", -> diff --git a/spec/browser/mocha-test-runner.js b/spec/main-process/mocha-test-runner.js similarity index 100% rename from spec/browser/mocha-test-runner.js rename to spec/main-process/mocha-test-runner.js diff --git a/spec/spawner-spec.coffee b/spec/spawner-spec.coffee index daa804bbb..27b5be7ea 100644 --- a/spec/spawner-spec.coffee +++ b/spec/spawner-spec.coffee @@ -1,5 +1,5 @@ ChildProcess = require 'child_process' -Spawner = require '../src/browser/spawner' +Spawner = require '../src/main-process/spawner' describe "Spawner", -> beforeEach -> @@ -18,7 +18,7 @@ describe "Spawner", -> it "invokes passed callback", -> someCallback = jasmine.createSpy('someCallback') - + Spawner.spawn('some-command', 'some-args', someCallback) waitsFor -> diff --git a/spec/squirrel-update-spec.coffee b/spec/squirrel-update-spec.coffee index 4a6936a50..a8a39eb54 100644 --- a/spec/squirrel-update-spec.coffee +++ b/spec/squirrel-update-spec.coffee @@ -2,10 +2,10 @@ fs = require 'fs-plus' path = require 'path' temp = require 'temp' -SquirrelUpdate = require '../src/browser/squirrel-update' -Spawner = require '../src/browser/spawner' -WinPowerShell = require '../src/browser/win-powershell' -WinRegistry = require '../src/browser/win-registry' +SquirrelUpdate = require '../src/main-process/squirrel-update' +Spawner = require '../src/main-process/spawner' +WinPowerShell = require '../src/main-process/win-powershell' +WinRegistry = require '../src/main-process/win-registry' # Run passed callback as Spawner.spawn() would do invokeCallback = (callback) -> @@ -70,14 +70,14 @@ describe "Windows Squirrel Update", -> beforeEach -> desktopShortcutPath = path.join(tempHomeDirectory, 'Desktop', 'Atom.lnk') - + jasmine.unspy(Spawner, 'spawn') spyOn(Spawner, 'spawn').andCallFake (command, args, callback) -> if path.basename(command) is 'Update.exe' and args?[0] is '--createShortcut' fs.writeFileSync(desktopShortcutPath, '') else # simply ignore other commands - + invokeCallback callback it "does not exist before install", -> diff --git a/src/browser/application-menu.coffee b/src/main-process/application-menu.coffee similarity index 100% rename from src/browser/application-menu.coffee rename to src/main-process/application-menu.coffee diff --git a/src/browser/atom-application.coffee b/src/main-process/atom-application.coffee similarity index 100% rename from src/browser/atom-application.coffee rename to src/main-process/atom-application.coffee diff --git a/src/browser/atom-portable.coffee b/src/main-process/atom-portable.coffee similarity index 100% rename from src/browser/atom-portable.coffee rename to src/main-process/atom-portable.coffee diff --git a/src/browser/atom-protocol-handler.coffee b/src/main-process/atom-protocol-handler.coffee similarity index 100% rename from src/browser/atom-protocol-handler.coffee rename to src/main-process/atom-protocol-handler.coffee diff --git a/src/browser/atom-window.coffee b/src/main-process/atom-window.coffee similarity index 100% rename from src/browser/atom-window.coffee rename to src/main-process/atom-window.coffee diff --git a/src/browser/auto-update-manager.coffee b/src/main-process/auto-update-manager.coffee similarity index 100% rename from src/browser/auto-update-manager.coffee rename to src/main-process/auto-update-manager.coffee diff --git a/src/browser/auto-updater-win32.coffee b/src/main-process/auto-updater-win32.coffee similarity index 100% rename from src/browser/auto-updater-win32.coffee rename to src/main-process/auto-updater-win32.coffee diff --git a/src/browser/context-menu.coffee b/src/main-process/context-menu.coffee similarity index 100% rename from src/browser/context-menu.coffee rename to src/main-process/context-menu.coffee diff --git a/src/browser/main.coffee b/src/main-process/main.coffee similarity index 97% rename from src/browser/main.coffee rename to src/main-process/main.coffee index 193ec85d8..c7ff4882b 100644 --- a/src/browser/main.coffee +++ b/src/main-process/main.coffee @@ -21,7 +21,7 @@ start = -> return else if args.test and args.mainProcess console.log = previousConsoleLog - testRunner = require(path.join(args.resourcePath, 'spec/browser/mocha-test-runner')) + testRunner = require(path.join(args.resourcePath, 'spec/main-process/mocha-test-runner')) app.on 'ready', -> testRunner(args.pathsToOpen) return @@ -49,7 +49,7 @@ start = -> app.removeListener 'open-file', addPathToOpen app.removeListener 'open-url', addUrlToOpen - AtomApplication = require path.join(args.resourcePath, 'src', 'browser', 'atom-application') + AtomApplication = require path.join(args.resourcePath, 'src', 'main-process', 'atom-application') AtomApplication.open(args) console.log("App load time: #{Date.now() - global.shellStartTime}ms") unless args.test @@ -128,7 +128,7 @@ parseCommandLine = -> options.alias('1', 'one').boolean('1').describe('1', 'This option is no longer supported.') options.boolean('include-deprecated-apis').describe('include-deprecated-apis', 'This option is not currently supported.') options.alias('d', 'dev').boolean('d').describe('d', 'Run in development mode.') - options.alias('f', 'foreground').boolean('f').describe('f', 'Keep the browser process in the foreground.') + options.alias('f', 'foreground').boolean('f').describe('f', 'Keep the main process in the foreground.') options.alias('h', 'help').boolean('h').describe('h', 'Print this usage message.') options.alias('l', 'log-file').string('l').describe('l', 'Log all output to file.') options.alias('n', 'new-window').boolean('n').describe('n', 'Open a new window.') diff --git a/src/browser/spawner.coffee b/src/main-process/spawner.coffee similarity index 100% rename from src/browser/spawner.coffee rename to src/main-process/spawner.coffee diff --git a/src/browser/squirrel-update.coffee b/src/main-process/squirrel-update.coffee similarity index 100% rename from src/browser/squirrel-update.coffee rename to src/main-process/squirrel-update.coffee diff --git a/src/browser/win-powershell.coffee b/src/main-process/win-powershell.coffee similarity index 100% rename from src/browser/win-powershell.coffee rename to src/main-process/win-powershell.coffee diff --git a/src/browser/win-registry.coffee b/src/main-process/win-registry.coffee similarity index 100% rename from src/browser/win-registry.coffee rename to src/main-process/win-registry.coffee