New patch system for Android

Kureev Alexey · Kureev Alexey · commit 64772a0d2d1d · 2016-04-11T10:42:23.000+02:00
diff --git a/src/android/isInstalled.js b/src/android/isInstalled.js
@@ -1,9 +1,8 @@
-const compose = require('lodash').flowRight;
-const readFile = require('./fs').readFile;
+const fs = require('fs');
+const makeBuildPatch = require(`./patches/makeBuildPatch`);
 
-module.exports = function isInstalled(projectConfig, name) {
-  return compose(
-    (content) => content.indexOf(`:${name}`) >= 0,
-    readFile(projectConfig.buildGradlePath)
-  )();
+module.exports = function isInstalled(config, name) {
+  return fs
+    .readFileSync(config.buildGradlePath)
+    .indexOf(makeBuildPatch(name).patch) > -1;
 };
diff --git a/src/android/patches/applyPatch.js b/src/android/patches/applyPatch.js
@@ -0,0 +1,8 @@
+const fs = require('fs');
+
+module.exports = function applyPatch(file, patch) {
+  fs.writeFileSync(file, fs
+    .readFileSync(file, 'utf8')
+    .replace(patch.pattern, `${patch.pattern}${patch.patch}`)
+  );
+};
diff --git a/src/android/patches/makeBuildPatch.js b/src/android/patches/makeBuildPatch.js
@@ -1,13 +1,6 @@
 module.exports = function makeBuildPatch(name) {
-  /**
-   * Replace pattern by patch in the passed content
-   * @param  {String} content Content of the build.gradle file
-   * @return {String}         Patched content of build.gradle
-   */
-  return function applyBuildPatch(content) {
-    const pattern = `dependencies {`;
-    const patch = `    compile project(':${name}')`;
-
-    return content.replace(pattern, `${pattern}\n${patch}`);
+  return {
+    pattern: 'dependencies {\n',
+    patch: `    compile project(':${name}')\n`,
   };
 };
diff --git a/src/android/patches/makeSettingsPatch.js b/src/android/patches/makeSettingsPatch.js
@@ -1,30 +1,26 @@
 const path = require('path');
+const isWin = process.platform === 'win32';
 
-module.exports = function makeSettingsPatch(name, androidConfig, params, projectConfig) {
-  const relativeSourceDir = path.relative(
+module.exports = function makeSettingsPatch(name, androidConfig, projectConfig) {
+  var projectDir = path.relative(
     path.dirname(projectConfig.settingsGradlePath),
     androidConfig.sourceDir
   );
 
   /*
    * Fix for Windows
-   * Backslashes is the escape character and will result in an invalid path in settings.gradle
+   * Backslashes is the escape character and will result in
+   * an invalid path in settings.gradle
    * https://github.com/rnpm/rnpm/issues/113
    */
-  const projectDir = process.platform === 'win32'
-    ? relativeSourceDir.replace(/\\/g, '/')
-    : relativeSourceDir;
+  if (isWin) {
+    projectDir = projectDir.replace(/\\/g, '/');
+  }
 
-  /**
-   * Replace pattern by patch in the passed content
-   * @param  {String} content Content of the Settings.gradle file
-   * @return {String}         Patched content of Settings.gradle
-   */
-  return function applySettingsPatch(content) {
-    const patch = `include ':${name}'\n` +
+  return {
+    pattern: 'include \':app\'\n',
+    patch: `include ':${name}'\n` +
       `project(':${name}').projectDir = ` +
-      `new File(rootProject.projectDir, '${projectDir}')`;
-
-    return `${content.trim()}\n${patch}\n`;
+      `new File(rootProject.projectDir, '${projectDir}')`,
   };
 };
diff --git a/src/android/patches/revokePatch.js b/src/android/patches/revokePatch.js
@@ -0,0 +1,8 @@
+const fs = require('fs');
+
+module.exports = function revokePatch(file, patch) {
+  fs.writeFileSync(file, fs
+    .readFileSync(file, 'utf8')
+    .replace(patch.patch, '')
+  );
+};
diff --git a/src/android/registerNativeModule.js b/src/android/registerNativeModule.js
@@ -1,36 +1,41 @@
-const readFile = require('./fs').readFile;
-const writeFile = require('./fs').writeFile;
-const compose = require('lodash').flowRight;
+const fs = require('fs');
 const getReactVersion = require('../getReactNativeVersion');
 const getPrefix = require('./getPrefix');
+const isInstalled = require('./isInstalled');
 
-const applyPatch = (filePath, patch) =>
-  compose(writeFile(filePath), patch, readFile(filePath));
+const applyPatch = require('./patches/applyPatch');
+const makeSettingsPatch = require(`./patches/makeSettingsPatch`);
+const makeBuildPatch = require(`./patches/makeBuildPatch`);
+
+module.exports = function registerNativeAndroidModule(
+  name,
+  androidConfig,
+  params,
+  projectConfig
+) {
+  const buildPatch = makeBuildPatch(name);
+  const isInstalled = fs
+    .readFileSync(projectConfig.buildGradlePath)
+    .indexOf(buildPatch.patch) > -1;
+
+  if (isInstalled(projectConfig, name)) {
+    return false;
+  }
 
-module.exports = function registerNativeAndroidModule(name, androidConfig, params, projectConfig) {
   const prefix = getPrefix(getReactVersion(projectConfig.folder));
-  const makeSettingsPatch = require(`./patches/makeSettingsPatch`);
-  const makeBuildPatch = require(`./patches/makeBuildPatch`);
   const makeMainActivityPatch = require(`./${prefix}/makeMainActivityPatch`);
 
-  const performSettingsGradlePatch = applyPatch(
+  applyPatch(
     projectConfig.settingsGradlePath,
-    makeSettingsPatch.apply(null, arguments)
+    makeSettingsPatch(name, androidConfig, projectConfig)
   );
 
-  const performBuildGradlePatch = applyPatch(
-    projectConfig.buildGradlePath,
-    makeBuildPatch(name)
-  );
+  applyPatch(projectConfig.buildGradlePath, buildPatch);
 
-  const performMainActivityPatch = applyPatch(
+  applyPatch(
     projectConfig.mainActivityPath,
     makeMainActivityPatch(androidConfig, params)
   );
 
-  compose(
-    performSettingsGradlePatch,
-    performBuildGradlePatch,
-    performMainActivityPatch
-  )();
+  return true;
 };
diff --git a/src/android/unregisterNativeModule.js b/src/android/unregisterNativeModule.js
@@ -1,34 +1,26 @@
 const readFile = require('./fs').readFile;
 const writeFile = require('./fs').writeFile;
-const path = require('path');
 const compose = require('lodash').flowRight;
 const getReactVersion = require('../getReactNativeVersion');
 const getPrefix = require('./getPrefix');
 const isInstalled = require('./isInstalled');
 
-const cut = (scope, pattern) =>
-  scope.replace(pattern, '');
+const revokePatch = require('./patches/revokePatch');
+const makeSettingsPatch = require('./patches/makeSettingsPatch');
+const makeBuildPatch = require(`./patches/makeBuildPatch`);
 
-module.exports = function unregisterNativeAndroidModule(name, dependencyConfig, projectConfig) {
+module.exports = function unregisterNativeAndroidModule(
+  name,
+  androidConfig,
+  projectConfig
+) {
   const prefix = getPrefix(getReactVersion(projectConfig.folder));
 
-  /**
-   * @param  {String} content Content of the Settings.gradle file
-   * @return {String}         Patched content of Settings.gradle
-   */
-  const cutModuleFromSettings = (name) => (content) =>
-    cut(content, `include ':${name}'\n` +
-      `project(':${name}').projectDir = ` +
-      `new File(rootProject.projectDir, '../node_modules/${name}/android')\n`
-    );
+  const buildPatch = makeBuildPatch(name);
 
-  /**
-   * Cut module compilation from the project build
-   * @param  {String} content Content of the Build.gradle file
-   * @return {String}         Patched content of Build.gradle
-   */
-  const cutModuleFromBuild = (name) => (content) =>
-    cut(content, `    compile project(':${name}')\n`);
+  if (!isInstalled(projectConfig, name)) {
+    return false;
+  }
 
   const getAddPackagePatch = require(`./${prefix}/addPackagePatch`);
 
@@ -39,20 +31,18 @@ module.exports = function unregisterNativeAndroidModule(name, dependencyConfig,
    * @return {Function}            Patcher function
    */
   const makeMainActivityPatcher = (content) => {
-    const patched = cut(content, dependencyConfig.packageImportPath + '\n');
-    return cut(patched, getAddPackagePatch(dependencyConfig));
+    const patched = cut(content, androidConfig.packageImportPath + '\n');
+    return cut(patched, getAddPackagePatch(androidConfig));
   };
 
-  const applySettingsGradlePatch = compose(
-    writeFile(projectConfig.settingsGradlePath),
-    cutModuleFromSettings(name),
-    readFile(projectConfig.settingsGradlePath)
+  revokePatch(
+    projectConfig.settingsGradlePath,
+    makeSettingsPatch(name, androidConfig, projectConfig)
   );
 
-  const applyBuildGradlePatch = compose(
-    writeFile(projectConfig.buildGradlePath),
-    cutModuleFromBuild(name),
-    readFile(projectConfig.buildGradlePath)
+  revokePatch(
+    projectConfig.buildGradlePath,
+    makeBuildPatch(name)
   );
 
   const applyMainActivityPatch = compose(
@@ -61,13 +51,7 @@ module.exports = function unregisterNativeAndroidModule(name, dependencyConfig,
     readFile(projectConfig.mainActivityPath)
   );
 
-  if (!isInstalled(projectConfig, name)) {
-    return false;
-  }
-
   compose(
-    applySettingsGradlePatch,
-    applyBuildGradlePatch,
     applyMainActivityPatch
   )();
 
diff --git a/src/unlink.js b/src/unlink.js
@@ -19,7 +19,6 @@ log.heading = 'rnpm-link';
  * If optional argument [packageName] is provided, it's the only one that's checked
  */
 module.exports = function unlink(config, args) {
-
   try {
     const project = config.getProjectConfig();
   } catch (err) {
diff --git a/test/android/patches/makeBuildPatch.spec.js b/test/android/patches/makeBuildPatch.spec.js
@@ -3,24 +3,17 @@ const path = require('path');
 const chai = require('chai');
 const expect = chai.expect;
 const makeBuildPatch = require('../../../src/android/patches/makeBuildPatch');
+const applyPatch = require('../../../src/android/patches/applyPatch');
 
 const name = 'test';
-const buildGradle = fs.readFileSync(
-  path.join(process.cwd(), 'test/fixtures/android/build.gradle'),
-  'utf-8'
-);
-const patchedBuildGradle = fs.readFileSync(
-  path.join(process.cwd(), 'test/fixtures/android/patchedBuild.gradle'),
-  'utf-8'
-);
 
 describe('makeBuildPatch', () => {
   it('should build a patch function', () => {
-    expect(makeBuildPatch(name)).to.be.a('function');
+    expect(makeBuildPatch(name)).to.be.an('object');
   });
 
   it('should make a correct patch', () => {
-    const patch = makeBuildPatch('test');
-    expect(patch(buildGradle)).to.be.equal(patchedBuildGradle);
+    expect(makeBuildPatch(name).patch)
+      .to.be.equal(`    compile project(':${name}')\n`);
   });
 });
diff --git a/test/android/patches/makeSettingsPatch.spec.js b/test/android/patches/makeSettingsPatch.spec.js
@@ -9,25 +9,28 @@ const projectConfig = {
   sourceDir: '/home/project/android/app',
   settingsGradlePath: '/home/project/android/settings.gradle',
 };
-const dependencyConfig = { sourceDir: `/home/project/node_modules/${name}/android` };
-const settingsGradle = fs.readFileSync(
-  path.join(process.cwd(), 'test/fixtures/android/settings.gradle'),
-  'utf-8'
-);
-const patchedSettingsGradle = fs.readFileSync(
-  path.join(process.cwd(), 'test/fixtures/android/patchedSettings.gradle'),
-  'utf-8'
-);
+const dependencyConfig = {
+  sourceDir: `/home/project/node_modules/${name}/android`,
+};
 
 describe('makeSettingsPatch', () => {
   it('should build a patch function', () => {
     expect(
       makeSettingsPatch(name, dependencyConfig, {}, projectConfig)
-    ).to.be.a('function');
+    ).to.be.an('object');
   });
 
   it('should make a correct patch', () => {
-    const patch = makeSettingsPatch(name, dependencyConfig, {}, projectConfig);
-    expect(patch(settingsGradle)).to.be.equal(patchedSettingsGradle);
+    const projectDir = path.relative(
+      path.dirname(projectConfig.settingsGradlePath),
+      dependencyConfig.sourceDir
+    );
+
+    expect(makeSettingsPatch(name, dependencyConfig, projectConfig).patch)
+      .to.be.equal(
+        `include ':${name}'\n` +
+        `project(':${name}').projectDir = ` +
+        `new File(rootProject.projectDir, '${projectDir}')`
+      );
   });
 });
