lively-electron 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf19bfa8b454abba3dde67bb6e1267bf868fa68439dd167c689c52a51e7c0fd6
-  data.tar.gz: 0ab6ff6ea8a4ccf8d47c4097fa486074c12fc70e7fa343dd1ecee476fdfac2bc
+  metadata.gz: 248f9a41919d7b26d78d41b7a137b839061ad3a1ac721622d0f348d645e572a3
+  data.tar.gz: 74354a3a3a0da8efc6ea18fa707618f98643585b2c606d77bb2ce2d7d572b9e8
 SHA512:
-  metadata.gz: 42b648927ee2f83336fd533b5ffe33de54be204e7f16a8c45e667304045a3605aba110ad3ce1044a9994a9ef6600c54cf0b2e38f6ef368230560343d749d4518
-  data.tar.gz: d3986882840225c81d4e8de8cbe3c7613698567f8534a546d4e94a7fc965c51d5acfefc999f7b5f4ce0e95b3c0209f8ff9a79e1d4ea6010e728029107a8c55e9
+  metadata.gz: 94189c32f5843bb3dbdab9a6bbbfbb39c141a0cbb1f9cdbdfd0690049fbe06c75956789de5cd3cb8a63f892a792cb2556001c2f332e856545da11e047702879d
+  data.tar.gz: 7ed9041b2a731fef4fa215732b4c5cbf3136f0a39cd1e4d77e120e3ad96e5ce9e111775e22052bdea087b481b3bbae407c3b4dc148ff8799ae505cf12a878de5

data/bin/lively-electron

@@ -8,5 +8,9 @@ if development_mode
 	ENV["CONSOLE_LEVEL"] = "debug"
 end
 
+electron_path = ENV.fetch("ELECTRON") do
+	`npx which electron`.strip
+end
+
 main_js = File.join(__dir__, "..", "src", "main.js")
-Process.exec("npx", "electron", main_js, *ARGV)
+Process.exec(electron_path, main_js, *ARGV)

data/bin/lively-electron-server

@@ -11,7 +11,7 @@ end
 configuration = Async::Service::Configuration.build do
 	service "lively-electron" do
 		include Lively::Electron::Environment::Application
-	end	
+	end
 end
 
 Async::Service::Controller.run(configuration)

data/lib/lively/electron/version.rb

@@ -7,7 +7,7 @@
 module Lively
 	# @namespace
 	module Electron
-		VERSION = "0.1.1"
+		VERSION = "0.1.2"
 	end
 end
 

data/src/main.js

@@ -1,155 +1,155 @@
 const {app, BrowserWindow, ipcMain} = require('electron');
-const {spawn} = require('child_process');
+const {spawn, spawnSync} = require('child_process');
 const http = require('http');
 const net = require('net');
 const path = require('path');
 const fs = require('fs');
 
 class LivelyElectronApp {
-  constructor() {
-    this.rubyProcess = null;
-    this.mainWindow = null;
-    this.serverUrl = null;
-    
-    // Store the working directory (should be preserved by direct CLI)
-    this.originalCwd = process.cwd();
-    console.log('💾 Working directory:', this.originalCwd);
-  }
-
-  isDevelopment() {
-    const variant = process.env.LIVELY_VARIANT || process.env.VARIANT;
-    return variant === "development";
-  }
-
-  async start() {
-    try {
-      // 1. Start Ruby Lively server on TCP localhost
-      await this.startLivelyServer();
-      
-      // 2. Create Electron window (connects directly to Ruby server)
-      await this.createWindow();
-      
-      console.log(`Lively Electron started - Ruby server: ${this.serverUrl}`);
-    } catch (error) {
-      console.error('Failed to start Lively Electron:', error);
-      app.quit();
-    }
-  }
-
-  async startLivelyServer() {
-    return new Promise((resolve, reject) => {
-      // Forward all CLI args to the Ruby server; let the Ruby script decide the application file
-      const args = process.argv.slice(2);
-      
-      // Create server and let it bind+listen, then pass handle to child
-      const server = net.createServer();
-      server.listen(0, '127.0.0.1', () => {
-        const port = server.address().port;
-        this.serverUrl = `http://localhost:${port}`;
-        
-        const fd = server._handle.fd;
-
-        // Start Ruby process with FD passed via stdio and forward all CLI args
-        const livelyElectronScript = path.join(__dirname, '..', 'bin', 'lively-electron-server');
-        const childArgs = args.slice();
-
-        const child = spawn(livelyElectronScript, childArgs, {
-          stdio: [
-            'inherit',  // stdin
-            'inherit',  // stdout
-            'inherit',  // stderr
-            fd          // Pass socket FD as stdio[3]
-          ],
-          env: { 
-            ...process.env, 
-            LIVELY_SERVER_DESCRIPTOR: '3'  // Tell child it's on FD 3
-          }
-        });
-
-        child.on('spawn', () => {
-          this.rubyProcess = child;
-          server.close((error) => {
-            if (error) {
-              reject(error);
-            } else {
-              console.log(`✅ Ruby server should be ready: ${this.serverUrl}`);
-              resolve();
-            }
-          });
-        });
-
-        child.on('error', (error) => {
-          server.close();
-          console.error('Failed to spawn Ruby process:', error);
-          reject(error);
-        });
-
-        child.on('close', (code) => {
-          this.rubyProcess = null;
-          console.log(`Ruby process exited with code ${code}`);
-          if (code !== 0) {
-            reject(new Error(`Ruby process failed with code ${code}`));
-          }
-        });
-      });
-    });
-  }
-
-  async createWindow() {
-    this.mainWindow = new BrowserWindow({
-      width: 1200,
-      height: 800,
-      webPreferences: {
-        nodeIntegration: false,
-        contextIsolation: true,
-        enableRemoteModule: false
-      },
-      titleBarStyle: 'hiddenInset'
-    });
-
-    // Load the Lively app directly
-    await this.mainWindow.loadURL(this.serverUrl);
-
-    // Open DevTools in development mode
-    if (this.isDevelopment()) {
-      this.mainWindow.webContents.openDevTools();
-    }
-
-    this.mainWindow.on('closed', () => {
-      this.cleanup();
-    });
-  }
-
-  cleanup() {
-    if (this.rubyProcess) {
-      this.rubyProcess.kill();
-    }
-  }
+	constructor() {
+		this.rubyProcess = null;
+		this.mainWindow = null;
+		this.serverUrl = null;
+		
+		// Store the working directory (should be preserved by direct CLI)
+		this.originalCwd = process.cwd();
+		console.log('💾 Working directory:', this.originalCwd);
+	}
+	
+	isDevelopment() {
+		const variant = process.env.LIVELY_VARIANT || process.env.VARIANT;
+		return variant === "development";
+	}
+	
+	async start() {
+		try {
+			// 1. Start Ruby Lively server on TCP localhost
+			await this.startLivelyServer();
+			
+			// 2. Create Electron window (connects directly to Ruby server)
+			await this.createWindow();
+			
+			console.log(`Lively Electron started - Ruby server: ${this.serverUrl}`);
+		} catch (error) {
+			console.error('Failed to start Lively Electron:', error);
+			app.quit();
+		}
+	}
+	
+	async startLivelyServer() {
+		return new Promise((resolve, reject) => {
+			// Forward all CLI args to the Ruby server; let the Ruby script decide the application file
+			const args = process.argv.slice(2);
+			
+			// Create server and let it bind+listen, then pass handle to child
+			const server = net.createServer();
+			server.listen(0, '127.0.0.1', () => {
+				const port = server.address().port;
+				this.serverUrl = `http://localhost:${port}`;
+				
+				const fd = server._handle.fd;
+				
+				// Start Ruby process with FD passed via stdio and forward all CLI args
+				const livelyElectronScript = path.join(__dirname, '..', 'bin', 'lively-electron-server');
+				const childArgs = args.slice();
+				
+				const child = spawn(livelyElectronScript, childArgs, {
+					stdio: [
+						'inherit',  // stdin
+						'inherit',  // stdout
+						'inherit',  // stderr
+						fd          // Pass socket FD as stdio[3]
+					],
+					env: { 
+						...process.env, 
+						LIVELY_SERVER_DESCRIPTOR: '3'  // Tell child it's on FD 3
+					}
+				});
+				
+				child.on('spawn', () => {
+					this.rubyProcess = child;
+					server.close((error) => {
+						if (error) {
+							reject(error);
+						} else {
+							console.log(`✅ Ruby server should be ready: ${this.serverUrl}`);
+							resolve();
+						}
+					});
+				});
+				
+				child.on('error', (error) => {
+					server.close();
+					console.error('Failed to spawn Ruby process:', error);
+					reject(error);
+				});
+				
+				child.on('close', (code) => {
+					this.rubyProcess = null;
+					console.log(`Ruby process exited with code ${code}`);
+					if (code !== 0) {
+						reject(new Error(`Ruby process failed with code ${code}`));
+					}
+				});
+			});
+		});
+	}
+	
+	async createWindow() {
+		this.mainWindow = new BrowserWindow({
+			width: 1200,
+			height: 800,
+			webPreferences: {
+				nodeIntegration: false,
+				contextIsolation: true,
+				enableRemoteModule: false
+			},
+			titleBarStyle: 'hiddenInset'
+		});
+		
+		// Load the Lively app directly
+		await this.mainWindow.loadURL(this.serverUrl);
+		
+		// Open DevTools in development mode
+		if (this.isDevelopment()) {
+			this.mainWindow.webContents.openDevTools();
+		}
+		
+		this.mainWindow.on('closed', () => {
+			this.cleanup();
+		});
+	}
+	
+	cleanup() {
+		if (this.rubyProcess) {
+			this.rubyProcess.kill();
+		}
+	}
 }
 
 // Electron app lifecycle
 app.whenReady().then(() => {
-  console.log('Electron ready, starting Lively app...');
-  const livelyApp = new LivelyElectronApp();
-  livelyApp.start().catch(error => {
-    console.error('Failed to start Lively app:', error);
-    app.quit();
-  });
+	console.log('Electron ready, starting Lively app...');
+	const livelyApp = new LivelyElectronApp();
+	livelyApp.start().catch(error => {
+		console.error('Failed to start Lively app:', error);
+		app.quit();
+	});
 });
 
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
+	if (process.platform !== 'darwin') {
+		app.quit();
+	}
 });
 
 app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    const livelyApp = new LivelyElectronApp();
-    livelyApp.start();
-  }
+	if (BrowserWindow.getAllWindows().length === 0) {
+		const livelyApp = new LivelyElectronApp();
+		livelyApp.start();
+	}
 });
 
 app.on('before-quit', () => {
-  // Cleanup will be handled by window close event
+	// Cleanup will be handled by window close event
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lively-electron
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Samuel Williams