xctest_list 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b135528c2930823c1b2b1c80114718e6e592ef03
-  data.tar.gz: c83baaf81dbc8711c4ee88783ae97adff34ecc4e
+SHA256:
+  metadata.gz: 5ba4ec13aa03904dd67add015a892024392888ca2249507a4374dba75e877ea6
+  data.tar.gz: 3e2e5a315360be63e4b4811f7d9cc49163ccefc56a00b806b98665928d2ad8a2
 SHA512:
-  metadata.gz: 3d490fa698a812624133584bf815898d043ecb95b529f581de5689adf149ea8e503b0e8f56a4a525f7c8f4899fca5cd6f816af0760c7ab4e7896e43bb461e1da
-  data.tar.gz: 5a434f60320cc64d6297825239c02ea484b8207f09b564395c06180b5bff1f1c44cc16adc800f5ec6e2dde82d0485c970e084388de27e7fd0124a373e8243a13
+  metadata.gz: 4e92a404299ddbfaa80402f7e44463eb17e4c98f6655ce8f93766682377ec89baa2847a85e37b68abe7ca60f62815ffbd7aba7353bc9337ad20675299c65e84d
+  data.tar.gz: ee4c4972c09a280f787521cd655ae603883d4c5fb0ca80ead55bc2ec322cafa93d9cb1cc454fb505d7ba226640e9ad6d24e6b65863b4c2635685ad1ece41977e

data/lib/xctest_list.rb

@@ -30,45 +30,55 @@ class XCTestList
     unless File.exist?(xctest_binary_path)
       raise "Missing xctest binary: '#{xctest_binary_path}'"
     end
+
     xctest_binary_path
   end
 
   # find the Objective-C symbols in the bundle's binary
-  def self.objc_tests(xctest_bundle_path)
+  def self.objc_tests(xctest_bundle_path, test_prefix: "test")
     tests = []
     objc_symbols_command_output_tempfile = Tempfile.new(File.basename(xctest_bundle_path) + "objc")
     system("nm -U '#{binary_path(xctest_bundle_path)}' > '#{objc_symbols_command_output_tempfile.path}'")
     tests = []
     File.foreach(objc_symbols_command_output_tempfile.path) do |line|
-      if / t -\[(?<testclass>\w+) (?<testmethod>test\w+)\]/ =~ line
-        tests << "#{testclass}/#{testmethod}"
+      regex = / t -\[(?<testclass>\w+) (?<testmethod>#{test_prefix}\w*)\]/
+      if (matches = regex.match(line))
+        tests << "#{matches[:testclass]}/#{matches[:testmethod]}"
       end
     end
     tests
   end
 
   # cleanup the Swift nm output to only provide the swift symbols
-  def self.swift_symbols(swift_symbols_cmd_output)
+  def self.swift_symbols(swift_symbols_cmd_output, test_prefix: "test")
     swift_symbols_cmd_output.gsub(/^.* .* (.*)$/, '\1')
   end
 
+  def self.swift_symbol_dump_command(xctest_binary_path, test_prefix: "test")
+    nm_version_string = `nm -version | head -n 1 | sed -E 's/Apple LLVM version ([0-9]+\.[0-9]+\.[0-9]+).*/\\1/'`.chomp
+    if Gem::Version.new(nm_version_string) < Gem::Version.new('9.0.0')
+      "nm -gU '#{xctest_binary_path}' | cut -d' ' -f3 | xcrun swift-demangle | grep -E '^\\S+\\.test[^.]+\\(\\)$' | sed 's/ () -> ()/()/'"
+    else
+      "nm -gU '#{xctest_binary_path}' | cut -d' ' -f3 | xargs -s 131072 xcrun swift-demangle | cut -d' ' -f3 | grep -e '[\\.|_]'#{test_prefix}"
+    end
+  end
+
   # find the Swift symbols in the bundle's binary
-  def self.swift_tests(xctest_bundle_path)
+  def self.swift_tests(xctest_bundle_path, test_prefix: "test")
     swift_symbols_command_output_tempfile = Tempfile.new(File.basename(xctest_bundle_path) + "swift")
-    system("nm -gU '#{binary_path(xctest_bundle_path)}' > '#{swift_symbols_command_output_tempfile.path}'")
+    system("#{swift_symbol_dump_command(binary_path(xctest_bundle_path), test_prefix: test_prefix)}  > '#{swift_symbols_command_output_tempfile.path}'")
     tests = []
     File.foreach(swift_symbols_command_output_tempfile.path) do |line|
-      next unless /.*__\w+test\w*/ =~ line
-
-      if /.*-\[.*\]/ !~ line && /\w+\.(?<testclass>[^\.]+)\.(?<testmethod>test[^\(]+)\(/ =~ system("xcrun swift-demangle #{line}")
-        tests << "#{testclass}/#{testmethod}"
+      regex = /\w+\.(?<testclass>[^\.]+)\.(?<testmethod>#{test_prefix}[^\(]*)\(/
+      if /.*-\[.*\]/ !~ line && (matches = regex.match(line))
+        tests << "#{matches[:testclass]}/#{matches[:testmethod]}"
       end
     end
     tests
   end
 
   # find the Objective-C and Swift tests in the binary's bundle
-  def self.tests(xctest_bundle_path)
-    objc_tests(xctest_bundle_path) | swift_tests(xctest_bundle_path)
+  def self.tests(xctest_bundle_path, test_prefix: 'test')
+    objc_tests(xctest_bundle_path, test_prefix: test_prefix) | swift_tests(xctest_bundle_path, test_prefix: test_prefix)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xctest_list
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Lyndsey Ferguson
@@ -50,8 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: List the tests in the given xctest bundle