chore(build): fix release script bugs

shivangkapoor · Jun 16, 2014 · 0b56a15 · 0b56a15
1 parent a057734
commit 0b56a15
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 226 deletions.
diff --git a/config/gulp-tasks/docs.js b/config/gulp-tasks/docs.js
@@ -1,11 +1,15 @@
 var buildConfig = require('../build.config.js');
 var cp = require('child_process');
 var dgeni = require('dgeni');
+var es = require('event-stream');
+var fs = require('fs');
 var gutil = require('gulp-util');
 var htmlparser = require('htmlparser2');
 var lunr = require('lunr');
+var mkdirp = require('mkdirp');
 var path = require('canonical-path');
 var projectRoot = path.resolve(__dirname, '../..');
+var semver = require('semver');
 var yaml = require('js-yaml');
 
 module.exports = function(gulp, argv) {
@@ -80,19 +84,22 @@ module.exports = function(gulp, argv) {
       refId++;
     }
 
+    var docPath = buildConfig.dist + '/ionic-site';
+    gutil.log('Reading docs from', gutil.colors.cyan(docPath));
+
     return gulp.src([
-      'temp/ionic-site/docs/{components,guide,api,overview}/**/*.{md,html,markdown}',
-      'temp/ionic-site/docs/index.html',
-      'temp/ionic-site/getting-started/index.html',
-      'temp/ionic-site/tutorials/**/*.{md,html,markdown}',
-      'temp/ionic-site/_posts/**/*.{md,html,markdown}'
+      docPath + '/docs/{components,guide,api,overview}/**/*.{md,html,markdown}',
+      docPath + '/docs/index.html',
+      docPath + '/getting-started/index.html',
+      docPath + '/tutorials/**/*.{md,html,markdown}',
+      docPath + '/_posts/**/*.{md,html,markdown}'
     ])
       .pipe(es.map(function(file, callback) {
         //docs for gulp file objects: https://github.com/wearefractal/vinyl
         var contents = file.contents.toString(); //was buffer
 
         // Grab relative path from ionic-site root
-        var relpath = file.path.replace(/^.*?temp\/ionic-site\//, '');
+        var relpath = file.path.replace(RegExp('^.*?' + docPath + '/'), '');
 
         // Read out the yaml portion of the Jekyll file
         var yamlStartIndex = contents.indexOf('---');
@@ -186,9 +193,9 @@ module.exports = function(gulp, argv) {
 
       })).on('end', function() {
         // Write out as one json file
-        mkdirp.sync('temp/ionic-site/data');
+        mkdirp.sync(docPath + '/data');
         fs.writeFileSync(
-          'temp/ionic-site/data/index.json',
+          docPath + '/data/index.json',
           JSON.stringify({'ref': ref, 'index': idx.toJSON()})
         );
       });

diff --git a/scripts/app-base/publish.sh b/scripts/app-base/publish.sh
@@ -9,7 +9,7 @@ echo "#####"
 
 function init {
   APPBASE_DIR=$HOME/ionic-app-base
-  APPBASE_LIB_DIR=$HOME/www/lib/ionic
+  APPBASE_LIB_DIR=$APPBASE_DIR/www/lib/ionic
 
   ../clone/clone.sh --repository="driftyco/ionic-app-base" \
     --directory="$APPBASE_DIR" \

diff --git a/scripts/release/publish.sh b/scripts/release/publish.sh
@@ -15,7 +15,6 @@ function run {
   cd ../..
 
   node_modules/.bin/gulp build --release --dist="$RELEASE_DIR/release"
-  node_modules/.bin/gulp version --dist="$RELEASE_DIR/release"
   node_modules/.bin/gulp changelog --dest="$RELEASE_DIR/CHANGELOG.md"
 
   cp package.json $RELEASE_DIR

diff --git a/scripts/site/config.sh b/scripts/site/config.sh
@@ -20,7 +20,7 @@ function run {
 
   VERSION=$(readJsonProp "package.json" "version")
   CODENAME=$(readJsonProp "package.json" "codename")
-  DATE=$(readJsonProp "dist/version.json" "date")
+  DATE=$(date +"%Y-%m-%d")
 
   cd $SITE_DIR
 

diff --git a/scripts/site/docs.sh b/scripts/site/docs.sh
@@ -23,7 +23,7 @@ function run {
   VERSION=$(readJsonProp "package.json" "version")
 
   node_modules/.bin/gulp docs --doc-version="$VERSION_NAME" --dist=$SITE_DIR
-  node_modules/.bin/gulp docs-index
+  node_modules/.bin/gulp docs-index --dist=$SITE_DIR
 
   cd $SITE_DIR
 

diff --git a/scripts/travis/ci.sh b/scripts/travis/ci.sh
diff --git a/scripts/travis/release-new-version.sh b/scripts/travis/release-new-version.sh