xcknife 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7dcc40d67413a5b35f7eba1289d75724965a63
-  data.tar.gz: 7ea917dd613f5fcdd8e6a41471538c01bf9df4d2
+  metadata.gz: 61ae96758615ce1185744290070e987ded9759c5
+  data.tar.gz: 925f308dac333b4275ac2768d2a142aac3746912
 SHA512:
-  metadata.gz: b786211a86a81b9483a8721de939de4bcb7eba683698e334d6f299e706153ee607a3b8de6621599465cecbf236b42805618f2e71812a664c9c9cf8abd20c8ae3
-  data.tar.gz: 1295e3a8a1e7040d0acadf14d42e2c36838f9fdde95c8d57c83b4bcaa4986165b689239a27cdecbdb512233110b3d54c40d1175c649f7c8b7c267642495c47bf
+  metadata.gz: b7258f576308b34b5c69b16219941b889ea78e9e2ec0c072a52f3374e171ae157562e854a44ed650236716b293f536637900dfe569bf10df45b1105b5315dd09
+  data.tar.gz: e014902ceec3b6aa54f75668839c7dc51efa920940206b4321e975bda55a82f504b94d57a83dc6b590e69b6e1fb10d3a71f46d3af22cd86d6e47c3521de79277

data/README.md

@@ -20,9 +20,10 @@ More information on XCKnife, go [here](https://corner.squareup.com/2016/06/xckni
 ```
 $ xcknife --help
 Usage: xcknife [options] worker-count historical-timings-json-stream-file [current-tests-json-stream-file]
-    -p, --partition TARGETS          Comma separated list of targets. Can be used multiple times
+    -p, --partition TARGETS          Comma separated list of targets. Can be used multiple times.
     -o, --output FILENAME            Output file. Defaults to STDOUT
     -a, --abbrev                     Results are abbreviated
+    -x, --xcodebuild-output          Output is formatted for xcodebuild
     -h, --help                       Show this message
 ```
 
@@ -68,7 +69,7 @@ This will balance the tests onthe `iPhoneTestTarget` into 3 machines. The output
         }]}]}
 ```
 
-This provides a lot of data about the partitions and their imabalances (both internal to the partition sets, and amongst them).
+This provides a lot of data about the partitions and their imbalances (both internal to the partition sets, and amongst them).
 
 If you only want the *-only* arguments, run with the `-a` flag:
 

data/example/run_example.rb

@@ -26,6 +26,7 @@ def run(historical_file, current_file)
     partition_set.each do |partition|
       puts "target name for worker #{shard_number} = #{target_name}"
       puts "only is: #{xctool_only_arguments(partition).inspect}"
+      puts "skip-only is: #{xcodebuild_skip_arguments(partition, result.test_time_for_partitions).inspect}"
       shard_number += 1
     end
   end

data/lib/xcknife.rb

@@ -7,5 +7,5 @@ require 'xcknife/exceptions'
 require 'xcknife/xcscheme_analyzer'
 
 module XCKnife
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/lib/xcknife/stream_parser.rb

@@ -24,17 +24,18 @@ module XCKnife
 
     class PartitionResult
       TimeImbalances = Struct.new :partition_set, :partitions
-      attr_reader :stats, :test_maps, :test_times, :total_test_time, :test_time_imbalances
+      attr_reader :stats, :test_maps, :test_times, :total_test_time, :test_time_imbalances, :test_time_for_partitions
       extend Forwardable
       delegate ResultStats.members => :@stats
 
-      def initialize(stats, partition_sets)
+      def initialize(stats, partition_sets, test_time_for_partitions)
         @stats = stats
         @partition_sets = partition_sets
         @test_maps = partition_sets_map(&:test_time_map)
         @test_times = partition_sets_map(&:total_time)
         @total_test_time = test_times.flatten.inject(:+)
         @test_time_imbalances = compute_test_time_imbalances
+        @test_time_for_partitions = test_time_for_partitions.inject(&:merge)
       end
 
       private
@@ -75,7 +76,7 @@ module XCKnife
     def compute_shards_for_partitions(test_time_for_partitions)
       PartitionResult.new(@stats, split_machines_proportionally(test_time_for_partitions).map do |partition|
         compute_single_shards(partition.number_of_shards, partition.test_time_map)
-      end)
+      end, test_time_for_partitions)
     end
 
     def test_time_for_partitions(historical_events, current_events = nil)
@@ -125,7 +126,7 @@ module XCKnife
       partition_with_machines_list
     end
 
-    # Computes  a 2-aproximation to the optimal partition_time, which is an instance of the Open shop scheduling problem (which is NP-hard)
+    # Computes a 2-aproximation to the optimal partition_time, which is an instance of the Open shop scheduling problem (which is NP-hard)
     # see: https://en.wikipedia.org/wiki/Open-shop_scheduling
     def compute_single_shards(number_of_shards, test_time_map)
       raise XCKnife::XCKnifeError, "There are not enough workers provided" if number_of_shards <= 0

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)
@@ -29,8 +30,20 @@ module XCKnife
         classes.sort.map do |clazz|
           "-only-testing:#{test_target}/#{clazz}"
         end
+      end
+    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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcknife
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Daniel Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler