cocoapods-pod-sign 0.0.1 → 1.1.2

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

@@ -6,37 +6,46 @@ 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|
+        next unless target.respond_to?('product_type') && target.product_type == 'com.apple.product-type.bundle'
+
         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?
+            if config.base_configuration_reference&.real_path&.exist?
               Xcodeproj::Config.new(config.base_configuration_reference.real_path).to_hash
             else
               {}
@@ -44,15 +53,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.2
 platform: ruby
 authors:
 - wosicuanqi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,6 +51,49 @@ files:
 - README.md
 - Rakefile
 - cocoapods-pod-sign.gemspec
+- example/podSign/Gemfile
+- example/podSign/Gemfile.lock
+- example/podSign/Podfile
+- example/podSign/bundleSign/.gitignore
+- example/podSign/bundleSign/.travis.yml
+- example/podSign/bundleSign/Example/Podfile
+- example/podSign/bundleSign/Example/Pods/Local Podspecs/bundleSign.podspec.json
+- example/podSign/bundleSign/Example/Tests/Tests-Info.plist
+- example/podSign/bundleSign/Example/Tests/Tests-Prefix.pch
+- example/podSign/bundleSign/Example/Tests/Tests.m
+- example/podSign/bundleSign/Example/Tests/en.lproj/InfoPlist.strings
+- example/podSign/bundleSign/Example/bundleSign.xcodeproj/project.pbxproj
+- example/podSign/bundleSign/Example/bundleSign.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+- example/podSign/bundleSign/Example/bundleSign.xcodeproj/xcshareddata/xcschemes/bundleSign-Example.xcscheme
+- example/podSign/bundleSign/LICENSE
+- example/podSign/bundleSign/README.md
+- example/podSign/bundleSign/_Pods.xcodeproj
+- example/podSign/bundleSign/bundleSign.podspec
+- example/podSign/bundleSign/bundleSign/Assets/.gitkeep
+- example/podSign/bundleSign/bundleSign/Assets/screenshot-20220817-205345.png
+- example/podSign/bundleSign/bundleSign/Classes/.gitkeep
+- example/podSign/bundleSign/bundleSign/Classes/ReplaceMe.m
+- example/podSign/podSign.xcodeproj/project.pbxproj
+- example/podSign/podSign.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+- example/podSign/podSign.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+- example/podSign/podSign.xcodeproj/project.xcworkspace/xcuserdata/liuxiaoliang01.xcuserdatad/UserInterfaceState.xcuserstate
+- example/podSign/podSign.xcodeproj/xcuserdata/liuxiaoliang01.xcuserdatad/xcschemes/xcschememanagement.plist
+- example/podSign/podSign.xcworkspace/contents.xcworkspacedata
+- example/podSign/podSign.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+- example/podSign/podSign.xcworkspace/xcuserdata/liuxiaoliang01.xcuserdatad/UserInterfaceState.xcuserstate
+- example/podSign/podSign/AppDelegate.h
+- example/podSign/podSign/AppDelegate.m
+- example/podSign/podSign/Assets.xcassets/AccentColor.colorset/Contents.json
+- example/podSign/podSign/Assets.xcassets/AppIcon.appiconset/Contents.json
+- example/podSign/podSign/Assets.xcassets/Contents.json
+- example/podSign/podSign/Base.lproj/LaunchScreen.storyboard
+- example/podSign/podSign/Base.lproj/Main.storyboard
+- example/podSign/podSign/Info.plist
+- example/podSign/podSign/SceneDelegate.h
+- example/podSign/podSign/SceneDelegate.m
+- example/podSign/podSign/ViewController.h
+- example/podSign/podSign/ViewController.m
+- example/podSign/podSign/main.m
 - lib/.idea/.gitignore
 - lib/.idea/inspectionProfiles/Project_Default.xml
 - lib/.idea/lib.iml