mmine 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '067639c9e8125d67e9385f760218f5157bc00692'
-  data.tar.gz: 75b4b96d6e3e5903ddc1fec0ab31868aa4e05598
+SHA256:
+  metadata.gz: b93bff8cb6f6805674448c80182bb7528c615151558b0f3fa895f82f688be025
+  data.tar.gz: e4d80b4079119fd0ed02f25ab06c96be9c3b0acc147349fb3c7aeaefb82970d8
 SHA512:
-  metadata.gz: 368bc89e02e79061374c25d3fdc031446607073e8b89e061de852181ed435fa9aa3b38ec83cf6ef8b2459fee95a849a0c064a09ee21e08c22369719a3b38b74c
-  data.tar.gz: 2a6e089e40329a2f76781935a8c785682a1b1217967895850197228d2b39a5ef176e20bb6289f8ea36c4def5ef4bedf37c9d25a83406a01f2ab488eadbbedcb0
+  metadata.gz: 251873c65c14bb0098e2aa6bd179d4925f36229b075ffdc2854cf7c8d19fb0b6941d4f9b5943da5fbc7b1e4dd623a94a6b8a99aee4ab6aad1d967b83ca1715d2
+  data.tar.gz: bb3949d9bf9b815ef100fb19f8cefdf4f1a5c7e514701c55d6e6bf4dce656d3357c45c2cc50e533cf917cc7c96a761fc9bba15d5f53f95d362475f4290506fd1

data/lib/mmine/notification_extension_integrator.rb

@@ -60,7 +60,7 @@ class NotificationExtensionIntegrator
 		setupDeploymentTarget()
 		setupNotificationExtensionInfoPlist()
 		setupNotificationExtensionBundleId()
-		setupCommonEntitlementsFiles()
+		
 		setupUserAppGroupValue()
 		setupBackgroundModesPlistValue()
 	
@@ -74,10 +74,14 @@ class NotificationExtensionIntegrator
 		setupBuildNumber()
 		
 		if @cordova
+			setupEntitlements(resolveAbsolutePath("$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-Debug.plist"),resolveAbsolutePath("$(PROJECT_DIR)/$(PROJECT_NAME)/Entitlements-Release.plist"), nil, @main_target_build_settings_debug, @main_target_build_settings_release)
 			setupFrameworkSearchPaths()
 			setupRunpathSearchPaths()
 			setupLibCordovaLink()
 			setupCopyFrameworkScript()
+		else
+			setupEntitlements(@main_target_build_settings_debug['CODE_SIGN_ENTITLEMENTS'], @main_target_build_settings_release['CODE_SIGN_ENTITLEMENTS'], @main_target_name, @main_target_build_settings_debug, @main_target_build_settings_release)
+			setupEntitlements(@extension_build_settings_debug['CODE_SIGN_ENTITLEMENTS'], @extension_build_settings_release['CODE_SIGN_ENTITLEMENTS'], @ne_target_name, @extension_build_settings_debug, @extension_build_settings_release)
 		end
 
 		@project.save()
@@ -171,35 +175,57 @@ class NotificationExtensionIntegrator
 		end		
 	end
 
-	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
+	def createEntitlementsFile(_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
+		return resolveXcodePath(entitlements_destination_filepath)
+	end
 
+	def setupEntitlements(entitlements_debug_filepath, entitlements_release_filepath, target_name, _build_settings_debug, _build_settings_release)
 		key = 'CODE_SIGN_ENTITLEMENTS'
 		
+		if entitlements_debug_filepath == nil and entitlements_release_filepath == nil and target_name != nil
+			@logger.info("\tEntitlements are not set for both release and debug schemes, setting up...")
+			entitlements_destination_filepath = createEntitlementsFile("#{target_name}.entitlements")
+
+			@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
+			entitlements_debug_filepath = entitlements_destination_filepath
+			entitlements_release_filepath = entitlements_destination_filepath
+		end
+
 		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
-			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
+			if entitlements_debug_filepath == nil and target_name != nil
+				@logger.error("\tEntitlements debug settings are not set, creating entitlements file")
+				entitlements_debug_filepath = createEntitlementsFile("#{target_name}_debug.entitlements")
+				_build_settings_debug[key] = entitlements_debug_filepath
 			end
 
-			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
+			if entitlements_release_filepath == nil and target_name != nil
+				@logger.error("\tEntitlements release settings are not set, creating entitlements file")
+				entitlements_release_filepath = createEntitlementsFile("#{target_name}_release.entitlements")
+				_build_settings_release[key] = entitlements_release_filepath
 			end
+				
+			putKeyArrayElement("com.apple.security.application-groups", @app_group, entitlements_debug_filepath)
+			putStringValueIntoXML("aps-environment", "development", entitlements_debug_filepath)
+			putKeyArrayElement("com.apple.security.application-groups", @app_group, entitlements_release_filepath)
+			putStringValueIntoXML("aps-environment", "production", entitlements_release_filepath)
 		end
 	end
 
@@ -422,6 +448,7 @@ class NotificationExtensionIntegrator
 	end
 
 	def putKeyArrayElement(key, value, filepath) # check if it appends to existing array
+		filepath = resolveAbsolutePath(filepath)
 		doc = Nokogiri::XML(IO.read(filepath))
 		key_node = doc.search("//dict//key[text() = '#{key}']").first
 		string_app_group_value = Nokogiri::XML::Node.new("string",doc)

data/lib/mmine/version.rb

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

metadata

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