mmine 0.6.10 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 2773b87d18c96214b3cdeb05f4c2c559b2da8c57b263a4bde62cd8008a9fd8ab
-  data.tar.gz: c6eef31a78233af85b15ac23d59adef4bbe323929dccdabad1f269f224b34c04
+SHA1:
+  metadata.gz: '067639c9e8125d67e9385f760218f5157bc00692'
+  data.tar.gz: 75b4b96d6e3e5903ddc1fec0ab31868aa4e05598
 SHA512:
-  metadata.gz: f21992cc1dac96ad18a9445bcf8ddc26569d37dd367340cbb9e838c01e1c590489dc411428dc927e1fd4ee2b463cfcb10fa5c38a74f44a64ef225bd13c9065db
-  data.tar.gz: 2c8affa1549caa7f342d0428028840b64849899ccaa96a1e6e890166a192fde2d132bb1d49094eed2203bc5f0c9d831c5ccd34fc17bbae2b0dd1230c6b830e1f
+  metadata.gz: 368bc89e02e79061374c25d3fdc031446607073e8b89e061de852181ed435fa9aa3b38ec83cf6ef8b2459fee95a849a0c064a09ee21e08c22369719a3b38b74c
+  data.tar.gz: 2a6e089e40329a2f76781935a8c785682a1b1217967895850197228d2b39a5ef176e20bb6289f8ea36c4def5ef4bedf37c9d25a83406a01f2ab488eadbbedcb0

data/lib/mmine/notification_extension_integrator.rb

@@ -24,6 +24,7 @@ class NotificationExtensionIntegrator
 		
 		@project_dir = Pathname.new(@project_file_path).parent.to_s
 		@project = Xcodeproj::Project.open(@project_file_path)
+		@project_name = @project.root_object.name
 		@ne_target_name = 'MobileMessagingNotificationExtension'
 		@framework_file_name = "MobileMessaging.framework"
 		@extension_source_name_filepath = File.join(Mmine.root, 'resources','NotificationService.swift')
@@ -59,12 +60,13 @@ class NotificationExtensionIntegrator
 		setupDeploymentTarget()
 		setupNotificationExtensionInfoPlist()
 		setupNotificationExtensionBundleId()
-		setupNotificationExtensionEntitlements()
-		setupMainTargetEntitlements()
-		setupAppGroupPlistValue()
+		setupCommonEntitlementsFiles()
+		setupUserAppGroupValue()
 		setupBackgroundModesPlistValue()
-		setupExtensionTargetCapabilities()
-		setupMainTargetCapabilities()
+	
+		setupTargetCapabilities(@ne_target.uuid)
+		setupTargetCapabilities(@main_target.uuid)
+
 		setupEmbedExtensionAction()
 		setupMainTargetDependency()
 		setupSwiftVersion()
@@ -169,26 +171,39 @@ class NotificationExtensionIntegrator
 		end		
 	end
 
-	def setupMainTargetEntitlements
-		@logger.info("Setting up main target entitlements...")
-		setupEntitlements(@main_target_build_settings_debug, @main_target_build_settings_release, @main_target_name)
+	def setupCommonEntitlementsFiles
+		entitlements_debug_filepath = resolveAbsolutePath("$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-Debug.plist") #todo
+		entitlements_release_filepath = resolveAbsolutePath("$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-Release.plist") #todo
 
-		entitlements_path_debug = @main_target_build_settings_debug['CODE_SIGN_ENTITLEMENTS']
-		entitlements_path_release = @main_target_build_settings_release['CODE_SIGN_ENTITLEMENTS']
-		if entitlements_path_debug = entitlements_path_release
-			putStringValueIntoXML("aps-environment", "development", entitlements_path_debug)
+		key = 'CODE_SIGN_ENTITLEMENTS'
+		
+		if entitlements_debug_filepath == entitlements_release_filepath
+			@logger.info("\tEntitlements settings are equal for debug and release schemes.")
+			
+			putKeyArrayElement("com.apple.security.application-groups", @app_group, entitlements_debug_filepath)
+			putStringValueIntoXML("aps-environment", "development", entitlements_debug_filepath)
 		else
-			putStringValueIntoXML("aps-environment", "development", entitlements_path_debug)
-			putStringValueIntoXML("aps-environment", "production", entitlements_path_release)	
-		end
-	end
+			if entitlements_debug_filepath != nil
+				@logger.info("\tEntitlements debug settings already set, updating settings...")
+				putKeyArrayElement("com.apple.security.application-groups", @app_group, entitlements_debug_filepath)
+				putStringValueIntoXML("aps-environment", "development", entitlements_debug_filepath)
+			else
+				@logger.error("\tEntitlements debug settings are not set")
+				# stop here
+			end
 
-	def setupNotificationExtensionEntitlements
-		@logger.info("Setting up extension entitlements...")
-		setupEntitlements(@extension_build_settings_debug, @extension_build_settings_release, @ne_target_name)
+			if entitlements_release_filepath != nil
+				@logger.info("\tEntitlements release settings already set, updating settings...")
+				putKeyArrayElement("com.apple.security.application-groups", @app_group, entitlements_release_filepath)
+				putStringValueIntoXML("aps-environment", "production", entitlements_release_filepath)
+			else
+				@logger.error("\tEntitlements debug settings are not set")
+				# stop here
+			end
+		end
 	end
 
-	def setupAppGroupPlistValue
+	def setupUserAppGroupValue
 		putStringValueIntoXML("com.mobilemessaging.app_group", @app_group, @main_target_debug_plist)
 		putStringValueIntoXML("com.mobilemessaging.app_group", @app_group, @main_target_release_plist)
 	end
@@ -278,75 +293,11 @@ class NotificationExtensionIntegrator
 		removeEmbedFrameworkPhase()
 	end
 
-	def setupEntitlements(_build_settings_debug, _build_settings_release, target_name)
-		entitlements_debug_filepath = _build_settings_debug['CODE_SIGN_ENTITLEMENTS'] != nil ? resolveAbsolutePath(_build_settings_debug['CODE_SIGN_ENTITLEMENTS']) : nil
-		entitlements_release_filepath = _build_settings_release['CODE_SIGN_ENTITLEMENTS'] != nil ? resolveAbsolutePath(_build_settings_release['CODE_SIGN_ENTITLEMENTS']) : nil
-		key = 'CODE_SIGN_ENTITLEMENTS'
-		if entitlements_debug_filepath == nil and entitlements_release_filepath == nil
-			@logger.info("\tEntitlements are not set for both release and debug schemes, setting up...")
-			entitlements_destination_filepath = createAppGroupEntitlements("#{target_name}.entitlements")
-			entitlements_destination_filepath = resolveXcodePath(entitlements_destination_filepath)
-
-			@logger.info("\tSetting build settings:\n\t\tdebug:  \t#{key}\t#{entitlements_destination_filepath}\n\t\trelease:\t#{key}\t#{entitlements_destination_filepath}")
-
-			_build_settings_debug[key] = entitlements_destination_filepath
-			_build_settings_release[key] = entitlements_destination_filepath
-		else
-			if entitlements_debug_filepath == entitlements_release_filepath
-				@logger.info("\tEntitlements settings are equal for debug and release schemes.")
-				putAppGroupEntitlement(entitlements_debug_filepath)
-			else
-				if entitlements_debug_filepath != nil
-					@logger.info("\tEntitlements debug settings already set, updating settings...")
-					putAppGroupEntitlement(entitlements_debug_filepath)
-				else
-					@logger.info("\tEntitlements debug settings are not set, setting up...")
-					entitlements_destination_filepath = createAppGroupEntitlements("#{target_name}_debug.entitlements")
-					entitlements_destination_filepath = resolveXcodePath(entitlements_destination_filepath)
-
-					@logger.info("\tSetting build settings:\n\tdebug:\t#{key}\t#{entitlements_destination_filepath}")
-					_build_settings_debug[key] = entitlements_destination_filepath
-				end
-
-				if entitlements_release_filepath != nil
-					@logger.info("\tEntitlements release settings already set, updating settings...")
-					putAppGroupEntitlement(entitlements_release_filepath)
-				else
-					@logger.info("\tEntitlements release settings are not set, setting up...")
-					entitlements_destination_filepath = createAppGroupEntitlements("#{target_name}_release.entitlements")
-					entitlements_destination_filepath = resolveXcodePath(entitlements_destination_filepath)
-
-					@logger.info("\tSetting build settings:\n\trelease:\t#{key}\t#{entitlements_destination_filepath}")
-					_build_settings_release[key] = entitlements_destination_filepath
-				end
-			end
-		end
-	end
-
-	def setupExtensionTargetCapabilities
+	def setupTargetCapabilities(target_uuid)
 		unless @project.root_object.attributes["TargetAttributes"]
 			@project.root_object.attributes["TargetAttributes"] = Hash.new
 		end
-		exitsting_capabilities = @project.root_object.attributes["TargetAttributes"][@ne_target.uuid] 
-		mobilemessaging_capabilities = { "SystemCapabilities" => 
-			{
-				"com.apple.ApplicationGroups.iOS" => { "enabled" => 1 }
-			}
-		}
-		if exitsting_capabilities == nil
-			@logger.info("\tSetting TargetAttributes #{mobilemessaging_capabilities} for extension")
-			@project.root_object.attributes["TargetAttributes"][@ne_target.uuid] = mobilemessaging_capabilities
-		else
-			@logger.info("\tMerging TargetAttributes #{mobilemessaging_capabilities} for extension")
-			@project.root_object.attributes["TargetAttributes"][@ne_target.uuid] = exitsting_capabilities.merge(mobilemessaging_capabilities)
-		end
-	end
-
-	def setupMainTargetCapabilities
-		unless @project.root_object.attributes["TargetAttributes"]
-			@project.root_object.attributes["TargetAttributes"] = Hash.new
-		end
-		exitsting_capabilities = @project.root_object.attributes["TargetAttributes"][@main_target.uuid] 
+		exitsting_capabilities = @project.root_object.attributes["TargetAttributes"][target_uuid] 
 		mobilemessaging_capabilities = { "SystemCapabilities" => 
 			{
 				"com.apple.ApplicationGroups.iOS" => { "enabled" => 1 },
@@ -355,15 +306,14 @@ class NotificationExtensionIntegrator
 			}
 		}
 		if exitsting_capabilities == nil
-			@logger.info("\tSetting TargetAttributes #{mobilemessaging_capabilities} for main target")
-			@project.root_object.attributes["TargetAttributes"][@main_target.uuid] = mobilemessaging_capabilities
+			@logger.info("\tSetting TargetAttributes #{mobilemessaging_capabilities} for target #{target_uuid}")
+			@project.root_object.attributes["TargetAttributes"][target_uuid] = mobilemessaging_capabilities
 		else
-			@logger.info("\tMerging TargetAttributes #{mobilemessaging_capabilities} for main target")
-			@project.root_object.attributes["TargetAttributes"][@main_target.uuid] = exitsting_capabilities.merge(mobilemessaging_capabilities)
+			@logger.info("\tMerging TargetAttributes #{mobilemessaging_capabilities} for target #{target_uuid}")
+			@project.root_object.attributes["TargetAttributes"][target_uuid] = exitsting_capabilities.merge(mobilemessaging_capabilities)
 		end
 	end
 
-
 	def removeEmbedFrameworkPhase
 		@logger.info("Setting up embed framework script")
 		emb_fs = @main_target.copy_files_build_phases
@@ -398,29 +348,18 @@ class NotificationExtensionIntegrator
 		return group_reference
 	end
 
-	def createAppGroupEntitlements(_entitlements_name)
-		entitlements_destination_filepath = File.join(@project_dir, _entitlements_name)
-		entitlements_source_filepath = File.join(Mmine.root, 'resources', "MobileMessagingNotificationExtension.entitlements")
-		unless File.exist?(entitlements_destination_filepath)
-			@logger.info("\tCopying entitlemenst file to path: #{entitlements_destination_filepath}")
-			FileUtils.cp(entitlements_source_filepath, entitlements_destination_filepath)
-			ref = @project.main_group.new_reference(entitlements_destination_filepath)
-			ref.last_known_file_type = "text.xml"
-		else
-			@logger.info("\tEntitlements file already exists on path: #{entitlements_destination_filepath}")
-		end
-		putAppGroupEntitlement(entitlements_destination_filepath)
-		return entitlements_destination_filepath
-	end
-
 	def resolveAbsolutePath(path)
 		ret = path
 		["$(PROJECT_DIR)", "$PROJECT_DIR"].each do |proj_dir|
 			ret = ret.sub(proj_dir, @project_dir)
 		end
 
+		["$(PROJECT_NAME)", "$PROJECT_NAME"].each do |proj_name|
+			ret = ret.sub(proj_name, @project_name)
+		end
+
 		if ret.include?("$")
-			puts "Could not resolve absolute path for #{path}. The only supported variable are $(PROJECT_DIR) and $PROJECT_DIR. Make sure you don't misuse Xcode paths variables, consider using $(PROJECT_DIR) instead or contact Infobip Mobile Messaging support via email Push.Support@infobip.com"
+			puts "Could not resolve absolute path for #{path}. Make sure you don't misuse Xcode paths variables, contact Infobip Mobile Messaging support via email Push.Support@infobip.com"
 			exit
 		end
 
@@ -520,8 +459,4 @@ class NotificationExtensionIntegrator
 			file.puts Nokogiri::XML(doc.to_xml) { |x| x.noblanks }
 		end
 	end
-
-	def putAppGroupEntitlement(filepath)
-		putKeyArrayElement("com.apple.security.application-groups", @app_group, filepath)
-	end
 end

data/lib/mmine/version.rb

@@ -1,3 +1,3 @@
 module Mmine
-  VERSION = "0.6.10"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmine
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.7.5
 platform: ruby
 authors:
 - Andrey Kadochnikov
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Mobile Messaging iOS Notification Extension Integration Tool made at Infobip