standalone-ruby 1.5.0 → 1.5.2

data/lib/data/exe_templates/launcher_stub.c

@@ -1,30 +1,30 @@
-#include <windows.h>
-
-int main() {
-    char command[] = "wscript.exe launcher.vbs";
-
-    STARTUPINFO si = {0};
-    PROCESS_INFORMATION pi = {0};
-
-    if (CreateProcess(
-        NULL,
-        command,
-        NULL,
-        NULL,
-        FALSE,
-        0,
-        NULL,
-        NULL,
-        &si,
-        &pi
-    )) {
-        WaitForSingleObject(pi.hProcess, INFINITE);
-
-        CloseHandle(pi.hProcess);
-        CloseHandle(pi.hThread);
-    } else {
-
-    }
-
-    return 0;
+#include <windows.h>
+
+int main() {
+    char command[] = "wscript.exe launcher.vbs";
+
+    STARTUPINFO si = {0};
+    PROCESS_INFORMATION pi = {0};
+
+    if (CreateProcess(
+        NULL,
+        command,
+        NULL,
+        NULL,
+        FALSE,
+        0,
+        NULL,
+        NULL,
+        &si,
+        &pi
+    )) {
+        WaitForSingleObject(pi.hProcess, INFINITE);
+
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+    } else {
+
+    }
+
+    return 0;
 }

data/lib/data/exe_templates/launcher_stub.cpp

@@ -1,31 +1,31 @@
-#include <windows.h>
-#include <iostream>
-
-int main() {
-    const char* command = "wscript.exe LAUNCHER_FILE";
-
-    STARTUPINFO si = {0};
-    PROCESS_INFORMATION pi = {0};
-
-    if (CreateProcess(
-        NULL,
-        const_cast<LPSTR>(command),
-        NULL,
-        NULL,
-        FALSE,
-        0,
-        NULL,
-        NULL,
-        &si,
-        &pi
-    )) {
-        WaitForSingleObject(pi.hProcess, INFINITE);
-
-        CloseHandle(pi.hProcess);
-        CloseHandle(pi.hThread);
-    } else {
-        std::cerr << "CreateProcess failed with error code: " << GetLastError() << std::endl;
-    }
-
-    return 0;
-}
+#include <windows.h>
+#include <iostream>
+
+int main() {
+    const char* command = "wscript.exe LAUNCHER_FILE";
+
+    STARTUPINFO si = {0};
+    PROCESS_INFORMATION pi = {0};
+
+    if (CreateProcess(
+        NULL,
+        const_cast<LPSTR>(command),
+        NULL,
+        NULL,
+        FALSE,
+        0,
+        NULL,
+        NULL,
+        &si,
+        &pi
+    )) {
+        WaitForSingleObject(pi.hProcess, INFINITE);
+
+        CloseHandle(pi.hProcess);
+        CloseHandle(pi.hThread);
+    } else {
+        std::cerr << "CreateProcess failed with error code: " << GetLastError() << std::endl;
+    }
+
+    return 0;
+}

data/lib/data/launcher_templates/vbs/default_vbs.txt

@@ -1,7 +1,7 @@
-Set objShell = CreateObject("WScript.Shell")
-
-rubyPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "/STANDALONE_RUBY_PATH"
-scriptPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "/STANDALONE_MAIN_FILE"
-
-command = """" & rubyPath & """ """ & scriptPath & """"
-objShell.Run command, 1, False
+Set objShell = CreateObject("WScript.Shell")
+
+rubyPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "/STANDALONE_RUBY_PATH"
+scriptPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "/STANDALONE_MAIN_FILE"
+
+command = """" & rubyPath & """ """ & scriptPath & """"
+objShell.Run command, 1, False

data/lib/data/launcher_templates/vbs/vbs_gui.txt

@@ -1,8 +1,8 @@
-Set objShell = CreateObject("WScript.Shell")
-
-rubyPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\STANDALONE_RUBY_PATH"
-scriptPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\STANDALONE_MAIN_FILE"
-
-command = """" & rubyPath & """ """ & scriptPath & """"
-
-objShell.Run command, 1, False
+Set objShell = CreateObject("WScript.Shell")
+
+rubyPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\STANDALONE_RUBY_PATH"
+scriptPath = CreateObject("Scripting.FileSystemObject").GetParentFolderName(WScript.ScriptFullName) & "\STANDALONE_MAIN_FILE"
+
+command = """" & rubyPath & """ """ & scriptPath & """"
+
+objShell.Run command, 1, False

data/lib/data/resource_files/default.rc

@@ -1,17 +1,17 @@
-#include <windows.h>
-
-1 VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
- BEGIN
-   BLOCK "StringFileInfo"
-   BEGIN
-     BLOCK "040904B0"
-     BEGIN
-       VALUE "CompanyName", "Developer\0"
-       VALUE "FileDescription", "MyProgram\0"
-       VALUE "FileVersion", "1.0.0.0\0"
-       VALUE "ProductName", "MyProgram\0"
-     END
-   END
- END
+#include <windows.h>
+
+1 VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ BEGIN
+   BLOCK "StringFileInfo"
+   BEGIN
+     BLOCK "040904B0"
+     BEGIN
+       VALUE "CompanyName", "Developer\0"
+       VALUE "FileDescription", "MyProgram\0"
+       VALUE "FileVersion", "1.0.0.0\0"
+       VALUE "ProductName", "MyProgram\0"
+     END
+   END
+ END

data/lib/displayer.rb

@@ -1,66 +1,64 @@
-require_relative 'logger_helper'
-require_relative 'version/version'
-
-class Displayer
-  def initialize(params)
-    @params = params
-    @logger = LoggerHelper.instance
-  end
-
-  def display_params
-    begin
-      puts("Working With:")
-
-      display_map = {
-        "Project Path"   => @params[:project_path],
-        "Resource File" => @params[:resource_file],
-        "Exe File"       => @params[:exe],
-        "Ruby Path"      => @params[:ruby_path],
-        "Ruby Folder"    => @params[:ruby_path] ? File.basename(@params[:ruby_path]) : nil,
-        "Main File"      => @params[:main_file],
-        "Launcher"       => @params[:launcher],
-        "Launcher Type"  => @params[:launcher_type],
-        "Template"       => @params[:template] || "Default Template",
-        "Log Path"       => "Users Documents Directory"
-      }
-
-      display_text = display_map.map { |key, value| "  - #{key}: #{value}" if value }.compact
-
-      puts display_text.join("\n") unless display_text.empty?
-
-    rescue => e
-      print("Display Error: ".red); puts(e.message.red)
-      @logger.error("Display Error: #{e.message}")
-    end
-  end
-
-
-  def banner
-    banner = -<<"BANNER"
-Standalone-Ruby v#{StandaloneRuby::VERSION} - Package your Ruby projects as exe!
-  # Github: https://github.com/ardatetikbey/Standalone-Ruby
-  # RubyGems: https://rubygems.org/gems/standalone-ruby
-
-BANNER
-
-    puts banner
-  end
-end
-
-class String
-  def red
-    "\e[31m#{self}\e[0m"
-  end
-
-  def green
-    "\e[32m#{self}\e[0m"
-  end
-
-  def magenta
-    "\e[35m#{self}\e[0m"
-  end
-
-  def yellow
-    "\e[33m#{self}\e[0m"
-  end
+require_relative 'version/version'
+
+class Displayer
+  def initialize(params)
+    @params = params
+  end
+
+  def display_params
+    begin
+      puts("Parameters:")
+
+      display_map = {
+        "Platform" => @params[:platform],
+        "Project Path"   => @params[:project_path],
+        "Resource File" => @params[:resource_file],
+        "Exe File"       => @params[:exe],
+        "Ruby Path"      => @params[:ruby_path],
+        "Ruby Folder"    => @params[:ruby_path] ? File.basename(@params[:ruby_path]) : nil,
+        "Main File"      => @params[:main_file],
+        "Launcher"       => @params[:launcher],
+        "Launcher Type"  => @params[:launcher_type],
+        "Template"       => @params[:template] || "Default Template",
+        "Log Path"       => "Users Documents Directory"
+      }
+
+      display_text = display_map.map { |key, value| "  - #{key}: #{value}" if value }.compact
+
+      puts display_text.join("\n") unless display_text.empty?
+
+    rescue => e
+      print("Display Error: ".red); puts(e.message.red)
+    end
+  end
+
+
+  def banner
+    banner = -<<"BANNER"
+Standalone-Ruby v#{StandaloneRuby::VERSION} - Make Ruby independent!
+  # Github: https://github.com/ardatetikbey/Standalone-Ruby
+  # RubyGems: https://rubygems.org/gems/standalone-ruby
+
+BANNER
+
+    puts banner
+  end
+end
+
+class String
+  def red
+    "\e[31m#{self}\e[0m"
+  end
+
+  def green
+    "\e[32m#{self}\e[0m"
+  end
+
+  def magenta
+    "\e[35m#{self}\e[0m"
+  end
+
+  def yellow
+    "\e[33m#{self}\e[0m"
+  end
 end

data/lib/exe_packer.rb

@@ -1,82 +1,72 @@
-require_relative 'logger_helper'
-
-class ExePacker
-  def initialize(params)
-    @params = params
-    @logger = LoggerHelper.instance
-  end
-
-  def pack
-    begin
-      stub_path = File.join(File.expand_path("data/exe_templates", __dir__), "launcher_stub.c")
-      @logger.info("Reading stub template from: #{stub_path}")
-
-      stub_content = File.read(stub_path)
-
-      stub_output = "#{File.join(@params[:project_path].to_s, "launcher_stub.c")}"
-      exe_path = "#{File.join(@params[:project_path].to_s, @params[:exe].to_s)}"
-
-      File.open(stub_output, 'w') { |f| f.write(stub_content) }
-
-      if @params[:use_gcc]
-        puts "\nChecking GCC and Windres..."
-        output = `where gcc`
-        gcc_path = output.strip
-
-        output = `where windres`
-        windres_path = output.strip
-
-        if File.exist?(output.strip)
-          puts "GCC Path: #{gcc_path}"
-          puts "Windres Path: #{windres_path}"
-
-          windres_command = "#{windres_path} #{@params[:resource_file].to_s} -O coff -o #{File.join(@params[:project_path].to_s, "program.o")}"
-          @logger.info("Running command: #{windres_command}")
-          `#{windres_command}`
-
-          gcc_command = "#{gcc_path} -o #{exe_path} #{File.join(@params[:project_path].to_s, "program.o")} #{stub_output}"
-          @logger.info("Running command: #{gcc_command}")
-          `#{gcc_command}`
-
-          File.delete("#{File.join(@params[:project_path].to_s, 'program.o')}")
-          @logger.info("program.o file deleted")
-        else
-          print("Error: ".red); puts("GCC could not be found!")
-          exit!
-        end
-      else
-        puts "\nUsing Tiny C Compiler (TCC)..."
-
-        tcc_path = File.join(File.expand_path("data/c_compilers/tcc", __dir__), "tcc.exe")
-        @logger.info("TCC Path: #{tcc_path}")
-
-        command = "#{tcc_path} -o #{exe_path} #{stub_output} -lkernel32"
-        @logger.info("Running command: #{command}")
-        `#{command}`
-      end
-
-      File.delete(stub_output)
-      @logger.info("Stub file deleted successfully")
-
-      puts("\nExe file has been generated!".green_bold_dark)
-      @logger.info("Exe file generated at: #{exe_path}")
-    rescue Exception => err
-      @logger.error("Error occurred: #{err.message}")
-      print("Error: ".red); puts(err.message)
-    end
-  end
-end
-
-class String
-  def red
-    "\e[31m#{self}\e[0m"
-  end
-
-  def yellow
-    "\e[33m#{self}\e[0m"
-  end
-
-  def green_bold_dark
-    "\e[1m\e[38;5;28m#{self}\e[0m"
-  end
-end
+class ExePacker
+  def initialize(params)
+    @params = params
+  end
+
+  def pack_linux
+    puts
+  end
+
+  def pack_windows
+    begin
+      stub_path = File.join(File.expand_path("data/exe_templates", __dir__), "launcher_stub.c")
+      stub_content = File.read(stub_path)
+
+      stub_output = "#{File.join(@params[:project_path].to_s, "launcher_stub.c")}"
+      exe_path = "#{File.join(@params[:project_path].to_s, "program.exe")}"
+
+      File.open(stub_output, 'w') { |f| f.write(stub_content) }
+
+      if @params[:use_gcc]
+        puts "\nChecking GCC and Windres..."
+        output = `where gcc`
+        gcc_path = output.strip
+
+        output = `where windres`
+        windres_path = output.strip
+
+        if File.exist?(output.strip)
+          puts "GCC Path: #{gcc_path}"
+          puts "Windres Path: #{windres_path}"
+
+          windres_command = "#{windres_path} #{@params[:resource_file].to_s} -O coff -o #{File.join(@params[:project_path].to_s, "program.o")}"
+          `#{windres_command}`
+
+          gcc_command = "#{gcc_path} -o #{exe_path} #{File.join(@params[:project_path].to_s, "program.o")} #{stub_output}"
+          `#{gcc_command}`
+
+          File.delete("#{File.join(@params[:project_path].to_s, 'program.o')}")
+        else
+          print("Error: ".red); puts("GCC could not be found!")
+          exit!
+        end
+      else
+        puts "\nUsing Tiny C Compiler (TCC)..."
+
+        tcc_path = File.join(File.expand_path("data/c_compilers/tcc", __dir__), "tcc.exe")
+        command = "#{tcc_path} -o #{exe_path} #{stub_output} -lkernel32"
+        `#{command}`
+      end
+
+      File.delete(stub_output)
+
+      puts("\nExe file has been generated!")
+    rescue Exception => err
+      print("Error: ".red); puts(err.message)
+    end
+  end
+end
+
+class String
+  def red
+    "\e[31m#{self}\e[0m"
+  end
+
+  def yellow
+    "\e[33m#{self}\e[0m"
+  end
+
+  def green_bold_dark
+    "\e[1m\e[38;5;28m#{self}\e[0m"
+  end
+end

data/lib/launcher.rb

@@ -1,84 +1,58 @@
-require 'optparse'
-
-require_relative 'displayer'
-require_relative 'parameter_parser'
-require_relative 'ruby_copy'
-require_relative 'logger_helper'
-require_relative 'exe_packer'
-require_relative 'launcher_handler'
-
-
-class Launcher
-  def initialize
-    @parser = ParameterParser.new
-    @parser.parse
-    @params = @parser.params
-
-    @displayer = Displayer.new(@params)
-    @ruby_copy = RubyCopy.new(@params)
-    @logger = LoggerHelper.instance
-    @exe_packer = ExePacker.new(@params)
-    @launcher_handler = LauncherHandler.new(@params)
-  end
-
-  def platform_analysis
-    case RUBY_PLATFORM
-    when /win32|mingw|cygwin/
-      @params[:platform] = 'Windows'
-      @logger.info("Working on windows platform.")
-    else
-      print("Error: ".red); puts("This platform is not supported! Exiting...")
-      @logger.error("This platform is not supported! Exiting...")
-      exit!
-    end
-  end
-
-  def run
-    begin
-      Signal.trap("INT") do
-        @logger.info("The program was closed because an interrupt command was detected.")
-        puts "\nProgram interrupted. Shutting down..."
-        exit(0)
-      end
-
-      platform_analysis
-
-      @logger.info("the executor function is started.")
-      @displayer.banner
-      @logger.info("Banner display was made.")
-      @displayer.display_params
-      @logger.info("The parameters entered by the user are reflected on the screen.")
-      @ruby_copy.robocopy_interpreter
-      @logger.info("Ruby interpreter copy function completed.")
-      @launcher_handler.handle
-      @logger.info("Launcher handler finished.")
-      @exe_packer.pack
-      @logger.info("Exe pack finished.")
-
-      if @params[:one_file_exe]
-        require_relative 'sfx_generator'
-        @sfx_generator = SFXGenerator.new(@params)
-        @sfx_generator.generate_sfx
-      end
-
-      print("\nWARNING: ".yellow); puts("Instead of changing the path of the created exe file, create a shortcut. The same applies here as in every application.")
-
-      puts("\nThis project is under development. If you encounter any errors, you can open an issue on Github.\nIf you want to make a suggestion, you can contact me.")
-      puts "Thanks for using Standalone-Ruby! Don't forget to star the project on Github."
-      @logger.info("Program finished.")
-    rescue Exception => e
-      @logger.error("Launcher Error: #{e.message}")
-      print("Launcher Error: "); puts("#{e.message}".red)
-    end
-  end
-end
-
-class String
-  def red
-    "\e[31m#{self}\e[0m"
-  end
-
-  def yellow
-    "\e[33m#{self}\e[0m"
-  end
-end
+require 'optparse'
+
+require_relative 'displayer'
+require_relative 'parameter_parser'
+require_relative 'ruby_copy'
+require_relative 'exe_packer'
+require_relative 'launcher_handler'
+
+class Launcher
+  def initialize
+    @parser = ParameterParser.new
+    @parser.parse
+    @params = @parser.params
+
+    @displayer = Displayer.new(@params)
+    @ruby_copy = RubyCopy.new(@params)
+    @exe_packer = ExePacker.new(@params)
+    @launcher_handler = LauncherHandler.new(@params)
+  end
+
+  def run
+    begin
+      Signal.trap("INT") do
+        puts "\nProgram interrupted. Shutting down..."
+        exit(0)
+      end
+
+      @displayer.banner
+      @displayer.display_params
+
+      if @params[:platform] == 'windows'
+        @ruby_copy.robocopy_interpreter
+        @launcher_handler.handle
+        @exe_packer.pack_windows
+      elsif @params[:platform] == 'linux'
+        @ruby_copy.rsync_interpreter
+        @exe_packer.pack_linux
+      end
+
+      print("\nWARNING: ".yellow); puts("Instead of changing the path of the created exe file, create a shortcut. The same applies here as in every application.")
+
+      puts("\nThis project is under development. If you encounter any errors, you can open an issue on Github.\nIf you want to make a suggestion, you can contact me.")
+      puts "Thanks for using Standalone-Ruby! Don't forget to star the project on Github."
+    rescue Exception => e
+      print("Launcher Error: "); puts("#{e.message}".red)
+    end
+  end
+end
+
+class String
+  def red
+    "\e[31m#{self}\e[0m"
+  end
+
+  def yellow
+    "\e[33m#{self}\e[0m"
+  end
+end