Merge pull request #13 from infomofo/grunt-cordovacli

#11: add the use of grunt-cordovacli

Author: infomofo

Gruntfile.js

@@ -20,7 +20,8 @@ module.exports = function (grunt) {
     app: require('./bower.json').appPath || 'app',
     dist: 'dist',
     cordova: 'cordova',
-    appName: 'YoAngularCordova'
+    appName: 'YoAngularCordova',
+    appPackage: 'com.sample.YoAngularCordova'
   };
 
   // Define the configuration for all the tasks
@@ -369,61 +370,76 @@ module.exports = function (grunt) {
         singleRun: true
       }
     },
-
-    shell: {
-      cordovaClean: {
-        command: 'rm -Rf <%= yeoman.cordova %>'
+    cordovacli: {
+      options: {
+        path: '<%= yeoman.cordova %>',
+        id: '<%= yeoman.appPackage %>',
+        name: '<%= yeoman.appName %>',
+        platforms: ['ios', 'android']
       },
-      cordovaCreate: {
-          command: 'cordova create <%= yeoman.cordova %> com.sample.<%= yeoman.appName %> "<%= yeoman.appName %>" --copy-from=<%= yeoman.dist %>'
+      cordova: {
+        options: {
+          command: ['create','platform','plugin','build'],
+        }
       },
-      cordovaPrepare: {
-          command: 'cordova prepare',
-          options: {
-              stderr: false,
-              execOptions: {
-                  cwd: '<%= yeoman.cordova %>'
-              }
-          }
+      create: {
+        options: {
+          command: 'create',
+          args: ['--copy-from=<%= yeoman.dist %>']
+        }
       },
-      cordovaInstallPlugins: {
-        command: 'cordova plugin add https://github.com/j-mcnally/cordova-statusTap',
+      addPlatforms: {
         options: {
-          stderr: false,
-          execOptions: {
-            cwd: '<%= yeoman.cordova %>'
-          }
+          command: 'platform',
+          action: 'add'
         }
       },
-      cordovaPlatformInstallAndroid: {
-          command: 'cordova platform add android',
-          options: {
-              stderr: false,
-              execOptions: {
-                  cwd: '<%= yeoman.cordova %>'
-              }
-          }
+      addPlugins: {
+        options: {
+          command: 'plugin',
+          action: 'add',
+          plugins: [
+            'https://github.com/j-mcnally/cordova-statusTap'
+          ]
+        }
       },
-      cordovaPlatformInstallIos: {
-        command: 'cordova platform add ios',
+      build: {
         options: {
-          stderr: false,
-          execOptions: {
-            cwd: '<%= yeoman.cordova %>'
-          }
+          command: 'build'
         }
       },
-      cordovaBuild: {
-        command: 'cordova build',
+      emulateAndroid: {
         options: {
-          stderr: false,
-          execOptions: {
-            cwd: '<%= yeoman.cordova %>'
-          }
+          command: 'emulate',
+          platforms: ['android']
+        }
+      },
+      emulateIos: {
+        options: {
+          command: 'emulate',
+          platforms: ['ios']
         }
+      },
+      runAndroid: {
+        options: {
+          command: 'run',
+          platforms: ['android']
+        }
+      },
+      runIos: {
+        options: {
+          command: 'run',
+          platforms: ['ios']
+        }
+      }
+    },
+    shell: {
+      cordovaClean: {
+        command: 'rm -Rf <%= yeoman.cordova %>'
       }
     }
   });
+  grunt.loadNpmTasks('grunt-cordovacli');
 
   //var xpath = require('xpath');
   var DOMParser = require('xmldom').DOMParser;
@@ -530,11 +546,10 @@ module.exports = function (grunt) {
     [
       'build',
       'shell:cordovaClean',
-      'shell:cordovaCreate',
+      'cordovacli:create',
       'addCordovaPreferences',
-      'shell:cordovaPlatformInstallAndroid',
-      'shell:cordovaPlatformInstallIos',
-      'shell:cordovaInstallPlugins',
-      'shell:cordovaBuild'
+      'cordovacli:addPlatforms',
+      'cordovacli:addPlugins',
+      'cordovacli:build'
     ]);
 };

README.md

@@ -25,26 +25,22 @@ To build a cordova app
 ---------------------
 
 1. npm install
-2. bower install
-3. grunt cordova
+2. grunt 
 
 To run on android
 -----------------
 
-1. cd cordova
-2. cordova run android
+     grunt cordovacli:runAndroid
 
 To emulate on ios
 -----------------
 
-1. cd cordova
-2. cordova emulate ios
+     grunt cordovacli:emulateIos
 
 To run on ios
 -------------
 
-1. cd cordova
-2. cordova run ios
+     grunt cordovacli:runIos
 
 Directory Structure
 -------------------

package.json

@@ -3,6 +3,8 @@
   "version": "0.0.0",
   "dependencies": {},
   "devDependencies": {
+    "cca": "^0.5.1",
+    "cordova": "^4.2.0",
     "grunt": "^0.4.1",
     "grunt-autoprefixer": "^0.7.3",
     "grunt-bower-task": "^0.4.0",
@@ -17,6 +19,7 @@
     "grunt-contrib-jshint": "^0.10.0",
     "grunt-contrib-uglify": "^0.4.0",
     "grunt-contrib-watch": "^0.6.1",
+    "grunt-cordovacli": "^0.7.0",
     "grunt-filerev": "^0.2.1",
     "grunt-google-cdn": "^0.4.0",
     "grunt-karma": "^0.9.0",