From 520c4f96d4703d13ec97e5a2e9ee69f312d075a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Mon, 21 Jul 2014 20:41:53 -0700 Subject: [PATCH] Move react-source gem out of project root Now it requires a build step. At least the confusing lib directory is gone though. --- Gruntfile.js | 15 ++--- {lib => gem-react-source/lib}/react/source.rb | 0 .../react-source.gemspec | 5 +- grunt/tasks/gem-react-source.js | 61 +++++++++++++++++++ grunt/tasks/npm-react-tools.js | 4 +- 5 files changed, 73 insertions(+), 12 deletions(-) rename {lib => gem-react-source/lib}/react/source.rb (100%) rename react-source.gemspec => gem-react-source/react-source.gemspec (79%) create mode 100644 grunt/tasks/gem-react-source.js diff --git a/Gruntfile.js b/Gruntfile.js index 1ad097a685..80ee672cac 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,6 +12,7 @@ var releaseTasks = require('./grunt/tasks/release'); var npmReactTasks = require('./grunt/tasks/npm-react'); var npmReactToolsTasks = require('./grunt/tasks/npm-react-tools'); var versionCheckTask = require('./grunt/tasks/version-check'); +var gemReactSourceTasks = require('./grunt/tasks/gem-react-source'); module.exports = function(grunt) { @@ -68,6 +69,8 @@ module.exports = function(grunt) { grunt.registerTask('npm-react:pack', npmReactTasks.packRelease); grunt.registerTask('npm-react-tools:release', npmReactToolsTasks.buildRelease); grunt.registerTask('npm-react-tools:pack', npmReactToolsTasks.packRelease); + grunt.registerTask('gem-react-source:release', gemReactSourceTasks.buildRelease); + grunt.registerTask('gem-react-source:pack', gemReactSourceTasks.packRelease); grunt.registerTask('version-check', versionCheckTask); @@ -96,6 +99,7 @@ module.exports = function(grunt) { 'populist:test' ]); grunt.registerTask('build:npm-react', ['version-check', 'jsx:normal', 'npm-react:release']); + grunt.registerTask('build:gem-react-source', ['build', 'gem-react-source:release']) grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask); @@ -238,7 +242,8 @@ module.exports = function(grunt) { 'release:setup', 'clean', 'build', - 'gem:only', + 'gem-react-source:release', + 'gem-react-source:pack', 'release:bower', 'release:starter', 'compress', @@ -246,14 +251,6 @@ module.exports = function(grunt) { 'release:msg' ]); - // `gem` task to build the react-source gem - grunt.registerTask('gem', ['build', 'gem:only']); - - grunt.registerTask('gem:only', function() { - var done = this.async(); - exec('gem build react-source.gemspec', done); - }); - // The default task - build - to keep setup easy grunt.registerTask('default', ['build']); }; diff --git a/lib/react/source.rb b/gem-react-source/lib/react/source.rb similarity index 100% rename from lib/react/source.rb rename to gem-react-source/lib/react/source.rb diff --git a/react-source.gemspec b/gem-react-source/react-source.gemspec similarity index 79% rename from react-source.gemspec rename to gem-react-source/react-source.gemspec index acfdc53f01..93fc022d8b 100644 --- a/react-source.gemspec +++ b/gem-react-source/react-source.gemspec @@ -1,7 +1,10 @@ #encoding: utf-8 require('json') -package = JSON.parse(File.read('package.json')) + +# Because of build process, does not necessarily reflect directory path in the +# repository. +package = JSON.parse(File.read('../../package.json')) gemspec = Gem::Specification.new do |s| s.name = 'react-source' diff --git a/grunt/tasks/gem-react-source.js b/grunt/tasks/gem-react-source.js new file mode 100644 index 0000000000..a42d5c6c54 --- /dev/null +++ b/grunt/tasks/gem-react-source.js @@ -0,0 +1,61 @@ +'use strict'; + +var fs = require('fs'); +var grunt = require('grunt'); + +var src = 'gem-react-source/'; +var dest = 'build/gem-react-source/'; +var build = dest + 'build/'; +var buildFiles = [ + 'react.js', 'react.min.js', 'JSXTransformer.js', + 'react-with-addons.js', 'react-with-addons.min.js' +]; + +function buildRelease() { + grunt.file.exists(dest) && grunt.file.delete(dest); + + // Copy gem-react-source/**/* to build/gem-react-source + var mappings = [].concat( + grunt.file.expandMapping('**/*', dest, {cwd: src}) + ); + mappings.forEach(function(mapping) { + var src = mapping.src[0]; + var dest = mapping.dest; + if (grunt.file.isDir(src)) { + grunt.file.mkdir(dest); + } else { + grunt.file.copy(src, dest); + } + }); + + // Make built source available inside npm package + grunt.file.mkdir(build); + buildFiles.forEach(function(file) { + grunt.file.copy('build/' + file, build + file); + }); +} + +function packRelease() { + /*jshint validthis:true */ + var done = this.async(); + var spawnCmd = { + cmd: 'gem', + args: ['build', 'react-source.gemspec'], + opts: { + cwd: dest + } + }; + grunt.util.spawn(spawnCmd, function(err, result) { + // Gem packing does weird things to versions so 0.12.0-alpha becomes + // 0.12.0.pre.alpha. We need to get the filename printed to stdout. + var filename = result.stdout.match(/File: (.*)$/)[1]; + var src = 'build/gem-react-source/' + filename; + var dest = 'build/react-source.tgz'; + fs.rename(src, dest, done); + }); +} + +module.exports = { + buildRelease: buildRelease, + packRelease: packRelease +}; diff --git a/grunt/tasks/npm-react-tools.js b/grunt/tasks/npm-react-tools.js index 2efcd827f7..543c15a6ec 100644 --- a/grunt/tasks/npm-react-tools.js +++ b/grunt/tasks/npm-react-tools.js @@ -20,9 +20,9 @@ function buildRelease() { pkgFiles.map(function(file) { if (grunt.file.isDir(file)) { - mappings = mappings.concat(grunt.file.expandMapping(file + '**/*', dest)) + mappings = mappings.concat(grunt.file.expandMapping(file + '**/*', dest)); } else { - mappings.push({src: [file], dest: dest + file}) + mappings.push({src: [file], dest: dest + file}); } });