Initial 1.0.1 push

oraclejet · oraclejet · commit 16e35aec41d2 · 2016-04-11T12:02:50.000-07:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# generator-oraclejet 1.0.0
+# generator-oraclejet 1.0.1
 
 ## About the generator
 This Yeoman generator for Oracle JET lets you quickly set up a project for use as a Web application or mobile-hybrid application for Android and iOS. 
diff --git a/common/template/index.js b/common/template/index.js
@@ -13,7 +13,7 @@ var _WEB = "web";
 var _BOTH = "both";
 
 var BLANK_TEMPLATE = blankTemplate.BLANK_TEMPLATE;
-var _TEMPLATE_URL_ROOT = "https://github.com/oracle/oraclejet/releases/download/2.0.0/";
+var _TEMPLATE_URL_ROOT = "https://github.com/oracle/oraclejet/releases/download/2.0.1-b1/";
 
 var _TEMPLATES =
 {
diff --git a/generators/app/templates/blank/index.html b/generators/app/templates/blank/index.html
@@ -31,7 +31,7 @@
     <link rel="apple-touch-icon-precomposed" href="css/images/touchicon.png">
     <meta name="apple-mobile-web-app-title" content="Oracle JET">
 
-    <link rel="stylesheet" href="css/libs/oj/v2.0.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v2.0.1/alta/oj-alta-min.css" id="css" />
   </head>
   <body>
     <div id="mainContent" class="oj-web-applayout-page">
diff --git a/generators/app/templates/blank/js/main-release-paths.json b/generators/app/templates/blank/js/main-release-paths.json
@@ -5,9 +5,9 @@
   "promise": "libs/es6-promise/promise-1.0.0.min",
   "hammerjs": "libs/hammer/hammer-2.0.4.min",
   "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0.min",
-  "ojs": "libs/oj/v2.0.0/min",
-  "ojL10n": "libs/oj/v2.0.0/ojL10n",
-  "ojtranslations": "libs/oj/v2.0.0/resources",
+  "ojs": "libs/oj/v2.0.1/min",
+  "ojL10n": "libs/oj/v2.0.1/ojL10n",
+  "ojtranslations": "libs/oj/v2.0.1/resources",
   "knockout-amd-helpers": "libs/knockout/knockout-amd-helpers.min",
   "text": "libs/require/text",
   "signals": "libs/js-signals/signals.min"
diff --git a/generators/app/templates/blank/js/main.js b/generators/app/templates/blank/js/main.js
@@ -16,9 +16,9 @@ requirejs.config(
     "promise": "libs/es6-promise/promise-1.0.0",
     "hammerjs": "libs/hammer/hammer-2.0.4",
     "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0",
-    "ojs": "libs/oj/v2.0.0/debug",
-    "ojL10n": "libs/oj/v2.0.0/ojL10n",
-    "ojtranslations": "libs/oj/v2.0.0/resources",
+    "ojs": "libs/oj/v2.0.1/debug",
+    "ojL10n": "libs/oj/v2.0.1/ojL10n",
+    "ojtranslations": "libs/oj/v2.0.1/resources",
     "knockout-amd-helpers": "libs/knockout/knockout-amd-helpers",
     "text": "libs/require/text",
     "signals": "libs/js-signals/signals"
diff --git a/generators/app/templates/common/bower.json b/generators/app/templates/common/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "oraclejet-app",
-  "version": "1.0.0",
+  "version": "1.0.1-b1",
   "dependencies": 
   {
-    "oraclejet": "2.0.0"
+    "oraclejet": "2.0.1-b1"
   }
 }
diff --git a/generators/app/templates/common/package.json b/generators/app/templates/common/package.json
@@ -1,11 +1,9 @@
 {
   "name": "oraclejet-app",
-  "version": "1.0.0",
+  "version": "1.0.1-b1",
   "description":"A sample Oracle JavaScript Extension Toolkit (JET) web app",
   "author":{
-    "name": "Oracle Jet Team",
-    "email": "oraclejet_interest_ww_grp@oracle.com",
-    "homepage": "http://jet.us.oracle.com"
+    "name": "Oracle Jet Team"
   },
   "devDependencies": 
   {
diff --git a/generators/hybrid/templates/blank/index.html b/generators/hybrid/templates/blank/index.html
@@ -28,7 +28,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
     <link rel="icon" href="css/images/favicon.ico" type="image/x-icon" />
 
-    <link rel="stylesheet" href="css/libs/oj/v2.0.0/alta/oj-alta-min.css" id="css" />
+    <link rel="stylesheet" href="css/libs/oj/v2.0.1/alta/oj-alta-min.css" id="css" />
     <!-- This is where you would add any app specific styling -->
   </head>
   <body class="oj-hybrid">
diff --git a/generators/hybrid/templates/blank/js/main-release-paths.json b/generators/hybrid/templates/blank/js/main-release-paths.json
@@ -5,9 +5,9 @@
   "promise": "libs/es6-promise/promise-1.0.0.min",
   "hammerjs": "libs/hammer/hammer-2.0.4.min",
   "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0.min",
-  "ojs": "libs/oj/v2.0.0/min",
-  "ojL10n": "libs/oj/v2.0.0/ojL10n",
-  "ojtranslations": "libs/oj/v2.0.0/resources",
+  "ojs": "libs/oj/v2.0.1/min",
+  "ojL10n": "libs/oj/v2.0.1/ojL10n",
+  "ojtranslations": "libs/oj/v2.0.1/resources",
   "knockout-amd-helpers": "libs/knockout/knockout-amd-helpers.min",
   "text": "libs/require/text",
   "signals": "libs/js-signals/signals.min"
diff --git a/generators/hybrid/templates/blank/js/main.js b/generators/hybrid/templates/blank/js/main.js
@@ -18,9 +18,9 @@ requirejs.config(
     "promise": "libs/es6-promise/promise-1.0.0",
     "hammerjs": "libs/hammer/hammer-2.0.4",
     "ojdnd": "libs/dnd-polyfill/dnd-polyfill-1.0.0",
-    "ojs": "libs/oj/v2.0.0/debug",
-    "ojL10n": "libs/oj/v2.0.0/ojL10n",
-    "ojtranslations": "libs/oj/v2.0.0/resources",
+    "ojs": "libs/oj/v2.0.1/debug",
+    "ojL10n": "libs/oj/v2.0.1/ojL10n",
+    "ojtranslations": "libs/oj/v2.0.1/resources",
     "knockout-amd-helpers": "libs/knockout/knockout-amd-helpers",
     "text": "libs/require/text",
     "signals": "libs/js-signals/signals"
diff --git a/generators/hybrid/templates/common/bower.json b/generators/hybrid/templates/common/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "oraclejet-app",
-  "version": "1.0.0",
+  "version": "1.0.1-b1",
   "dependencies": 
   {
-    "oraclejet": "2.0.0"
+    "oraclejet": "2.0.1-b1"
   }
 }
diff --git a/generators/hybrid/templates/common/package.json b/generators/hybrid/templates/common/package.json
@@ -1,11 +1,9 @@
 {
   "name": "oraclejet-app",
-  "version": "1.0.0",
+  "version": "1.0.1-b1",
   "description":"A sample Oracle JavaScript Extension Toolkit (JET) mobile app based on Cordova",
   "author":{
-    "name": "Oracle Jet Team",
-    "email": "oraclejet_interest_ww_grp@oracle.com",
-    "homepage": "http://jet.us.oracle.com"
+    "name": "Oracle Jet Team"
   },
   "devDependencies": 
   {
diff --git a/generators/hybrid/templates/common/scripts/common/platformPaths.js b/generators/hybrid/templates/common/scripts/common/platformPaths.js
@@ -49,5 +49,17 @@ module.exports =
         path.resolve(begPath + this.ROOT + endPath)
       ];
     }
-  }
+  },
+  
+  "browser": 
+  {
+    ROOT: cordovaDirectory + "/platforms/browser/www/",
+
+    getCopyPaths: function(begPath, endPath, appName) 
+    {
+      return [
+        path.resolve(begPath + this.ROOT + endPath)
+      ];
+    }
+  }  
 };
diff --git a/generators/hybrid/templates/common/scripts/grunt/config/shell.js b/generators/hybrid/templates/common/scripts/grunt/config/shell.js
@@ -44,5 +44,17 @@ module.exports =
         cwd: cordovaDirectory
       }
     }
+  },
+
+  cordovaClean:
+  {
+    command: "cordova clean <%= platform %>",
+    options:
+    {
+      execOptions: 
+      {
+        cwd: cordovaDirectory
+      }
+    }
   }
 };
diff --git a/generators/hybrid/templates/common/scripts/grunt/fileChangeHandler.js b/generators/hybrid/templates/common/scripts/grunt/fileChangeHandler.js
@@ -80,8 +80,12 @@ function _copyFileToPlatforms(filePath, begPath, endPath)
 
   platforms.forEach(function(platform) 
   {
+    if (platformPaths[platform] === undefined)
+    {
+      return;   // skip unsupported platform
+    }
+    
     var paths = platformPaths[platform].getCopyPaths(begPath, endPath, appName);
-
     paths.forEach(function(currPath) 
     {
       var exists = fs.existsSync(currPath);
diff --git a/generators/hybrid/templates/common/scripts/grunt/tasks/serve.js b/generators/hybrid/templates/common/scripts/grunt/tasks/serve.js
@@ -6,7 +6,6 @@
 var ports = require("../common/ports");
 var constants = require("../../common/constants");
 var util = require("../../common/util");
-var injector = require("../../common/injector");
 var StringDecoder = require("string_decoder").StringDecoder;
 
 module.exports = function(grunt) {
@@ -200,10 +199,12 @@ function _getTasks(grunt, disableLiveReload, web, target)
 
     if (!disableLiveReload)
     {
+      tasks.push("shell:cordovaClean");
       tasks.push("customServe");
     }
     else
     {
+      tasks.push("shell:cordovaClean");
       tasks.push("shell:cordovaRun");
     }
   }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-oraclejet",
-  "version": "1.0.0",
+  "version": "1.0.1-b1",
   "license":"UPL-1.0",
   "description": "initial",
   "keywords": 
diff --git a/test/commonTest.js b/test/commonTest.js
@@ -23,7 +23,7 @@ describe("Npm Packages", function()
 {
 	it("check yeoman plugin is installed", function(done) 
 	{
-		this.timeout(10000);
+		this.timeout(30000);
 	   	exec('npm list', execOptions, function(error, stdout)
 	   	{	   	
 	   		assert.equal(
diff --git a/test/hybridTest.js b/test/hybridTest.js
diff --git a/test/util/index.js b/test/util/index.js
diff --git a/test/webTest.js b/test/webTest.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# generator-oraclejet 1.0.0`
	`1`	`+# generator-oraclejet 1.0.1`
`2`	`2`
`3`	`3`	`## About the generator`
`4`	`4`	`This Yeoman generator for Oracle JET lets you quickly set up a project for use as a Web application or mobile-hybrid application for Android and iOS.`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ var _WEB = "web";`
`13`	`13`	`var _BOTH = "both";`
`14`	`14`
`15`	`15`	`var BLANK_TEMPLATE = blankTemplate.BLANK_TEMPLATE;`
`16`		`-var _TEMPLATE_URL_ROOT = "https://github.com/oracle/oraclejet/releases/download/2.0.0/";`
	`16`	`+var _TEMPLATE_URL_ROOT = "https://github.com/oracle/oraclejet/releases/download/2.0.1-b1/";`
`17`	`17`
`18`	`18`	`var _TEMPLATES =`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "oraclejet-app",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1-b1",`
`4`	`4`	`"dependencies":`
`5`	`5`	`{`
`6`		`- "oraclejet": "2.0.0"`
	`6`	`+ "oraclejet": "2.0.1-b1"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "oraclejet-app",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1-b1",`
`4`	`4`	`"description":"A sample Oracle JavaScript Extension Toolkit (JET) web app",`
`5`	`5`	`"author":{`
`6`		`- "name": "Oracle Jet Team",`
`7`		`- "email": "oraclejet_interest_ww_grp@oracle.com",`
`8`		`- "homepage": "http://jet.us.oracle.com"`
	`6`	`+ "name": "Oracle Jet Team"`
`9`	`7`	`},`
`10`	`8`	`"devDependencies":`
`11`	`9`	`{`