Merge branch 'release/0.0.4'

package.json

@@ -2,7 +2,7 @@
 	"name": "totalcross",
 	"displayName": "TotalCross Project Extension",
 	"description": "This is TotalCross plugin extension for vs code. ",
-	"version": "0.0.3",
+	"version": "0.0.4",
 	"publisher": "Italo",
 	"preview": true,
 	"icon": "icon.png",
@@ -77,8 +77,9 @@
 		"node-ssh": "^6.0.0",
 		"pom-parser": "^1.1.1",
 		"replace-in-file": "^4.2.0",
-		"request": "^2.88.0",
-		"totalcross-core-dev": "0.0.8",
+		"request": "^2.88.2",
+		"request-promise": "^4.2.5",
+		"totalcross-core-dev": "0.0.13",
 		"xml-js": "^1.6.11"
 	}
 }

src/creator.ts

@@ -58,7 +58,7 @@ exports.createNewProject = async function(context: vscode.ExtensionContext) {
         validators.artifactId
         );
     if(!artifactID) {return;}
-    let availableVersions = await core.versions(`${context.extensionPath}/resources/maven-metadata.xml`);
+    let availableVersions = await core.latestVersions(`${context.extensionPath}/resources/maven-metadata.xml`);
     let version = await vscode.window.showQuickPick(availableVersions, {
         placeHolder: 'totalcross sdk version',
         ignoreFocusOut: true

src/deployer.ts

@@ -3,6 +3,7 @@ var node_ssh = require('node-ssh');
 var validators = require('./validators/deployer');
 const pomParser = require('pom-parser');
 const Packager = require('./packager');
+import {addToHistory} from './util'; 
 
 var ssh = new node_ssh();
 var folder: any;
@@ -25,8 +26,6 @@ exports.deploy = async function() {
             resolve2(response.pomObject);
         });
     });
-
-    await Packager.package();
     // ask user
     if(!username) {
         username = await vscode.window.showInputBox({
@@ -89,6 +88,7 @@ exports.deploy = async function() {
                     resolve(status);
                     if(status) {
                         vscode.window.showInformationMessage('TotalCross Application succesfully deployed.');
+                        addToHistory('deploy');
                     }
                 })
                 .catch(function(err: any) {

src/packager.ts

@@ -1,8 +1,11 @@
 import * as vscode from 'vscode';
+import {addToHistory} from './util';
+var output = vscode.window.createTerminal("TotalCross Packager");
 
 exports.package = async function () {
     return new Promise((resolve, reject) => {
         // Display a message box to the user
+        addToHistory('package');
         var exec = require('child_process').exec, child;
         let workspaceFolders = vscode.workspace.workspaceFolders;
         if(!workspaceFolders) {
@@ -13,21 +16,20 @@ exports.package = async function () {
         if(process.platform === 'win32') {
             folder = "/d " + folder;
         }
-        var output = vscode.window.createOutputChannel("TotalCross Deploy");
-        output.appendLine("Starting Package...");
-        output.show();
-        child = exec(`cd ${folder} && mvn package`);		
-        child.stdout.on('data', function(data: string) {
-            output.append(data);
-        });
-        child.on('close', (code: number) => {
-            if(code === 0){
-                resolve(code);
-            }
-            else {
-                reject(code);
-            }
-        });
+        output.show();        
+        output.sendText("mvn package");    
+        // child = exec(`cd ${folder} && mvn package`);		
+        // child.stdout.on('data', function(data: string) {
+        //     output.sendText(`echo ${data}`, false);
+        // });
+        // child.on('close', (code: number) => {
+        //     if(code === 0){
+        //         resolve(code);
+        //     }
+        //     else {
+        //         reject(code);
+        //     }
+        // });
     });    
 };
 /**

src/util.ts

@@ -0,0 +1,19 @@
+const fs = require('fs-extra');
+const homedir = require('os').homedir();
+const request = require('request-promise');
+const token = require(`${homedir}/TotalCross/.config.json`).token;
+
+export async function addToHistory(activity: string) {
+        console.log('token: ' + token);
+        request({
+            method: 'POST',
+            uri: 'https://us-central1-totalcross-user-area.cloudfunctions.net/app/api/v1/history',
+            headers: {
+                'Authorization': `Bearer ${token}`
+            },
+            body: {
+                activity: activity
+            },
+            json: true
+        });
+}