pindo 4.7.0 → 4.7.1

data/lib/pindo/module/cert/xcodecerthelper.rb

@@ -69,12 +69,17 @@ module Pindo
 
             new_project_obj.targets.each do |target|
 
+                if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) || 
+                    target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+                    next
+                end
                 provisioning_info = nil
 
                 if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
                     bundle_id_map_key = target_map["MainTarget"]
                     provisioning_info = provisioning_info_array.select { |s| s["type"].to_s.eql?(bundle_id_map_key.to_s) }.first
-                elsif
+                else 
+
                     target_map.each do |k, v|
                         if target.name.to_s.end_with?(k)
                             bundle_id_map_key = v.to_s
@@ -83,29 +88,34 @@ module Pindo
                     end
                 end
 
-                target.build_configurations.each do |config|
-                    target_atts_obj[target.uuid] = target_atts_obj[target.uuid] || {}
-                    target_atts_obj[target.uuid]['DevelopmentTeam'] = team_id_vaule
-                    target_atts_obj[target.uuid]['ProvisioningStyle'] = "Manual"
-                    config.build_settings['DEVELOPMENT_TEAM'] = team_id_vaule
-                    config.build_settings['DEVELOPMENT_TEAM[sdk=iphoneos*]'] = team_id_vaule
-                    config.build_settings['CODE_SIGN_STYLE'] = "Manual"
-
-                    config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution"
-                    config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Distribution"
-    
-                    if cert_type == "development"
-                        config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Development"
-                        config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Development"
-                    end
+                # puts "=====1 target name: #{target.name.to_s}  bundle_id_map_key: #{bundle_id_map_key}  provisioning_info: #{provisioning_info}"
 
-                    if !provisioning_info.nil?
-                        config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
-                        config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
-                        config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
-                        
+                if !provisioning_info.nil?
+                    target.build_configurations.each do |config|
+                        target_atts_obj[target.uuid] = target_atts_obj[target.uuid] || {}
+                        target_atts_obj[target.uuid]['DevelopmentTeam'] = team_id_vaule
+                        target_atts_obj[target.uuid]['ProvisioningStyle'] = "Manual"
+                        config.build_settings['DEVELOPMENT_TEAM'] = team_id_vaule
+                        config.build_settings['DEVELOPMENT_TEAM[sdk=iphoneos*]'] = team_id_vaule
+                        config.build_settings['CODE_SIGN_STYLE'] = "Manual"
+
+                        config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution"
+                        config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Distribution"
+        
+                        if cert_type == "development"
+                            config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Development"
+                            config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = "Apple Development"
+                        end
+
+                        if !provisioning_info.nil?
+                            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
+                            config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = provisioning_info['profile_name']
+                            config.build_settings['PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]'] = provisioning_info['profile_name']
+                            
+                        end
                     end
                 end
+                
 
             end
             new_project_obj.save
@@ -120,6 +130,11 @@ module Pindo
 
                 project_obj.targets.each do |target|
 
+                    if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) || 
+                        target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:static_library]) || target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+                        next
+                    end
+
                     temp_entitlements_file = target.build_configurations.first.build_settings['CODE_SIGN_ENTITLEMENTS']
                     if !temp_entitlements_file.nil? && !temp_entitlements_file.empty?
                         entitlements_plist_path = File.join(new_project_dir, temp_entitlements_file)
@@ -127,27 +142,37 @@ module Pindo
                         if !File.exist?(entitlements_plist_path)
                           raise Informative, "Target: #{target.name.to_s} 找不到文件 #{entitlements_plist_path}"
                         end
-                    end
 
-                    temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                    info_plist_path = File.join(new_project_dir, temp_info)
-                    if target.product_type.to_s.eql?("com.apple.product-type.application") &&  !File.exist?(info_plist_path)
-                        raise Informative, "Missing Target #{target.name.to_s} Info.plist!!!  #{info_plist_path}  Modify Info.plist Error !!!"           
+                        if !group_id.nil?
+                            modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, group_id:group_id)
+                        end
+
+                        if target.product_type.to_s.eql?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) then
+                            add_swark_entitlement(entitlements_plist_path:entitlements_plist_path, bundle_id_dict:provisioning_info_array)
+                            if !icloud_id.nil?
+                              modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, icloud_id:icloud_id)
+                            end
+                        end
+
                     end
 
+                    temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+                    if !temp_info.nil? && !temp_info.empty?
+                        info_plist_path = File.join(new_project_dir, temp_info)
+                        if !File.exist?(info_plist_path)
+                            raise Informative, "Missing Target #{target.name.to_s} Info.plist!!!  #{info_plist_path}  Modify Info.plist Error !!!"           
+                        end
 
-                    if target.product_type.to_s.eql?("com.apple.product-type.application") then
-                        add_swark_entitlement(entitlements_plist_path:entitlements_plist_path, bundle_id_dict:provisioning_info_array)
-                        if !icloud_id.nil?
-                          modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, icloud_id:icloud_id)
-                          modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:icloud_id)
-                        else
-                          modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:nil)
+                        if target.product_type.to_s.eql?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) then
+                            if !icloud_id.nil?
+                              modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:icloud_id)
+                            else
+                              modify_info_plist_icloud(plist_file_name:info_plist_path, icloud_id:nil)
+                            end
                         end
+
                     end
-                    if !group_id.nil?
-                        modify_entitlements_plist(entitlements_plist_path:entitlements_plist_path, group_id:group_id)
-                    end
+
                 end
 
         end

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -36,7 +36,7 @@ module Pindo
         def login
             @pgyer_client = PgyerClient.new
             if @force_login || !@has_login
-                @has_login = @pgyer_client.do_login(force_login:@force_login)    
+                @has_login = @pgyer_client.do_login(force_login:@force_login)
                 @force_login = false
             end
             return @has_login
@@ -50,7 +50,7 @@ module Pindo
                 if !proj_name.nil?
                     app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
                 end
-                
+
                 if !app_info_obj.nil?
                     return app_info_obj
                 end
@@ -58,35 +58,35 @@ module Pindo
                 proj_name_array = []
                 if File.exist?(File.join(working_directory, "config.json"))
                     config_json = JSON.parse(File.read(File.join(working_directory, "config.json")))
-                    proj_name_array << config_json["project_info"]["project_name"]    
+                    proj_name_array << config_json["project_info"]["project_name"]
                 end
 
                 xcodeproj_file_name = Dir.glob(File.join(Dir.pwd, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
                 upload_proj_name = File.basename(xcodeproj_file_name, ".xcodeproj") if xcodeproj_file_name
                 if !upload_proj_name.nil? && !upload_proj_name.empty?
-                    proj_name_array << upload_proj_name    
+                    proj_name_array << upload_proj_name
                 end
-                
+
                 puts
                 dir_base_name = File.basename(working_directory)
                 unless ["Desktop", "Documents", "Downloads"].include?(dir_base_name)
                     proj_name_array << dir_base_name
                 end
-            
+
                 proj_name_array << "自定义输入Pyger上的App代号"
 
                 if proj_name_array.size > 1
                     cli = HighLine.new
                     upload_proj_name = cli.choose do |menu|
-                        menu.prompt = "请选择对应的Pgyer App代号:"
+                        menu.prompt = "请选择Pgyer上的App代号:"
                         menu.choices(*proj_name_array)
                     end
                     if upload_proj_name.include?("自定义输入")
-                        upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                        upload_proj_name = ask('请输入Pyger上的App代号(大小写空格忽略):') || nil
                         upload_proj_name = upload_proj_name.strip
                     end
                 else
-                    upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                    upload_proj_name = ask('请输入Pyger上的App代号(大小写空格忽略):') || nil
                     upload_proj_name = upload_proj_name.strip
                 end
 
@@ -94,14 +94,16 @@ module Pindo
                 app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
 
                 if app_info_obj.nil?
-                    upload_proj_name = ask('请输入对应Pyger上的App代号(大小写空格忽略):') || nil
+                    upload_proj_name = ask('没有找到结果,请重新输入Pyger上的App代号(大小写空格忽略):') || nil
                     upload_proj_name = upload_proj_name.strip
                     app_info_obj = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name:upload_proj_name)
                 end
 
                 if app_info_obj.nil?
-                    raise Informative, "#{upload_proj_name} 错误， 请输入正确的App代号， pgyer网站没有该App"
+                    raise Informative, "#{upload_proj_name} 名称错误, 请输入正确的App代号,Pgyer网站没有该App!!!"
                 end
+            else
+                raise Informative, "请先登录Pgyer网站"
             end
             app_info_obj
         end
@@ -112,13 +114,10 @@ module Pindo
                 ipa_file_upload=File.join(args_ipa_file_dir, File.basename(ipa_file_upload))
 
                 current_project_dir = Dir.pwd
-                puts "current_project_dir : #{current_project_dir}"
-                puts description
-                puts File.exist?(File.join(current_project_dir, ".git"))
                 if description.nil? && File.exist?(File.join(current_project_dir, ".git"))
                     commit_id_info = git_latest_commit_id(local_repo_dir:current_project_dir)
                     if commit_id_info
-                        description = "commit " + commit_id_info    
+                        description = "commit " + commit_id_info
                     end
                 end
 
@@ -264,7 +263,7 @@ module Pindo
                             req.headers['Content-Type'] = 'application/json'
                             req.body =  body_data.to_json
                         end
-                        
+
 
                         body_data = {
                             msgtype:"text",
@@ -387,7 +386,7 @@ module Pindo
                 Funlog.instance.fancyinfo_error("拉取app信息列表失败!")
                 raise Informative, "Pgyer网络数据异常!!!"
             end
-            
+
 
             return app_info_list
         end
@@ -424,7 +423,7 @@ module Pindo
                     app_incId_index = ask('请选择上面的Build号:')
 
                 end
-                
+
                 Funlog.instance.fancyinfo_success("拉取app上传记录完成!")
 
                 version_item_obj = nil
@@ -508,7 +507,7 @@ module Pindo
                 return true
             else
                 Funlog.instance.fancyinfo_error("重签名失败!")
-                return false                
+                return false
             end
 
         end

data/lib/pindo/module/xcode/xcodereshandler.rb

@@ -109,7 +109,7 @@ module Pindo
         def get_xcodeproj_imessage_icon_path
             icon_path = nil
             select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:messages_extension])  }.first
-            if select_target.nil?
+            if !select_target.nil?
                 file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
                 icon_path = File.join(file_ref.real_path,"iMessage App Icon.stickersiconset")
             end

data/lib/pindo/module/xcode/xcodereshelper.rb

@@ -63,7 +63,7 @@ module Pindo
                     'sips',
                     '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
                     '-z', width.to_s, height.to_s,
-                    icon_name,
+                    icon_ori_name,
                     '--out', File.join(new_icon_dir, image_name)
                 ]
                 Executable.capture_command('sips', command, capture: :out)
@@ -83,7 +83,6 @@ module Pindo
             create_icon(icon_name: icon_name, new_icon_dir: new_icon_dir, xcode_icon_json: XcodoeResConst.xcode_ios_icon_json)
             icon_dir = File.dirname(icon_name)
             imessage_icon = File.join(icon_dir, "icon1024_768.png")
-
             new_imessage_icon_dir = File.join(new_icon_dir, "imessage")
 
             if File.exist?(imessage_icon)
@@ -92,7 +91,7 @@ module Pindo
                 rescue => e
                     puts e
                 end
-                create_imessage_icon(icon_name: imessage_icon, image_icon_name:imessage_icon, new_icon_dir: new_imessage_icon_dir, xcode_icon_json: XcodoeResConst.xcode_ios_imessage_icon_json)
+                create_imessage_icon(icon_name: icon_name, image_icon_name:imessage_icon, new_icon_dir: new_imessage_icon_dir, xcode_icon_json: XcodoeResConst.xcode_ios_imessage_icon_json)
             end
         end
         

data/lib/pindo/options/deployoptions.rb

@@ -105,7 +105,6 @@ module Pindo
             
             def validate!
                 super
-
                 if !@args_appconfig.empty? && File::file?(@args_appconfig)   
                     @args_appconfig_dir=File::expand_path(File::dirname(@args_appconfig))
                     @args_appconfig_fullname=File::join(@args_appconfig_dir, File::basename(@args_appconfig))
@@ -274,7 +273,7 @@ module Pindo
 
                 unless @args_bundle_id.nil?
                     @bundle_id = @args_bundle_id.nil? ? @deploy_identifier : @args_bundle_id
-                    @group_id =  @deploy_group_id.nil? ? @deploy_group_idnil : ("group." + @bundle_id)
+                    @group_id =  @deploy_group_id.nil? ? @deploy_group_id : ("group." + @bundle_id)
                     @icloud_id = @deploy_icloud_id.nil? ? @deploy_icloud_id : ("iCloud." + @bundle_id)
                     @bundle_id_pushcontent =  @deploy_identifier_pushcontent.nil? ? @deploy_identifier_pushcontent : (@bundle_id+".content")
                     @bundle_id_pushservice =  @deploy_identifier_pushservice.nil? ? @deploy_identifier_pushservice : (@bundle_id+".service")

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.7.0"
+  	VERSION = "4.7.1"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -280,6 +280,7 @@ files:
 - lib/pindo/command/dev.rb
 - lib/pindo/command/dev/autobuild.rb
 - lib/pindo/command/dev/autoresign.rb
+- lib/pindo/command/dev/build.rb
 - lib/pindo/command/dev/confusecode.rb
 - lib/pindo/command/dev/confuseproj.rb
 - lib/pindo/command/dev/createbuild.rb