Prepare package for bundling in Atom

lib/atom-items/issueish-pane-item.js

@@ -1,4 +1,4 @@
-import {Emitter} from 'atom';
+import {Emitter} from 'event-kit';
 
 import url from 'url';
 

lib/controllers/editor-conflict-controller.js

@@ -1,4 +1,4 @@
-import {CompositeDisposable} from 'atom';
+import {CompositeDisposable} from 'event-kit';
 import React from 'react';
 import {autobind} from 'core-decorators';
 import compareSets from 'compare-sets';

lib/controllers/file-patch-controller.js

@@ -1,6 +1,7 @@
 import React from 'react';
 
-import {Point, Emitter} from 'atom';
+import {Point} from 'atom';
+import {Emitter} from 'event-kit';
 import {autobind} from 'core-decorators';
 
 import Switchboard from '../switchboard';

lib/controllers/pr-info-controller.js

@@ -1,33 +1,13 @@
 import React from 'react';
-import Relay from 'react-relay';
 
 import {RemotePropType} from '../prop-types';
 import RelayRootContainer from '../containers/relay-root-container';
 import PrListContainer from '../containers/pr-list-container';
 import GithubLoginView from '../views/github-login-view';
+import PrInfoByBranchRoute from '../routes/pr-info-by-branch-route';
 import RelayNetworkLayerManager from '../relay-network-layer-manager';
 import {UNAUTHENTICATED} from '../models/github-login-model';
 
-class PrInfoByBranchRoute extends Relay.Route {
-  static routeName = 'pr-info-route'
-
-  static queries = {
-    query: (Component, variables) => Relay.QL`
-      query {
-        relay {
-          ${Component.getFragment('query', variables)}
-        }
-      }
-    `,
-  }
-
-  static paramDefinitions = {
-    repoOwner: {required: true},
-    repoName: {required: true},
-    branchName: {required: true},
-  }
-}
-
 export default class PrInfoController extends React.Component {
   static propTypes = {
     token: React.PropTypes.oneOfType([

lib/controllers/repository-conflict-controller.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import React from 'react';
 import yubikiri from 'yubikiri';
-import {CompositeDisposable} from 'atom';
+import {CompositeDisposable} from 'event-kit';
 
 import ObserveModelDecorator from '../decorators/observe-model';
 import ResolutionProgress from '../models/conflicts/resolution-progress';

lib/controllers/root-controller.js

@@ -1,7 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import {CompositeDisposable, Disposable, File} from 'atom';
+import {File} from 'atom';
+import {CompositeDisposable, Disposable} from 'event-kit';
 
 import React from 'react';
 import {autobind} from 'core-decorators';

lib/git-prompt-server.js

@@ -2,9 +2,9 @@ import net from 'net';
 import path from 'path';
 import os from 'os';
 
-import {Emitter} from 'atom';
+import {Emitter} from 'event-kit';
 
-import {deleteFileOrFolder, getTempDir, copyFile} from './helpers';
+import {getPackageRoot, deleteFileOrFolder, getTempDir, copyFile} from './helpers';
 
 function getAtomHelperPath() {
   if (process.platform === 'darwin') {
@@ -41,7 +41,7 @@ export default class GitPromptServer {
 
     await Promise.all(
       Object.keys(sourceFiles).map(filename => copyFile(
-        path.resolve(__dirname, '..', 'bin', filename),
+        path.resolve(getPackageRoot(), 'bin', filename),
         path.join(this.tmpFolderPath, filename),
       ).then(sourceFiles[filename])),
     );

lib/git-shell-out-strategy.js

@@ -1,20 +1,19 @@
 import path from 'path';
 import os from 'os';
 
-import {CompositeDisposable} from 'atom';
+import {CompositeDisposable} from 'event-kit';
 
-import {GitProcess} from 'git-kitchen-sink';
+import {GitProcess} from 'dugite';
 import {parse as parseDiff} from 'what-the-diff';
 
 import GitPromptServer from './git-prompt-server';
 import AsyncQueue from './async-queue';
-import {readFile, fileExists, writeFile, isFileExecutable} from './helpers';
+import {getPackageRoot, getDugitePath, readFile, fileExists, writeFile, isFileExecutable} from './helpers';
 import GitTimingsView from './views/git-timings-view';
 
 const LINE_ENDING_REGEX = /\r?\n/;
 
-const GPG_HELPER_PATH = path.resolve(__dirname, '..', 'bin', 'gpg-no-tty.sh');
-const DUGITE_PATH = require.resolve('git-kitchen-sink');
+const GPG_HELPER_PATH = path.resolve(getPackageRoot(), 'bin', 'gpg-no-tty.sh');
 
 export class GitError extends Error {
   constructor(message) {
@@ -100,7 +99,7 @@ export default class GitShellOutStrategy {
         env.ATOM_GITHUB_SOCK_PATH = normalizePath(socket);
 
         env.ATOM_GITHUB_WORKDIR_PATH = this.workingDir;
-        env.ATOM_GITHUB_DUGITE_PATH = DUGITE_PATH;
+        env.ATOM_GITHUB_DUGITE_PATH = path.join(getDugitePath(), 'git', 'bin', 'git');
 
         // "ssh" won't respect SSH_ASKPASS unless:
         // (a) it's running without a tty

lib/github-package.js

@@ -1,4 +1,5 @@
-import {CompositeDisposable, Disposable, File} from 'atom';
+import {File} from 'atom';
+import {CompositeDisposable, Disposable} from 'event-kit';
 
 import path from 'path';
 

lib/helpers.js

@@ -1,6 +1,40 @@
+import path from 'path';
 import fs from 'fs-extra';
 import {ncp} from 'ncp';
 
+export function getPackageRoot() {
+  const {resourcePath} = atom.getLoadSettings();
+  const currentFileWasRequiredFromSnapshot = !path.isAbsolute(__dirname);
+  if (currentFileWasRequiredFromSnapshot) {
+    return path.join(resourcePath, 'node_modules', 'github');
+  } else {
+    const packageRoot = path.resolve(__dirname, '..');
+    if (path.extname(resourcePath) === '.asar') {
+      if (packageRoot.indexOf(resourcePath) === 0) {
+        return path.join(`${resourcePath}.unpacked`, 'node_modules', 'github');
+      }
+    }
+    return packageRoot;
+  }
+}
+
+let DUGITE_PATH;
+export function getDugitePath() {
+  if (!DUGITE_PATH) {
+    DUGITE_PATH = require.resolve('dugite');
+    if (!path.isAbsolute(DUGITE_PATH)) {
+      // Assume we're snapshotted
+      const {resourcePath} = atom.getLoadSettings();
+      if (path.extname(resourcePath) === '.asar') {
+        DUGITE_PATH = path.join(`${resourcePath}.unpacked`, 'node_modules', 'dugite');
+      } else {
+        DUGITE_PATH = path.join(resourcePath, 'node_modules', 'dugite');
+      }
+    }
+  }
+
+  return DUGITE_PATH;
+}
 
 function descriptorsFromProto(proto) {
   return Object.getOwnPropertyNames(proto).reduce((acc, name) => {
@@ -99,9 +133,9 @@ export function writeFile(absoluteFilePath, contents) {
   });
 }
 
-export function deleteFileOrFolder(path) {
+export function deleteFileOrFolder(fileOrFolder) {
   return new Promise((resolve, reject) => {
-    fs.remove(path, err => {
+    fs.remove(fileOrFolder, err => {
       if (err) { return reject(err); } else { return resolve(); }
     });
   });

lib/index.js

@@ -1,45 +1,26 @@
-/* eslint-disable no-var */
+import GithubPackage from './github-package';
 
-var semver = require('semver');
+let pack;
+const entry = {
+  activate(...args) {
+    pack.activate(...args);
+  },
 
-var v = semver.parse(atom.appVersion);
-var atomVersion = [v.major, v.minor, v.patch].join('.');
-var requiredVersion = '>=1.13.0';
+  initialize() {
+    pack = new GithubPackage(
+      atom.workspace, atom.project, atom.commands, atom.notifications, atom.tooltips,
+      atom.styles, atom.config, atom.confirm.bind(atom),
+    );
+  },
+};
 
-if (atom.inDevMode() || atom.inSpecMode() || semver.satisfies(atomVersion, requiredVersion)) {
-  module.exports = startPackage();
-} else {
-  module.exports = versionMismatch();
-}
-
-function versionMismatch() {
-  return {
-    activate: () => {
-      atom.notifications.addWarning('Incompatible Atom Version', {
-        description: 'The GitHub packages requires Atom ' + requiredVersion +
-          '. You are running ' + atomVersion + '. Please check for updates and try again.',
-        dismissable: true,
-      });
-    },
+[
+  'serialize', 'deserialize', 'deactivate', 'consumeStatusBar',
+  'createGitTimingsView', 'createIssueishPaneItem',
+].forEach(method => {
+  entry[method] = (...args) => {
+    return pack[method](...args);
   };
-}
-
-function startPackage() {
-  var GithubPackage = require('./github-package').default;
-
-  if (atom.inDevMode()) {
-    // Let's install some devTools
-    try {
-      const electronDevtoolsInstaller = require('electron-devtools-installer');
-      const installExtension = electronDevtoolsInstaller.default;
-      installExtension(electronDevtoolsInstaller.REACT_DEVELOPER_TOOLS);
-    } catch (_e) {
-      // Nothing
-    }
-  }
+});
 
-  return new GithubPackage(
-    atom.workspace, atom.project, atom.commands, atom.notifications, atom.tooltips,
-    atom.styles, atom.config, atom.confirm.bind(atom),
-  );
-}
+module.exports = entry;

lib/models/conflicts/resolution-progress.js

@@ -1,4 +1,4 @@
-import {Emitter} from 'atom';
+import {Emitter} from 'event-kit';
 
 export default class ResolutionProgress {
   static empty() {

lib/models/file-system-change-observer.js

@@ -1,4 +1,4 @@
-import {Emitter} from 'atom';
+import {Emitter} from 'event-kit';
 import nsfw from 'nsfw';
 
 import path from 'path';

lib/models/github-login-model.js

@@ -2,7 +2,7 @@ import {execFile} from 'child_process';
 
 import keytar from 'keytar';
 
-import {Emitter} from 'atom';
+import {Emitter} from 'event-kit';
 
 export const UNAUTHENTICATED = Symbol('UNAUTHENTICATED');
 
@@ -107,12 +107,22 @@ export default class GithubLoginModel {
     return instance;
   }
 
-  constructor(Strategy = strategies.find(strat => strat.isValid())) {
+  constructor(Strategy) {
+    this._Strategy = Strategy;
+    this._strategy = null;
     this.emitter = new Emitter();
-    if (!Strategy) {
-      throw new Error('None of the listed GithubLoginModel strategies returned true for `isValid`');
+  }
+
+  get strategy() {
+    if (!this._strategy) {
+      const Strategy = this._Strategy || strategies.find(strat => strat.isValid());
+      if (!Strategy) {
+        throw new Error('None of the listed GithubLoginModel strategies returned true for `isValid`');
+      }
+      this._strategy = new Strategy();
     }
-    this.strategy = new Strategy();
+
+    return this._strategy;
   }
 
   async getToken(account) {

lib/models/repository.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 
-import {Emitter, Disposable} from 'atom';
+import {Emitter, Disposable} from 'event-kit';
 import {autobind} from 'core-decorators';
 
 import CompositeGitStrategy from '../composite-git-strategy';

lib/models/style-calculator.js

@@ -1,4 +1,4 @@
-import {CompositeDisposable} from 'atom';
+import {CompositeDisposable} from 'event-kit';
 
 import {autobind} from 'core-decorators';
 

lib/models/workspace-change-observer.js

@@ -1,4 +1,4 @@
-import {CompositeDisposable, Disposable, Emitter} from 'atom';
+import {CompositeDisposable, Disposable, Emitter} from 'event-kit';
 
 import nsfw from 'nsfw';
 import {autobind} from 'core-decorators';

lib/routes/pr-info-by-branch-route.js

@@ -0,0 +1,21 @@
+import Relay from 'react-relay';
+
+export default class PrInfoByBranchRoute extends Relay.Route {
+  static routeName = 'pr-info-route'
+
+  static queries = {
+    query: (Component, variables) => Relay.QL`
+      query {
+        relay {
+          ${Component.getFragment('query', variables)}
+        }
+      }
+    `,
+  }
+
+  static paramDefinitions = {
+    repoOwner: {required: true},
+    repoName: {required: true},
+    branchName: {required: true},
+  }
+}

lib/views/clone-dialog.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import {autobind} from 'core-decorators';
-import {CompositeDisposable} from 'atom';
+import {CompositeDisposable} from 'event-kit';
 import url from 'url';
 import path from 'path';
 

lib/views/commit-view.js

@@ -1,7 +1,8 @@
 /** @jsx etch.dom */
 /* eslint react/no-unknown-property: "off" */
 
-import {CompositeDisposable, TextEditor} from 'atom';
+import {TextEditor} from 'atom';
+import {CompositeDisposable} from 'event-kit';
 
 import etch from 'etch';
 import {autobind} from 'core-decorators';
@@ -119,7 +120,7 @@ export default class CommitView {
         return '∞';
       }
     } else {
-      return this.props.maximumCharacterLimit;
+      return this.props.maximumCharacterLimit || '';
     }
   }
 

lib/views/decoration.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import {CompositeDisposable} from 'atom';
+import {CompositeDisposable} from 'event-kit';
 
 import Portal from './portal';
 

lib/views/file-patch-view.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {CompositeDisposable, Disposable} from 'atom';
+import {CompositeDisposable, Disposable} from 'event-kit';
 import cx from 'classnames';
 import {autobind} from 'core-decorators';
 

lib/views/git-tab-view.js

@@ -1,7 +1,7 @@
 /** @jsx etch.dom */
 /* eslint react/no-unknown-property: "off" */
 
-import {Disposable, CompositeDisposable} from 'atom';
+import {Disposable, CompositeDisposable} from 'event-kit';
 
 import etch from 'etch';
 import {autobind} from 'core-decorators';