xcknife 0.6.3 → 0.11.0

data/lib/xcknife/xcscheme_analyzer.rb

@@ -0,0 +1,29 @@
+require 'rexml/document'
+
+module XCKnife
+  module XcschemeAnalyzer
+    extend self
+
+    def extract_environment_variables(xscheme_data)
+      ret = {}
+      xml_root = REXML::Document.new(xscheme_data).root
+
+
+      action = xml_root.elements["//TestAction"]
+      return ret if action.nil?
+      if action.attributes['shouldUseLaunchSchemeArgsEnv'] == "YES"
+        action = xml_root.elements["//LaunchAction"]
+      end
+      return ret if action.nil?
+      env_elements = action.elements[".//EnvironmentVariables"]
+      return ret if env_elements.nil?
+      env_elements.elements.each do |e|
+        attrs = e.attributes
+        if attrs["isEnabled"] == "YES"
+          ret[attrs["key"]] = attrs["value"]
+        end
+      end
+      ret
+    end
+  end
+end

data/lib/xcknife/xctool_cmd_helper.rb

@@ -1,4 +1,5 @@
-require 'pp'
+require 'set'
+
 module XCKnife
   module XCToolCmdHelper
     def only_arguments_for_a_partition_set(output_type, partition_set)
@@ -24,17 +25,41 @@ module XCKnife
     end
 
     # only-testing is available since Xcode 8
-    def xcodebuild_only_arguments(single_partition)
-      single_partition.flat_map do |test_target, classes|
+    def xcodebuild_only_arguments(single_partition, meta_partition = nil)
+      only_targets = if meta_partition
+        single_partition.keys.to_set & meta_partition.flat_map(&:keys).group_by(&:to_s).select{|_,v| v.size == 1 }.map(&:first).to_set
+      else
+        Set.new
+      end
+
+      only_target_arguments = only_targets.sort.map { |test_target| "-only-testing:#{test_target}" }
+
+      only_class_arguments = single_partition.flat_map do |test_target, classes|
+        next [] if only_targets.include?(test_target)
+
         classes.sort.map do |clazz|
           "-only-testing:#{test_target}/#{clazz}"
         end
+      end.sort
+
+      only_target_arguments + only_class_arguments
+    end
 
+    # skip-testing is available since Xcode 8
+    def xcodebuild_skip_arguments(single_partition, test_time_for_partitions)
+      excluded_targets = test_time_for_partitions.keys.to_set - single_partition.keys.to_set
+      skipped_target_arguments = excluded_targets.sort.map { |test_target| "-skip-testing:#{test_target}" }
+
+      skipped_classes_arguments = single_partition.flat_map do |test_target, classes|
+        all_classes = test_time_for_partitions[test_target].keys.to_set
+        (all_classes - classes.to_set).sort.map { |test_class| "-skip-testing:#{test_target}/#{test_class}" }
       end
+
+      skipped_target_arguments + skipped_classes_arguments
     end
 
     def xcodebuild_only_arguments_for_a_partition_set(partition_set)
       partition_set.map { |partition| xctool_only_arguments(partition) }
     end
   end
-end
+end

data/xcknife.gemspec

@@ -17,9 +17,6 @@ Gem::Specification.new do |s|
     Works by leveraging xctool's json-streams timing and test data.
   DESCRIPTION
 
-  # Only allow gem to be pushed to https://rubygems.org
-  s.metadata["allowed_push_host"] = 'https://rubygems.org'
-
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR).reject { |f| f =~ /^spec/} + ["TestDumper/TestDumper.dylib"]
   s.bindir        = 'bin'
   s.executables      = ['xcknife', 'xcknife-min', 'xcknife-test-dumper']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcknife
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Daniel Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,18 +38,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitmodules"
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
+- OWNERS.yml
 - README.md
 - Rakefile
 - TestDumper/README.md
 - TestDumper/TestDumper.dylib
 - TestDumper/TestDumper.xcodeproj/project.pbxproj
+- TestDumper/TestDumper.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - TestDumper/TestDumper.xcodeproj/xcshareddata/xcschemes/TestDumper.xcscheme
 - TestDumper/TestDumper/Info.plist
 - TestDumper/TestDumper/Initialize.m
@@ -69,13 +71,13 @@ files:
 - lib/xcknife/runner.rb
 - lib/xcknife/stream_parser.rb
 - lib/xcknife/test_dumper.rb
+- lib/xcknife/xcscheme_analyzer.rb
 - lib/xcknife/xctool_cmd_helper.rb
 - xcknife.gemspec
 homepage: https://github.com/square/xcknife
 licenses:
 - Apache-2.0
-metadata:
-  allowed_push_host: https://rubygems.org
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -91,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Simple tool for optimizing XCTest runs across machines

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "spec/xcknife-exemplar"]
-	path = spec/xcknife-exemplar
-	url = https://github.com/danielribeiro/xcknife-exemplar.git