cocoapods-pod-sign 0.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1215d9c1fb53ce2eebc417636ab87e7d9f1475c20cf734740ba3968f79f907
-  data.tar.gz: 2d10fa10be40dd8627fae479bf8c68bd28515ba259d81ddb61d7442d020fd386
+  metadata.gz: e99c59f44c5d8cb30d08012c2ec57f4c74c910ed1453105fefc8cb6f6d528d50
+  data.tar.gz: 58f16caf31467198dcbe09b4aeccdf6d95b0372107edf1b88ec61d2951ac91b9
 SHA512:
-  metadata.gz: 935fdf8b485184179d33be735f742df83111fa6caf6ea23bb501da6f871596e8b0130ee5f3ee55f6d85bda75eae35325e745640bf72f19269838df6060311784
-  data.tar.gz: 1e751b60aa71c6ce2d3029c727bc708a5b5668a75f945fd66abb60c640d4e6c7e3c0733dd4447ca4231decb1b80d22ef784ddd6ee9c70576e441c7fd16c00c5b
+  metadata.gz: 05a1c9e66553050aa27cb1ea1169b1e990d9088421a8676133f8c75e7899fe09990cf5fa0b4ee5f13ed29b5271d6db31d84285d1c5a446d37239c20d4d6272cb
+  data.tar.gz: '047687cfc3d5b7d1e54ee35b4c55f612e2b7d71d408fdc38179afdbbc73c9c9b71958182254de357026ca4d47ee7b8c8370b8122d754c26e0fb4eebdd9eabfa2'

data/README.md

@@ -18,10 +18,28 @@ Just write the following code into the Podfile, it will automatically read the b
 
 ### Manually
 
-You can also manually specify the bundle identifier and team under different configs. For example, I want to set the bundle identifier of the Debug config to com.xxx.app and the team to xxooxxoo.
+You can also manually specify the bundle identifier and team under different configs. For example:
+
+> Debug
+bundle identifier: com.aaa.bbb
+team: ABCDEFG
+
+> Release
+bundle identifier: com.ccc.ddd
+team: HIJKLMN
+
+> Profile
+bundle identifier: com.xxx.eee
+team: ASDFGHJ
+
+
 
 ```
 plugin 'cocoapods-pod-sign'
-config_pod_bundle_id_and_team_id({'Debug' => {:bundle_id => 'com.xxx.app', :team_id => 'xxooxxoo'}})
+config_pod_bundle_id_and_team_id({
+  'Debug' => {:bundle_id => 'com.aaa.bbb', :team_id => 'ABCDEFG'},
+  'Release' => {:bundle_id => 'com.ccc.ddd', :team_id => 'HIJKLMN'},
+  'Profile' => {:bundle_id => 'com.xxx.eee', :team_id => 'ASDFGHJ'}
+})
 ```
 

data/lib/cocoapods-pod-sign/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPodSign
-  VERSION = "0.0.1"
+  VERSION = "1.1.0"
 end

data/lib/cocoapods-pod-sign/pod_installer.rb

@@ -6,35 +6,42 @@ module Pod
     alias_method :origin_run_podfile_post_install_hook, :run_podfile_post_install_hook
     def run_podfile_post_install_hook
 
-      if $pod_sign_configurations_hash.empty?
-        pod_sign_extract_bundle_id_and_team_id_from_user_project
-      end
+      pod_sign_extract_bundle_id_and_team_id_from_user_project if $pod_sign_configurations_hash.empty?
 
-      if installation_options.generate_multiple_pod_projects
-        targets = self.pod_target_subprojects.flat_map { |p| p.targets }
-      else
-        targets = self.pods_project.targets
-      end
+      targets = if installation_options.generate_multiple_pod_projects
+                  pod_target_subprojects.flat_map { |p| p.targets }
+                else
+                  pods_project.targets
+                end
       targets.each do |target|
         target.build_configurations.each do |config|
           sign_config = $pod_sign_configurations_hash[config.name]
-          if sign_config.instance_of?(Hash)
-            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = sign_config[:bundle_id]
-            config.build_settings['DEVELOPMENT_TEAM'] = sign_config[:team_id]
-          end
+          next unless sign_config.instance_of?(Hash)
+
+          config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = sign_config[:bundle_id]
+          config.build_settings['DEVELOPMENT_TEAM'] = sign_config[:team_id]
+          config.build_settings['CODE_SIGN_STYLE'] = if sign_config[:sign_style]
+                                                       sign_config[:sign_style]
+                                                     else
+                                                       config.type == :debug ? 'Automatic' : 'Manual'
+                                                     end
+          config.build_settings['CODE_SIGN_IDENTITY'] = if sign_config[:sign_identity]
+                                                          sign_config[:sign_identity]
+                                                        else
+                                                          config.type == :debug ? 'Apple Development' : 'Apple Distribution'
+                                                        end
         end
       end
 
       origin_run_podfile_post_install_hook
-      return true
+      true
     end
 
     private
 
     def pod_sign_extract_bundle_id_and_team_id_from_user_project
-      target = self.aggregate_targets.first.user_project.root_object.targets.first;
-      if target
-        target.build_configurations.each do |config|
+      target = aggregate_targets.first.user_project.root_object.targets.first
+      target&.build_configurations&.each do |config|
           xcconfig_hash ||=
             if config.base_configuration_reference.real_path.exist?
               Xcodeproj::Config.new(config.base_configuration_reference.real_path).to_hash
@@ -44,15 +51,20 @@ module Pod
           pod_sign_extract_bundle_id_and_team_id(xcconfig_hash, config.name)
           pod_sign_extract_bundle_id_and_team_id(config.build_settings, config.name)
         end
-      end
     end
 
     def pod_sign_extract_bundle_id_and_team_id(build_settings, config_name)
       bundle_id = build_settings['PRODUCT_BUNDLE_IDENTIFIER']
       team_id = build_settings['DEVELOPMENT_TEAM']
-      if bundle_id and team_id and config_name
-        $pod_sign_configurations_hash[config_name] = {:bundle_id => bundle_id, :team_id => team_id}
-      end
+      sign_style = build_settings['CODE_SIGN_STYLE']
+      sign_identity = build_settings['CODE_SIGN_IDENTITY']
+      return unless bundle_id && team_id && config_name
+
+      $pod_sign_configurations_hash[config_name] = { bundle_id: bundle_id,
+                                                     team_id: team_id,
+                                                     sign_style: sign_style,
+                                                     sign_identity: sign_identity }
+      
     end
   end
 end

data/lib/cocoapods-pod-sign/podfile_dsl.rb

@@ -7,20 +7,20 @@ module Pod
 
       def config_pod_bundle_id_and_team_id(configurations)
         unless configurations.instance_of?(Hash)
-          UI.info "config_pod_bundle_id_and_team_id parameters not hash".red
+          UI.info 'config_pod_bundle_id_and_team_id parameters not hash'.red
           return
         end
         configurations.each do |name, configuration|
           unless configuration.instance_of?(Hash)
-            UI.info "config_pod_bundle_id_and_team_id parameters not hash".red
+            UI.info 'config_pod_bundle_id_and_team_id parameters not hash'.red
             return
           end
-          unless configuration[:bundle_id] and configuration[:team_id]
-            UI.info "config_pod_bundle_id_and_team_id parameters parameters error".red
+          unless configuration[:bundle_id] && configuration[:team_id]
+            UI.info 'config_pod_bundle_id_and_team_id parameters parameters error'.red
             return
           end
         end
-        UI.info "config_pod_bundle_id_and_team_id parameters setup success"
+        UI.info 'config_pod_bundle_id_and_team_id parameters setup success'
         $pod_sign_configurations_hash = configurations
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-pod-sign
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - wosicuanqi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler