Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct version number when used as an addon. #4066

Merged
merged 2 commits into from
Jan 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions lib/calculate-version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
var path = require('path');
var existsSync = require('exists-sync');
var gitRepoInfo = require('git-repo-info');

module.exports = function() {
var gitPath = path.join(__dirname, '..', '.git');
var packageVersion = require('../package.json').version;

if (existsSync(gitPath)) {
var info = gitRepoInfo(gitPath);
if (info.tag) {
return info.tag;
}

return packageVersion + '+' + info.sha.slice(0, 10);
} else {
return packageVersion;
}
};
6 changes: 3 additions & 3 deletions lib/version-replace.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
var VERSION = require('git-repo-version')(10);
var calculateVersion = require('./calculate-version');
var version = calculateVersion().replace(/^v/, '');
var replace = require('broccoli-string-replace');

module.exports = function configFiles(tree) {
return replace(tree, {
files: ['*.{json,js}'],
pattern: {
match: /VERSION_STRING_PLACEHOLDER/g,
replacement: VERSION
replacement: version
}
});
};

11 changes: 2 additions & 9 deletions lib/version.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
var calculateVersion = require('./calculate-version');
var createFile = require('broccoli-file-creator');

var version;

try {
version = require('git-repo-version')(10);
} catch (e) {
version = require('../package').version;
}

module.exports = function() {
return createFile('version.js', 'export default "' + version + '";');
return createFile('version.js', 'export default "' + calculateVersion() + '";');
};
4 changes: 2 additions & 2 deletions lib/yuidoc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var YUIDoc = require('broccoli-yuidoc');
var version = require('git-repo-version')(10);
var calculateVersion = require('./calculate-version');
var path = require('path');

module.exports = function yui() {
Expand All @@ -12,7 +12,7 @@ module.exports = function yui() {
yuidoc: {
"name": "The ember-data API",
"description": "The ember-data API: a data persistence library for Ember.js",
"version": version,
"version": calculateVersion(),
"logo": "http://f.cl.ly/items/1A1L432s022u1O1q1V3p/ember%20logo.png",
"url": "https://github.com/emberjs/data",
"options": {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"ember-cli-test-info": "^1.0.0",
"ember-cli-version-checker": "^1.1.4",
"ember-inflector": "^1.9.4",
"exists-sync": "0.0.3",
"git-repo-info": "^1.1.2",
"inflection": "^1.8.0",
"semver": "^5.1.0",
"silent-error": "^1.0.0"
Expand Down Expand Up @@ -67,7 +69,6 @@
"ember-publisher": "0.0.7",
"ember-try": "0.0.6",
"ember-watson": "^0.7.0",
"git-repo-version": "^0.3.0",
"github": "^0.2.4",
"glob": "^5.0.13",
"lodash.assign": "^3.2.0",
Expand Down