ruflet 0.0.9 → 0.0.11

data/lib/ruflet/cli/extra_command.rb

@@ -6,6 +6,7 @@ module Ruflet
   module CLI
     module ExtraCommand
       include FlutterSdk
+      include NewCommand
 
       def command_create(args)
         command_new(args)
@@ -15,9 +16,24 @@ module Ruflet
         verbose = args.delete("--verbose") || args.delete("-v")
         fix = args.delete("--fix")
         client_dir = detect_client_dir
+        template_root = resolve_ruflet_client_template_root
         puts "Ruflet doctor"
         puts "  Ruby: #{RUBY_VERSION}"
         puts "  Flutter host target: #{flutter_host || 'unsupported'}"
+        if template_root
+          puts "  Template: #{template_root}"
+        elsif fix
+          template_root = ensure_cached_ruflet_client_template!(verbose: !!verbose)
+          unless template_root
+            warn "  Template: missing"
+            warn "Failed to fetch the Ruflet Flutter template from GitHub."
+            return 1
+          end
+          puts "  Template: #{template_root}"
+        else
+          warn "  Template: missing"
+          warn "Run `ruflet doctor --fix` to fetch the Flutter template from GitHub."
+        end
         if fix
           tools = ensure_flutter!("doctor", client_dir: client_dir, auto_install: true)
         else
@@ -97,7 +113,7 @@ module Ruflet
         client_dir = detect_client_dir
         unless client_dir
           warn "Could not find Flutter client directory."
-          warn "Set RUFLET_CLIENT_DIR or place client at ./ruflet_client"
+          warn "Set RUFLET_CLIENT_DIR or let Ruflet manage the client under ./build/client"
           warn "`ruflet debug` requires Flutter client source code."
           warn "For prebuilt clients, use: `ruflet run --web` or `ruflet run --desktop`."
           return 1
@@ -132,6 +148,9 @@ module Ruflet
         env_dir = ENV["RUFLET_CLIENT_DIR"]
         return env_dir if env_dir && Dir.exist?(env_dir)
 
+        hidden = File.expand_path(File.join("build", "client"), Dir.pwd)
+        return hidden if Dir.exist?(hidden)
+
         local = File.expand_path("ruflet_client", Dir.pwd)
         return local if Dir.exist?(local)
 

data/lib/ruflet/cli/flutter_sdk.rb

@@ -75,7 +75,7 @@ module Ruflet
         system(fvm_env, fvm, "install", version.to_s, chdir: project_dir, out: File::NULL, err: File::NULL)
         system(fvm_env, fvm, "use", "--force", version.to_s, chdir: project_dir, out: File::NULL, err: File::NULL)
 
-        flutter = File.join(project_dir, ".fvm", "flutter_sdk", "bin", windows_host? ? "flutter.bat" : "flutter")
+        flutter = flutter_bin_path(project_dir)
         return nil unless File.executable?(flutter)
 
         tools_from_flutter_bin(flutter)
@@ -91,28 +91,35 @@ module Ruflet
         dart = which_command("dart")
         unless dart
           sdk_root = ensure_flutter_sdk_downloaded(client_dir: client_dir)
-          dart = sdk_root ? File.join(sdk_root, "bin", windows_host? ? "dart.bat" : "dart") : nil
+          dart = sdk_root ? File.join(sdk_root, "bin", dart_executable_name) : nil
         end
         return nil unless dart && File.executable?(dart)
 
         system(dart, "pub", "global", "activate", "fvm", out: File::NULL, err: File::NULL)
+        installed_fvm = File.join(pub_cache_bin_dir, fvm_executable_name)
+        return installed_fvm if File.executable?(installed_fvm)
+
         which_command("fvm")
       end
 
       def fvm_env
-        pub_bin = File.join(Dir.home, ".pub-cache", "bin")
-        { "PATH" => "#{pub_bin}#{File::PATH_SEPARATOR}#{ENV.fetch('PATH', '')}" }
+        { "PATH" => "#{pub_cache_bin_dir}#{File::PATH_SEPARATOR}#{ENV.fetch('PATH', '')}" }
       end
 
       def tools_from_flutter_bin(flutter_bin)
         return nil unless File.executable?(flutter_bin)
 
         bin_dir = File.dirname(flutter_bin)
-        dart = File.join(bin_dir, windows_host? ? "dart.bat" : "dart")
+        sdk_root = File.expand_path("..", bin_dir)
+        dart = File.join(bin_dir, dart_executable_name)
         {
           flutter: flutter_bin,
           dart: (File.executable?(dart) ? dart : "dart"),
-          env: { "PATH" => "#{bin_dir}#{File::PATH_SEPARATOR}#{ENV.fetch('PATH', '')}" }
+          env: {
+            "PATH" => "#{bin_dir}#{File::PATH_SEPARATOR}#{pub_cache_bin_dir}#{File::PATH_SEPARATOR}#{ENV.fetch('PATH', '')}",
+            "FLUTTER_ROOT" => sdk_root,
+            "FVM_FLUTTER_SDK" => sdk_root
+          }
         }
       end
 
@@ -125,7 +132,7 @@ module Ruflet
         archive = release.fetch("archive")
         install_root = File.join(Dir.home, ".ruflet", "flutter", release.fetch("version"), host)
         sdk_root = File.join(install_root, "flutter")
-        flutter_bin = File.join(sdk_root, "bin", windows_host? ? "flutter.bat" : "flutter")
+        flutter_bin = File.join(sdk_root, "bin", flutter_executable_name)
         return sdk_root if File.executable?(flutter_bin)
 
         FileUtils.mkdir_p(install_root)
@@ -138,9 +145,9 @@ module Ruflet
         return sdk_root if File.executable?(flutter_bin)
 
         # Some archives may unpack into a different folder name.
-        guessed = Dir.glob(File.join(install_root, "**", windows_host? ? "flutter.bat" : "flutter"))
+        guessed = Dir.glob(File.join(install_root, "**", flutter_executable_name))
           .map { |p| File.expand_path("../..", p) }
-          .find { |root| File.executable?(File.join(root, "bin", windows_host? ? "flutter.bat" : "flutter")) }
+          .find { |root| File.executable?(File.join(root, "bin", flutter_executable_name)) }
         return guessed if guessed
 
         nil
@@ -195,12 +202,16 @@ module Ruflet
       end
 
       def existing_fvm_flutter_bin(project_dir)
-        flutter = File.join(project_dir, ".fvm", "flutter_sdk", "bin", windows_host? ? "flutter.bat" : "flutter")
+        flutter = flutter_bin_path(project_dir)
         return flutter if File.executable?(flutter)
 
         nil
       end
 
+      def flutter_bin_path(project_dir)
+        File.join(project_dir, ".fvm", "flutter_sdk", "bin", flutter_executable_name)
+      end
+
       def find_fvmrc(client_dir)
         candidates = []
         candidates << File.join(client_dir, ".fvmrc") if client_dir
@@ -308,6 +319,22 @@ module Ruflet
         RbConfig::CONFIG["host_os"].match?(/mswin|mingw|cygwin/i)
       end
 
+      def flutter_executable_name
+        windows_host? ? "flutter.bat" : "flutter"
+      end
+
+      def dart_executable_name
+        windows_host? ? "dart.bat" : "dart"
+      end
+
+      def fvm_executable_name
+        windows_host? ? "fvm.bat" : "fvm"
+      end
+
+      def pub_cache_bin_dir
+        File.join(Dir.home, ".pub-cache", "bin")
+      end
+
       def which_command(name)
         exts = windows_host? ? ENV.fetch("PATHEXT", ".EXE;.BAT;.CMD").split(";") : [""]
         ENV.fetch("PATH", "").split(File::PATH_SEPARATOR).each do |dir|

data/lib/ruflet/cli/new_command.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "tmpdir"
 require "yaml"
 
 module Ruflet
@@ -43,33 +44,91 @@ module Ruflet
         File.write(File.join(root, "Gemfile"), Ruflet::CLI::GEMFILE_TEMPLATE)
         File.write(File.join(root, "README.md"), format(Ruflet::CLI::README_TEMPLATE, app_name: File.basename(root)))
         write_default_ruflet_config(root, File.basename(root))
-        copy_ruflet_client_template(root)
-        configure_ruflet_client(root)
-
+        copy_default_project_assets(root)
         project_name = File.basename(root)
         puts "Run:"
         puts "  cd #{project_name}"
         puts "  bundle install"
         puts "  bundle exec ruflet run main.rb"
         puts
-        puts "Client template:"
-        puts "  cd ruflet_client"
-        puts "  flutter pub get"
-        puts "  flutter run"
+        puts "Build:"
+        puts "  bundle exec ruflet build android --self"
+        puts "  bundle exec ruflet build ios --self"
         0
       end
 
       private
 
       def copy_ruflet_client_template(root)
-        template_root = File.expand_path("../../../../../ruflet_client", __dir__)
-        return unless Dir.exist?(template_root)
+        template_root = resolve_ruflet_client_template_root || ensure_cached_ruflet_client_template!
+        return unless template_root && Dir.exist?(template_root)
 
-        target = File.join(root, "ruflet_client")
+        target = hidden_flutter_client_dir(root)
+        FileUtils.mkdir_p(File.dirname(target))
         FileUtils.cp_r(template_root, target)
         prune_client_template(target)
       end
 
+      def hidden_flutter_client_dir(root = Dir.pwd)
+        File.join(root, "build", "client")
+      end
+
+      def resolve_ruflet_client_template_root
+        repo_template = File.expand_path("../../../../../templates/ruflet_flutter_template", __dir__)
+        return repo_template if Dir.exist?(repo_template)
+
+        cached_template = cached_ruflet_client_template_root
+        return cached_template if Dir.exist?(cached_template)
+
+        fallback = File.expand_path("../../../../../ruflet_client", __dir__)
+        return fallback if Dir.exist?(fallback)
+
+        nil
+      end
+
+      def ensure_cached_ruflet_client_template!(verbose: false)
+        cached_template = cached_ruflet_client_template_root
+        return cached_template if Dir.exist?(cached_template)
+
+        download_ruflet_client_template(verbose: verbose)
+      end
+
+      def cached_ruflet_client_template_root
+        File.join(template_cache_root, "ruflet_flutter_template")
+      end
+
+      def template_cache_root
+        File.join(Dir.home, ".ruflet", "templates")
+      end
+
+      def download_ruflet_client_template(verbose: false)
+        target = cached_ruflet_client_template_root
+        FileUtils.mkdir_p(template_cache_root)
+
+        Dir.mktmpdir("ruflet-template") do |tmp|
+          repo_dir = File.join(tmp, "Ruflet")
+          clone_cmd = ["git", "clone", "--depth", "1", "--filter=blob:none", "--sparse", "https://github.com/AdamMusa/Ruflet.git", repo_dir]
+          return nil unless run_template_command(clone_cmd, verbose: verbose)
+          return nil unless run_template_command(["git", "-C", repo_dir, "sparse-checkout", "set", "templates/ruflet_flutter_template"], verbose: verbose)
+
+          source = File.join(repo_dir, "templates", "ruflet_flutter_template")
+          return nil unless Dir.exist?(source)
+
+          FileUtils.rm_rf(target)
+          FileUtils.cp_r(source, target)
+        end
+
+        target
+      rescue StandardError => e
+        warn "Failed to fetch Ruflet template: #{e.class}: #{e.message}"
+        nil
+      end
+
+      def run_template_command(cmd, verbose: false)
+        output = verbose ? $stdout : File::NULL
+        system(*cmd, out: output, err: verbose ? $stderr : File::NULL)
+      end
+
       def prune_client_template(target)
         paths = %w[
           .dart_tool
@@ -83,6 +142,7 @@ module Ruflet
           android/.gradle
           android/.kotlin
           android/local.properties
+          pubspec_overrides.yaml
         ]
         paths.each do |path|
           full = File.join(target, path)
@@ -94,9 +154,14 @@ module Ruflet
         File.write(File.join(root, "ruflet.yaml"), <<~YAML)
           app:
             name: #{app_name}
-            # Optional production client endpoint used by `ruflet build`.
+            display_name: #{humanize_name(app_name)}
+            package_name: #{app_name.gsub(/[^a-zA-Z0-9_]+/, "_").downcase}
+            organization: com.example
+            version: 1.0.0+1
+            description: A new Ruflet app.
+            # Required for server-driven builds: `ruflet build ios`, `apk`, `web`, etc. without `--self`.
             # Example: https://api.example.com
-            ruflet_client_url: ""
+            backend_url: ""
 
           # Source of truth for Flutter client extensions/plugins.
           # Examples: camera, video, audio, flashlight, webview, map
@@ -117,100 +182,27 @@ module Ruflet
         YAML
       end
 
-      def configure_ruflet_client(root)
-        config_path = File.join(root, "ruflet.yaml")
-        return unless File.file?(config_path)
-
-        config = YAML.safe_load(File.read(config_path), aliases: true) || {}
-        extension_keys = extract_extension_keys(config)
-        extension_packages = extension_keys.filter_map { |key| CLIENT_EXTENSION_MAP[key]&.fetch(:package) }.uniq
-        extension_aliases = extension_keys.filter_map { |key| CLIENT_EXTENSION_MAP[key]&.fetch(:alias) }.uniq
-
-        client_dir = File.join(root, "ruflet_client")
-        apply_client_manifest!(client_dir, extension_packages, extension_aliases)
-      rescue StandardError => e
-        warn "Failed to configure ruflet_client from ruflet.yaml: #{e.class}: #{e.message}"
-      end
-
-      def extract_extension_keys(config)
-        from_services = Array(config["services"])
-
-        from_services
-          .map { |v| normalize_extension_key(v) }
-          .compact
-          .uniq
-      end
-
-      def normalize_extension_key(value)
-        key = value.to_s.strip.downcase
-        return nil if key.empty?
-
-        key.tr!("-", "_")
-        key.gsub!(/\A(flet_)+/, "")
-        key.gsub!(/\Aservice_/, "")
-        key.gsub!(/\Acontrol_/, "")
-        key = "file_picker" if key == "filepicker"
-        key
-      end
-
-      def apply_client_manifest!(client_dir, extension_packages, extension_aliases)
-        return unless Dir.exist?(client_dir)
-
-        pubspec_path = File.join(client_dir, "pubspec.yaml")
-        main_path = File.join(client_dir, "lib", "main.dart")
-        prune_client_pubspec(pubspec_path, extension_packages) if File.file?(pubspec_path)
-        prune_client_main(main_path, extension_aliases) if File.file?(main_path)
-      end
-
-      def prune_client_pubspec(path, selected_packages)
-        data = YAML.safe_load(File.read(path), aliases: true) || {}
-        deps = (data["dependencies"] || {}).dup
+      def copy_default_project_assets(root)
+        assets_dir = File.join(root, "assets")
+        FileUtils.mkdir_p(assets_dir)
 
-        deps.keys.each do |name|
-          next unless name.start_with?("flet_")
-          next if name == "flet"
-          next if selected_packages.include?(name)
+        default_project_assets_root.each do |source_root|
+          next unless Dir.exist?(source_root)
 
-          deps.delete(name)
-        end
-
-        data["dependencies"] = deps
-        File.write(path, YAML.dump(data))
-      end
-
-      def prune_client_main(path, selected_aliases)
-        lines = File.readlines(path)
-        alias_to_package = {}
-
-        lines.each do |line|
-          match = line.match(%r{\Aimport 'package:(flet_[^/]+)/\1\.dart' as ([a-zA-Z0-9_]+);})
-          next unless match
-
-          alias_to_package[match[2]] = match[1]
-        end
-
-        kept = lines.select do |line|
-          import_match = line.match(%r{\Aimport 'package:(flet_[^/]+)/\1\.dart' as ([a-zA-Z0-9_]+);})
-          if import_match
-            package_name = import_match[1]
-            next true if package_name == "flet"
-            next true if selected_aliases.include?(import_match[2])
-            next false
-          end
-
-          extension_match = line.match(/\A\s*([a-zA-Z0-9_]+)\.Extension\(\),\s*\z/)
-          if extension_match
-            extension_alias = extension_match[1]
-            package_name = alias_to_package[extension_alias]
-            next true if package_name.nil? # non-Flet extension lines
-            next true if selected_aliases.include?(extension_alias)
-            next false
+          %w[icon.png splash.png].each do |filename|
+            source = File.join(source_root, filename)
+            FileUtils.cp(source, File.join(assets_dir, filename)) if File.file?(source)
           end
-
-          true
+          return if File.file?(File.join(assets_dir, "icon.png")) && File.file?(File.join(assets_dir, "splash.png"))
         end
+      end
 
-        File.write(path, kept.join)
+      def default_project_assets_root
+        [
+          File.expand_path("../../../assets", __dir__),
+          File.expand_path("../../../../../templates/ruflet_flutter_template/assets", __dir__),
+          File.expand_path("../../../../../ruflet_client/assets", __dir__)
+        ]
       end
 
       def humanize_name(name)

data/lib/ruflet/cli/run_command.rb

@@ -40,6 +40,7 @@ module Ruflet
           "RUFLET_SUPPRESS_SERVER_BANNER" => "1",
           "RUFLET_PORT" => selected_port.to_s
         }
+        apply_local_ruflet_dev_overrides(env)
         assets_dir = File.join(File.dirname(script_path), "assets")
         env["RUFLET_ASSETS_DIR"] = assets_dir if File.directory?(assets_dir)
 
@@ -105,6 +106,24 @@ module Ruflet
         [RbConfig.ruby, script_path]
       end
 
+      def apply_local_ruflet_dev_overrides(env)
+        lib_paths = local_ruflet_dev_lib_paths
+        return if lib_paths.empty?
+
+        existing = env["RUBYLIB"].to_s
+        segments = lib_paths + existing.split(File::PATH_SEPARATOR).reject(&:empty?)
+        env["RUBYLIB"] = segments.uniq.join(File::PATH_SEPARATOR)
+        puts "Ruflet dev source: #{lib_paths.join(", ")}"
+      end
+
+      def local_ruflet_dev_lib_paths
+        repo_root = File.expand_path("../../../../../", __dir__)
+        package_roots = %w[ruflet_core ruflet_server].map { |name| File.join(repo_root, "packages", name, "lib") }
+        return [] unless package_roots.all? { |path| Dir.exist?(path) }
+
+        package_roots
+      end
+
       def resolve_script(token)
         path = File.expand_path(token, Dir.pwd)
         return path if File.file?(path)

data/lib/ruflet/cli/templates.rb

@@ -7,7 +7,7 @@ module Ruflet
     Ruflet.run do |page|
       page.title = "Counter Demo"
       count = 0
-      count_text = text(count.to_s, size: 40)
+      count_text = text(count.to_s, style: {size: 40})
       page.add(
         container(
           expand: true,
@@ -22,7 +22,7 @@ module Ruflet
           )
         ),
         floating_action_button: fab(
-          icon: Ruflet::MaterialIcons::ADD,
+          icon: "add",
           on_click: ->(_e) do
             count += 1
             page.update(count_text, value: count.to_s)
@@ -36,8 +36,8 @@ module Ruflet
     GEMFILE_TEMPLATE = <<~GEMFILE
       source "https://rubygems.org"
 
-      gem "ruflet_core", ">= 0.0.9"
-      gem "ruflet_server", ">= 0.0.9"
+      gem "ruflet_core", ">= 0.0.10"
+      gem "ruflet_server", ">= 0.0.10"
     GEMFILE
 
     README_TEMPLATE = <<~MD

data/lib/ruflet/cli.rb

@@ -39,6 +39,8 @@ module Ruflet
         command_debug(argv)
       when "build"
         command_build(argv)
+      when "install"
+        command_install(argv)
       when "devices"
         command_devices(argv)
       when "emulators"
@@ -66,7 +68,8 @@ module Ruflet
           ruflet run [scriptname|path] [--web|--desktop] [--port PORT]
           ruflet update [web|desktop|all] [--check] [--force] [--platform PLATFORM]
           ruflet debug [scriptname|path]
-          ruflet build <apk|android|ios|aab|web|macos|windows|linux>
+          ruflet build <apk|android|ios|aab|web|macos|windows|linux> [--self] [--verbose]
+          ruflet install [--device DEVICE_ID] [--verbose]
           ruflet devices
           ruflet emulators
           ruflet doctor

data/lib/ruflet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruflet
-  VERSION = "0.0.9" unless const_defined?(:VERSION)
+  VERSION = "0.0.11" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - AdamMusa
@@ -23,34 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: ruflet_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-- !ruby/object:Gem::Dependency
-  name: ruflet_server
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.9
 description: Ruflet command line interface for creating, updating, building, and running
   Ruflet apps.
 email:
@@ -61,6 +33,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- assets/icon.png
+- assets/splash.png
 - bin/ruflet
 - lib/ruflet/cli.rb
 - lib/ruflet/cli/build_command.rb