pindo 4.6.9 → 4.7.1

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

@@ -0,0 +1,198 @@
+require 'fileutils'
+require 'xcodeproj'
+require 'json'
+require 'pindo/module/xcode/xcoderesconstant'
+
+module Pindo
+
+    class XcodeResHandler
+
+
+        def self.create_icon(icon_name:nil, new_icon_dir:nil, xcode_icon_json:nil)
+            xcode_icon_json["images"].each do |image_data|
+                width,height  = image_data["size"].split("x")
+                image_name = image_data["filename"]
+                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
+                width = width.to_f * iNum
+                height = height.to_f * iNum
+
+                width = width.to_i
+                height = height.to_i
+
+                command = [
+                    'sips',
+                    '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
+                    '-z', width.to_s, height.to_s,
+                    icon_name,
+                    '--out', File.join(new_icon_dir, image_name)
+                ]
+                Executable.capture_command('sips', command, capture: :out)
+
+                # if !File.exist?(File.join(new_icon_dir, image_name))
+                #     raise  Informative, "生成icon失败!"
+                # end
+                # system("sips --matchTo '/System/Library/ColorSync/Profiles/sRGB Profile.icc' -z #{width} #{height} #{icon_name} --out #{new_icon_dir}/#{image_name}")
+            end
+            File.open(File.join(new_icon_dir, "Contents.json"), "w") do |f|
+                f.write(JSON.pretty_generate(xcode_icon_json))
+            end
+        end
+
+
+        def self.create_imessage_icon(icon_name:nil, image_icon_name:nil, new_icon_dir:nil, xcode_icon_json:nil)
+            xcode_icon_json["images"].each do |image_data|
+
+                height, width = image_data["size"].split("x")
+                image_name = image_data["filename"]
+                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
+                width = width.to_f * iNum
+                height = height.to_f * iNum
+                width = width.to_i
+                height = height.to_i
+
+                icon_ori_name = image_icon_name
+                if width.to_s.eql?(height.to_s)
+                    icon_ori_name = icon_name
+                end
+
+                command = [
+                    'sips',
+                    '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
+                    '-z', width.to_s, height.to_s,
+                    icon_name,
+                    '--out', File.join(new_icon_dir, image_name)
+                ]
+                Executable.capture_command('sips', command, capture: :out)
+            end
+
+            File.open(File.join(new_icon_dir, "Contents.json"), "w") do |f|
+                f.write(JSON.pretty_generate(xcode_icon_json))
+            end
+        end
+
+        def initialize(proj_fullname:nil)
+            @proj_fullname = proj_fullname
+            @project_obj = Xcodeproj::Project.open(proj_fullname) 
+        end
+
+        def get_xcodeproj_icon_path
+            select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+            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,"AppIcon.appiconset")
+            return icon_path
+        end
+
+        def install_icon_res(new_icon_dir:nil)
+            icon_path = get_xcodeproj_icon_path
+            begin
+                FileUtils.rm_rf(icon_path) 
+                FileUtils.mkdir_p(icon_path)
+            rescue StandardError => e
+            end
+            files = Dir.glob("#{new_icon_dir}/*").select { |file| File.file?(file) }
+            files.each do |file|
+                FileUtils.cp(file, icon_path)
+            end
+        end
+
+        def validate_icon_res()
+            icon_path = get_xcodeproj_icon_path
+            xcode_ios_icon_json = XcodoeResConst.xcode_ios_icon_json
+            xcode_ios_icon_json["images"].each do |image_data|
+                image_name = image_data["filename"]
+                if !File.exist?(File.join(icon_path, image_name))
+                    raise  Informative, "Xcode生成icon 有缺失文件:#{File.join(icon_path, image_name)}"
+                end
+            end
+        end
+
+        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?
+                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
+            return icon_path
+        end
+
+        def install_imessage_icon_res(new_icon_dir:nil)
+            icon_path = get_xcodeproj_imessage_icon_path
+            begin
+                FileUtils.rm_rf(icon_path) 
+                FileUtils.mkdir_p(icon_path)
+            rescue StandardError => e
+            end
+
+            files = Dir.glob("#{new_icon_dir}/*").select { |file| File.file?(file) }
+            files.each do |file|
+                FileUtils.cp(file, icon_path)
+            end
+        end
+
+
+        def validate_imessage_icon_res()
+            icon_path = get_xcodeproj_imessage_icon_path
+            xcode_ios_icon_json = XcodoeResConst.xcode_ios_imessage_icon_json
+            xcode_ios_icon_json["images"].each do |image_data|
+                image_name = image_data["filename"]
+                if !File.exist?(File.join(icon_path, image_name))
+                    raise  Informative, "Xcode生成icon 有缺失文件:#{File.join(icon_path, image_name)}"
+                end
+            end
+        end
+
+        def get_xcodeproj_launchimg_path
+
+            launchimg_path = nil
+            select_target = @project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+            file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("Assets.xcassets") }.first
+            
+            assets_path = file_ref.real_path
+            if File.exist?(File.join(assets_path, "LaunchImage.imageset"))
+                launchimg_path = File.join(assets_path, "LaunchImage.imageset")
+            else
+                launchimg_path = File.join(assets_path, "LaunchImage.launchimage")
+            end
+
+            return launchimg_path
+        end
+
+        def install_launchimg(launchimg_file:nil)
+
+
+            xcodeproj_launchimg_path = get_xcodeproj_launchimg_path
+            if xcodeproj_launchimg_path.nil? || !File.exist?(xcodeproj_launchimg_path)
+                return
+            end
+
+            project_origin_launchimg = Dir.glob(File.join(xcodeproj_launchimg_path, "/*.png")).max_by {|f| File.mtime(f)}
+            
+            if project_origin_launchimg.nil? || !File.exist?(project_origin_launchimg)
+                return                
+            end
+
+            if File.exist?(project_origin_launchimg) && !File.exist?(launchimg_file)
+                raise  Informative, "缺少启动文件:#{launchimg_file}"
+            end
+
+            begin
+                FileUtils.rm_rf(xcodeproj_launchimg_path) 
+                FileUtils.mkdir_p(xcodeproj_launchimg_path)
+            rescue StandardError => e
+            end
+
+            launch_json = XcodoeResConst.xcode_ios_launchimg_json
+            file_name = launch_json["images"].select { |image| image["scale"].include?("2x") }.first["filename"]
+            xcode_launchimg_name = File.join(xcodeproj_launchimg_path, file_name)
+            FileUtils.cp(launchimg_file, xcode_launchimg_name)
+
+            File.open(File.join(xcodeproj_launchimg_path, "Contents.json"), "w") do |f|
+                f.write(JSON.pretty_generate(launch_json))
+            end
+        
+        end
+
+    end
+
+end

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

@@ -0,0 +1,119 @@
+require 'fileutils'
+require 'xcodeproj'
+require 'json'
+require 'pindo/module/xcode/xcodereshandler'
+
+module Pindo
+
+    module XcodeResHelper
+        def self.create_icon(icon_name:nil, new_icon_dir:nil, xcode_icon_json:nil)
+            if !File.exist?(icon_name)
+                raise  Informative, "文件不存在:#{icon_name}"
+            end
+            xcode_icon_json["images"].each do |image_data|
+                width,height  = image_data["size"].split("x")
+                image_name = image_data["filename"]
+                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
+                width = width.to_f * iNum
+                height = height.to_f * iNum
+
+                width = width.to_i
+                height = height.to_i
+
+                command = [
+                    'sips',
+                    '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
+                    '-z', width.to_s, height.to_s,
+                    icon_name,
+                    '--out', File.join(new_icon_dir, image_name)
+                ]
+                Executable.capture_command('sips', command, capture: :out)
+
+                # if !File.exist?(File.join(new_icon_dir, image_name))
+                #     raise  Informative, "生成icon失败!"
+                # end
+                # system("sips --matchTo '/System/Library/ColorSync/Profiles/sRGB Profile.icc' -z #{width} #{height} #{icon_name} --out #{new_icon_dir}/#{image_name}")
+            end
+            File.open(File.join(new_icon_dir, "Contents.json"), "w") do |f|
+                f.write(JSON.pretty_generate(xcode_icon_json))
+            end
+        end
+
+
+        def self.create_imessage_icon(icon_name:nil, image_icon_name:nil, new_icon_dir:nil, xcode_icon_json:nil)
+            if !File.exist?(icon_name) || !File.exist?(image_icon_name) 
+                raise  Informative, "文件不存在:#{image_icon_name} or #{icon_name}"
+            end
+            xcode_icon_json["images"].each do |image_data|
+
+                height, width = image_data["size"].split("x")
+                image_name = image_data["filename"]
+                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
+                width = width.to_f * iNum
+                height = height.to_f * iNum
+                width = width.to_i
+                height = height.to_i
+
+                icon_ori_name = image_icon_name
+                if width.to_s.eql?(height.to_s)
+                    icon_ori_name = icon_name
+                end
+
+                command = [
+                    'sips',
+                    '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
+                    '-z', width.to_s, height.to_s,
+                    icon_ori_name,
+                    '--out', File.join(new_icon_dir, image_name)
+                ]
+                Executable.capture_command('sips', command, capture: :out)
+            end
+
+            File.open(File.join(new_icon_dir, "Contents.json"), "w") do |f|
+                f.write(JSON.pretty_generate(xcode_icon_json))
+            end
+        end
+
+        def self.create_icons(icon_name:nil, new_icon_dir:nil)
+            begin
+                FileUtils.mkdir_p(new_icon_dir) 
+            rescue => e
+                puts e
+            end
+            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)
+                begin
+                    FileUtils.mkdir_p(new_imessage_icon_dir) 
+                rescue => e
+                    puts e
+                end
+                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
+        
+        def self.install_icon(proj_dir:nil, new_icon_dir:nil)
+            xcodeproj_file_name = Dir.glob(File.join(proj_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+            xcodereshandler = XcodeResHandler.new(proj_fullname: xcodeproj_file_name)
+            xcodereshandler.install_icon_res(new_icon_dir: new_icon_dir)
+            xcodereshandler.validate_icon_res
+
+            new_imessage_icon_dir = File.join(new_icon_dir, "imessage")
+            if File.exist?(new_imessage_icon_dir)
+                xcodereshandler.install_imessage_icon_res(new_icon_dir: new_imessage_icon_dir)
+                xcodereshandler.validate_imessage_icon_res
+            end
+        end
+
+        def self.install_launchimg(proj_dir:nil, launchimg_filename:nil)
+            xcodeproj_file_name = Dir.glob(File.join(proj_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+            xcodereshandler = XcodeResHandler.new(proj_fullname: xcodeproj_file_name)
+            xcodereshandler.install_launchimg(launchimg_file:launchimg_filename)
+        end
+
+    end
+
+end

data/lib/pindo/options/appconfigoptions.rb

@@ -1,4 +1,5 @@
 
+
 module Pindo
   module AppConfigOptions
         

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))
@@ -128,7 +127,7 @@ module Pindo
 
                 help! 'Need input a bundle id, you may input with --a options' if @args_bundle_id.nil? && @deploy_identifier.nil?
 
-                print_params_info()
+                # print_params_info()
 
             end
 
@@ -145,31 +144,6 @@ module Pindo
                 args_temp << mode_flag
             end
 
-            def get_modify_bundleid_args()
-
-                args_temp = []
-
-                unless @apple_id.eql?(pindo_single_config.demo_apple_id)
-                    @args_apple_id = pindo_single_config.demo_apple_id
-                    args_temp << "--u=#{@args_apple_id}"
-                end
-
-                unless @apple_id.eql?(pindo_single_config.demo_apple_id) && @apple_id.eql?(@deploy_acount_id)
-                    if @args_bundle_id.nil? || @args_bundle_id.empty?
-                        @args_bundle_id = pindo_single_config.demo_bundle_id
-                        args_temp << "--a=#{@args_bundle_id}"
-                    else
-                        args_temp << "--a=#{@args_bundle_id}"
-                    end
-                end 
-
-                unless @deploy_repo_name.nil?
-                    args_temp << "--repo=#{@deploy_repo_name}"
-                end
-
-                return args_temp
-            end
-
             def get_confuse_type_args()
                 args_temp = []
                 confuse_flag = "--newconfuse"
@@ -179,6 +153,28 @@ module Pindo
                 args_temp << mode_flag
             end
 
+            def get_bundle_id_map
+
+              dic = {
+                    "bundle_id": @deploy_identifier.nil? ? nil : @bundle_id,
+                     "bundle_id_pushcontent": @deploy_identifier_pushcontent.nil? ? nil : @bundle_id_pushcontent,
+                     "bundle_id_pushservice": @deploy_identifier_pushservice.nil? ? nil : @bundle_id_pushservice,
+                     "bundle_id_keyboard": @deploy_identifier_keyboard.nil? ? nil : @bundle_id_keyboard,
+                    "bundle_id_imessage": @deploy_identifier_imessage.nil? ? nil : @bundle_id_imessage,
+                    "bundle_id_extension": @deploy_identifier_extension.nil? ? nil : @bundle_id_extension,
+                    "bundle_id_siri": @deploy_identifier_siri.nil? ? nil : @bundle_id_siri,
+                    "bundle_id_siriui": @deploy_identifier_siriui.nil? ? nil : @bundle_id_siriui,
+                    "bundle_id_widget": @deploy_identifier_widget.nil? ? nil : @bundle_id_widget,
+                    "bundle_id_extensionad": @deploy_identifier_extensionad.nil? ? nil : @bundle_id_extensionad,
+                    "bundle_id_extensionporn": @deploy_identifier_extensionporn.nil? ? nil : @bundle_id_extensionporn,
+                    "bundle_id_watchapp": @deploy_identifier_watchapp.nil? ? nil : @bundle_id_watchapp,
+                    "bundle_id_watchapp_extension": @deploy_identifier_watchapp_extension.nil? ? nil : @bundle_id_watchapp_extension
+                }
+                # puts dic.compact
+
+                return dic.compact
+            end
+
             def init_deploy_params()
 
                 if !@config_json.nil?
@@ -276,21 +272,21 @@ module Pindo
                 end  
 
                 unless @args_bundle_id.nil?
-                    @bundle_id = @args_bundle_id
-                    @group_id = "group." + @bundle_id
-                    @icloud_id = "iCloud." + @bundle_id
-                    @bundle_id_pushcontent =  @bundle_id + '.content'
-                    @bundle_id_pushservice =  @bundle_id + '.service'
-                    @bundle_id_keyboard =  @bundle_id + '.keyboard'
-                    @bundle_id_imessage =  @bundle_id + '.imessage'
-                    @bundle_id_siri =  @bundle_id + '.siri'
-                    @bundle_id_siriui =  @bundle_id + '.siriui'
-                    @bundle_id_widget =  @bundle_id + '.widget'
-                    @bundle_id_extension =  @bundle_id + '.extension'
-                    @bundle_id_extensionad =  @bundle_id + '.extensionad'
-                    @bundle_id_extensionporn =  @bundle_id + '.extensionporn'
-                    @bundle_id_watchapp =  @bundle_id + '.watchapp'
-                    @bundle_id_watchapp_extension =  @bundle_id + '.watchapp.extension'
+                    @bundle_id = @args_bundle_id.nil? ? @deploy_identifier : @args_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")
+                    @bundle_id_keyboard =  @deploy_identifier_keyboard.nil? ? @deploy_identifier_keyboard : (@bundle_id+".keyboard")
+                    @bundle_id_imessage =  @deploy_identifier_imessage.nil? ? @deploy_identifier_imessage : (@bundle_id+".imessage")
+                    @bundle_id_siri =  @deploy_identifier_siri.nil? ? @deploy_identifier_siri : (@bundle_id+".siri")
+                    @bundle_id_siriui =  @deploy_identifier_siriui.nil? ? @deploy_identifier_siriui : (@bundle_id+".siriui")
+                    @bundle_id_widget =  @deploy_identifier_widget.nil? ? @deploy_identifier_widget : (@bundle_id+".widget")
+                    @bundle_id_extension =  @deploy_identifier_extension.nil? ? @deploy_identifier_extension : (@bundle_id+".extension")
+                    @bundle_id_extensionad =  @deploy_identifier_extensionad.nil? ? @deploy_identifier_extensionad : (@bundle_id+".extensionad")
+                    @bundle_id_extensionporn =  @deploy_identifier_extensionporn.nil? ? @deploy_identifier_extensionporn : (@bundle_id+".extensionporn")
+                    @bundle_id_watchapp =  @deploy_identifier_watchapp.nil? ? @deploy_identifier_watchapp : (@bundle_id+".watchapp")
+                    @bundle_id_watchapp_extension =  @deploy_identifier_watchapp_extension.nil? ? @deploy_identifier_watchapp_extension : (@bundle_id+".watchapp.extension")
                 end 
             end
 

data/lib/pindo/version.rb

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