xcknife 0.6.6 → 0.13.0

data/lib/xcknife/xcscheme_analyzer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rexml/document'
 
 module XCKnife
@@ -8,20 +10,18 @@ module XCKnife
       ret = {}
       xml_root = REXML::Document.new(xscheme_data).root
 
-
-      action = xml_root.elements["//TestAction"]
+      action = xml_root.elements['//TestAction']
       return ret if action.nil?
-      if action.attributes['shouldUseLaunchSchemeArgsEnv'] == "YES"
-        action = xml_root.elements["//LaunchAction"]
-      end
+
+      action = xml_root.elements['//LaunchAction'] if action.attributes['shouldUseLaunchSchemeArgsEnv'] == 'YES'
       return ret if action.nil?
-      env_elements = action.elements[".//EnvironmentVariables"]
+
+      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
+        ret[attrs['key']] = attrs['value'] if attrs['isEnabled'] == 'YES'
       end
       ret
     end

data/lib/xcknife/xctool_cmd_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module XCKnife
@@ -5,12 +7,14 @@ module XCKnife
     def only_arguments_for_a_partition_set(output_type, partition_set)
       method = "#{output_type}_only_arguments_for_a_partition_set"
       raise "Unknown output_type: #{output_type}" unless respond_to?(method)
+
       __send__(method, partition_set)
     end
 
     def only_arguments(output_type, partition)
       method = "#{output_type}_only_arguments"
       raise "Unknown output_type: #{output_type}" unless respond_to?(method)
+
       __send__(method, partition)
     end
 
@@ -25,12 +29,31 @@ module XCKnife
     end
 
     # only-testing is available since Xcode 8
-    def xcodebuild_only_arguments(single_partition)
-      single_partition.flat_map do |test_target, classes|
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def xcodebuild_only_arguments(single_partition, meta_partition = nil)
+      only_targets = Set.new
+
+      if meta_partition
+        filtered = meta_partition.flat_map(&:keys)
+                                 .group_by(&:to_s)
+                                 .select { |_, v| v.size == 1 }
+                                 .map(&:first)
+                                 .to_set
+
+        only_targets = single_partition.keys.to_set & filtered
+      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
+      end.sort
+
+      only_target_arguments + only_class_arguments
     end
 
     # skip-testing is available since Xcode 8
@@ -50,4 +73,5 @@ module XCKnife
       partition_set.map { |partition| xctool_only_arguments(partition) }
     end
   end
-end
+  # rubocop:enable Metrics/CyclomaticComplexity
+end

data/xcknife.gemspec

@@ -1,6 +1,8 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'xcknife'
 
 Gem::Specification.new do |s|
@@ -11,22 +13,19 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/square/xcknife'
   s.licenses      = ['Apache-2.0']
 
-  s.summary       = %q{Simple tool for optimizing XCTest runs across machines}
+  s.summary       = 'Simple tool for optimizing XCTest runs across machines'
   s.description   = <<-DESCRIPTION
     Simple tool for optimizing XCTest runs across machines.
     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.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']
+  s.executables = %w[xcknife xcknife-min xcknife-test-dumper]
   s.require_paths = ['lib']
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_development_dependency 'bundler', '~> 1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcknife
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.13.0
 platform: ruby
 authors:
 - Daniel Ribeiro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -37,19 +37,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
-- ".gitmodules"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
+- ".vscode/configure.sh"
+- ".vscode/vscode_ruby.json.template"
 - 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
@@ -75,9 +80,8 @@ files:
 homepage: https://github.com/square/xcknife
 licenses:
 - Apache-2.0
-metadata:
-  allowed_push_host: https://rubygems.org
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,16 +89,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: Simple tool for optimizing XCTest runs across machines
 test_files: []

data/.gitmodules

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

data/.travis.yml

@@ -1,18 +0,0 @@
-language: objective-c
-sudo: false
-matrix:
-  include:
-    - os: osx
-      osx_image: xcode8
-    - os: osx
-      osx_image: xcode8.1
-    - os: osx
-      osx_image: xcode8.2
-
-before_script:
-  - export LANG=en_US.UTF-8
-install: bundle
-script:
-  - csrutil status
-  - git submodule update --init --recursive
-  - bundle exec rake build_test_dumper spec