Actualizando ember-cli y simplificando estructura general del proyecto

.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  globals: {
+    requireNode: true
+  },
+  rules: {
+    'no-console': 0
+  }
+};

.gitignore

@@ -3,23 +3,24 @@
 # compiled output
 /dist
 /tmp
-.DS_Store
 /binarios
 
 # dependencies
 /node_modules
 /bower_components
 
-pilasengine/node_modules/
-
 # misc
 /.sass-cache
 /connect.lock
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
 
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
 
-.env.deploy.*
-docs/_book
+electron-out/

.travis.yml

@@ -0,0 +1,22 @@
+---
+language: node_js
+node_js:
+  - "6"
+
+sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
+
+cache:
+  directories:
+    - $HOME/.npm
+
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
+before_install:
+  - npm config set spin false

Makefile

@@ -51,6 +51,7 @@ comandos:
 	@echo "    ${G}api${N}                  Genera la documentación de API para pilas."
 	@echo "    ${G}pilas_manual${N}         Genera el manual de pilas."
 	@echo "    ${G}pilas_sprites${N}        Genera los spritesheets."
+	@echo "    ${G}actualizar_phaser${N}    Actualiza phaser a una versión más reciente."
 	@echo ""
 	@echo "  ${Y}Para distribuir${N}"
 	@echo ""
@@ -202,3 +203,14 @@ pilas_manual:
 	@echo ""
 	@echo "${G}OK, la documentación quedó en public/manual"
 	@echo ""
+
+actualizar_phaser:
+	@echo "${Y}Para actualizar phaser, hay que seguir estos pasos:${N}"
+	@echo "${Y}${N}"
+	@echo "${Y} - Subir el número de versión de package.json.${N}"
+	@echo "${Y} - Ejecutar npm install.${N}"
+	@echo "${Y} - Copiar phaser al directorio public:${N}"
+	@echo "${Y}${N}"
+	@echo "${Y}        cp node_modules/phaser-ce/build/phaser.js public/${N}"
+	@echo "${Y}${N}"
+

README.md

@@ -43,6 +43,15 @@ se generan los binarios para cada plataforma en esta dirección:
 - https://github.com/pilas-engine/pilas-engine/releases
 
 
+Si se quieren generar los binarios directamente de forma local, hay que tener
+instalado wine con anterioridad y luego ejecutar `make binarios`:
+
+```
+brew install wine winetricks
+make binarios
+```
+
+
 
 ## Nota
 

app/app.js

@@ -1,13 +1,9 @@
-import Ember from "ember";
+import Application from "@ember/application";
 import Resolver from "./resolver";
 import loadInitializers from "ember-load-initializers";
 import config from "./config/environment";
 
-let App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

app/components/pilas-arduino.js

@@ -3,7 +3,7 @@ import { task, timeout } from "ember-concurrency";
 let serialport = {};
 let five = {};
 
-if (requireNode) {
+if (window.enElectron) {
   serialport = requireNode("serialport");
   five = requireNode("johnny-five");
 }
@@ -47,7 +47,7 @@ export default Ember.Component.extend({
   }),
 
   didInsertElement() {
-    if (requireNode) {
+    if (window.inElectron) {
       this.get("tareaListarDispositivos").perform({});
 
       var board = new five.Board({

app/components/pilas-logo.js

@@ -1,3 +1,3 @@
-import Ember from "ember";
+import Component from "@ember/component";
 
-export default Ember.Component.extend({});
+export default Component.extend({});

app/components/pilas-manual.js

@@ -1,6 +1,6 @@
-import Ember from "ember";
+import Component from "@ember/component";
 
-export default Ember.Component.extend({
+export default Component.extend({
   tagName: "",
   url: "./manual/index.html"
 });

app/components/pilas-phaser-experimental.js

@@ -86,7 +86,6 @@ class EstadoEjecucion {
 }
 
 export default Ember.Component.extend({
-  remodal: Ember.inject.service(),
   ancho: 400,
   alto: 400,
   entidades: null,
@@ -133,10 +132,7 @@ export default Ember.Component.extend({
           }
 
           if (e.data.tipo === "finaliza_carga_de_recursos") {
-            this.set(
-              "estado",
-              new EstadoEdicion(contexto, this.get("entidades"))
-            );
+            this.set("estado", new EstadoEdicion(contexto, this.get("entidades")));
           }
         },
         false
@@ -151,9 +147,7 @@ export default Ember.Component.extend({
     detener() {
       this.set("estado", this.get("estado").detener());
     },
-    abrirDialogoParaAgregarUnActor() {
-      this.get("remodal").open("dialogo-agregar-actor");
-    },
+    abrirDialogoParaAgregarUnActor() {},
     agregarUnActor(nombre) {
       this.set("estado", this.get("estado").agregarActor(nombre));
       this.set("entidades", this.get("estado.entidades"));

app/components/pilas-version.js

@@ -0,0 +1,3 @@
+import Component from "@ember/component";
+
+export default Component.extend({});

app/controllers/application.js

@@ -0,0 +1,3 @@
+import Controller from "@ember/controller";
+
+export default Controller.extend({});

app/index.html

@@ -9,8 +9,22 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/pilas-engine.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/pilas-engine.css">
+
+<script>
+window.enElectron = false;
+
+var win = window;
+win.moduleNode = win.module;
+win.processNode = win.process;
+win.requireNode = win.require;
+
+delete win.module;
+delete win.process;
+delete win.require;
+</script>
+
 
     {{content-for "head-footer"}}
   </head>
@@ -21,5 +35,11 @@
     <script src="{{rootURL}}assets/pilas-engine.js"></script>
 
     {{content-for "body-footer"}}
+
+<script>
+win.process = win.processNode;
+win.module = win.moduleNode;
+</script>
+
   </body>
 </html>

app/router.js

@@ -1,7 +1,7 @@
-import Ember from "ember";
+import EmberRouter from "@ember/routing/router";
 import config from "./config/environment";
 
-const Router = Ember.Router.extend({
+const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL
 });
@@ -12,10 +12,10 @@ Router.map(function() {
   this.route("manual");
   this.route("api");
   this.route("experimentos");
-  this.route('demo');
-  this.route('arduino');
-  this.route('editor');
-  this.route('ejemplos');
+  this.route("demo");
+  this.route("arduino");
+  this.route("editor");
+  this.route("ejemplos");
 });
 
 export default Router;

app/routes/acercade.js

@@ -1,3 +1,3 @@
-import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({});
+export default Route.extend({});

app/routes/api.js

@@ -1,3 +1,3 @@
-import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({});
+export default Route.extend({});

app/routes/application.js

@@ -1,6 +1,7 @@
 import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({
+export default Route.extend({
   livereload: Ember.inject.service(),
   electron: Ember.inject.service(),
 

app/routes/arduino.js

@@ -1,4 +1,3 @@
-import Ember from 'ember';
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({
-});
+export default Route.extend({});

app/routes/demo.js

@@ -1,6 +1,6 @@
-import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     let proyecto = {
       entidades: [

app/routes/ejemplos.js

@@ -1,4 +1,3 @@
-import Ember from 'ember';
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({
-});
+export default Route.extend({});

app/routes/experimentos.js

@@ -1,3 +1,3 @@
-import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({});
+export default Route.extend({});

app/routes/index.js

@@ -1,3 +1,3 @@
-import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({});
+export default Route.extend({});

app/routes/manual.js

@@ -1,3 +1,3 @@
-import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({});
+export default Route.extend({});

app/routes/pilas.js

@@ -1,3 +1,3 @@
-import Ember from "ember";
+import Route from "@ember/routing/route";
 
-export default Ember.Route.extend({});
+export default Route.extend({});

app/services/electron.js

@@ -1,10 +1,10 @@
-import Ember from "ember";
+import Service from "@ember/service";
 
-export default Ember.Service.extend({
+export default Service.extend({
   enElectron: false,
 
   iniciar() {
-    if (requireNode) {
+    if (window.enElectron) {
       this.set("enElectron", true);
     }
   }