erebrus 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a0cf035d47b272eefe1385dd63919f5b6c58c75765248dc165f3ba942057b6
-  data.tar.gz: 637e125435680c16aefe62e318bc78990b2b0e1910d3c669071757996442279c
+  metadata.gz: 1bf5fcdb4df2979ab91e097f590ba95f5bf9340e491003badda831ebd8898276
+  data.tar.gz: 5ef55f5ca03dbc62c4404515e853c7552d0e7eef9126861e721089c8d710913e
 SHA512:
-  metadata.gz: 935badb603ccfa49c812c702fd884f143a130fa051fda3f66fab25080a704549c11df48fc4fb3d731dd3789a1225488d2bd3229a700a5ef0dcab42cb6136bd9f
-  data.tar.gz: '008219953c4f5ca5f9e245240bc824c7db35cba780830dee4e2fa58680fe3a8259a87350e4146f42bb91ab838381a51c0b8b899a960338e6eb4bdcd69496861d'
+  metadata.gz: e8b82d1a8064ecace9fc87632277a345ed1b7840cdd3c8c110b9506bd5f9e22edd0b13363aa7cf9b2333743e0b1f739e4af22e04daa8dd2ce29e0d5db47686ea
+  data.tar.gz: 88803910630b9a10898d172540e852c733bc312b1303c9bc9c6d7ba61ae8f9a50632eb0a14792b77140c4eab4afcc5ec19f960e9c17097c84deac355743dac27

data/bin/erebrus

@@ -39,7 +39,7 @@ class ErebrusCommand < Thor
       load_buildfile_with_error_handling
 
       begin
-        puts "" # spacing for readability
+        puts ""
         if namespace
           say_title("Targets in namespace '#{namespace}'")
         else
@@ -209,7 +209,6 @@ class ErebrusCommand < Thor
 
     context.merge!(options[:var]) if options[:var]
 
-    # Legacy variables for backward compatibility
     context["PLATFORM"] = RUBY_PLATFORM
     context["RUBY_VERSION"] = RUBY_VERSION
     context["PWD"] = Dir.pwd
@@ -217,7 +216,6 @@ class ErebrusCommand < Thor
     context
   end
 
-  # --- Styling helpers -----------------------------------------------------
   def color_enabled?
     options[:color] && $stdout.respond_to?(:isatty) && $stdout.isatty && ENV["NO_COLOR"].nil?
   rescue StandardError

data/examples/Buildfile

@@ -192,21 +192,53 @@ target :parallel_compile, description: "Compile sources and tests in parallel" d
   parallel :compile_sources, :compile_tests
 end
 
+# Demonstrate MSVC environment detection and setup (Windows only)
+target :msvc_demo, description: "Detect MSVC and show version (Windows)" do
+  platform :windows do
+    conditional(msvc_available?) do
+      msvc_setup arch: "x64", version: "latest"
+      echo "MSVC Channel: ${MSVC_CHANNEL}"
+      echo "MSVC Version: ${MSVC_VERSION}"
+      run "where cl"
+      # Use cmd to ignore non-zero exit from cl /Bv
+      run "cmd /c \"cl /Bv & exit /b 0\""
+    end
+    conditional(!msvc_available?) do
+      echo "Visual Studio Build Tools not found. Install VS 2022/2019 Build Tools to enable MSVC."
+    end
+  end
+end
+
+target :msvc_preview_demo, description: "Detect VS Preview/Insiders and show version" do
+  platform :windows do
+    conditional(msvc_available?(version: "insiders")) do
+      msvc_setup arch: "x64", version: "insiders"
+      echo "MSVC Channel: ${MSVC_CHANNEL}"
+      echo "MSVC Version: ${MSVC_VERSION}"
+      run "where cl"
+      run "cmd /c \"cl /Bv & exit /b 0\""
+    end
+    conditional(!msvc_available?(version: "insiders")) do
+      echo "VS Preview/Insiders not found. Install Visual Studio Preview (Build Tools/Community)."
+    end
+  end
+end
+
 # Demonstrate conditional logic with system variables
 target :system_specific, description: "Show system-specific behavior" do
   echo "Detected system: ${HOST_OS} on ${HOST_ARCH}"
-  
+
   conditional(get_variable("HOST_OS") == "windows") do
     echo "Running Windows-specific commands"
     echo "User profile: ${HOME}"
     echo "Temp directory: ${TEMP_DIR}"
   end
-  
+
   conditional(get_variable("HOST_ARCH") == "x64") do
     echo "64-bit architecture detected"
     echo "Using optimized 64-bit settings"
   end
-  
+
   # Show CPU-based logic
   echo "System has ${CPU_COUNT} CPU cores available"
 end
@@ -217,6 +249,8 @@ target :demo, description: "Run all demonstration features" do
   depends_on :gen_config
   depends_on :write_demo
   depends_on :env_demo
+  depends_on :msvc_demo
+  depends_on :msvc_preview_demo
   depends_on :system_specific
   depends_on :build
   depends_on :symlink_demo

data/lib/erebrus/build_engine.rb

@@ -19,7 +19,6 @@ module Erebrus
       @progress_count = 0
       @progress_enabled = false
       @progress_line_open = false
-      # Predefine useful system and build variables
       @variables["HOST_OS"] = detect_host_os
       @variables["HOST_ARCH"] = detect_host_arch
       @variables["CPU_COUNT"] = detect_cpu_count
@@ -140,7 +139,6 @@ module Erebrus
 
       merged_context = @variables.merge(context)
 
-      # Setup build-level progress bar across targets to execute
       target_obj = @targets[target_name]
       to_run = collect_targets_to_run(target_obj)
       @progress_total = to_run.size
@@ -255,7 +253,6 @@ module Erebrus
         execute_target(dep_target, context, visited.dup)
       end
 
-      # Ensure progress bar line is terminated before any action output
       finish_progress_bar if @progress_enabled
       target.execute(context)
       increment_progress!
@@ -267,7 +264,6 @@ module Erebrus
       @targets.each_value(&:reset!)
     end
 
-    # Progress helpers -------------------------------------------------------
     def collect_targets_to_run(root)
       seen = Set.new
       stack = [root]
@@ -295,14 +291,66 @@ module Erebrus
     def print_progress_bar(current, total)
       current = [current, total].min
       percent = total.zero? ? 100 : ((current.to_f / total) * 100).round
-      bar_length = 30
-      filled = (percent * bar_length / 100.0).round
-      bar = "[" + "#" * filled + " " * (bar_length - filled) + "]"
-      $stdout.print "\rProgress #{bar} #{percent}% (#{current}/#{total})"
+      bar_length = 25
+
+      filled_exact = (percent * bar_length / 100.0)
+      filled_full = filled_exact.floor
+      partial = filled_exact - filled_full
+
+      full_block = "█"
+      partial_blocks = ["", "▏", "▎", "▍", "▌", "▋", "▊", "▉"]
+      empty_block = "░"
+
+      bar = ""
+      bar += full_block * filled_full
+
+      if filled_full < bar_length && partial > 0
+        partial_index = (partial * (partial_blocks.length - 1)).round
+        bar += partial_blocks[partial_index]
+        filled_full += 1
+      end
+
+      bar += empty_block * (bar_length - filled_full)
+
+      if color_supported?
+        colored_bar = colorize_progress_bar(bar, filled_exact, bar_length)
+        $stdout.print "\r#{colored_bar} #{colorize(percent.to_s + "%",
+                                                   :cyan)} #{colorize("(#{current}/#{total})", :dim)}"
+      else
+        $stdout.print "\r#{bar} #{percent}% (#{current}/#{total})"
+      end
+
       $stdout.flush
       @progress_line_open = true
     end
 
+    def color_supported?
+      $stdout.respond_to?(:isatty) && $stdout.isatty && ENV["NO_COLOR"].nil?
+    rescue StandardError
+      false
+    end
+
+    def colorize(text, color)
+      return text unless color_supported?
+
+      case color
+      when :green then "\e[32m#{text}\e[0m"
+      when :cyan then "\e[36m#{text}\e[0m"
+      when :dim then "\e[2m#{text}\e[0m"
+      else text
+      end
+    end
+
+    def colorize_progress_bar(bar, filled_exact, bar_length)
+      return bar unless color_supported?
+
+      filled_chars = filled_exact.ceil
+      filled_portion = bar[0, filled_chars]
+      empty_portion = bar[filled_chars..-1] || ""
+
+      "\e[32m#{filled_portion}\e[0m\e[2m#{empty_portion}\e[0m"
+    end
+
     def finish_progress_bar
       return unless @progress_enabled
       return unless @progress_line_open
@@ -363,6 +411,77 @@ module Erebrus
     def detect_temp_dir
       ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp"
     end
+
+    public
+    # --- MSVC / Visual Studio environment helpers -------------------------
+    # Returns a Hash of environment variables configured by VsDevCmd for a given arch
+    def msvc_env(arch: "x64", version: "latest")
+      raise Error, "MSVC environment is only available on Windows" unless detect_host_os == "windows"
+
+      vsdevcmd = find_vsdevcmd(version: version)
+      raise Error, "Visual Studio Dev Cmd not found" unless vsdevcmd && File.exist?(vsdevcmd)
+
+      # Capture environment after activating VS developer environment
+      cmd = %Q{cmd.exe /c "\"#{vsdevcmd}\" -arch=#{arch} && set"}
+      output = `#{cmd}`
+      raise Error, "Failed to load MSVC environment" unless $?.success?
+
+      env = {}
+      output.each_line do |line|
+        line = line.strip
+        next if line.empty?
+        next unless line.include?("=")
+        k, v = line.split("=", 2)
+        env[k] = v
+      end
+
+      env
+    end
+
+    # Try to locate VsDevCmd.bat using vswhere, then fall back to well-known paths
+    def find_vsdevcmd(version: "latest")
+      # Normalize version request
+      v = (version || "latest").to_s.downcase
+      include_prerelease = (v == "insiders" || v == "preview" || v == "prerelease")
+
+      # First try vswhere
+      vswhere = File.join(ENV["ProgramFiles(x86)"] || "C:/Program Files (x86)", "Microsoft Visual Studio", "Installer", "vswhere.exe")
+      if File.exist?(vswhere)
+        # Prefer installations that have VC tools
+        flags = []
+        flags << "-products *"
+        flags << "-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+        flags << "-latest" if v == "latest" || include_prerelease
+        flags << "-prerelease" if include_prerelease
+        property_cmd = %Q{"#{vswhere}" #{flags.join(" ")} -property installationPath}
+        install_path = `#{property_cmd}`.to_s.strip
+        if !$?.nil? && $?.success? && install_path && !install_path.empty?
+          vsdevcmd = File.join(install_path, "Common7", "Tools", "VsDevCmd.bat")
+          return vsdevcmd if File.exist?(vsdevcmd)
+        end
+      end
+
+      # Fallback to common installation paths
+      pf = ENV["ProgramFiles"] || "C:/Program Files"
+      pf86 = ENV["ProgramFiles(x86)"] || "C:/Program Files (x86)"
+      years = case v
+              when "2019" then ["2019", "2022", "2026"]
+              when "2022" then ["2022", "2019", "2026"]
+              when "2026" then ["2026", "2022", "2019"]
+              else ["2026", "2022", "2019"]
+              end
+      editions = ["Preview", "BuildTools", "Community", "Professional", "Enterprise"]
+      [pf, pf86].each do |base|
+        years.each do |year|
+          editions.each do |edition|
+            candidate = File.join(base, "Microsoft Visual Studio", year, edition, "Common7", "Tools", "VsDevCmd.bat")
+            return candidate if File.exist?(candidate)
+          end
+        end
+      end
+
+      nil
+    end
   end
 
   class TargetContext
@@ -412,6 +531,52 @@ module Erebrus
       end
     end
 
+    # Check if MSVC environment (VsDevCmd) is available on this machine
+    def msvc_available?(version: "latest")
+      !!(@engine&.find_vsdevcmd(version: version))
+    end
+
+    # Activate MSVC environment variables for subsequent actions in this target
+    def msvc_setup(options = {})
+      @target.action do |_context|
+        arch = options[:arch] || "x64"
+        version = options[:version] || "latest"
+        env = @engine&.msvc_env(arch: arch, version: version)
+        raise Error, "MSVC environment not found" unless env && env.any?
+
+        # Set env for this process so later run/system calls inherit it
+        env.each { |k, v| ENV[k] = v }
+
+        # Expose some useful MSVC-related variables to the build context
+        @engine&.set_variable("MSVC_VERSION", env["VCToolsVersion"] || env["VisualStudioVersion"] || "unknown")
+        @engine&.set_variable("MSVC_CHANNEL", (version.to_s.downcase =~ /(preview|insiders|prerelease)/ ? "preview" : "stable"))
+        @engine&.set_variable("VSINSTALLDIR", env["VSINSTALLDIR"]) if env["VSINSTALLDIR"]
+        @engine&.set_variable("VCToolsInstallDir", env["VCToolsInstallDir"]) if env["VCToolsInstallDir"]
+        @engine&.set_variable("WindowsSdkDir", env["WindowsSdkDir"]) if env["WindowsSdkDir"]
+      end
+    end
+
+    # Temporarily activate MSVC environment within the provided block
+    def with_msvc_env(options = {})
+      @target.action do |context|
+        arch = options[:arch] || "x64"
+        version = options[:version] || "latest"
+        env = @engine&.msvc_env(arch: arch, version: version)
+        raise Error, "MSVC environment not found" unless env && env.any?
+
+        backup = {}
+        env.each do |k, v|
+          backup[k] = ENV[k]
+          ENV[k] = v
+        end
+        begin
+          yield(context) if block_given?
+        ensure
+          env.each_key { |k| ENV[k] = backup[k] }
+        end
+      end
+    end
+
     def move(source, destination)
       @target.action do |context|
         expanded_source = expand_variables(source, context)
@@ -627,7 +792,12 @@ module Erebrus
 
       text.gsub(/\$\{(\w+)\}|\$(\w+)/) do |match|
         var_name = ::Regexp.last_match(1) || ::Regexp.last_match(2)
-        context[var_name] || context[var_name.to_sym] || ENV[var_name] || match
+        # Prefer context, then engine variables, then ENV
+        context[var_name] ||
+          context[var_name.to_sym] ||
+          (@engine && @engine.get_variable(var_name)) ||
+          ENV[var_name] ||
+          match
       end
     end
   end

data/lib/erebrus/version.rb

@@ -1,3 +1,3 @@
 module Erebrus
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/sig/erebrus/build_engine.rbs

@@ -30,6 +30,9 @@ module Erebrus
 
     def watch_file: (String pattern) { (String) -> untyped } -> void
     def check_file_changes: () -> void
+
+    # MSVC helpers
+    def msvc_env: (arch?: String, version?: String) -> Hash[String, String]
   end
 
   class TargetContext
@@ -74,5 +77,10 @@ module Erebrus
     def append: (String file, String content) -> Erebrus::Target
     def with_env: (Hash[Symbol | String, untyped] vars) { (Hash[Symbol | String, untyped]) -> untyped } -> Erebrus::Target
     def run_set: ((String | Symbol) name, String command) -> Erebrus::Target
+
+    # MSVC environment actions
+    def msvc_available?: (version?: String) -> bool
+    def msvc_setup: (Hash[Symbol | String, untyped] options) -> Erebrus::Target
+    def with_msvc_env: (Hash[Symbol | String, untyped] options) { (Hash[Symbol | String, untyped]) -> untyped } -> Erebrus::Target
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erebrus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - jel9