match 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3cf7e4c9af9050a9b6e8f6a7c5c760bc281c92b
-  data.tar.gz: c76983326e8d722aeff558973124604555adf5e0
+  metadata.gz: ca106e53fcfa3a6afb2796907c6375bbeb4712ea
+  data.tar.gz: b2dfe54acc43db599594d53e142a1a53525f33be
 SHA512:
-  metadata.gz: e4aca4ba5efcd4ab989d0d04969b418632ae2840de179a9ad3469d2f43655809495753a34d8d1aa8202231951790fafbf1da7291093065d03cd1330024ca1292
-  data.tar.gz: 89e4be72b960293545dc25678dc71db2402f4da7c8fb4ec280be44d2bc2574376b861ab43e685e822d30d58bcef8b0afa2921943687c810695a909d55081151d
+  metadata.gz: 4fe6fc7d7b53ca65690898254cefe1c3119ed3525c8a8ec26c01c39595fe601742312dce8a8938f6f0c23da684a1d15078c05d98da75b4801252d31946c85027
+  data.tar.gz: 14552497d001e8d507c5fede87a21afdee863e7afa930429a2c224b0459c7513338f37536594f9c5fff7b603af30bb448b7d41dd4e304fc99034681af61309e8

data/lib/match.rb

@@ -26,7 +26,26 @@ module Match
     return envs
   end
 
+  # @return [Boolean] returns true if the unsupported enterprise mode should be enabled
   def self.enterprise?
     ENV["MATCH_FORCE_ENTERPRISE"]
   end
+
+  # @return [Boolean] returns true if match should interpret the given [certificate|profile] type as an enterprise one
+  def self.type_is_enterprise?(type)
+    Match.enterprise? && type != "development"
+  end
+
+  def self.profile_type_sym(type)
+    return :enterprise if self.type_is_enterprise? type
+    return :adhoc if type == "adhoc"
+    return :appstore if type == "appstore"
+    return :development
+  end
+
+  def self.cert_type_sym(type)
+    return :enterprise if self.type_is_enterprise? type
+    return :development if type == "development"
+    return :distribution
+  end
 end

data/lib/match/generator.rb

@@ -36,7 +36,7 @@ module Match
     def self.generate_provisioning_profile(params: nil, prov_type: nil, certificate_id: nil, app_identifier: nil)
       require 'sigh'
 
-      prov_type = :enterprise if Match.enterprise? && ENV["SIGH_PROFILE_ENTERPRISE"] && !params[:type] == "development"
+      prov_type = Match.profile_type_sym(params[:type])
 
       profile_name = ["match", profile_type_name(prov_type), app_identifier].join(" ")
 

data/lib/match/nuke.rb

@@ -47,7 +47,7 @@ module Match
     # Collect all the certs/profiles
     def prepare_list
       UI.message "Fetching certificates and profiles..."
-      cert_type = type.to_sym
+      cert_type = Match.cert_type_sym(type)
 
       prov_types = [:development]
       prov_types = [:appstore, :adhoc] if cert_type == :distribution

data/lib/match/runner.rb

@@ -1,6 +1,7 @@
 module Match
   class Runner
     attr_accessor :changes_to_commit
+    attr_accessor :spaceship
 
     def run(params)
       FastlaneCore::PrintTable.print_values(config: params,
@@ -10,7 +11,7 @@ module Match
       UI.error("Enterprise profiles are currently not officially supported in _match_, you might run into issues") if Match.enterprise?
 
       params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone], skip_docs: params[:skip_docs], branch: params[:git_branch])
-      spaceship = SpaceshipEnsure.new(params[:username]) unless params[:readonly]
+      self.spaceship = SpaceshipEnsure.new(params[:username]) unless params[:readonly]
 
       if params[:app_identifier].kind_of?(Array)
         app_identifiers = params[:app_identifier]
@@ -31,10 +32,11 @@ module Match
 
       # Provisioning Profiles
       app_identifiers.each do |app_identifier|
-        uuid = fetch_provisioning_profile(params: params,
-                                  certificate_id: cert_id,
-                                  app_identifier: app_identifier)
-        spaceship.profile_exists(username: params[:username], uuid: uuid) if spaceship
+        loop do
+          break if fetch_provisioning_profile(params: params,
+                                      certificate_id: cert_id,
+                                      app_identifier: app_identifier)
+        end
       end
 
       # Done
@@ -60,9 +62,7 @@ module Match
     end
 
     def fetch_certificate(params: nil)
-      cert_type = :distribution
-      cert_type = :development if params[:type] == "development"
-      cert_type = :enterprise if Match.enterprise? && params[:type] == "enterprise"
+      cert_type = Match.cert_type_sym(params[:type])
 
       certs = Dir[File.join(params[:workspace], "certs", cert_type.to_s, "*.cer")]
       keys = Dir[File.join(params[:workspace], "certs", cert_type.to_s, "*.p12")]
@@ -92,10 +92,11 @@ module Match
 
     # @return [String] The UUID of the provisioning profile so we can verify it with the Apple Developer Portal
     def fetch_provisioning_profile(params: nil, certificate_id: nil, app_identifier: nil)
-      prov_type = params[:type].to_sym
+      prov_type = Match.profile_type_sym(params[:type])
 
       profile_name = [Match::Generator.profile_type_name(prov_type), app_identifier].join("_").gsub("*", '\*') # this is important, as it shouldn't be a wildcard
-      profiles = Dir[File.join(params[:workspace], "profiles", prov_type.to_s, "#{profile_name}.mobileprovision")]
+      base_dir = File.join(params[:workspace], "profiles", prov_type.to_s)
+      profiles = Dir[File.join(base_dir, "#{profile_name}.mobileprovision")]
 
       # Install the provisioning profiles
       profile = profiles.last
@@ -105,7 +106,15 @@ module Match
       end
 
       if profile.nil? or params[:force]
-        UI.user_error!("No matching provisioning profiles found and can not create a new one because you enabled `readonly`") if params[:readonly]
+        if params[:readonly]
+          all_profiles = Dir.entries(base_dir).reject { |f| f.start_with? "." }
+          UI.error "No matching provisioning profiles found for '#{profile_name}'"
+          UI.error "A new one cannot be created because you enabled `readonly`"
+          UI.error "Provisioning profiles in your repo for type `#{prov_type}`:"
+          all_profiles.each { |p| UI.error "- '#{p}'" }
+          UI.error "If you are certain that a profile should exist, double-check the recent changes to your match repository"
+          UI.user_error! "No matching provisioning profiles found and can not create a new one because you enabled `readonly`. Check the output above for more information."
+        end
         profile = Generator.generate_provisioning_profile(params: params,
                                                        prov_type: prov_type,
                                                   certificate_id: certificate_id,
@@ -118,6 +127,13 @@ module Match
       parsed = FastlaneCore::ProvisioningProfile.parse(profile)
       uuid = parsed["UUID"]
 
+      if spaceship && !spaceship.profile_exists(username: params[:username], uuid: uuid)
+        # This profile is invalid, let's remove the local file and generate a new one
+        File.delete(profile)
+        self.changes_to_commit = true
+        return nil
+      end
+
       Utils.fill_environment(Utils.environment_variable_name(app_identifier: app_identifier,
                                                                        type: prov_type),
                              uuid)

data/lib/match/spaceship_ensure.rb

@@ -54,13 +54,25 @@ module Match
       found = Spaceship.provisioning_profile.all.find do |profile|
         profile.uuid == uuid
       end
-      return if found
 
-      UI.error("Provisioning profile '#{uuid}' is not available on the Developer Portal")
-      UI.error("for the user #{username}")
-      UI.error("Make sure to use the same user and team every time you run 'match' for this")
-      UI.error("Git repository. This might be caused by deleting the provisioning profile on the Dev Portal")
-      UI.user_error!("To reset the provisioning profiles of your Apple account, you can use the `match nuke` feature, more information on https://github.com/fastlane/fastlane/tree/master/match")
+      unless found
+        UI.error("Provisioning profile '#{uuid}' is not available on the Developer Portal")
+        UI.error("for the user #{username}")
+        UI.error("Make sure to use the same user and team every time you run 'match' for this")
+        UI.error("Git repository. This might be caused by deleting the provisioning profile on the Dev Portal")
+        UI.user_error!("To reset the provisioning profiles of your Apple account, you can use the `match nuke` feature, more information on https://github.com/fastlane/fastlane/tree/master/match")
+      end
+
+      if found.valid?
+        return found
+      else
+        UI.important("'#{found.name}' is available on the Developer Portal, however it's 'Invalid', fixing this now for you 🔨")
+        # it's easier to just create a new one, than to repair an existing profile
+        # it has the same effects anyway, including a new UUID of the provisioning profile
+        found.delete!
+        # return nil to re-download the new profile in runner.rb
+        return nil
+      end
     end
   end
 end

data/lib/match/version.rb

@@ -1,4 +1,4 @@
 module Match
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
   DESCRIPTION = "Easily sync your certificates and profiles across your team using git"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: match
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security