makit 0.0.176 → 0.0.177

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b822415fae8239531e9bb0f5df0a3fc83e5103fb2e26bfa02339097ab52b964
-  data.tar.gz: b7ded409a3abe37aee2fda3d6ef8d0cd4520449fd47fc5063c83d99c0bdafc2d
+  metadata.gz: fc386dde3db0fe6432b9b85b3b00dc999c20196e3efb93fd9d29d18db82f8350
+  data.tar.gz: c1714543dc6bdfad90b7d27f8216a8d16e1e036f3d6d8caba995e5f3de904379
 SHA512:
-  metadata.gz: ea552a44f6da66c4b14536cbe7b1b3c20c248b23602d98c186876652c63b59f130cd9eeb26567f12352e77f75d0dd4b445f12366ef42598ea0963abc95b338e4
-  data.tar.gz: 96e51fc6aaac95794555122796b0f983cd56c1e2d11a30e35ba8d2712c56d1a781049d16464fa413d805f74f0fa78613727dacf93ee0affaf5696b290a487b9b
+  metadata.gz: 34345e6eb386707bf6e77c3cffeccb9570b374633b9a2a4731215a6a7dfb796d9dbf75b77b291563bbc09f569a4eafdfaa04cadf7ca89313bb00e2f77c46d14d
+  data.tar.gz: 7d77300973c442e66266990be6e5e80ba345b8ea72480e8f76dd63784e40a9a7121bdb30a62ae820b2e44c0fa38f37f65bcfea5ba470037063fa6b00189c0822

data/lib/makit/msbuild.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "open3"
+
+module Makit
+  # Helpers for locating and invoking MSBuild (Windows).
+  module Msbuild
+    # Locates MSBuild executable: vswhere when available, then common VS 2022 paths, else "msbuild" on PATH.
+    #
+    # @return [String] Path to MSBuild.exe or "msbuild" as fallback
+    def self.find_msbuild
+      return find_msbuild_windows if Makit::Environment.is_windows?
+
+      "msbuild"
+    end
+
+    # @return [String]
+    def self.find_msbuild_windows
+      vswhere_path = nil
+      if ENV["ProgramFiles(x86)"]
+        p = File.join(ENV["ProgramFiles(x86)"], "Microsoft Visual Studio", "Installer", "vswhere.exe")
+        vswhere_path = p if File.exist?(p)
+      end
+
+      if vswhere_path
+        stdout, _stderr, status = Open3.capture3(
+          vswhere_path, "-latest", "-requires", "Microsoft.Component.MSBuild",
+          "-find", "MSBuild\\**\\Bin\\MSBuild.exe"
+        )
+        if status.success? && !stdout.strip.empty?
+          path = stdout.strip.lines.first&.strip
+          return path if path && File.exist?(path)
+        end
+      end
+
+      %w[Community Professional Enterprise BuildTools].each do |edition|
+        p = "C:\\Program Files\\Microsoft Visual Studio\\2022\\#{edition}\\MSBuild\\Current\\Bin\\MSBuild.exe"
+        return p if File.exist?(p)
+      end
+
+      "msbuild"
+    end
+    private_class_method :find_msbuild_windows
+  end
+end

data/lib/makit/nuget.rb

@@ -318,6 +318,9 @@ module Makit
         return false
       end
 
+      #config_paths = existing_nuget_config_paths
+      #content_before = config_paths.to_h { |p| [p, File.read(p)] }
+
       args = ["dotnet", "nuget", "add", "source", url, "--name", name]
       args << "--username" << username if username
       args << "--password" << password if password
@@ -325,6 +328,18 @@ module Makit
 
       stdout, stderr, status = Open3.capture3(*args)
 
+      #if config_paths.any?
+      #  config_paths.each do |path|
+      #    next unless content_before.key?(path)
+      #    content_after = File.read(path)
+      #    if content_after != content_before[path]
+      #      Makit::Logging.default_logger.warn(
+      #        "WARNING: NuGet config file was modified by add_source. Expected content to remain unchanged: #{path}"
+      #      )
+      #    end
+      #  end
+      #end
+
       if status.success?
         Makit::Logging.default_logger.info("Added NuGet source '#{name}' (#{url})")
         true
@@ -334,6 +349,25 @@ module Makit
       end
     end
 
+    # Returns paths to NuGet config files that exist (current directory and user-level).
+    # Used to detect if add_source modifies any existing config.
+    #
+    # @return [Array<String>]
+    def self.existing_nuget_config_paths
+      candidates = [
+        File.join(Dir.pwd, "NuGet.config"),
+        File.join(Dir.pwd, "nuget.config")
+      ]
+      if ENV["APPDATA"]
+        candidates << File.join(ENV["APPDATA"], "NuGet", "NuGet.Config")
+      else
+        candidates << File.expand_path(File.join("~", ".nuget", "NuGet", "NuGet.Config"))
+        candidates << File.expand_path(File.join("~", ".config", "NuGet", "NuGet.Config"))
+      end
+      candidates.select { |p| File.file?(p) }.uniq
+    end
+    private_class_method :existing_nuget_config_paths
+
     # Removes a NuGet source
     #
     # @param name [String] The source name to remove

data/lib/makit/version.rb

@@ -2,7 +2,7 @@
 
 module Makit
   # Static version for now to avoid circular dependency issues
-  #VERSION = "0.0.176"
+  #VERSION = "0.0.177"
 
   # Version management utilities for various file formats
   #

data/lib/makit.rb

@@ -73,6 +73,7 @@ require_relative "makit/files"
 require_relative "makit/task_info"
 require_relative "makit/tasks"
 require_relative "makit/environment"
+require_relative "makit/msbuild"
 require_relative "makit/process"
 
 # Load GitLab pipeline modules

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.176
+  version: 0.0.177
 platform: ruby
 authors:
 - Lou Parslow
@@ -342,6 +342,7 @@ files:
 - lib/makit/mp/command_request.mp.rb
 - lib/makit/mp/project_mp.rb
 - lib/makit/mp/string_mp.rb
+- lib/makit/msbuild.rb
 - lib/makit/nuget.rb
 - lib/makit/nuget_cache.rb
 - lib/makit/podman/podman.rb