chore(build): snapshot upgrades with more parameters

Author: ajoslin

config/demos/demos.config.js

@@ -9,6 +9,8 @@ module.exports = function(config) {
   config = staticSite(config);
   config.set('buildConfig', require('../build.config'));
 
+  //rendering.outputFolder set by gulp task
+
   config.merge('rendering.nunjucks.config.tags', {
     variableStart: '{$',
     variableEnd: '$}',
@@ -18,8 +20,6 @@ module.exports = function(config) {
 
   config.set('logging.level', 'info');
 
-  config.set('rendering.outputFolder', path.resolve(projectBase, 'dist/ionic-demo'));
-
   config.set('rendering.templateFolders', [
     path.resolve(__dirname, 'templates')
   ]);

config/docs/docs.config.js

@@ -10,6 +10,8 @@ module.exports = function(config) {
 
   config = basePackage(config);
 
+  //rendering.outputFolder set by gulp task
+
   config.set('logging.level', 'info');
 
   config.prepend('rendering.templateFolders', [
@@ -20,8 +22,6 @@ module.exports = function(config) {
   config.set('source.projectPath', '.');
 
   config.set('versionFolderBase', 'docs');
-  config.set('rendering.outputFolder', path.resolve(projectBase, 'dist/ionic-site'));
-  //contentsFolder is set in the version-data processor
 
   config.set('processing.api-docs', {
     outputPath: 'api/${docType}/${name}/index.md',

config/gulp-tasks/test.js

@@ -17,12 +17,12 @@ module.exports = function(gulp, argv) {
    */
   var sauceInstance;
   gulp.task('sauce-connect', function(done) {
-    gutil.log('sauce-connect parameters: ', _.pick(process.env, ['SAUCE_USER', 'SAUCE_KEY', 'SAUCE_TUNNEL_ID']));
+    gutil.log('sauce-connect parameters: ', _.pick(process.env, ['SAUCE_USER', 'SAUCE_KEY', 'SAUCE_TUNNEL_ID', 'SAUCE_BUILD_ID']));
     require('sauce-connect-launcher')({
       username: process.env.SAUCE_USER,
       accessKey: process.env.SAUCE_KEY,
       tunnelIdentifier: process.env.SAUCE_TUNNEL_ID || 0,
-      verbose: true
+      // verbose: true
     }, function(err, instance) {
       if (err) return done('Failed to launch sauce connect!');
       sauceInstance = instance;
@@ -51,7 +51,7 @@ module.exports = function(gulp, argv) {
     karma.start(karmaConf, done);
   });
 
-  gulp.task('karm-sauce', ['run-karma-sauce'], sauceDisconnect);
+  gulp.task('karma-sauce', ['run-karma-sauce'], sauceDisconnect);
   gulp.task('run-karma-sauce', ['sauce-connect'], function(done) {
     return karma.start(karmaSauceConf, done);
   });
@@ -66,7 +66,7 @@ module.exports = function(gulp, argv) {
     protractorHttpServer = http.createServer(app).listen(buildConfig.protractorPort);
   });
 
-  gulp.task('snapshot', ['snapshot-server'], function(done) {
+  gulp.task('snapshot', ['protractor-server'], function(done) {
     snapshot(done, 'config/protractor.conf.js');
   });
 

config/karma-sauce.conf.js

@@ -17,14 +17,14 @@ module.exports = _.assign({}, shared, {
   browserNoActivityTimeout: 60 * 1000,
   browserDisconnectTolerance: 2,
   browsers: [
-    'sauce_ios',
+    // 'sauce_ios',
     // 'sauce_safari',
-    'sauce_android',
-    // 'sauce_chrome',
+    // 'sauce_android',
+    'sauce_chrome',
     // 'sauce_firefox',
     // 'sauce_ie9',
     // 'sauce_ie10',
-    // 'sauce_ie11'
+    // 'sauce_ie11',
   ],
   customLaunchers: {
     'sauce_ios': {

config/protractor-sauce.conf.js

@@ -11,8 +11,7 @@ exports.config = _.merge({}, config, {
     build: process.env.SAUCE_BUILD_ID || 1,
     'tunnel-identifier': process.env.SAUCE_TUNNEL_ID || 0,
     name: 'Ionic!',
-    browserName: 'safari',
-    platform: 'OS X 10.9'
+    browserName: 'chrome'
   }
 });
 

config/protractor.conf.js

@@ -4,7 +4,7 @@ exports.config = {
 
   // Spec patterns are relative to the location of the spec file. They may
   // include glob patterns.
-  specs: ['../dist/ionic-demo/nightly/**/*.scenario.js'],
+  specs: [__dirname + '/../dist/ionic-demo/nightly/**/*.scenario.js'],
 
   // Options to be passed to Jasmine-node.
   jasmineNodeOpts: {

gulpfile.js

@@ -67,6 +67,10 @@ gulp.task('docs', function() {
 
   var config = dgeni.loadConfig(path.join(__dirname, '/config/docs/docs.config.js'));
   config.set('currentVersion', docVersion);
+  config.set(
+    'rendering.outputFolder',
+    argv.dist ? argv.dist : path.resolve(__dirname, buildConfig.dist, 'ionic-site')
+  );
 
   return dgeni.generator(config)().then(function() {
     gutil.log('Docs for', gutil.colors.cyan(docVersion), 'generated!');
@@ -82,14 +86,20 @@ gulp.task('demos', function(done) {
 
   var config = dgeni.loadConfig(path.join(__dirname, '/config/demos/demos.config.js'));
   config.set('currentVersion', demoVersion);
+  config.set('dist', buildConfig.dist);
+  config.set(
+    'rendering.outputFolder',
+    argv.dist ? argv.dist : path.resolve(__dirname, buildConfig.dist, 'ionic-demo')
+  );
 
   dgeni.generator(config)().then(function() {
     gutil.log('Demos for', gutil.colors.cyan(demoVersion), 'generated!');
     gutil.log('Building ionic into demo folder...');
     cp.spawn('gulp', [
       'build',
       IS_RELEASE_BUILD ? '--release' : '--no-release',
-      '--dist='+config.get('rendering.outputFolder')+'/'+config.get('rendering.contentsFolder')+'/ionic'
+      '--dist=' + config.rendering.outputFolder + '/' +
+        config.rendering.contentsFolder + '/ionic'
     ])
     .on('exit', done);
   });
@@ -103,9 +113,9 @@ gulp.task('watch', ['build'], function() {
 });
 
 gulp.task('changelog', function(done) {
-  var newCodename = fs.readFileSync('config/CODENAMES').toString().split('\n')[0];
+  var codename = pkg.codename;
   var file = argv.standalone ? '' : __dirname + '/CHANGELOG.md';
-  var subtitle = argv.subtitle || '"' + newCodename + '"';
+  var subtitle = argv.subtitle || '"' + codename + '"';
   var toHtml = !!argv.html;
   var dest = argv.dest || 'CHANGELOG.md';
   var from = argv.from;