appforge-cli 1.5.0__tar.gz → 1.6.0__tar.gz

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.5.0
+Version: 1.6.0
 Summary: Convert web, Flutter, and native apps into Android/iOS apps automatically using cloud builds.
 Author: AppForge Team
 Author-email: AppForge Team <juniorsir.bot@gmail.com>

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/appforge/capacitor.py

@@ -35,6 +35,24 @@ def generate_capacitor_config(app_name, package_id, web_dir):
     with open("capacitor.config.json", "w") as f:
         json.dump(config, f, indent=2)
 
+def check_npm_installed():
+    """Verifies that npm is installed before attempting Capacitor setup."""
+    try:
+        # We use 'npm -v' to check if the command exists and is executable
+        subprocess.run(['npm', '-v'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        print_error(
+            "Node.js and npm are required to initialize Web/Capacitor projects, but they are not installed!\n\n"
+            "💡 How to fix:\n"
+            "   If you are on Termux (Android), run:\n"
+            "   pkg install nodejs\n\n"
+            "   If you are on Ubuntu/Debian, run:\n"
+            "   sudo apt install nodejs npm\n\n"
+            "   If you are on Mac, use Homebrew:\n"
+            "   brew install node\n\n"
+            "After installing, run 'appforge init' again."
+        )
+
 def setup_capacitor(web_dir, platforms=["android"]):
     if not os.path.exists("package.json"):
         run_with_spinner(lambda: run_cmd("npm init -y"), "Initializing npm project")

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/appforge/cli.py

@@ -3,7 +3,7 @@ import sys
 import argparse
 import shutil
 from .utils import (print_header, print_footer, print_info, print_success, prompt, print_error, print_warning,
-                    GRAY, RESET, BOLD, CYAN, YELLOW, GREEN, RED, CLI_VERSION,
+                    GRAY, RESET, BOLD, CYAN, YELLOW, GREEN, RED, CLI_VERSION, BLUE,
                     cursor_up, clear_from_cursor)
 from .detector import detect_project
 from .capacitor import setup_capacitor, apply_configuration
@@ -25,7 +25,7 @@ def init_project():
         try:
             cli_dir = os.path.dirname(os.path.abspath(__file__))
             bundled_icon = os.path.join(cli_dir, "default_icon.png")
-            
+
             if os.path.exists(bundled_icon):
                 shutil.copy2(bundled_icon, default_icon_dest)
                 save_local_config({"iconPath": default_icon_dest})
@@ -37,46 +37,62 @@ def init_project():
 
     if category == "web":
         web_dir = prompt("Confirm web build directory", project_info["webDir"])
-        platform_choice = prompt("Select platform (android, ios, both)", "android").lower()
-        if platform_choice == "both": platforms = ["android", "ios"]
-        elif platform_choice == "ios": platforms = ["ios"]
-        else: platforms = ["android"]
-        
+        platform_choice = prompt("Select platforms (android, ios, both)", "android").lower()
+        if platform_choice == "both" or platform_choice == "all": 
+            platforms = ["android", "ios"]
+            platform_choice = "android,ios"
+        elif "ios" in platform_choice: 
+            platforms = ["ios"]
+            platform_choice = "ios"
+        else: 
+            platforms = ["android"]
+            platform_choice = "android"
+
         save_local_config({"webDir": web_dir, "platform": platform_choice})
         setup_capacitor(web_dir, platforms)
     else:
         print_info(f"Native {proj_type} project detected. Bypassing Capacitor setup.")
-        platform_choice = prompt("Select platform to build in cloud (android, ios, both)", "android").lower()
+        
+        if proj_type == "flutter":
+            platform_choice = prompt("Select platforms (e.g., android, ios, windows, linux, or 'all')", "android").lower()
+            if platform_choice == "all" or platform_choice == "both":
+                platform_choice = "android,ios,windows,linux"
+        else:
+            platform_choice = prompt("Select platform to build in cloud (android)", "android").lower()
+            platform_choice = "android"
+        
         save_local_config({"platform": platform_choice})
 
     print("")
     detected_features = scan_codebase_for_permissions()
-    
+
     if detected_features:
         print_success(f"AI detected {len(detected_features)} native features required by your app:")
-        
+
         for data in detected_features.values():
             print(f"  {CYAN}●{RESET} {data['feature']} {GRAY}({data['desc']}){RESET}")
-            
+
         print_info("The AppForge Cloud Server will automatically inject these permissions during the build process.")
     else:
         print_info("AI scan complete. No special native permissions detected.")
+    
     try:
         import subprocess
         git_root = subprocess.check_output(
-            ['git', 'rev-parse', '--show-toplevel'], 
+            ['git', 'rev-parse', '--show-toplevel'],
             text=True,
             stderr=subprocess.DEVNULL
         ).strip()
-        
+
         sub_path = os.path.relpath(os.getcwd(), git_root)
-        
+
         if sub_path and sub_path != '.':
             print_info(f"Detected sub-project path: {GRAY}{sub_path}{RESET}")
             save_local_config({"sub_path": sub_path})
-            
+
     except (subprocess.CalledProcessError, FileNotFoundError):
         save_local_config({"sub_path": "."})
+        
     print_success("Ready to send to the AppForge Cloud Builder.")
 
 def configure_project():
@@ -172,18 +188,14 @@ def build_app():
     display_app_details(config)
     print(f"  {GRAY}Target Platform:{RESET} {config.get('platform', 'android')}")
     print(f"  {GRAY}Next Version:{RESET}      {new_version_str}")
-    # Show the user what they selected
     color = GREEN if build_type == "release" else YELLOW
     print(f"  {GRAY}Build Mode:{RESET}        {color}{build_type.upper()}{RESET}\n")
 
-    # Ask ONLY ONCE if they want to build
     action = prompt("Proceed with build? (Y/n)", default="y").lower()
 
     if action in ['y', 'yes', '']:
-        # 1. Save new version to local memory
         save_local_config({"version": new_version_str})
         
-        # 2. Sync CLI memory to Capacitor native config (if applicable)
         if config.get("category") == "web":
             apply_configuration(
                 config.get('appName', 'My App'), 
@@ -194,11 +206,9 @@ def build_app():
                 config.get('webDir', 'dist')
             )
 
-        # 3. Zip and send to cloud
         push_and_build(config)
         print_success("Your app is now building in the cloud!")
         
-        # 4. Ask to watch logs
         watch = prompt("Watch live build logs? (Y/n)", default="y").lower()
         if watch in ['y', 'yes', '']:
             status_check() 
@@ -211,7 +221,6 @@ def build_app():
         print_info("Build cancelled.")
 
 def show_history():
-    """Displays a list of past builds with their current cloud status."""
     history = load_history()
     if not history:
         print_info("No build history found. Run 'appforge build' to create your first app!")
@@ -273,7 +282,6 @@ def show_history():
         else:
             print_warning("This is a legacy build entry without a unique Run ID. Cannot guarantee the correct artifact.")
     
-    # Case 3: User typed something, but it was invalid
     elif choice:
         print_warning("Invalid input. Please enter a number from the list or a valid App ID.")
 
@@ -322,7 +330,7 @@ def show_argu():
     print("  appforge init       - Initialize an AppForge project")
     print("  appforge configure  - Open interactive settings")
     print(f"  {CYAN}info{RESET}  - View CLI version and release notes")
-    print(f"  {CYAN}create <framework> <name>{RESET} Scaffold a new app (vite, flutter, html)")
+    print(f"  {CYAN}create <framework> <name>{RESET} Scaffold a new app (vite, flutter, html, kotlin, win, linux), {BLUE}Ex - appforge create flutter myapp{RESET}")
     print("  appforge build      - Package project and send to build repo")
     print("  appforge status     - Check build status")
     print("  appforge download   - Download the built APK")

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/appforge/create.py

@@ -20,6 +20,16 @@ TEMPLATES = {
     "html": {
         "cmd": None,
         "desc": "Plain HTML/CSS/JS (Simple Web App)"
+    },
+    "win": {
+        "cmd": "git clone --progress https://github.com/flutter/samples.git _temp_samples",
+        "desc": "Flutter Windows Desktop App (.exe)",
+        "base_framework": "flutter" # It uses Flutter under the hood!
+    },
+    "linux": {
+        "cmd": "git clone --progress https://github.com/flutter/samples.git _temp_samples",
+        "desc": "Flutter Linux Desktop App",
+        "base_framework": "flutter" # It uses Flutter under the hood!
     }
 }
 

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/appforge/github.py

@@ -371,61 +371,71 @@ def get_build_status_by_id(run_id):
 # --- Replace the download_apk function in github.py ---
 
 def download_apk(run_id=None):
+    """
+    Finds and downloads ALL artifacts (Android, iOS, Windows, Linux) for a build.
+    """
     headers = get_headers()
-    
+    app_id = get_app_id()
+
     if run_id:
-        # User selected a specific build from history. Find its artifact directly.
         url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs/{run_id}/artifacts"
     else:
-        # Standard 'appforge download' command. Find latest for current app.
-        app_id = get_app_id()
-        print_info(f"Searching for latest artifact for App ID: {app_id}")
+        print_info(f"Searching for latest artifacts for App ID: {app_id}")
         url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/artifacts?per_page=100"
 
     res = requests.get(url, headers=headers)
-    
+
     if res.status_code == 200:
         artifacts = res.json().get("artifacts", [])
         if not artifacts:
             print_error("No artifacts found. The build may have failed or is still in progress.")
             return
 
-        # If a run_id was provided, there will only be one or two artifacts.
-        # Otherwise, we need to find the latest one matching the current app_id.
-        target_artifact = artifacts[0] if run_id else next((a for a in artifacts if get_app_id() in a.get("name")), None)
+        # --- NEW: FIND ALL MATCHING ARTIFACTS ---
+        # Filter artifacts that belong to this specific App ID
+        target_artifacts = [a for a in artifacts if app_id in a.get("name", "")]
 
-        if not target_artifact:
-            print_error(f"Could not find a recent artifact for App ID: {get_app_id()}")
+        if not target_artifacts:
+            print_error(f"Could not find any recent artifacts for App ID: {app_id}")
             return
+
+        print_info(f"Found {len(target_artifacts)} artifact(s) for this build. Starting downloads...\n")
+
+        # --- MULTI-DOWNLOAD LOOP ---
+        for target_artifact in target_artifacts:
+            artifact_name = target_artifact['name']
+            print_info(f"Preparing download for: {CYAN}{artifact_name}{RESET}")
             
-        print_success(f"Found artifact: {target_artifact['name']}")
-        secure_api_url = target_artifact.get('archive_download_url')
-        redirect_res = requests.get(secure_api_url, headers=headers, allow_redirects=False)
-        
-        if redirect_res.status_code == 302:
-            public_download_url = redirect_res.headers['Location']
-            filename = target_artifact['name'] + ".zip"
-            try:
-                # Start a streaming download
-                with requests.get(public_download_url, stream=True) as r:
-                    r.raise_for_status()
-                    total_size = int(r.headers.get('content-length', 0))
-                    downloaded = 0
-                    
-                    with open(filename, 'wb') as f:
-                        # Download in 8KB chunks
-                        for chunk in r.iter_content(chunk_size=8192):
-                            f.write(chunk)
-                            downloaded += len(chunk)
-                            percentage = (downloaded / total_size * 100) if total_size > 0 else 0
-                            print_progress_bar(percentage, "Downloading")
-                
-                print_progress_bar(100.0, "Downloading")
-                print_success(f"App artifact saved to: {os.path.join(os.getcwd(), filename)}")
+            secure_api_url = target_artifact.get('archive_download_url')
+            redirect_res = requests.get(secure_api_url, headers=headers, allow_redirects=False)
 
-            except Exception as e:
-                print_error(f"Download failed: {e}")
-        else:
-            print_error("Could not generate a temporary download link.")
+            if redirect_res.status_code == 302:
+                public_download_url = redirect_res.headers['Location']
+                filename = f"{artifact_name}.zip"
+                
+                try:
+                    # Start a streaming download
+                    with requests.get(public_download_url, stream=True) as r:
+                        r.raise_for_status()
+                        total_size = int(r.headers.get('content-length', 0))
+                        downloaded = 0
+
+                        with open(filename, 'wb') as f:
+                            # Download in 8KB chunks
+                            for chunk in r.iter_content(chunk_size=8192):
+                                if chunk: # filter out keep-alive new chunks
+                                    f.write(chunk)
+                                    downloaded += len(chunk)
+                                    percentage = (downloaded / total_size * 100) if total_size > 0 else 0
+                                    print_progress_bar(percentage, f"Downloading {artifact_name}")
+
+                    print_progress_bar(100.0, f"Downloading {artifact_name}")
+                    print_success(f"Saved: {os.path.join(os.getcwd(), filename)}\n")
+
+                except Exception as e:
+                    print_error(f"Download failed for {artifact_name}: {e}")
+            else:
+                print_error(f"Could not generate a temporary download link for {artifact_name}.")
+                
     else:
-        print_error(f"Failed to fetch artifacts: {res.text}")
+         print_error(f"Failed to fetch artifacts. Status Code: {res.status_code}")

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/appforge/utils.py

@@ -12,8 +12,9 @@ CYAN = "\033[36m"
 YELLOW = "\033[33m"
 RED = "\033[31m"
 GRAY = "\033[90m"
+BLUE = "\033[34m"
 
-CLI_VERSION = "1.4.4"
+CLI_VERSION = "1.6.0"
 
 def check_for_cli_updates():
     try:

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/appforge_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.5.0
+Version: 1.6.0
 Summary: Convert web, Flutter, and native apps into Android/iOS apps automatically using cloud builds.
 Author: AppForge Team
 Author-email: AppForge Team <juniorsir.bot@gmail.com>

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "appforge-cli"
-version = "1.5.0"
+version = "1.6.0"
 authors = [
   { name="AppForge Team", email="juniorsir.bot@gmail.com" },
 ]

{appforge_cli-1.5.0 → appforge_cli-1.6.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="appforge",
-    version="1.5.0",
+    version="1.6.0",
     description="Convert web apps into Android apps automatically using Capacitor and GitHub cloud builds.",
     author="AppForge Team",
     packages=["appforge"],