solara 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf4626fe23d16f245e1e77267bf23f3b368cd4bb2fd286cb038a73f52f7f6b65
-  data.tar.gz: a4bbc04dfe9844532227f16283c4c3b7cf86450a21a75b01a479a88be8021c82
+  metadata.gz: fa3aa21eb21036202da4957e2e682b8d5adc0f4c8a10189f685476ea803a067b
+  data.tar.gz: 2317f81050447c643c8256cdc5f1b87990eaa8a646abc29a82ee4bd26d1c6a4a
 SHA512:
-  metadata.gz: c490881fbbcf873cb1fae33bcad4f25989cff5196ff70d0494238e2640cd39d68089512fe940590863d633494528755ee6dd4024d05d58f379c503cdd499b3ac
-  data.tar.gz: bcebb36d901d66ea8f184f480fcceb3c8472d35424432ea43d0a42b153409ff500f968626c32f507011f012194b5277f2defab8ce52c25064730ae2cccdc07eb
+  metadata.gz: cf458275766a458bfd964573218841dcf2db126a2403fc30a762b8038c0413508fa31a230fa9e703ecd90aff435bde9a57497eaf24c730e0fde26d783b93f849
+  data.tar.gz: 1e0224750e3cff54df88d9e4758292ddde655c5af8f467a7abe7475c800db1047404dfbd93b3417bb590287d6554516fadf21bdae7e54d66e228d75d3cab8e2a

data/solara/lib/core/aliases/alias_generator.rb

@@ -1,63 +1,199 @@
 Dir[File.expand_path('../scripts/*.rb', __dir__)].each { |file| require_relative file }
+
 require 'json'
+require 'rbconfig'
 
-class AliasGenerator
+class AliasManager
     def initialize
-        @output_file = FilePath.solara_aliases_sh
-        FileManager.create_file_if_not_exist(@output_file)
+        case RbConfig::CONFIG['host_os']
+        when /mswin|mingw|cygwin/
+            @generator = WindowsAliasGenerator.new
+        when /darwin|mac os|linux/
+            @generator = UnixAliasGenerator.new
+        else
+          Solara.logger.fatal("Unsupported operating system. Aliases can't be generated.")
+        end
+    end
 
-        @readme_file = FilePath.solara_aliases_readme
-        FileManager.create_file_if_not_exist(@readme_file)
+    def start
+        Solara.logger.start_step("Generate terminal command aliases")
+        add_brand_aliases(BrandsManager.instance.brands_list)
 
-        @json_file = FilePath.solara_aliases_json
-        FileManager.create_file_if_not_exist(@json_file)
+        common_aliases =
+        [
+            ["solara_dashboard", "bundle exec solara dashboard"],
+            ["solara_doctor", "bundle exec solara doctor"],
+            ["solara_status", "bundle exec solara status"],
+        ]
+        add_common_aliases(common_aliases)
 
+        generate
+        save_aliases_to_json
+        generate_readme
+
+        TerminalSetup.new.run
+
+        Solara.logger.end_step("Generate terminal command aliases")
+    end
+
+    private
+
+    def add_brand_aliases(brands)
+        @generator.add_brand_aliases(brands)
+    end
+
+    def add_common_aliases(common_aliases)
+        @generator.add_common_aliases(common_aliases)
+    end
+
+    def generate
+        @generator.generate
+    end
+
+    def generate_readme
+        @generator.generate_readme
+    end
+
+    def save_aliases_to_json
+        @generator.save_aliases_to_json
+    end
+
+    def self.aliases_json
+        path = FilePath.solara_aliases_json
+        JSON.parse(File.read(path))
+    end
+
+    private
+
+    def windows?
+
+        # Check for Windows OS
+        !!(RUBY_PLATFORM =~ /mingw|mswin/)
+    end
+end
+
+class AliasGenerator
+    def initialize
         @brand_aliases = {}
         @common_aliases = []
     end
 
     def add_brand_aliases(brands)
         alias_templates = [
-            "solara_export_{brand_key}='solara export --brand_keys {brand_key}'",
-            "solara_offboard_{brand_key}='solara offboard -k {brand_key}'",
-            "solara_switch_{brand_key}='solara switch -k {brand_key}'",
-            "solara_doctor_{brand_key}='solara doctor -k {brand_key}'",
-            "solara_dashboard_{brand_key}='solara dashboard -k {brand_key}'"
+            ["solara_export_{brand_key}", "bundle exec solara export --brand_keys {brand_key}"],
+            ["solara_offboard_{brand_key}", "bundle exec solara offboard -k {brand_key}"],
+            ["solara_switch_{brand_key}", "bundle exec solara switch -k {brand_key}"],
+            ["solara_doctor_{brand_key}", "bundle exec solara doctor -k {brand_key}"],
+            ["solara_dashboard_{brand_key}", "bundle exec solara dashboard -k {brand_key}"]
         ]
 
         brands.each do |app|
             brand_key = app['key']
             @brand_aliases[brand_key] = []
-            alias_templates.each do |template|
-                alias_line = template.gsub('{brand_key}', brand_key)
-                @brand_aliases[brand_key] << "alias #{alias_line}"
+            alias_templates.each do |alias_name, command|
+                alias_name = alias_name.gsub('{brand_key}', brand_key)
+                command = command.gsub('{brand_key}', brand_key)
+                @brand_aliases[brand_key] << [alias_name, command]
             end
         end
     end
 
     def add_common_aliases(common_aliases)
-        @common_aliases = common_aliases.map { |alias_line| "alias #{alias_line}" }
+        @common_aliases = common_aliases
+    end
+
+    def generate_readme
+        File.open(@readme_file, 'w') do |file|
+            file.puts "# Aliases"
+            file.puts
+            file.puts "This document provides an overview of all available aliases."
+            file.puts
+
+            if @common_aliases.any?
+                file.puts "## Common Aliases"
+                file.puts
+                @common_aliases.each do |value|
+                    file.puts "- `#{value[0]}`: `#{value[1]}`"
+                end
+            end
+
+            file.puts
+
+            @brand_aliases.each do |brand_name, brand_aliases|
+                file.puts "## #{brand_name}"
+                file.puts
+                brand_aliases.each do |alias_name, command|
+                    file.puts "- `#{alias_name}`: `#{command}`"
+                end
+                file.puts
+            end
+        end
+        Solara.logger.debug("README.md has been generated in #{@readme_file}")
+    end
+
+    def save_aliases_to_json
+        json_data = {
+            "common_aliases" => @common_aliases,
+            "brand_aliases" => @brand_aliases
+        }
+
+        File.open(@json_file, 'w') do |file|
+            file.puts JSON.pretty_generate(json_data)
+        end
+        Solara.logger.debug("Aliases have been saved in JSON format in #{@json_file}")
+    end
+end
+
+class UnixAliasGenerator < AliasGenerator
+    def initialize
+        super()
+        @output_file = FilePath.solara_generated_aliases_unix
+        @readme_file = FilePath.solara_aliases_readme
+        @json_file = FilePath.solara_aliases_json
+        FileManager.create_file_if_not_exist(@output_file)
+        FileManager.create_file_if_not_exist(@readme_file)
+        FileManager.create_file_if_not_exist(@json_file)
     end
 
-    def generate_shell_file
+    def generate
         existing_content = File.exist?(@output_file) ? File.read(@output_file) : ""
         new_content = []
 
         new_content << "#!/bin/bash" if existing_content.empty?
 
+        add_common_aliases_to_file(existing_content, new_content)
+        add_brand_aliases_to_file(existing_content, new_content)
+
+        if new_content.any? && !(new_content.size == 1 && new_content.first == "#!/bin/bash")
+            File.open(@output_file, 'a') do |file|
+                file.puts new_content
+            end
+            Solara.logger.debug("Unix aliases have been appended to #{@output_file}")
+        else
+            Solara.logger.debug("No new Unix aliases to add to #{@output_file}")
+        end
+    end
+
+    private
+
+    def add_common_aliases_to_file(existing_content, new_content)
         common_aliases_added = false
-        @common_aliases.each do |alias_line|
+        @common_aliases.each do |value|
+            alias_line = "alias #{value[0]}='#{value[1]}'"
             unless existing_content.include?(alias_line)
                 new_content << "# Common Aliases" unless common_aliases_added
                 common_aliases_added = true
                 new_content << alias_line
             end
         end
+    end
 
+    def add_brand_aliases_to_file(existing_content, new_content)
         brand_aliases_added = false
         @brand_aliases.each do |brand_name, brand_aliases|
             brand_aliases_for_this_brand_added = false
-            brand_aliases.each do |alias_line|
+            brand_aliases.each do |alias_name, command|
+                alias_line = "alias #{alias_name}='#{command}'"
                 unless existing_content.include?(alias_line)
                     unless brand_aliases_added
                         brand_aliases_added = true
@@ -71,59 +207,97 @@ class AliasGenerator
                 end
             end
         end
-
         new_content.reject!(&:empty?) if new_content.size == 1
+    end
+end
 
-        if new_content.any? && !(new_content.size == 1 && new_content.first == "#!/bin/bash")
-            File.open(@output_file, 'a') do |file|
+class WindowsAliasGenerator < AliasGenerator
+    def initialize
+        super()
+        @cmd_output_file = FilePath.solara_generated_aliases_windows_command_prompt
+        @ps_output_file = FilePath.solara_generated_aliases_powershell
+        @readme_file = FilePath.solara_aliases_readme
+        @json_file = FilePath.solara_aliases_json
+        FileManager.create_file_if_not_exist(@cmd_output_file)
+        FileManager.create_file_if_not_exist(@ps_output_file)
+        FileManager.create_file_if_not_exist(@readme_file)
+        FileManager.create_file_if_not_exist(@json_file)
+    end
+
+    def generate
+        generate_cmd_file
+        generate_powershell_file
+    end
+
+    private
+
+    def generate_cmd_file
+        existing_content = File.exist?(@cmd_output_file) ? File.read(@cmd_output_file) : ""
+        new_content = []
+
+        new_content << "@echo off" if existing_content.empty?
+
+        add_common_aliases_to_file(existing_content, new_content, :cmd)
+        add_brand_aliases_to_file(existing_content, new_content, :cmd)
+
+        if new_content.any? && !(new_content.size == 1 && new_content.first == "@echo off")
+            File.open(@cmd_output_file, 'a') do |file|
                 file.puts new_content
             end
-            Solara.logger.debug("Aliases have been appended to #{@output_file}")
+            Solara.logger.debug("Windows Command Prompt aliases have been appended to #{@cmd_output_file}")
         else
-            Solara.logger.debug("No new aliases to add to #{@output_file}")
+            Solara.logger.debug("No new Windows Command Prompt aliases to add to #{@cmd_output_file}")
         end
     end
 
-    def generate_readme
-        File.open(@readme_file, 'w') do |file|
-            file.puts "# Aliases"
-            file.puts
-            file.puts "This document provides an overview of all available aliases."
-            file.puts
-
-            if @common_aliases.any?
-                file.puts "## Common Aliases"
-                file.puts
-                @common_aliases.each do |alias_line|
-                    alias_name = alias_line.split('=').first.strip.gsub('alias ', '')
-                    file.puts "- `#{alias_name}`"
-                end
-            end
+    def generate_powershell_file
+        existing_content = File.exist?(@ps_output_file) ? File.read(@ps_output_file) : ""
+        new_content = []
 
-            file.puts
+        add_common_aliases_to_file(existing_content, new_content, :powershell)
+        add_brand_aliases_to_file(existing_content, new_content, :powershell)
 
-            file.puts
-            @brand_aliases.each do |brand_name, brand_aliases|
-                file.puts "## #{brand_name}"
-                file.puts
-                brand_aliases.each do |alias_line|
-                    alias_name = alias_line.split('=').first.strip.gsub('alias ', '')
-                    file.puts "- `#{alias_name}`"
-                end
+        if new_content.any?
+            File.open(@ps_output_file, 'a') do |file|
+                file.puts new_content
             end
+            Solara.logger.debug("PowerShell aliases have been appended to #{@ps_output_file}")
+        else
+            Solara.logger.debug("No new PowerShell aliases to add to #{@ps_output_file}")
         end
-        Solara.logger.debug("README.md has been generated in #{@readme_file}")
     end
 
-    def save_aliases_to_json
-        json_data = {
-            "common_aliases" => @common_aliases,
-            "brand_aliases" => @brand_aliases
-        }
+    def add_common_aliases_to_file(existing_content, new_content, shell_type)
+        common_aliases_added = false
+        @common_aliases.each do |alias_name, command|
+            alias_line = shell_type == :cmd ? "doskey #{alias_name}=#{command} $*" : "function #{alias_name} { & #{command} }"
+            unless existing_content.include?(alias_line)
+                new_content << (shell_type == :cmd ? "REM Common Aliases" : "# Common Aliases") unless common_aliases_added
+                common_aliases_added = true
+                new_content << alias_line
+            end
+        end
+    end
 
-        File.open(@json_file, 'w') do |file|
-            file.puts JSON.pretty_generate(json_data)
+    def add_brand_aliases_to_file(existing_content, new_content, shell_type)
+        brand_aliases_added = false
+        @brand_aliases.each do |brand_name, brand_aliases|
+            brand_aliases_for_this_brand_added = false
+            brand_aliases.each do |alias_name, command|
+                alias_line = shell_type == :cmd ? "doskey #{alias_name}=#{command} $*" : "function #{alias_name} { & #{command} }"
+                unless existing_content.include?(alias_line)
+                    unless brand_aliases_added
+                        brand_aliases_added = true
+                    end
+                    unless brand_aliases_for_this_brand_added
+                        new_content << "" # Add a new line before each brand name
+                        new_content << (shell_type == :cmd ? "REM #{brand_name}" : "# #{brand_name}")
+                        brand_aliases_for_this_brand_added = true
+                    end
+                    new_content << alias_line
+                end
+            end
         end
-        Solara.logger.debug("Aliases have been saved in JSON format in #{@json_file}")
+        new_content.reject!(&:empty?) if new_content.size == 1
     end
 end

data/solara/lib/core/aliases/{solara_terminal_setup.rb → terminal_setup.rb}

@@ -5,26 +5,21 @@ Dir.glob("../scripts/*.rb").each { |file| require file }
 require 'fileutils'
 require 'rbconfig'
 
-class SolaraSetup
+class TerminalSetup
   def initialize
-    @aliases_file = FilePath.solara_aliases_sh
     @setup_dir = File.join(ENV['HOME'], '.solara')
-    @unix_setup_file = File.join(@setup_dir, 'setup.sh')
-    @windows_setup_file = File.join(@setup_dir, 'setup.bat')
   end
 
   def run
     create_setup_directory
-    create_unix_setup_script
-    create_windows_setup_script
-    
+
     case RbConfig::CONFIG['host_os']
     when /mswin|mingw|cygwin/
-      setup_windows
+      WindowsTerminalSetup.new(@setup_dir).run
     when /darwin|mac os|linux/
-      setup_unix
+      UnixTerminalSetup.new(@setup_dir).run
     else
-      Solara.logger.fatal("Unsupported operating system. Please set up manually.")
+      Solara.logger.fatal("Unsupported operating system. Please set up the terminal manually.")
     end
   end
 
@@ -33,26 +28,31 @@ class SolaraSetup
   def create_setup_directory
     FileUtils.mkdir_p(@setup_dir)
   end
+end
+
+class UnixTerminalSetup
+  def initialize(setup_dir)
+    @aliases_file_unix = FilePath.solara_generated_aliases_unix
+    @unix_setup_file = File.join(setup_dir, 'setup.sh')
+  end
+
+  def run
+    create_unix_setup_script
+    setup_unix
+  end
+
+  private
 
   def create_unix_setup_script
     File.open(@unix_setup_file, 'w') do |file|
       file.puts <<~SCRIPT
         #!/bin/bash
-        source "#{@aliases_file}"
+        source "#{@aliases_file_unix}"
       SCRIPT
     end
     FileUtils.chmod(0755, @unix_setup_file)
   end
 
-  def create_windows_setup_script
-    File.open(@windows_setup_file, 'w') do |file|
-      file.puts <<~SCRIPT
-        @echo off
-        call "#{@aliases_file.gsub('/', '\\')}"
-      SCRIPT
-    end
-  end
-
   def setup_unix
     shell_config_file = determine_shell_config_file
     setup_line = "source #{@unix_setup_file}"
@@ -75,29 +75,64 @@ class SolaraSetup
     end
   end
 
-  def setup_windows
+  def determine_shell_config_file
+    if ENV['SHELL'] =~ /zsh/
+      File.expand_path('~/.zshrc')
+    elsif ENV['SHELL'] =~ /bash/
+      File.expand_path('~/.bashrc')
+    else
+      File.expand_path('~/.profile')
+    end
+  end
+end
+
+class WindowsTerminalSetup
+  def initialize(setup_dir)
+  end
+
+  def run
+    setup_command_prompt
+    setup_powershell
+  end
+
+  private
+
+  def setup_command_prompt
     require 'win32/registry'
+    setup_file = FilePath.solara_generated_aliases_windows_command_prompt
 
     begin
       Win32::Registry::HKEY_CURRENT_USER.create('Software\Microsoft\Command Processor') do |reg|
-        reg['AutoRun', Win32::Registry::REG_EXPAND_SZ] = @windows_setup_file
+        reg['AutoRun', Win32::Registry::REG_EXPAND_SZ] = setup_file
       end
-      Solara.logger.success("Windows AutoRun registry key set up successfully.")
-      Solara.logger.warn("Please restart your Command Prompt to apply changes.")
+      Solara.logger.debug("Windows AutoRun registry key set up successfully.")
+      Solara.logger.debug("Please restart your Command Prompt to apply changes.")
     rescue Win32::Registry::Error => e
-      Solara.logger.failure("Failed to set up Windows registry: #{e.message}")
+      Solara.logger.failure("Failed to set up Windows registry: #{e.class} - #{e.message}")
       Solara.logger.failure("Please add the following file path to your AutoRun registry key manually:")
-      Solara.logger.failure(@windows_setup_file)
+      Solara.logger.failure(setup_file)
     end
   end
 
-  def determine_shell_config_file
-    if ENV['SHELL'] =~ /zsh/
-      File.expand_path('~/.zshrc')
-    elsif ENV['SHELL'] =~ /bash/
-      File.expand_path('~/.bashrc')
-    else
-      File.expand_path('~/.profile')
+  def setup_powershell_
+    require 'win32/registry'
+    setup_file = FilePath.solara_generated_aliases_powershell
+
+    begin
+      # This path targets all versions of PowerShell
+      Win32::Registry::HKEY_CURRENT_USER.create('Software\Microsoft\PowerShell\PowerShellEngine') do |reg|
+        reg['AutoRun', Win32::Registry::REG_EXPAND_SZ] = setup_file
+      end
+      Solara.logger.debug("PowerShell AutoRun registry key set up successfully.")
+      Solara.logger.debug("Please restart your PowerShell to apply changes.")
+    rescue Win32::Registry::Error => e
+      Solara.logger.failure("Failed to set up PowerShell registry: #{e.class} - #{e.message}")
+      Solara.logger.failure("Please add the following file path to your PowerShell AutoRun registry key manually:")
+      Solara.logger.failure(setup_file)
     end
   end
-end
+
+ def setup_powershell
+   # Not supported at the moment
+ end
+end

data/solara/lib/core/brands/brands_manager.rb

@@ -55,11 +55,23 @@ class BrandsManager
         end
     end
 
+    def has_current_brand
+       value = File.exist?(FilePath.current_brand)
+       Solara.logger.debug("No current brand!") unless value
+       value
+    end
+
     def current_brand
+        unless has_current_brand
+            return nil
+        end
         JSON.parse(File.read(FilePath.current_brand))
     end
 
     def set_current_brand_content_changed(brand_key, changed)
+        unless has_current_brand
+            return nil
+        end
         unless is_current_brand(brand_key)
             return false
         end
@@ -71,6 +83,9 @@ class BrandsManager
     end
 
     def is_current_brand(brand_key)
+        unless has_current_brand
+            return false
+        end
         current_brand['key'] == brand_key
     end
 

data/solara/lib/core/dashboard/brand/BrandDetailView.js

@@ -237,6 +237,7 @@ class BrandDetailView {
     showApplyChangesButton() {
         const applyChangesButton = document.getElementById('applyChangesButton');
         applyChangesButton.style.display = 'block';
+        this.header.style.backgroundColor = '#ff4136';
     }
 
     showSwitchButton() {