branch_io_cli 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e336c69b9c5ad8f7ab8de92720aa3b1c9cb7d5d207d21d5555dd91c3ca3e32
-  data.tar.gz: 180282031893b9e7b7277ceb3e2bc11143f803879ad094e3d5290e4bfca6df66
+  metadata.gz: 6d66c36f8ea879767e9928b94821ca85203a04db1beda4e23c387194b955e60f
+  data.tar.gz: 0a3d8be8d0787754615ac1c98cb7b07e86261bd46e13e1006a5e6ff5e284bb48
 SHA512:
-  metadata.gz: 3187f68f3c2ed85eb3b57ae2cd21cb58d4f9d57b04062fa157ac8f9fce77724c7b0d37d82733f9d520ba72e34172311825fd2dcc7d24676d23b799c4aa21a214
-  data.tar.gz: db654aa13ac717e8294cbe0a66b6f199490642ec8a47180a8e6bfbf0bc8f9acc2ef113a791b2cf8986c63c602ac16861c2ec0da8df997a1d971fdb578fd2c373
+  metadata.gz: e9720d76203af10eeb5ce6abab6760c8e73235309dea04f66fa276e07f33b8d957b14827f3f3470e579aad8efa934e0ce65b82ef783e49619b07b394d4d48631
+  data.tar.gz: cbbc107c96b63ee5ffe3ee7256dca279c53ed8aca4ac60cdb8b932f62ce8d82bb7cc6797e8d450fac91d878c1589820c69485a073442a255eb232fab358d4fd5

data/lib/branch_io_cli/command/setup_command.rb

@@ -21,7 +21,7 @@ module BranchIOCLI
           return 1 unless valid || config.force
         end
 
-        # Make sure we can resolve all build settings in a project using
+        # Make sure we can resolve all build settings in a project that uses
         # CocoaPods.
         if config.podfile_path && File.exist?(config.podfile_path) && config.pod_install_required?
           tool_helper.verify_cocoapods
@@ -50,37 +50,28 @@ module BranchIOCLI
       end
 
       def validate_universal_links
-        say "Validating new Universal Link configuration before making any changes.\n\n"
-        valid = helper.validate_team_and_bundle_ids_from_aasa_files @domains
-        if valid
-          say "Universal Link configuration passed validation. ✅\n\n"
-        else
-          say "Universal Link configuration failed validation.\n\n"
-          helper.errors.each { |error| say " #{error}" }
-        end
-        valid
-      end
+        say "Validating new Universal Link configuration before making any changes."
+        valid = true
+        config.xcodeproj.build_configurations.each do |c|
+          message = "Validating #{c.name} configuration"
+          say "\n<%= color('#{message}', [BOLD, CYAN]) %>\n\n"
 
-      def update_project_settings
-        say "Updating project settings.\n\n"
-        helper.add_custom_build_setting if config.setting
-        helper.add_keys_to_info_plist @keys
-        config.target.add_system_frameworks config.frameworks unless config.frameworks.blank?
+          configuration_valid = helper.validate_team_and_bundle_ids_from_aasa_files @domains, false, c.name
 
-        return unless config.target.symbol_type == :application
+          if configuration_valid
+            say "Universal Link configuration passed validation for #{c.name} configuration. ✅\n\n"
+          else
+            say "Universal Link configuration failed validation for #{c.name} configuration.\n\n"
+            helper.errors.each { |error| say " #{error}" }
+          end
 
-        helper.add_branch_universal_link_domains_to_info_plist @domains
-        helper.ensure_uri_scheme_in_info_plist
-        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
+          valid &&= configuration_valid
         end
-      ensure
-        config.xcodeproj.save
+        valid
       end
 
       def add_sdk
-        say "Making sure Branch dependency is available."
+        say "\nMaking sure Branch dependency is available.\n\n"
         case config.sdk_integration_mode
         when :cocoapods
           if File.exist? config.podfile_path
@@ -97,7 +88,24 @@ module BranchIOCLI
         when :direct
           tool_helper.add_direct config
         end
-        say "\n"
+      end
+
+      def update_project_settings
+        say "Updating project settings.\n\n"
+        helper.add_custom_build_setting if config.setting
+        helper.add_keys_to_info_plist @keys
+        config.target.add_system_frameworks config.frameworks unless config.frameworks.blank?
+
+        return unless config.target.symbol_type == :application
+
+        helper.add_branch_universal_link_domains_to_info_plist @domains
+        helper.ensure_uri_scheme_in_info_plist
+        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
+      ensure
+        config.xcodeproj.save
       end
 
       def commit_changes

data/lib/branch_io_cli/configuration/configuration.rb

@@ -53,6 +53,18 @@ module BranchIOCLI
           return nil unless current
           current.root
         end
+
+        # Removes any trailing :/* from the argument and returns a copy.
+        # Matches:
+        #  myscheme
+        #  myscheme:
+        #  myscheme://
+        #  myscheme:///
+        #  etc.
+        def uri_scheme_without_suffix(scheme)
+          return nil if scheme.blank?
+          scheme.sub %r{:/*$}, ""
+        end
       end
 
       attr_reader :options

data/lib/branch_io_cli/configuration/setup_configuration.rb

@@ -175,7 +175,13 @@ module BranchIOCLI
 
       def validate_uri_scheme(options)
         # No validation at the moment. Just strips off any trailing ://
-        @uri_scheme = uri_scheme_without_suffix options.uri_scheme
+        uri_scheme = options.uri_scheme
+
+        if confirm
+          uri_scheme ||= ask "Please enter any URI scheme you entered in the Branch Dashboard (optional). "
+        end
+
+        @uri_scheme = self.class.uri_scheme_without_suffix uri_scheme
       end
 
       def app_link_roots_from_domains(domains)
@@ -225,12 +231,6 @@ module BranchIOCLI
         custom_domains + app_link_subdomains
       end
 
-      # Removes any trailing :// from the argument and returns a copy
-      def uri_scheme_without_suffix(scheme)
-        return nil if scheme.nil?
-        scheme.sub %r{://$}, ""
-      end
-
       def prompt_for_podfile_or_cartfile
         loop do
           path = ask("Please enter the location of your Podfile or Cartfile: ").trim

data/lib/branch_io_cli/configuration/setup_options.rb

@@ -40,7 +40,8 @@ module BranchIOCLI
               example: "myurischeme[://]",
               type: String,
               aliases: "-U",
-              label: "URI scheme"
+              label: "URI scheme",
+              convert_proc: ->(value) { Configuration.uri_scheme_without_suffix(value) }
             ),
             Option.new(
               name: :setting,
@@ -57,7 +58,7 @@ module BranchIOCLI
               example: "config1,config2",
               type: Array,
               negatable: true,
-              valid_values_proc: -> { Configuration.current.xcodeproj.build_configurations.map(&:name) }
+              valid_values_proc: -> { Configuration.current && Configuration.current.xcodeproj.build_configurations.map(&:name) }
             ),
             Option.new(
               name: :xcodeproj,
@@ -73,7 +74,7 @@ module BranchIOCLI
               example: "MyAppTarget",
               type: String,
               confirm_symbol: :target_name,
-              valid_values_proc: -> { Configuration.current.xcodeproj.targets.map(&:name) }
+              valid_values_proc: -> { Configuration.current && Configuration.current.xcodeproj.targets.map(&:name) }
             ),
             Option.new(
               name: :podfile,

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -177,9 +177,13 @@ module BranchIOCLI
       end
 
       def team_and_bundle_from_app_id(identifier)
-        team = identifier.sub(/\..+$/, "")
-        bundle = identifier.sub(/^[^.]+\./, "")
-        [team, bundle]
+        matches = /^(.*?)\.(.*)$/.match identifier
+        matches[1, 2]
+      end
+
+      def reportable_app_id(identifier)
+        team, bundle = team_and_bundle_from_app_id identifier
+        "Signing team: #{team.inspect}, Bundle identifier: #{bundle.inspect}"
       end
 
       def update_team_and_bundle_ids_from_aasa_file(domain)
@@ -317,12 +321,27 @@ module BranchIOCLI
         match_found = identifiers.include? app_id
 
         unless match_found
-          @errors << "[#{domain}] appID mismatch. Project: #{app_id}. AASA: #{identifiers}"
+          report_app_id_mismatch domain, app_id, identifiers
         end
 
         match_found
       end
 
+      def report_app_id_mismatch(domain, app_id, identifiers)
+        error_string = "[#{domain}] appID mismatch. Project #{reportable_app_id app_id}\n"
+        if identifiers.count <= 20
+          error_string << " Apps from AASA:\n"
+          identifiers.each do |identifier|
+            reportable = reportable_app_id identifier
+            error_string << "  #{reportable}\n"
+          end
+        else
+          error_string << " Please check your settings in the Branch Dashboard (https://dashboard.branch.io)"
+        end
+
+        @errors << error_string
+      end
+
       def validate_project_domains(expected, configuration = RELEASE_CONFIGURATION)
         @errors = []
         project_domains = domains_from_project configuration

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.12.5"
+  VERSION = "0.12.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList