emerge 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae04588f63b14ad87eb107872f2b2c7207b54d344e3b9f0d87915042568bf94f
-  data.tar.gz: 502237eec8ad7452fc11a55a014cc4de8cfb96ac86e7bae6566a0605a6729c13
+  metadata.gz: 1770b70a27551cc234f8dceca632c4b5314458fe18f1e4a58eadbf694fe8dc52
+  data.tar.gz: 2e1b0461aa6cd601428b53a6ea00c350566c72f74c20cf4d4c8a55d490c716fe
 SHA512:
-  metadata.gz: bc5457c9758300e751b86a688f10be6b784d3c0d714b8338b9dfb970629b21c8610985f88f08cab3bff9f68872f8c928d8f7ebd43f62a7376172eae859f15565
-  data.tar.gz: 651182cbe2b7e5a294ecdc126d41081b852857867e024197290d0764342c9aa5c14ad04abba2c91d3304eab04590c222807734af335bdf23b5cac4d48bcec5cd
+  metadata.gz: 24944c104d7e639b94786e685e0311be1adeaeb045583d56ef12e91c657be087ca53a9949c445c98f15880ac398d6d0eba961752e42d1cde0feba38cc08be67f
+  data.tar.gz: 71952252c5255b03bcfbae065c8d76c7a3ee53fa1c42756117ee20c78b879248ec7f02788740d8b2e6a18c47ea8ad43439abcbfb82fe2f73e7eda98a39a2ad22

data/lib/reaper/code_deleter.rb

@@ -17,7 +17,9 @@ module EmergeCLI
         types.each do |class_info|
           Logger.info "Deleting #{class_info['class_name']}"
 
-          type_name = parse_type_name(class_info['class_name'])
+          type_name_result = parse_type_name(class_info['class_name'])
+          type_name = type_name_result[:type_name]
+          package_name = type_name_result[:package_name]
           Logger.debug "Parsed type name: #{type_name}"
 
           # Remove line number from path if present
@@ -42,7 +44,7 @@ module EmergeCLI
           paths.each do |path|
             Logger.debug "Processing path: #{path}"
             @profiler.measure('delete_type_from_file') do
-              delete_type_from_file(path, type_name)
+              delete_type_from_file(path, type_name, package_name)
             end
           end
 
@@ -71,9 +73,11 @@ module EmergeCLI
       private
 
       def parse_type_name(type_name)
+        package_name = nil
+
         # Remove first module prefix for Swift types if present
         if @platform == 'ios' && type_name.include?('.')
-          type_name.split('.')[1..].join('.')
+          parsed_type_name = type_name.split('.')[1..].join('.')
         # For Android, strip package name and just use the class name
         elsif @platform == 'android' && type_name.include?('.')
           # rubocop:disable Layout/LineLength
@@ -81,22 +85,31 @@ module EmergeCLI
           # rubocop:enable Layout/LineLength
           has_nested_class = type_name.include?('$')
           parts = type_name.split
+
           if parts.length == 0
-            type_name
+            parsed_type_name = type_name
           elsif has_nested_class && parts.length > 1
-            base_name = parts[0].split('.').last
+            full_class_path = parts[0].split('.')
+            base_name = full_class_path.last
             nested_class = parts[1].match(/\$(.+)/).captures.first
-            "#{base_name}.#{nested_class}"
+            parsed_type_name = "#{base_name}.#{nested_class}"
+            # Extract package name (everything except the last part)
+            package_name = full_class_path[0...-1].join('.') if full_class_path.length > 1
           else
-            parts[0].split('.').last
+            full_class_path = parts[0].split('.')
+            parsed_type_name = full_class_path.last
+            # Extract package name (everything except the last part)
+            package_name = full_class_path[0...-1].join('.') if full_class_path.length > 1
           end
         else
-          type_name
+          parsed_type_name = type_name
         end
+
+        { type_name: parsed_type_name, package_name: package_name }
       end
 
-      def delete_type_from_file(path, type_name)
-        full_path = resolve_file_path(path)
+      def delete_type_from_file(path, type_name, marker = nil)
+        full_path = resolve_file_path(path, marker)
         return unless full_path
 
         Logger.debug "Processing file: #{full_path}"
@@ -221,7 +234,7 @@ module EmergeCLI
         end
       end
 
-      def resolve_file_path(path)
+      def resolve_file_path(path, marker = nil)
         # If path starts with /, treat it as relative to project root
         if path.start_with?('/')
           path = path[1..] # Remove leading slash
@@ -242,7 +255,21 @@ module EmergeCLI
           Logger.warn "Could not find #{path} in project"
           return nil
         elsif matching_files.length > 1
-          Logger.warn "Found multiple matches for #{path}: #{matching_files.join(', ')}"
+          Logger.debug "Found multiple matches for #{path}: #{matching_files.join(', ')}"
+
+          # If a marker is provided, use it to select the file
+          # For Android, this is the package name declaration of the type
+          if marker
+            Logger.debug "Using marker #{marker} to select file"
+            marker_files = matching_files.select { |file| File.read(file).include?(marker) }
+            if marker_files.length >= 1
+              Logger.info "Found #{marker_files.length} files with marker #{marker} for #{path}, using first match"
+              return marker_files.first
+            else
+              Logger.warn "No files found with marker #{marker} for #{path}"
+            end
+          end
+
           Logger.warn "Using first match: #{matching_files.first}"
         end
 

data/lib/utils/github.rb

@@ -50,7 +50,8 @@ module EmergeCLI
     end
 
     def self.previous_sha
-      Git.previous_sha
+      return unless push?
+      github_event_data[:before]
     end
 
     def self.github_event_data

data/lib/version.rb

@@ -1,3 +1,3 @@
 module EmergeCLI
-  VERSION = '0.7.6'.freeze
+  VERSION = '0.7.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Emerge Tools
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-05 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http