kompo 0.3.1 → 0.4.0

data/lib/kompo/tasks/install_deps.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'English'
+require "English"
 module Kompo
   # Section to handle platform-specific dependencies.
   # Switches implementation based on the current platform.
@@ -23,9 +23,9 @@ module Kompo
           InstallLibyaml.lib_path,
           InstallZlib.lib_path,
           InstallLibffi.lib_path
-        ].compact.join(' ')
+        ].compact.join(" ")
 
-        puts 'All Homebrew dependencies installed'
+        puts "All Homebrew dependencies installed"
       end
 
       # GMP library installation Section
@@ -37,8 +37,8 @@ module Kompo
           system("#{brew} list #{BREW_NAME} > /dev/null 2>&1") ? Installed : Install
         end
 
-        BREW_NAME = 'gmp'
-        MARKER_FILE = File.expand_path('~/.kompo_installed_gmp')
+        BREW_NAME = "gmp"
+        MARKER_FILE = File.expand_path("~/.kompo_installed_gmp")
 
         class Installed < Taski::Task
           def run
@@ -54,7 +54,7 @@ module Kompo
             brew = HomebrewPath.path
             puts "Installing #{BREW_NAME}..."
             system("#{brew} install #{BREW_NAME}") or raise "Failed to install #{BREW_NAME}"
-            File.write(MARKER_FILE, 'installed')
+            File.write(MARKER_FILE, "installed")
 
             prefix = `#{brew} --prefix #{BREW_NAME} 2>/dev/null`.chomp
             @lib_path = "-L#{prefix}/lib" if $CHILD_STATUS.success? && !prefix.empty?
@@ -80,8 +80,8 @@ module Kompo
           system("#{brew} list #{BREW_NAME} > /dev/null 2>&1") ? Installed : Install
         end
 
-        BREW_NAME = 'openssl@3'
-        MARKER_FILE = File.expand_path('~/.kompo_installed_openssl')
+        BREW_NAME = "openssl@3"
+        MARKER_FILE = File.expand_path("~/.kompo_installed_openssl")
 
         class Installed < Taski::Task
           def run
@@ -97,7 +97,7 @@ module Kompo
             brew = HomebrewPath.path
             puts "Installing #{BREW_NAME}..."
             system("#{brew} install #{BREW_NAME}") or raise "Failed to install #{BREW_NAME}"
-            File.write(MARKER_FILE, 'installed')
+            File.write(MARKER_FILE, "installed")
 
             prefix = `#{brew} --prefix #{BREW_NAME} 2>/dev/null`.chomp
             @lib_path = "-L#{prefix}/lib" if $CHILD_STATUS.success? && !prefix.empty?
@@ -123,8 +123,8 @@ module Kompo
           system("#{brew} list #{BREW_NAME} > /dev/null 2>&1") ? Installed : Install
         end
 
-        BREW_NAME = 'readline'
-        MARKER_FILE = File.expand_path('~/.kompo_installed_readline')
+        BREW_NAME = "readline"
+        MARKER_FILE = File.expand_path("~/.kompo_installed_readline")
 
         class Installed < Taski::Task
           def run
@@ -140,7 +140,7 @@ module Kompo
             brew = HomebrewPath.path
             puts "Installing #{BREW_NAME}..."
             system("#{brew} install #{BREW_NAME}") or raise "Failed to install #{BREW_NAME}"
-            File.write(MARKER_FILE, 'installed')
+            File.write(MARKER_FILE, "installed")
 
             prefix = `#{brew} --prefix #{BREW_NAME} 2>/dev/null`.chomp
             @lib_path = "-L#{prefix}/lib" if $CHILD_STATUS.success? && !prefix.empty?
@@ -166,8 +166,8 @@ module Kompo
           system("#{brew} list #{BREW_NAME} > /dev/null 2>&1") ? Installed : Install
         end
 
-        BREW_NAME = 'libyaml'
-        MARKER_FILE = File.expand_path('~/.kompo_installed_libyaml')
+        BREW_NAME = "libyaml"
+        MARKER_FILE = File.expand_path("~/.kompo_installed_libyaml")
 
         class Installed < Taski::Task
           def run
@@ -183,7 +183,7 @@ module Kompo
             brew = HomebrewPath.path
             puts "Installing #{BREW_NAME}..."
             system("#{brew} install #{BREW_NAME}") or raise "Failed to install #{BREW_NAME}"
-            File.write(MARKER_FILE, 'installed')
+            File.write(MARKER_FILE, "installed")
 
             prefix = `#{brew} --prefix #{BREW_NAME} 2>/dev/null`.chomp
             @lib_path = "-L#{prefix}/lib" if $CHILD_STATUS.success? && !prefix.empty?
@@ -209,8 +209,8 @@ module Kompo
           system("#{brew} list #{BREW_NAME} > /dev/null 2>&1") ? Installed : Install
         end
 
-        BREW_NAME = 'zlib'
-        MARKER_FILE = File.expand_path('~/.kompo_installed_zlib')
+        BREW_NAME = "zlib"
+        MARKER_FILE = File.expand_path("~/.kompo_installed_zlib")
 
         class Installed < Taski::Task
           def run
@@ -226,7 +226,7 @@ module Kompo
             brew = HomebrewPath.path
             puts "Installing #{BREW_NAME}..."
             system("#{brew} install #{BREW_NAME}") or raise "Failed to install #{BREW_NAME}"
-            File.write(MARKER_FILE, 'installed')
+            File.write(MARKER_FILE, "installed")
 
             prefix = `#{brew} --prefix #{BREW_NAME} 2>/dev/null`.chomp
             @lib_path = "-L#{prefix}/lib" if $CHILD_STATUS.success? && !prefix.empty?
@@ -252,8 +252,8 @@ module Kompo
           system("#{brew} list #{BREW_NAME} > /dev/null 2>&1") ? Installed : Install
         end
 
-        BREW_NAME = 'libffi'
-        MARKER_FILE = File.expand_path('~/.kompo_installed_libffi')
+        BREW_NAME = "libffi"
+        MARKER_FILE = File.expand_path("~/.kompo_installed_libffi")
 
         class Installed < Taski::Task
           def run
@@ -269,7 +269,7 @@ module Kompo
             brew = HomebrewPath.path
             puts "Installing #{BREW_NAME}..."
             system("#{brew} install #{BREW_NAME}") or raise "Failed to install #{BREW_NAME}"
-            File.write(MARKER_FILE, 'installed')
+            File.write(MARKER_FILE, "installed")
 
             prefix = `#{brew} --prefix #{BREW_NAME} 2>/dev/null`.chomp
             @lib_path = "-L#{prefix}/lib" if $CHILD_STATUS.success? && !prefix.empty?
@@ -291,30 +291,30 @@ module Kompo
     class ForLinux < Taski::Task
       def run
         unless pkg_config_available?
-          puts '[WARNING] pkg-config not found. Skipping dependency check.'
-          puts 'Install pkg-config to enable automatic dependency verification.'
-          @lib_paths = ''
+          puts "[WARNING] pkg-config not found. Skipping dependency check."
+          puts "Install pkg-config to enable automatic dependency verification."
+          @lib_paths = ""
           return
         end
 
         check_dependencies
         @lib_paths = collect_lib_paths
 
-        puts 'All required development libraries are installed.'
+        puts "All required development libraries are installed."
       end
 
       REQUIRED_LIBS = {
-        'openssl' => { pkg_config: 'openssl', apt: 'libssl-dev', yum: 'openssl-devel' },
-        'readline' => { pkg_config: 'readline', apt: 'libreadline-dev', yum: 'readline-devel' },
-        'zlib' => { pkg_config: 'zlib', apt: 'zlib1g-dev', yum: 'zlib-devel' },
-        'libyaml' => { pkg_config: 'yaml-0.1', apt: 'libyaml-dev', yum: 'libyaml-devel' },
-        'libffi' => { pkg_config: 'libffi', apt: 'libffi-dev', yum: 'libffi-devel' }
+        "openssl" => {pkg_config: "openssl", apt: "libssl-dev", yum: "openssl-devel"},
+        "readline" => {pkg_config: "readline", apt: "libreadline-dev", yum: "readline-devel"},
+        "zlib" => {pkg_config: "zlib", apt: "zlib1g-dev", yum: "zlib-devel"},
+        "libyaml" => {pkg_config: "yaml-0.1", apt: "libyaml-dev", yum: "libyaml-devel"},
+        "libffi" => {pkg_config: "libffi", apt: "libffi-dev", yum: "libffi-devel"}
       }.freeze
 
       private
 
       def pkg_config_available?
-        system('which pkg-config > /dev/null 2>&1')
+        system("which pkg-config > /dev/null 2>&1")
       end
 
       def check_dependencies
@@ -330,13 +330,13 @@ module Kompo
         paths = pkg_names.flat_map do |pkg|
           `pkg-config --libs-only-L #{pkg} 2>/dev/null`.chomp.split
         end
-        paths.uniq.join(' ')
+        paths.uniq.join(" ")
       end
 
       def build_error_message(missing)
-        lib_names = missing.keys.join(', ')
-        apt_packages = missing.values.map { |info| info[:apt] }.join(' ')
-        yum_packages = missing.values.map { |info| info[:yum] }.join(' ')
+        lib_names = missing.keys.join(", ")
+        apt_packages = missing.values.map { |info| info[:apt] }.join(" ")
+        yum_packages = missing.values.map { |info| info[:yum] }.join(" ")
 
         <<~MSG
           Missing required development libraries: #{lib_names}
@@ -359,7 +359,7 @@ module Kompo
     private
 
     def macos?
-      RUBY_PLATFORM.include?('darwin')
+      RUBY_PLATFORM.include?("darwin")
     end
   end
 end

data/lib/kompo/tasks/kompo_vfs_path.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-require 'fileutils'
-require_relative 'kompo_vfs_version_check'
+require "fileutils"
+require "open3"
+require_relative "kompo_vfs_version_check"
 
 module Kompo
   # Section to get the kompo-vfs library path.
   # Priority:
   #   1. Local directory (if specified via context[:local_kompo_vfs_path])
-  #   2. Homebrew (install if needed)
-  #   3. Source build (fallback if Homebrew doesn't support arch/os)
+  #   2. macOS: Homebrew (required)
+  #   3. Linux: Build from source
   class KompoVfsPath < Taski::Section
     interfaces :path
 
@@ -16,10 +17,13 @@ module Kompo
       # Priority 1: Local directory if specified
       return FromLocal if Taski.args[:local_kompo_vfs_path]
 
-      # # Priority 2: Homebrew if supported
-      return FromHomebrew if homebrew_supported?
+      # macOS: Homebrew is required
+      if darwin?
+        check_homebrew_available!
+        return FromHomebrew
+      end
 
-      # # Priority 3: Build from source
+      # Linux: Build from source
       FromSource
     end
 
@@ -27,15 +31,15 @@ module Kompo
     class FromLocal < Taski::Task
       def run
         local_path = Taski.args[:local_kompo_vfs_path]
-        raise 'Local kompo-vfs path not specified' unless local_path
+        raise "Local kompo-vfs path not specified" unless local_path
         raise "Local kompo-vfs path does not exist: #{local_path}" unless Dir.exist?(local_path)
 
         puts "Building kompo-vfs from local directory: #{local_path}"
         cargo = CargoPath.path
 
-        raise 'Failed to build kompo-vfs' unless system(cargo, 'build', '--release', chdir: local_path)
+        raise "Failed to build kompo-vfs" unless system(cargo, "build", "--release", chdir: local_path)
 
-        @path = File.join(local_path, 'target', 'release')
+        @path = File.join(local_path, "target", "release")
         puts "kompo-vfs library path: #{@path}"
 
         KompoVfsVersionCheck.verify!(@path)
@@ -63,7 +67,7 @@ module Kompo
           unless missing_libs.empty?
             installed_version = `#{brew} list --versions kompo-vfs`.chomp.split.last
             raise "kompo-vfs #{installed_version} is outdated. Please run: brew upgrade kompo-vfs\n" \
-                  "Missing libraries: #{missing_libs.join(', ')}"
+                  "Missing libraries: #{missing_libs.join(", ")}"
           end
 
           puts "kompo-vfs library path: #{@path}"
@@ -76,9 +80,9 @@ module Kompo
       class Install < Taski::Task
         def run
           brew = HomebrewPath.path
-          puts 'Installing kompo-vfs via Homebrew...'
-          system(brew, 'tap', 'ahogappa/kompo') or raise 'Failed to tap ahogappa/kompo'
-          system(brew, 'install', 'kompo-vfs') or raise 'Failed to install kompo-vfs'
+          puts "Installing kompo-vfs via Homebrew..."
+          system(brew, "tap", "ahogappa/kompo-vfs", "https://github.com/ahogappa/kompo-vfs.git") or raise "Failed to tap ahogappa/kompo-vfs"
+          system(brew, "install", "ahogappa/kompo-vfs/kompo-vfs") or raise "Failed to install kompo-vfs"
 
           @path = "#{`#{brew} --prefix kompo-vfs`.chomp}/lib"
           puts "kompo-vfs library path: #{@path}"
@@ -100,24 +104,24 @@ module Kompo
 
     # Build from source (requires Cargo)
     class FromSource < Taski::Task
-      REPO_URL = 'https://github.com/ahogappa/kompo-vfs'
+      REPO_URL = "https://github.com/ahogappa/kompo-vfs"
 
       def run
-        puts 'Building kompo-vfs from source...'
+        puts "Building kompo-vfs from source..."
         cargo = CargoPath.path
 
-        build_dir = File.expand_path('~/.kompo/kompo-vfs')
+        build_dir = File.expand_path("~/.kompo/kompo-vfs")
         FileUtils.mkdir_p(File.dirname(build_dir))
 
         if Dir.exist?(build_dir)
-          system('git', '-C', build_dir, 'pull', '--quiet')
+          system("git", "-C", build_dir, "pull", "--quiet")
         else
-          system('git', 'clone', REPO_URL, build_dir) or raise 'Failed to clone kompo-vfs repository'
+          system("git", "clone", REPO_URL, build_dir) or raise "Failed to clone kompo-vfs repository"
         end
 
-        system(cargo, 'build', '--release', chdir: build_dir) or raise 'Failed to build kompo-vfs'
+        system(cargo, "build", "--release", chdir: build_dir) or raise "Failed to build kompo-vfs"
 
-        @path = File.join(build_dir, 'target', 'release')
+        @path = File.join(build_dir, "target", "release")
         puts "kompo-vfs library path: #{@path}"
 
         KompoVfsVersionCheck.verify!(@path)
@@ -126,19 +130,24 @@ module Kompo
 
     private
 
-    def homebrew_supported?
-      # Check if current arch/os combination is supported by Homebrew formula
-      arch = `uname -m`.chomp
-      os = `uname -s`.chomp
+    def darwin?
+      RUBY_PLATFORM.include?("darwin") || `uname -s`.chomp == "Darwin"
+    end
+
+    def check_homebrew_available!
+      # Check if brew is in PATH
+      brew_in_path, = Open3.capture2("which", "brew", err: File::NULL)
+      return unless brew_in_path.chomp.empty?
+
+      # Check common Homebrew installation paths (including ARM64 at /opt/homebrew)
+      return if HomebrewPath::COMMON_BREW_PATHS.any? { |p| File.executable?(p) }
 
-      # Supported combinations (adjust based on actual formula support)
-      supported = [
-        %w[arm64 Darwin],
-        %w[x86_64 Darwin],
-        %w[x86_64 Linux]
-      ]
+      raise <<~ERROR
+        Homebrew is required on macOS but not installed.
+        Please install Homebrew first: https://brew.sh
 
-      supported.include?([arch, os])
+        For local development, you can use --local-vfs-path option instead.
+      ERROR
     end
   end
 end

data/lib/kompo/tasks/kompo_vfs_version_check.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../version'
+require_relative "../version"
 
 module Kompo
   # Verifies that the installed kompo-vfs version meets minimum requirements.
@@ -8,7 +8,7 @@ module Kompo
   module KompoVfsVersionCheck
     class IncompatibleVersionError < StandardError; end
 
-    VERSION_FILE = 'KOMPO_VFS_VERSION'
+    VERSION_FILE = "KOMPO_VFS_VERSION"
 
     def self.verify!(lib_path)
       actual_version = get_version(lib_path)
@@ -37,7 +37,8 @@ module Kompo
         Required: >= #{required_version}
 
         Please upgrade:
-          Homebrew: brew upgrade kompo-vfs
+          Homebrew: brew update && brew upgrade kompo-vfs
+            (If upgrade fails, try: brew tap --force-auto-update ahogappa/kompo)
           Source: cd ~/.kompo/kompo-vfs && git pull && cargo build --release
       MSG
     end
@@ -48,7 +49,8 @@ module Kompo
         Your kompo-vfs installation may be outdated (< 0.5.0).
 
         Please upgrade:
-          Homebrew: brew upgrade kompo-vfs
+          Homebrew: brew update && brew upgrade kompo-vfs
+            (If upgrade fails, try: brew tap --force-auto-update ahogappa/kompo)
           Source: cd ~/.kompo/kompo-vfs && git pull && cargo build --release
       MSG
     end

data/lib/kompo/tasks/make_fs_c.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'erb'
-require 'fileutils'
-require 'find'
+require "erb"
+require "fileutils"
+require "find"
 
 module Kompo
   # Struct to hold file data for embedding
@@ -30,7 +30,7 @@ module Kompo
 
     def run
       @work_dir = WorkDir.path
-      @path = File.join(@work_dir, 'fs.c')
+      @path = File.join(@work_dir, "fs.c")
 
       # Get original paths for Ruby standard library cache support
       # When Ruby is restored from cache, standard library paths are from the original build
@@ -47,8 +47,11 @@ module Kompo
       @file_bytes = []
       @paths = []
       @file_sizes = [0]
+      @added_paths = Set.new
+      @duplicate_count = 0
+      @verbose = Taski.args.fetch(:verbose, false)
 
-      group('Collecting files') do
+      group("Collecting files") do
         embed_paths = collect_embed_paths
 
         embed_paths.each do |embed_path|
@@ -64,13 +67,14 @@ module Kompo
             add_file(expand_path)
           end
         end
-        puts "Collected #{@file_sizes.size - 1} files"
+        duplicate_info = @duplicate_count.positive? ? " (#{@duplicate_count} duplicates skipped)" : ""
+        puts "Collected #{@file_sizes.size - 1} files#{duplicate_info}"
       end
 
-      group('Generating fs.c') do
+      group("Generating fs.c") do
         context = build_template_context
 
-        template_path = File.join(__dir__, '..', '..', 'fs.c.erb')
+        template_path = File.join(__dir__, "..", "..", "fs.c.erb")
         template = ERB.new(File.read(template_path))
         File.write(@path, template.result(binding))
         puts "Generated: fs.c (#{@file_bytes.size} bytes)"
@@ -81,7 +85,7 @@ module Kompo
       return unless @path && File.exist?(@path)
 
       FileUtils.rm_f(@path)
-      puts 'Cleaned up fs.c'
+      puts "Cleaned up fs.c"
     end
 
     private
@@ -90,24 +94,21 @@ module Kompo
       paths = []
 
       # 1. Project files (entrypoint + additional files/directories specified by user)
-      #    Created by: CopyProjectFiles
       paths << CopyProjectFiles.entrypoint_path
       paths += CopyProjectFiles.additional_paths
 
-      # 2. Gemfile and Gemfile.lock (if exists)
-      #    Created by: CopyGemfile
+      # 2. Gemfile, Gemfile.lock, and gemspec files (if exists)
       if CopyGemfile.gemfile_exists
-        paths << File.join(@work_dir, 'Gemfile')
-        paths << File.join(@work_dir, 'Gemfile.lock')
+        paths << File.join(@work_dir, "Gemfile")
+        paths << File.join(@work_dir, "Gemfile.lock")
+        paths += CopyGemfile.gemspec_paths
 
         # 3. Bundle directory (.bundle/config and bundle/ruby/X.Y.Z/gems/...)
-        #    Created by: BundleInstall
         paths << BundleInstall.bundler_config_path
         paths << BundleInstall.bundle_ruby_dir
       end
 
       # 4. Ruby standard library
-      #    Retrieved by: CheckStdlibs
       paths += CheckStdlibs.paths
 
       paths.compact
@@ -136,7 +137,7 @@ module Kompo
 
         # Skip certain file extensions
         next if SKIP_EXTENSIONS.any? { |ext| path.end_with?(ext) }
-        next if path.end_with?('selenium-manager')
+        next if path.end_with?("selenium-manager")
 
         # Skip files matching .kompoignore patterns
         next if should_ignore?(path)
@@ -154,7 +155,7 @@ module Kompo
       # Ruby standard library paths are outside work_dir and should not be filtered
       return false unless absolute_path.start_with?(@work_dir)
 
-      relative_path = absolute_path.sub("#{@work_dir}/", '')
+      relative_path = absolute_path.sub("#{@work_dir}/", "")
       if @kompo_ignore.ignore?(relative_path)
         puts "Ignoring (via .kompoignore): #{relative_path}"
         true
@@ -164,15 +165,23 @@ module Kompo
     end
 
     def add_file(path)
+      # Skip duplicate files (same absolute path)
+      if @added_paths.include?(path)
+        @duplicate_count += 1
+        puts "skip: duplicate path #{path}" if @verbose
+        return
+      end
+      @added_paths.add(path)
+
       # Keep original paths for VFS - the caching system already ensures
       # the same work_dir path is reused across builds via metadata.json
       # Ruby's $LOAD_PATH uses work_dir paths, so embedded files must match.
       embedded_path = if @current_ruby_install_dir != @original_ruby_install_dir && path.start_with?(@current_ruby_install_dir)
-                        # Ruby install dir path replacement for cache compatibility (when paths differ)
-                        path.sub(@current_ruby_install_dir, @original_ruby_install_dir)
-                      else
-                        path
-                      end
+        # Ruby install dir path replacement for cache compatibility (when paths differ)
+        path.sub(@current_ruby_install_dir, @original_ruby_install_dir)
+      else
+        path
+      end
 
       puts "#{path} -> #{embedded_path}" if path != embedded_path
 

data/lib/kompo/tasks/make_main_c.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'erb'
-require 'fileutils'
+require "erb"
+require "fileutils"
 
 module Kompo
   # Generate main.c from ERB template
@@ -15,25 +15,25 @@ module Kompo
 
     def run
       work_dir = WorkDir.path
-      @path = File.join(work_dir, 'main.c')
+      @path = File.join(work_dir, "main.c")
 
       return if File.exist?(@path)
 
-      template_path = File.join(__dir__, '..', '..', 'main.c.erb')
+      template_path = File.join(__dir__, "..", "..", "main.c.erb")
       template = ERB.new(File.read(template_path))
 
       # Build context object for ERB template
       context = build_template_context
 
       File.write(@path, template.result(binding))
-      puts 'Generated: main.c'
+      puts "Generated: main.c"
     end
 
     def clean
       return unless @path && File.exist?(@path)
 
       FileUtils.rm_f(@path)
-      puts 'Cleaned up main.c'
+      puts "Cleaned up main.c"
     end
 
     private