branch_io_cli 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1614c75a346bfa728be2437d7e729a54c381199c1786699210defc36a33e390
-  data.tar.gz: '0334849b987d626b6e606972c552a1ae2e737aad2746b96519da1402a8a48c85'
+  metadata.gz: 1fdec6cc2dfb747d21b5289bb907cdc3a0726d9b09cc489e7fa1d345da843745
+  data.tar.gz: af5b660dceb286f2f0d2b923944cfd447812d2be25243dfeef4beabbabf68a4c
 SHA512:
-  metadata.gz: d6ddacc36d94b84d8fa6f90b7a80c1964915e9a3b174d2d0928b53be0112cc31de7758a0f441e7c89adb1d0ce3baea2cb74ed5d7b4220dc770b43664ccfb512f
-  data.tar.gz: 29f548ba0c9c57583682f80c0f633cd8ef837f342342ba32ba8472a6f55554efe7a92b38e98ab5902c08c5bc39097251436fade3e53e542af8d0a41c52cc6603
+  metadata.gz: c134396f2768b91d8a157967f524136cd10a4d3b4b8358ce15830a6c99250af358fdb606c7192092dda158bed11d69ca94d9a9dcd30b78985e325ee9155514ba
+  data.tar.gz: 734523ffb51d4615e456056b81f8ecdff2c73278970f1114487a7b9765ba32a94348d1921d6c2148374d94796f411f98800a599ebd1f7b95efa346000fd4d9da

data/README.md

@@ -208,11 +208,17 @@ Only app targets are supported for this command. By default, it will validate th
 If your project has multiple app targets, specify the `--target` option to validate other
 targets.
 
-All parameters are optional. If `--domains` is specified, the list of Universal Link domains in
-the Associated Domains entitlement must exactly match this list, without regard to order. If
-no `--domains` are provided, validation passes if at least one Universal Link domain is
-configured and passes validation, and no Universal Link domain is present that does not pass
-validation.
+By default, all build configurations in the project are validated. To validate a different list
+of configurations, including a single configuration, specify the `--configurations` option.
+
+If `--domains` is specified, the list of Universal Link domains in the Associated
+Domains entitlement must exactly match this list, without regard to order, for all
+configurations under validation. If no `--domains` are provided, validation passes
+if at least one Universal Link domain is configured for each configuration and passes
+validation, and no Universal Link domain is present in anyconfiguration that does not
+pass validation.
+
+All parameters are optional.
 
 See https://github.com/BranchMetrics/branch_io_cli#validate-command for more information.
 
@@ -227,6 +233,7 @@ See https://github.com/BranchMetrics/branch_io_cli#validate-command for more inf
 |-D, --domains example.com,www.example.com|Comma-separated list of domains to validate (Branch domains or non-Branch domains) (default: [])|BRANCH_DOMAINS|
 |--xcodeproj MyProject.xcodeproj|Path to an Xcode project to update|BRANCH_XCODEPROJ|
 |--target MyAppTarget|Name of a target to validate in the Xcode project|BRANCH_TARGET|
+|--configurations Debug,Release|Comma-separated list of configurations to validate (default: all)|BRANCH_CONFIGURATIONS|
 
 
 
@@ -238,11 +245,12 @@ See https://github.com/BranchMetrics/branch_io_cli#validate-command for more inf
 branch_io report [OPTIONS]
 ```
 
-_Work in progress_
-
 This command optionally cleans and then builds a workspace or project, generating a verbose
 report with additional diagnostic information suitable for opening a support ticket.
 
+Use the `--header-only` option to output only a brief diagnostic report without
+building.
+
 
 #### Options
 

data/lib/assets/completions/completion.bash

@@ -17,7 +17,7 @@ _branch_io_complete()
 
     report_opts="--workspace --xcodeproj --scheme --target --configuration --sdk --podfile --cartfile --no-clean -H --header-only --no-pod-repo-update -o --out"
 
-    validate_opts="-D --domains --xcodeproj --target"
+    validate_opts="-D --domains --xcodeproj --target --configurations"
 
 
     if [[ ${cur} == -* ]] ; then

data/lib/assets/templates/report_description.erb

@@ -1,4 +1,5 @@
-<%= italics 'Work in progress' %>
-
 This command optionally cleans and then builds a workspace or project, generating a verbose
 report with additional diagnostic information suitable for opening a support ticket.
+
+Use the <%= option :header_only %> option to output only a brief diagnostic report without
+building.

data/lib/assets/templates/validate_description.erb

@@ -9,10 +9,16 @@ Only app targets are supported for this command. By default, it will validate th
 If your project has multiple app targets, specify the <%= option :target %> option to validate other
 targets.
 
-All parameters are optional. If <%= option :domains %> is specified, the list of Universal Link domains in
-the Associated Domains entitlement must exactly match this list, without regard to order. If
-no <%= option :domains %> are provided, validation passes if at least one Universal Link domain is
-configured and passes validation, and no Universal Link domain is present that does not pass
-validation.
+By default, all build configurations in the project are validated. To validate a different list
+of configurations, including a single configuration, specify the <%= option :configurations %> option.
+
+If <%= option :domains %> is specified, the list of Universal Link domains in the Associated
+Domains entitlement must exactly match this list, without regard to order, for all
+configurations under validation. If no <%= option :domains %> are provided, validation passes
+if at least one Universal Link domain is configured for each configuration and passes
+validation, and no Universal Link domain is present in anyconfiguration that does not
+pass validation.
+
+All parameters are optional.
 
 See https://github.com/BranchMetrics/branch_io_cli#validate-command for more information.

data/lib/branch_io_cli/command/setup_command.rb

@@ -45,8 +45,12 @@ module BranchIOCLI
         helper.add_branch_universal_link_domains_to_info_plist @domains if is_app_target
         helper.ensure_uri_scheme_in_info_plist if is_app_target # does nothing if already present
 
-        new_path = helper.add_universal_links_to_project @domains, false if is_app_target
-        sh ["git", "add", new_path] if config.commit && new_path
+        if is_app_target
+          config.xcodeproj.build_configurations.each do |c|
+            new_path = helper.add_universal_links_to_project @domains, false, c.name
+            sh ["git", "add", new_path] if config.commit && new_path
+          end
+        end
 
         config_helper.target.add_system_frameworks config.frameworks unless config.frameworks.nil? || config.frameworks.empty?
 

data/lib/branch_io_cli/command/validate_command.rb

@@ -4,28 +4,39 @@ module BranchIOCLI
       def run!
         valid = true
 
-        unless config.domains.nil? || config.domains.empty?
-          domains_valid = helper.validate_project_domains(config.domains)
+        configurations = config.configurations || config.xcodeproj.build_configurations.map(&:name)
 
-          if domains_valid
-            say "Project domains match :domains parameter: ✅"
-          else
-            say "Project domains do not match specified :domains"
-            helper.errors.each { |error| say " #{error}" }
+        configurations.each do |configuration|
+          message = "Validating #{configuration} configuration"
+          say "\n<%= color('#{message}', [BOLD, CYAN]) %>\n\n"
+
+          config_valid = true
+
+          unless config.domains.blank?
+            domains_valid = helper.validate_project_domains(config.domains, configuration)
+
+            if domains_valid
+              say "Project domains match :domains parameter: ✅"
+            else
+              say "Project domains do not match specified :domains"
+              helper.errors.each { |error| say "  #{error}" }
+            end
+
+            config_valid &&= domains_valid
           end
 
-          valid &&= domains_valid
-        end
+          entitlements_valid = helper.validate_team_and_bundle_ids_from_aasa_files [], false, configuration
+          unless entitlements_valid
+            say "Universal Link configuration failed validation for #{configuration} configuration."
+            helper.errors.each { |error| say " #{error}" }
+          end
 
-        configuration_valid = helper.validate_team_and_bundle_ids_from_aasa_files
-        unless configuration_valid
-          say "Universal Link configuration failed validation."
-          helper.errors.each { |error| say " #{error}" }
-        end
+          config_valid &&= entitlements_valid
 
-        valid &&= configuration_valid
+          say "Universal Link configuration passed validation for #{configuration} configuration. ✅" if config_valid
 
-        say "Universal Link configuration passed validation. ✅" if valid
+          valid &&= config_valid
+        end
 
         valid ? 0 : 1
       end

data/lib/branch_io_cli/configuration/validate_configuration.rb

@@ -31,6 +31,12 @@ module BranchIOCLI
               description: "Name of a target to validate in the Xcode project",
               type: String,
               example: "MyAppTarget"
+            ),
+            Option.new(
+              name: :configurations,
+              description: "Comma-separated list of configurations to validate (default: all)",
+              type: Array,
+              example: "Debug,Release"
             )
           ]
         end
@@ -52,6 +58,7 @@ module BranchIOCLI
 <%= color('Xcode project:', BOLD) %> #{xcodeproj_path}
 <%= color('Target:', BOLD) %> #{target.name}
 <%= color('Domains:', BOLD) %> #{domains || '(none)'}
+<%= color('Configurations:', BOLD) %> #{(configurations || xcodeproj.build_configurations.map(&:name)).join(',')}
 EOF
       end
     end

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -392,7 +392,10 @@ module BranchIOCLI
         entitlements = File.open(entitlements_path) { |f| Plist.parse_xml f }
         raise "Failed to parse entitlements file #{entitlements_path}" if entitlements.nil?
 
-        entitlements[ASSOCIATED_DOMAINS].select { |d| d =~ /^applinks:/ }.map { |d| d.sub(/^applinks:/, "") }
+        associated_domains = entitlements[ASSOCIATED_DOMAINS]
+        return [] if associated_domains.nil?
+
+        associated_domains.select { |d| d =~ /^applinks:/ }.map { |d| d.sub(/^applinks:/, "") }
       end
 
       def add_cocoapods(options)

data/lib/branch_io_cli/helper/patch_helper.rb

@@ -7,7 +7,8 @@ module BranchIOCLI
       extend PatternPatch::Methods
 
       # Set the patch_dir for PatternPatch
-      @patch_dir = File.expand_path(File.join('..', '..', '..', 'assets', 'patches'), __FILE__)
+      self.patch_dir = File.expand_path(File.join('..', '..', '..', 'assets', 'patches'), __FILE__)
+      self.trim_mode = "<>"
 
       class << self
         def config

data/lib/branch_io_cli/helper/report_helper.rb

@@ -61,7 +61,6 @@ module BranchIOCLI
 
           bundle_identifier = config.target.expanded_build_setting "PRODUCT_BUNDLE_IDENTIFIER", configuration
           dev_team = config.target.expanded_build_setting "DEVELOPMENT_TEAM", configuration
-          entitlements_path = config.target.expanded_build_setting "CODE_SIGN_ENTITLEMENTS", configuration
 
           header += "\nTarget #{config.target.name}:\n"
           header += " Bundle identifier: #{bundle_identifier || '(none)'}\n"
@@ -76,7 +75,10 @@ module BranchIOCLI
             header += "  #{c}: #{config.target.expanded_build_setting 'INFOPLIST_FILE', c}\n"
           end
 
-          header += " Entitlements file: #{config.relative_path(entitlements_path) || '(none)'}\n"
+          header += " Entitlements file\n"
+          configurations.each do |c|
+            header += "  #{c}: #{config.target.expanded_build_setting 'CODE_SIGN_ENTITLEMENTS', c}\n"
+          end
 
           if config.podfile_path
             begin
@@ -196,12 +198,13 @@ module BranchIOCLI
 
           unless config.target.extension_target_type?
             begin
-              # This isn't likely to vary by configuration, so just report for one, either
-              # whatever was passed or Release.
-              domains = helper.domains_from_project config.configuration || config.configurations_from_scheme.first
-              report += " Universal Link domains (entitlements):\n"
-              domains.each do |domain|
-                report += "  #{domain}\n"
+              configurations = config.configuration ? [config.configuration] : config.configurations_from_scheme
+              configurations.each do |configuration|
+                domains = helper.domains_from_project configuration
+                report += " Universal Link domains (entitlements:#{configuration}):\n"
+                domains.each do |domain|
+                  report += "  #{domain}\n"
+                end
               end
             rescue StandardError => e
               report += " (Failed to get Universal Link domains from entitlements file: #{e.message})\n"

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Branch
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement