solara 0.5.0 → 0.7.0

data/solara/lib/core/scripts/string_case.rb

@@ -0,0 +1,18 @@
+class StringCase
+
+    def self.capitalize(string)
+        "#{string[0].upcase}#{string[1..-1]}"
+    end
+
+    def self.snake_to_capitalized_spaced(snake_case_string, exclude: '', transform: ->(item) { StringCase.capitalize(item) })
+        # Split by underscores, then apply the transformation to each part
+        parts = snake_case_string.split('_').map do |item|
+            # Return the item as-is if it matches the exclude value
+            item == exclude ? item : transform.call(item)
+        end
+
+        # Join the parts with a space
+        parts.join(' ')
+     end
+
+end

data/solara/lib/core/template/brands/json/Json-Manifest.md

@@ -21,16 +21,14 @@ Each directory contains a `json_manifest.json` file with the following structure
     "files": [
         {
             "fileName": "",
-            "generate": {
-                "enabled": true,
-                "className": "",
-                "customClassNames": [
-                    {
-                        "generatedName": "",
-                        "customName": ""
-                    }
-                ]
-            }
+            "generate": true,
+            "parentClassName": "",
+            "customClassNames": [
+                {
+                    "originalName": "",
+                    "customName": ""
+                }
+            ]
         }
     ]
 }

data/solara/lib/core/template/brands/json/json_manifest.json

@@ -1,18 +1,16 @@
 {
-    "description": "This file specifies the JSON files that can be optionally generated for the target platform code.",
+    "description": "The JSON Manifest is intended to specify the files you need to customize its generated code",
     "files": [
         {
             "fileName": "",
-            "generate": {
-                "enabled": true,
-                "className": "",
-                "customClassNames": [
-                    {
-                        "generatedName": "",
-                        "customName": ""
-                    }
-                ]
-            }
+            "generate": true,
+            "parentClassName": "",
+            "customClassNames": [
+                {
+                    "originalName": "",
+                    "customName": ""
+                }
+            ]
         }
     ]
 }

data/solara/lib/core/template/config/android_template_config.json

@@ -72,22 +72,22 @@
         },
         {
             "source": "json/json_manifest.json",
-            "target": "android/json/",
+            "target": "android/json/android_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/json_manifest.json",
-            "target": "ios/json/",
+            "target": "ios/json/ios_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "android/json/",
+            "target": "android/json/Json-Manifest.md",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "ios/json/",
+            "target": "ios/json/Json-Manifest.md",
             "condition": "true"
         },
         {
@@ -97,12 +97,12 @@
         },
         {
             "source": "json/json_manifest.json",
-            "target": "../../global/json",
+            "target": "../../global/json/global_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "../../global/json",
+            "target": "../../global/json/Json-Manifest.md",
             "condition": "true"
         },
         {

data/solara/lib/core/template/config/flutter_template_config.json

@@ -72,12 +72,12 @@
         },
         {
             "source": "json/json_manifest.json",
-            "target": "flutter/json/",
+            "target": "flutter/json/flutter_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "flutter/json/",
+            "target": "flutter/json/Json-Manifest.md",
             "condition": "true"
         },
         {
@@ -87,12 +87,12 @@
         },
         {
             "source": "json/json_manifest.json",
-            "target": "../../global/json",
+            "target": "../../global/json/global_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "../../global/json",
+            "target": "../../global/json/Json-Manifest.md",
             "condition": "true"
         },
         {

data/solara/lib/core/template/config/ios_template_config.json

@@ -72,22 +72,22 @@
         },
         {
             "source": "json/json_manifest.json",
-            "target": "android/json/",
+            "target": "android/json/android_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/json_manifest.json",
-            "target": "ios/json/",
+            "target": "ios/json/ios_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "android/json/",
+            "target": "android/json/Json-Manifest.md",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "ios/json/",
+            "target": "ios/json/Json-Manifest.md",
             "condition": "true"
         },
         {
@@ -97,12 +97,12 @@
         },
         {
             "source": "json/json_manifest.json",
-            "target": "../../global/json",
+            "target": "../../global/json/global_json_manifest.json",
             "condition": "true"
         },
         {
             "source": "json/Json-Manifest.md",
-            "target": "../../global/json",
+            "target": "../../global/json/Json-Manifest.md",
             "condition": "true"
         },
         {

data/solara/lib/core/template/configurations.json

@@ -1,46 +1,59 @@
 {
     "configurations": [
         {
-            "key": "brand_config.json",
-            "name": "Brand Configuration",
+            "filename": "brand_config.json",
             "filePath": "shared/brand_config.json",
-            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/shared/brand_config.json"
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/shared/brand_config.json"
         },
         {
-            "key": "theme.json",
-            "name": "Theme Configuration",
+            "filename": "theme.json",
             "filePath": "shared/theme.json",
-            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/shared/theme.json"
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/shared/theme.json"
         },
         {
-            "key": "android_config.json",
-            "name": "Android Configuration",
+            "filename": "android_config.json",
             "filePath": "android/android_config.json",
-            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/android/android_config.json"
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/android/android_config.json"
         },
         {
-            "key": "android_signing.json",
-            "name": "Android Signing",
+            "filename": "android_signing.json",
             "filePath": "android/android_signing.json",
-            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/android/android_signing.json"
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/android/android_signing.json"
         },
         {
-            "key": "ios_config.json",
-            "name": "iOS Configuration",
+            "filename": "ios_config.json",
             "filePath": "ios/ios_config.json",
-            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/ios_config.json"
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/ios/ios_config.json"
         },
         {
-            "key": "ios_signing.json",
-            "name": "iOS Signing",
+            "filename": "ios_signing.json",
             "filePath": "ios/ios_signing.json",
-            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/ios_signing.json"
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/ios/ios_signing.json"
         },
         {
-            "key": "InfoPlist.xcstrings",
-            "name": "InfoPlist.xcstrings",
+            "filename": "InfoPlist.xcstrings",
             "filePath": "ios/InfoPlist.xcstrings",
-            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/InfoPlist.xcstrings"
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/ios/InfoPlist.xcstrings"
+        },
+        {
+            "filename": "ios_json_manifest.json",
+            "filePath": "ios/json/ios_json_manifest.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/json/json_manifest.json"
+        },
+        {
+            "filename": "android_json_manifest.json",
+            "filePath": "android/json/android_json_manifest.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/json/json_manifest.json"
+        },
+        {
+            "filename": "flutter_json_manifest.json",
+            "filePath": "flutter/json/flutter_json_manifest.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/json/json_manifest.json"
+        },
+        {
+            "filename": "global_json_manifest.json",
+            "filePath": "../../global/json/global_json_manifest.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/main/solara/lib/core/template/brands/json/json_manifest.json"
         }
     ]
 }

data/solara/lib/core/template/project_template_generator.rb

@@ -7,28 +7,125 @@ class ProjectTemplateGenerator
     @target_dir = target_dir
     @config_file = config_file
     @config = read_config
+    @file_mappings = build_file_mappings
   end
 
   def create_project
     @config["files"].each do |file|
-      if evaluate_condition(file["condition"], @config["variables"])
-        source_path = File.join(@template_dir, file["source"])
-        target_path = File.join(@target_dir, file["target"])
+      next unless evaluate_condition(file["condition"], @config["variables"])
+      source_path = File.join(@template_dir, file["source"])
+      target_path = File.join(@target_dir, file["target"])
 
-        if file["source"].nil? || file["source"].empty? || !File.exist?(source_path)
-          # Create the target directory if no source path is provided
-          FileUtils.mkdir_p(target_path)
-        else
-          copy_content = file.fetch("copy_content", true)
-          copy_item(source_path, target_path, copy_content)
-          replace_variables(target_path, @config["variables"]) if copy_content
-        end
+      if file["source"].nil? || file["source"].empty? || !File.exist?(source_path)
+        # Create the target directory if no source path is provided
+        FileUtils.mkdir_p(target_path)
+      else
+        copy_content = file.fetch("copy_content", true)
+        copy_item(source_path, target_path, copy_content, file)
+        replace_variables(target_path, @config["variables"]) if copy_content
+      end
+    end
+  end
+
+  def sync_with_template
+    @config["files"].each do |file|
+      next unless evaluate_condition(file["condition"], @config["variables"])
+      next if file["source"].nil? || file["source"].empty?
+
+      source_path = File.join(@template_dir, file["source"])
+      target_path = File.join(@target_dir, file["target"])
+
+      next unless File.exist?(source_path)
+
+      if File.directory?(source_path)
+        FileUtils.mkdir_p(target_path) unless Dir.exist?(target_path)
+        sync_directory(source_path, target_path, file)
+      elsif !File.exist?(target_path) && should_copy_path?(source_path)
+        FileUtils.mkdir_p(File.dirname(target_path))
+        FileUtils.cp(source_path, target_path)
+        copy_content = file.fetch("copy_content", true)
+        replace_variables(target_path, @config["variables"]) if copy_content
       end
     end
   end
 
   private
 
+#   This method:
+#   - Creates a hash of source paths to their targets
+#   - Removes leading slashes for consistency
+#   - Handles directories differently from files
+#   - For directories: stores true to indicate it's a directory that should be copied
+#   For files: stores the specific target path
+  def build_file_mappings
+    mappings = {}
+    @config["files"].each do |file|
+      source_path = file["source"].sub(/^\//, '') # Removes leading slashes for consistency
+      if File.directory?(File.join(@template_dir, source_path))
+        mappings[source_path] = true  # Directories are marked as true
+      else
+        mappings[source_path] = file["target"]  # Files store their target path
+      end
+    end
+    mappings
+  end
+
+#   This method:
+#   - Converts the full path to a relative path
+#   - Checks if the path matches any configured source
+#   - For directories (ending with '/'): checks if the path is within that directory
+#   - For files: checks for exact matches
+#   - Returns false if no match is found
+  def should_copy_path?(path)
+    relative_path = path.sub(@template_dir, '').sub(/^\//, '')
+
+    @file_mappings.each do |source, target|
+      if source.end_with?('/')
+        return true if relative_path.start_with?(source)
+      else
+        return true if relative_path == source
+      end
+    end
+
+    false
+  end
+
+  def get_target_path(source_path)
+    relative_path = source_path.sub(@template_dir, '').sub(/^\//, '')
+    @config["files"].each do |file|
+      if file["source"] == relative_path
+        return File.join(@target_dir, file["target"])
+      end
+    end
+    nil
+  end
+
+  def sync_directory(source_dir, target_dir, config_entry)
+    return unless File.directory?(source_dir)
+
+    Dir.foreach(source_dir) do |item|
+      next if item == '.' || item == '..'
+
+      source_path = File.join(source_dir, item)
+
+      if specific_target = get_target_path(source_path)
+        target_path = specific_target
+      else
+        target_path = File.join(target_dir, item)
+      end
+
+      next unless should_copy_path?(source_path)
+
+      if File.directory?(source_path)
+        FileUtils.mkdir_p(target_path) unless Dir.exist?(target_path)
+        sync_directory(source_path, target_path, config_entry)
+      elsif !File.exist?(target_path)
+        FileUtils.mkdir_p(File.dirname(target_path))
+        FileUtils.cp(source_path, target_path)
+      end
+    end
+  end
+
   def read_config
     JSON.parse(File.read(@config_file))
   end
@@ -37,12 +134,21 @@ class ProjectTemplateGenerator
     true
   end
 
-  def copy_item(source, target, copy_content)
+  def copy_item(source, target, copy_content, config_entry)
     if File.directory?(source)
       FileUtils.mkdir_p(target)
       Dir.foreach(source) do |item|
         next if item == '.' || item == '..'
-        copy_item(File.join(source, item), File.join(target, item), copy_content)
+        source_path = File.join(source, item)
+
+        if specific_target = get_target_path(source_path)
+          target_path = specific_target
+        else
+          target_path = File.join(target, item)
+        end
+
+        next unless should_copy_path?(source_path)
+        copy_item(source_path, target_path, copy_content, config_entry)
       end
     else
       FileUtils.mkdir_p(File.dirname(target))

data/solara/lib/solara/version.rb

@@ -1,3 +1,3 @@
 module Solara
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

data/solara/lib/solara_manager.rb

@@ -32,24 +32,32 @@ class SolaraManager
     end
 
     def onboard(brand_key, brand_name, init: false, clone_brand_key: nil, open_dashboard: true, success_message: nil)
-        Solara.logger.header("Onboarding #{brand_key}")
+        begin
+            Solara.logger.header("Onboarding #{brand_key}")
 
-        if !init && BrandsManager.instance.exists(brand_key)
-            Solara.logger.fatal("Brand with key (#{brand_key}) already added to brands!")
-            return
-        end
+            if !init && BrandsManager.instance.exists(brand_key)
+                Solara.logger.fatal("Brand with key (#{brand_key}) already added to brands!")
+                return
+            end
+
+            BrandOnboarder.new.onboard(brand_key, brand_name, clone_brand_key: clone_brand_key)
 
-        BrandOnboarder.new(brand_key, brand_name, clone_brand_key: clone_brand_key).onboard
+            switch(brand_key, ignore_health_check: true)
 
-        switch(brand_key, ignore_health_check: true)
 
-        clone_message = clone_brand_key.nil? || clone_brand_key.empty? ? '.' : ", cloned from #{clone_brand_key}."
-        message = success_message || "Onboarded #{brand_key} successfully#{clone_message}"
-        Solara.logger.success(message)
+            clone_message = clone_brand_key.nil? || clone_brand_key.empty? ? '.' : ", cloned from #{clone_brand_key}."
+            message = success_message || "Onboarded #{brand_key} successfully#{clone_message}"
+            Solara.logger.success(message)
 
-        if open_dashboard
-            Solara.logger.success("Openning the dashboard for #{brand_key} to complete its details.")
-            dashboard(brand_key)
+            if open_dashboard
+                Solara.logger.success("Openning the dashboard for #{brand_key} to complete its details.")
+                dashboard(brand_key)
+            end
+        rescue => e
+            # Rollback this brand
+            offboard(brand_key, confirm: false)
+            Solara.logger.debug("Performed rollback for (#{brand_key}).")
+            raise e
         end
     end
 
@@ -70,4 +78,8 @@ class SolaraManager
         DoctorManager.new.visit_brands(keys, print_logs: print_logs)
     end
 
+    def sync_brand_with_template(brand_key)
+        BrandOnboarder.new.sync_with_template(brand_key)
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solara
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Malek Kamel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -239,6 +239,7 @@ files:
 - solara/lib/core/doctor/validator/template/template_validator.rb
 - solara/lib/core/doctor/validator/validation_strategy.rb
 - solara/lib/core/scripts/brand_config_manager.rb
+- solara/lib/core/scripts/brand_config_updater.rb
 - solara/lib/core/scripts/brand_configurations_manager.rb
 - solara/lib/core/scripts/brand_exporter.rb
 - solara/lib/core/scripts/brand_importer.rb
@@ -270,11 +271,13 @@ files:
 - solara/lib/core/scripts/solara_settings_manager.rb
 - solara/lib/core/scripts/solara_status_manager.rb
 - solara/lib/core/scripts/solara_version_manager.rb
+- solara/lib/core/scripts/string_case.rb
 - solara/lib/core/scripts/strings_xml_manager.rb
 - solara/lib/core/scripts/terminal_input_manager.rb
 - solara/lib/core/scripts/theme_generator.rb
 - solara/lib/core/scripts/yaml_manager.rb
 - solara/lib/core/solara_configurator.rb
+- solara/lib/core/template/.DS_Store
 - solara/lib/core/template/brands/android/android_config.json
 - solara/lib/core/template/brands/android/android_signing.json
 - solara/lib/core/template/brands/android/res/.DS_Store