makit 0.0.163 → 0.0.164

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599b26976cbb6cc29f17237f53aa31d334594eb637425b0d534c0eaf53cc215c
-  data.tar.gz: 953a603a359bd3e2535cad44b76eaac2d590761b831b3c3367ff8a67c21f8da0
+  metadata.gz: 5aa415801dae9c081791596f59c00947878f6ee7d76d3bb7515f6ea8e2a8e958
+  data.tar.gz: 12983cf08ef21f336c22bf3903a0e336acc0860cc201f55c5c742814c4e1c8e7
 SHA512:
-  metadata.gz: 95d25294ff19b0a8dfaa611f0a45e471423555b95f1ced18b04b6945b2ece3e5279a9d77df3e0b370d239d4ebf30e87cc0f91598c0e0a33ae1ca16b6b4ecd9f1
-  data.tar.gz: 2fd32bc4994feb7492182ad20becea5f3a4bcb0d946e6bf939925a3921986c455abb0bc1b3378d75e6318b311c534e629af30824c17764e67fbcd5b89e447932
+  metadata.gz: 79310ac260f739a81bb2a2fec375133a6e61635a0b936b27fc1f3d223755c1024e76f6bca5e5134b008adf700cf2808bf54672647f7fdaede6fb9b4094ed7dee
+  data.tar.gz: 3677481dfedddfbd200f5adc024477ea74fc8044c9caf0f643d913e0b868a633c4ad90438469b11f7e2dcc5c9a1fc8112aaa442457f1a95019ec6c1165103f61

data/lib/makit/nuget.rb

@@ -276,20 +276,17 @@ module Makit
       source_path = source_info[:url]
       destination_path = destination_info[:url]
 
-      # Check if sources are local directory feeds (not URLs)
+      # Source must be a local directory feed (not a URL)
       unless source_path && !source_path.match?(/^https?:\/\//)
         Makit::Logging.default_logger.error("Source '#{source_name}' is not a local directory feed (URL: #{source_path})")
         return -1
       end
 
-      unless destination_path && !destination_path.match?(/^https?:\/\//)
-        Makit::Logging.default_logger.error("Destination source '#{destination_name}' is not a local directory feed (URL: #{destination_path})")
-        return -1
-      end
-
       # Expand and normalize the source path
       source_path = File.expand_path(source_path)
-      destination_path = File.expand_path(destination_path)
+      
+      # Destination can be either local directory feed or remote feed (Azure DevOps, NuGet.org, etc.)
+      is_remote_destination = destination_path && destination_path.match?(/^https?:\/\//)
 
       # Ensure source directory exists
       unless Dir.exist?(source_path)
@@ -298,9 +295,12 @@ module Makit
       end
 
       Makit::Logging.default_logger.info("Searching for packages matching '#{package_pattern}' in source '#{source_name}' (#{source_path})")
+      Makit::Logging.default_logger.info("Destination: #{destination_name} (#{destination_path}) - #{is_remote_destination ? 'Remote feed' : 'Local directory feed'}")
 
-      # Ensure destination directory exists
-      FileUtils.mkdir_p(destination_path) unless Dir.exist?(destination_path)
+      # Ensure destination directory exists (only for local feeds)
+      unless is_remote_destination
+        FileUtils.mkdir_p(destination_path) unless Dir.exist?(destination_path)
+      end
 
       # Find all .nupkg files matching the pattern
       # Simply search recursively for all .nupkg files and match package names
@@ -368,51 +368,76 @@ module Makit
 
         Makit::Logging.default_logger.info("Migrating #{package_name}.#{version} from '#{source_name}' to '#{destination_name}'...")
 
-        # Determine target path in organized structure: {package_name}/{version}/{package_name}.{version}.nupkg
-        # Use lowercase for directory structure to match NuGet conventions
-        target_package_dir = File.join(destination_path, package_name.downcase, version)
-        target_package_path = File.join(target_package_dir, File.basename(nupkg_path).downcase)
-        
-        if File.exist?(target_package_path)
-          Makit::Logging.default_logger.info("  Package already exists in destination, skipping: #{package_name}.#{version}")
-          migrated_count += 1
-          next
-        end
-
-        # For local directory feeds, use 'nuget add' which automatically organizes packages
-        # into the hierarchical structure: {packageID}/{version}/packageID.version.nupkg
-        # This is the recommended command for local feeds as it handles organization and metadata
-        stdout, stderr, status = Open3.capture3("nuget", "add", nupkg_path, "-Source", destination_path)
-
-        if status.success?
-          Makit::Logging.default_logger.info("  Successfully migrated and organized #{package_name}.#{version}")
-          migrated_count += 1
-        else
-          # Fallback to dotnet nuget push if nuget.exe is not available
-          # Check if nuget.exe exists, otherwise try dotnet nuget push
-          nuget_exe = Makit::Environment.which("nuget")
-          if nuget_exe.nil? || nuget_exe.empty?
-            Makit::Logging.default_logger.info("  nuget.exe not found, falling back to dotnet nuget push")
-            
-            # Manually organize package into proper directory structure
-            Makit::Logging.default_logger.info("  Organizing package into directory structure: #{target_package_dir}")
-            FileUtils.mkdir_p(target_package_dir)
-            FileUtils.cp(nupkg_path, target_package_path)
-            
-            # Push using dotnet nuget push from the organized location
-            stdout, stderr, status = Open3.capture3("dotnet", "nuget", "push", target_package_path, "--source", destination_path)
-            
-            if status.success?
-              Makit::Logging.default_logger.info("  Successfully migrated and organized #{package_name}.#{version}")
+        if is_remote_destination
+          # For remote feeds (Azure DevOps, NuGet.org, etc.), use dotnet nuget push
+          # Azure DevOps requires --api-key az (placeholder) and --skip-duplicate
+          Makit::Logging.default_logger.info("  Pushing #{package_name}.#{version} to remote feed...")
+          
+          args = ["dotnet", "nuget", "push", nupkg_path, "--source", destination_path, "--skip-duplicate"]
+          
+          # For Azure DevOps feeds, add --api-key az (required placeholder)
+          if destination_path.include?("dev.azure.com") || destination_path.include?("pkgs.dev.azure.com")
+            args << "--api-key" << "az"
+          end
+          
+          stdout, stderr, status = Open3.capture3(*args)
+          
+          if status.success?
+            Makit::Logging.default_logger.info("  Successfully migrated #{package_name}.#{version} to remote feed")
+            migrated_count += 1
+          else
+            # Check if it's a duplicate (which is okay with --skip-duplicate)
+            if stderr.include?("already exists") || stderr.include?("duplicate")
+              Makit::Logging.default_logger.info("  Package already exists in destination, skipping: #{package_name}.#{version}")
               migrated_count += 1
             else
-              Makit::Logging.default_logger.warn("  Package copied to organized structure but dotnet nuget push failed: #{stderr}")
-              Makit::Logging.default_logger.warn("  Package is available at #{target_package_path} but may need manual indexing")
-              migrated_count += 1
+              Makit::Logging.default_logger.error("  Failed to migrate #{package_name}.#{version}: #{stderr}")
+              failed_count += 1
             end
+          end
+        else
+          # For local directory feeds, use 'nuget add' which automatically organizes packages
+          # into the hierarchical structure: {packageID}/{version}/packageID.version.nupkg
+          target_package_dir = File.join(destination_path, package_name.downcase, version)
+          target_package_path = File.join(target_package_dir, File.basename(nupkg_path).downcase)
+          
+          if File.exist?(target_package_path)
+            Makit::Logging.default_logger.info("  Package already exists in destination, skipping: #{package_name}.#{version}")
+            migrated_count += 1
+            next
+          end
+          
+          stdout, stderr, status = Open3.capture3("nuget", "add", nupkg_path, "-Source", destination_path)
+
+          if status.success?
+            Makit::Logging.default_logger.info("  Successfully migrated and organized #{package_name}.#{version}")
+            migrated_count += 1
           else
-            Makit::Logging.default_logger.error("  Failed to migrate #{package_name}.#{version}: #{stderr}")
-            failed_count += 1
+            # Fallback to dotnet nuget push if nuget.exe is not available
+            nuget_exe = Makit::Environment.which("nuget")
+            if nuget_exe.nil? || nuget_exe.empty?
+              Makit::Logging.default_logger.info("  nuget.exe not found, falling back to dotnet nuget push")
+              
+              # Manually organize package into proper directory structure
+              Makit::Logging.default_logger.info("  Organizing package into directory structure: #{target_package_dir}")
+              FileUtils.mkdir_p(target_package_dir)
+              FileUtils.cp(nupkg_path, target_package_path)
+              
+              # Push using dotnet nuget push from the organized location
+              stdout, stderr, status = Open3.capture3("dotnet", "nuget", "push", target_package_path, "--source", destination_path)
+              
+              if status.success?
+                Makit::Logging.default_logger.info("  Successfully migrated and organized #{package_name}.#{version}")
+                migrated_count += 1
+              else
+                Makit::Logging.default_logger.warn("  Package copied to organized structure but dotnet nuget push failed: #{stderr}")
+                Makit::Logging.default_logger.warn("  Package is available at #{target_package_path} but may need manual indexing")
+                migrated_count += 1
+              end
+            else
+              Makit::Logging.default_logger.error("  Failed to migrate #{package_name}.#{version}: #{stderr}")
+              failed_count += 1
+            end
           end
         end
       end

data/lib/makit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.163
+  version: 0.0.164
 platform: ruby
 authors:
 - Lou Parslow