refinement 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b9ddd9af028db3ae8fa7d0303b0599bfea02b3f72827153fce14f32234b03a
-  data.tar.gz: 89d35046cbad3a50e5fff65dbbeca5b18005d2d85ee267e5014b8b32a5bf0b2b
+  metadata.gz: a99bcf514ec4c492f440d7da3f88fa0fa985965ba26ba5a1d402f24c00a7bee9
+  data.tar.gz: 65bc69b43d47cf902c76e7271f77a611c29d7dab4e40d2bd09763d846a1dddcb
 SHA512:
-  metadata.gz: 183ec917449425251c0fb7d9e1b695de35ec73e67b7f7a67de0931959650ae04c4855e5d310f8699f69fadab6a83e7e18877c8822199242f6ca4681bf7b113aa
-  data.tar.gz: 7487a0a6bbb3367daf5ebd5df76eb67722718d609fc340b4e618bc59cacc8d502a5fbbcc65fa3e97d6ee7ed65b0fd9edadd5fcd139d7a318ead010803d18443f
+  metadata.gz: 59564e789d67708dcb2ad0a565f434f170d9343234a448106292be5eb1666c5b0b9cd41ec7a6ab359989fb2b1baef0c7977bcc799bb5d0f4ac537a650fc7aa98
+  data.tar.gz: 8f464e9634f5ab6227d1165c8e7c3653bbe949437065b17c2b9c2beb3af1ac6827a78ec95d1699cf82d183b90f1d83b6fe87bb3006580938d65f4c075d1ba37e

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Refinement Changes
 
-## 0.1.2 (2019-03-20)
+## 0.2.0 (2019-03-21)
+
+##### Enhancements
+
+* Allow filtering schemes for either `:building` or `:testing`,
+  since tests can expand their arguments and environment variables based upon
+  a build target, and removing the build target could thus break macro expansion
+  without any benefit when `xcodebuild build-for-testing / test` is being run,
+  since when building for testing or testing, having build entries is not harmful.  
+
+
+## 0.1.3 (2019-03-20)
 
 ##### Bug Fixes
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/refinement/analyzer.rb

@@ -50,10 +50,31 @@ module Refinement
     #   Defaults to `false`
     # @param log_changes [Boolean] whether modifications to the scheme are logged.
     #   Defaults to `false`
+    # @param filter_scheme_for_build_action [:building, :testing]
+    #   The xcodebuild action the scheme is being filtered for. The currently supported values are
+    #   `:building` and `:testing`, with the only difference being `BuildActionEntry` are not
+    #   filtered out when building for testing, since test action macro expansion could
+    #   depend on a build entry being present.
     # @return [Xcodeproj::XCScheme] a scheme whose unchanged targets have been removed
-    def filtered_scheme(scheme_path:, change_level: :full_transitive, filter_when_scheme_has_changed: false, log_changes: false)
+    def filtered_scheme(scheme_path:, change_level: :full_transitive, filter_when_scheme_has_changed: false, log_changes: false,
+                        filter_scheme_for_build_action:)
       scheme = Xcodeproj::XCScheme.new(scheme_path)
 
+      sections_to_filter =
+        case filter_scheme_for_build_action
+        when :building
+          %w[BuildActionEntry TestableReference]
+        when :testing
+          # don't want to filter out build action entries running
+          # xcodebuild build-for-testing / test, since the test action could have a macro expansion
+          # that depends upon one of the build targets.
+          %w[TestableReference]
+        else
+          raise ArgumentError,
+                'The supported values for the `filter_scheme_for_build_action` parameter are: [:building, :testing]. ' \
+                "Given: #{filter_scheme_for_build_action.inspect}."
+        end
+
       if filter_when_scheme_has_changed ||
          !UsedPath.new(path: Pathname(scheme_path), inclusion_reason: 'scheme').find_in_changeset(changeset)
 
@@ -62,10 +83,7 @@ module Refinement
 
         doc = scheme.doc
 
-        xpaths = %w[
-          //*/TestableReference/BuildableReference
-          //*/BuildActionEntry/BuildableReference
-        ]
+        xpaths = sections_to_filter.map { |section| "//*/#{section}/BuildableReference" }
         xpaths.each do |xpath|
           doc.get_elements(xpath).to_a.each do |buildable_reference|
             suite_name = buildable_reference.attributes['BlueprintName']

data/lib/refinement/cli.rb

@@ -18,7 +18,9 @@ module Refinement
         ['--[no-]print-changes', 'Print the change reason for changed targets'],
         ['--[no-]print-scheme-changes', 'Print the change reason for targets in the given scheme'],
         ['--change-level=LEVEL', 'Change level at which a target must have changed in order to be considered changed. ' \
-                                 'One of `full-transitive`, `itself`, or an integer']
+                                 'One of `full-transitive`, `itself`, or an integer'],
+        ['--filter-scheme-for-build-action=BUILD_ACTION', 'The xcodebuild action the scheme (if given) is filtered for. ' \
+                                                          'One of `building` or `testing`.']
       ]
     end
 
@@ -30,6 +32,7 @@ module Refinement
       @print_changes = argv.flag?('print-changes', false)
       @print_scheme_changes = argv.flag?('print-scheme-changes', false)
       @change_level = argv.option('change-level', 'full-transitive')
+      @filter_scheme_for_build_action = argv.option('filter-scheme-for-build-action', 'testing').to_sym
 
       super
     end
@@ -45,7 +48,7 @@ module Refinement
       puts analyzer.format_changes if @print_changes
 
       return unless @scheme
-      analyzer.filtered_scheme(scheme_path: @scheme, log_changes: @print_scheme_changes)
+      analyzer.filtered_scheme(scheme_path: @scheme, log_changes: @print_scheme_changes, filter_scheme_for_build_action: @filter_scheme_for_build_action)
               .save_as(@scheme.gsub(%r{\.(xcodeproj|xcworkspace)/.+}, '.\1'), File.basename(@scheme, '.xcscheme'), true)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refinement
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj