pindo 5.2.4 → 5.3.7

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

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'xcodeproj'
 require 'json'
-require 'pindo/module/xcode/xcodebuildconfig'
 require 'pindo/module/cert/xcodecerthelper'
 
 module Pindo

data/lib/pindo/version.rb

@@ -1,111 +1,381 @@
+require 'net/http'
+require 'json'
+require 'yaml'
+require 'fileutils'
+require 'time'
+
 module Pindo
 
-  	VERSION = "5.2.4"
+  VERSION = "5.3.7"
+
+  class VersionCheck
+    RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'
+    VERSION_INFO_FILE = File.expand_path('~/.pindo/version_info.yml')
+    CHECK_INTERVAL = 5 * 60 * 60   # 5小时检查一次
+
+    class << self
+      # 主版本检查方法（保持向后兼容）
+      def check_pindo_new_version
+        begin
+          return if ENV['PINDO_NO_UPDATE_CHECK']  # 允许用户禁用
+
+          puts "  🔄 执行版本检查...".green if ENV['PINDO_DEBUG']
+
+          # 检查是否应该执行版本检查
+          return unless should_check?
+
+          # 优先尝试从 RubyGems API 获取版本
+          latest_version = fetch_latest_version_from_api
+
+          if latest_version
+            puts "  ✅ 从 RubyGems 获取最新版本: #{latest_version}".green if ENV['PINDO_DEBUG']
+            check_and_notify_with_version(latest_version)
+          else
+            puts "  ⚠️  RubyGems API 请求失败，使用配置文件检查".yellow if ENV['PINDO_DEBUG']
+            # 回退到配置文件检查
+            check_from_config_file
+          end
+
+        rescue => e
+          puts "  ❌ 版本检查出错: #{e.message}".red if ENV['PINDO_DEBUG']
+          puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
+          # 静默失败，不影响主程序
+        end
+      end
+
+      # 强制更新检查
+      def check_force_update!
+        return if ENV['PINDO_SKIP_FORCE_UPDATE']  # 紧急跳过选项
+
+        puts "  📌 执行强制更新检查...".green if ENV['PINDO_DEBUG']
+
+        begin
+          # 检查缓存中是否有强制更新标记
+          if require_force_update_from_cache?
+            cache = load_cache
+            show_force_update_message(cache['latest_version'], Pindo::VERSION)
+            exit(1)
+          end
+
+          # 如果缓存过期，立即检查
+          if should_check_immediately?
+            puts "  🌐 正在从 RubyGems 获取最新版本...".green if ENV['PINDO_DEBUG']
+            latest = fetch_latest_version_from_api
+
+            if latest && needs_major_or_minor_update?(latest, Pindo::VERSION)
+              # 更新缓存并退出
+              save_force_update_cache(latest)
+              show_force_update_message(latest, Pindo::VERSION)
+              exit(1)
+            end
+          end
+
+          # 检查配置文件中的强制更新（兼容原有逻辑）
+          check_pindo_force_upgrade
+
+        rescue SystemExit
+          raise  # 重新抛出 exit
+        rescue => e
+          puts "  ⚠️  强制更新检查失败: #{e.message}".yellow if ENV['PINDO_DEBUG']
+        end
+      end
+
+      # 原有的强制升级检查（从配置文件）
+      def check_pindo_force_upgrade
+        begin
+          pindo_dir = File.expand_path(ENV['PINDO_DIR'] || '~/.pindo')
+          pindo_common_configdir = File.join(pindo_dir, "pindo_common_config")
+          pindo_common_configfile_fullname = File.join(pindo_common_configdir, "pindo_config.json")
+
+          return unless File.exist?(pindo_common_configfile_fullname)
+
+          pindo_common_config_json = JSON.parse(File.read(pindo_common_configfile_fullname))
+
+          pindo_latest_version = pindo_common_config_json["pindo_latest_version"]
+          pindo_mini_version = pindo_common_config_json["pindo_mini_version"]
+          pindo_force_upgrade = pindo_common_config_json["pindo_force_upgrade"]
+          pindo_current_version = Pindo::VERSION
+
+          if pindo_force_upgrade
+            compare_num = version_greater_than(version_string1:pindo_current_version, version_string2:pindo_mini_version)
+            if compare_num < 0
+              puts "当前pindo版本 #{Pindo::VERSION}"
+              puts "最新版本 #{pindo_latest_version}"
+              puts "要求最低版本 #{pindo_mini_version}"
+              raise Informative, "请使用 gem install pindo 升级!"
+            end
+          end
+
+        rescue JSON::ParserError, Errno::ENOENT => e
+          # 配置文件不存在或解析失败，忽略
+        rescue Informative
+          raise  # 重新抛出 Informative 错误
+        rescue => e
+          raise Informative, "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
+        end
+      end
+
+      # 版本比较方法（保持原有实现）
+      def version_greater_than(version_string1: nil, version_string2: nil)
+        return 0 if version_string1.nil? && version_string2.nil?
+        return -1 if version_string1.nil?
+        return 1 if version_string2.nil?
+
+        version_string1_array = version_string1.split('.') || []
+        version_string2_array = version_string2.split('.') || []
+
+        array_max_length = [version_string1_array.size, version_string2_array.size].max
+
+        version_string1_array += ['0'] * (array_max_length - version_string1_array.size)
+        version_string2_array += ['0'] * (array_max_length - version_string2_array.size)
+
+        compare_num = 0
+        (0..array_max_length).each do |i|
+          if version_string1_array[i] == version_string2_array[i]
+            compare_num = 0
+          elsif version_string1_array[i].to_i > version_string2_array[i].to_i
+            compare_num = 1
+            break
+          else
+            compare_num = -1
+            break
+          end
+        end
+
+        compare_num
+      end
+
+      private
+
+      # 从 RubyGems API 获取最新版本
+      def fetch_latest_version_from_api
+        uri = URI(RUBYGEMS_API)
+
+        # 创建 HTTP 连接，禁用代理
+        http = Net::HTTP.new(uri.host, uri.port, nil, nil)
+        http.use_ssl = true
+        http.open_timeout = 3  # 3秒超时
+        http.read_timeout = 3
+
+        puts "  🌐 直连 RubyGems API (跳过代理)...".green if ENV['PINDO_DEBUG']
+
+        request = Net::HTTP::Get.new(uri)
+        response = http.request(request)
+
+        if response.code == '200'
+          data = JSON.parse(response.body)
+          version = data['version']
+          puts "  ✅ 获取到最新版本: #{version}".green if ENV['PINDO_DEBUG']
+          version
+        else
+          puts "  ❌ API 响应错误: #{response.code}".yellow if ENV['PINDO_DEBUG']
+          nil
+        end
+      rescue => e
+        puts "  ⚠️  版本获取失败: #{e.message}".yellow if ENV['PINDO_DEBUG']
+        nil
+      end
+
+      # 从配置文件检查版本（原有逻辑）
+      def check_from_config_file
+        begin
+          pindo_dir = File.expand_path(ENV['PINDO_DIR'] || '~/.pindo')
+          pindo_common_configdir = File.join(pindo_dir, "pindo_common_config")
+          pindo_common_configfile_fullname = File.join(pindo_common_configdir, "pindo_config.json")
+
+          return unless File.exist?(pindo_common_configfile_fullname)
+
+          pindo_common_config_json = JSON.parse(File.read(pindo_common_configfile_fullname))
+
+          pindo_latest_version = pindo_common_config_json["pindo_latest_version"]
+          pindo_mini_version = pindo_common_config_json["pindo_mini_version"]
+          pindo_force_upgrade = pindo_common_config_json["pindo_force_upgrade"]
+          pindo_lates_update_info = pindo_common_config_json["pindo_lates_update_info"]
+
+          pindo_current_version = Pindo::VERSION
+
+          if pindo_force_upgrade
+            compare_num = version_greater_than(version_string1:pindo_current_version, version_string2:pindo_latest_version)
+            if compare_num < 0
+              puts
+              puts "最新版本是#{pindo_latest_version}目前可用, 可使用 gem install pindo 升级"
+              puts
+              puts pindo_lates_update_info if pindo_lates_update_info
+              puts
+            end
+          end
+
+        rescue => e
+          puts "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
+          puts
+        end
+      end
+
+      # 检查并通知版本更新
+      def check_and_notify_with_version(latest_version)
+        return unless latest_version
+
+        current_version = Pindo::VERSION
+
+        # 检查是否有新版本
+        if newer_version?(latest_version, current_version)
+          # 更新缓存
+          save_update_cache(latest_version, true)
+
+          # 显示更新提示
+          show_update_banner(latest_version, current_version)
+        else
+          # 更新缓存（无新版本）
+          save_update_cache(latest_version, false)
+          puts "  ✓ 已是最新版本 (#{current_version})".green if ENV['PINDO_DEBUG']
+        end
+      end
+
+      # 判断是否应该检查版本
+      def should_check?
+        # 检查缓存文件
+        if File.exist?(VERSION_INFO_FILE)
+          cache = load_cache
+          last_check = cache['last_check_at']
+          if last_check
+            time_since_check = Time.now - Time.parse(last_check)
+            return time_since_check > CHECK_INTERVAL
+          end
+        end
+
+        true
+      end
 
+      # 是否应该立即检查（用于强制更新）
+      def should_check_immediately?
+        return true unless File.exist?(VERSION_INFO_FILE)
 
-  	class VersionCheck
-
-		def self.check_pindo_new_version
+        cache = load_cache
+        last_check = cache['last_check_at']
 
-			# puts
-			# puts "pindo #{Pindo::VERSION}"
-			begin
+        return true unless last_check
 
-	    		pindo_dir = File.expand_path(ENV['PINDO_DIR'] || '~/.pindo')
-	    		pindo_common_configdir = File.join(pindo_dir, "pindo_common_config")
-	    		pindo_common_configfile_fullname = File.join(pindo_common_configdir, "pindo_config.json")
-	    		pindo_common_config_json = JSON.parse(File.read(pindo_common_configfile_fullname))
+        time_since_check = Time.now - Time.parse(last_check)
+        time_since_check > CHECK_INTERVAL
+      end
 
-	    		pindo_latest_version = pindo_common_config_json["pindo_latest_version"]
-	    		pindo_mini_version = pindo_common_config_json["pindo_mini_version"]
-	    		pindo_force_upgrade = pindo_common_config_json["pindo_force_upgrade"]
-	    		pindo_lates_update_info = pindo_common_config_json["pindo_lates_update_info"]
+      # 检查缓存中是否需要强制更新
+      def require_force_update_from_cache?
+        return false unless File.exist?(VERSION_INFO_FILE)
 
-				pindo_current_version = Pindo::VERSION
+        cache = load_cache
+        latest = cache['latest_version']
+        current = Pindo::VERSION
 
-				if pindo_force_upgrade
-					compare_num = Pindo::VersionCheck::version_greater_than(version_string1:pindo_current_version, version_string2:pindo_latest_version)
-					if compare_num < 0
-						# answer = agree("有可用的新版本,是否升级?(Y/n:")
-						# if answer
-						# 	Pindo::Command::Env::Upgrade::run([])
-						# end
-						puts
-						puts "最新版本是#{pindo_latest_version}目前可用, 可使用 gem install pindo 升级"
-						puts
-						puts  pindo_lates_update_info
-						puts
-					end
+        return false unless latest
 
-				end
+        needs_major_or_minor_update?(latest, current)
+      end
 
-			rescue Exception => e
-				puts "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
-				puts 
+      # 判断是否是新版本
+      def newer_version?(latest, current)
+        return false unless latest && current
 
+        compare_result = version_greater_than(version_string1: current, version_string2: latest)
+        compare_result < 0
+      end
 
-			end
-		end
+      # 检查是否需要强制更新（主版本或次版本）
+      def needs_major_or_minor_update?(latest, current)
+        return false unless latest && current
 
-		def self.check_pindo_force_upgrade
+        latest_parts = latest.split('.').map(&:to_i)
+        current_parts = current.split('.').map(&:to_i)
 
-			begin
+        # 主版本更新
+        return true if latest_parts[0] > current_parts[0]
 
-	    		pindo_dir = File.expand_path(ENV['PINDO_DIR'] || '~/.pindo')
-	    		pindo_common_configdir = File.join(pindo_dir, "pindo_common_config")
-	    		pindo_common_configfile_fullname = File.join(pindo_common_configdir, "pindo_config.json")
-	    		pindo_common_config_json = JSON.parse(File.read(pindo_common_configfile_fullname))
+        # 次版本更新
+        return true if latest_parts[0] == current_parts[0] && latest_parts[1] > current_parts[1]
 
-	    		pindo_latest_version = pindo_common_config_json["pindo_latest_version"]
-	    		pindo_mini_version = pindo_common_config_json["pindo_mini_version"]
-	    		pindo_force_upgrade = pindo_common_config_json["pindo_force_upgrade"]
-				pindo_current_version = Pindo::VERSION
+        false
+      end
 
-				if pindo_force_upgrade
-                    compare_num = Pindo::VersionCheck::version_greater_than(version_string1:pindo_current_version, version_string2:pindo_mini_version)
-                    if compare_num < 0
-                    	puts "当前pindo版本 #{Pindo::VERSION}"
-                    	puts "最新版本 #{pindo_latest_version}"
-                    	puts "要求最低版本 #{pindo_mini_version}"
-                        raise Informative, "请使用 gem install pindo 升级!"
-                    end
-				end
+      # 加载缓存
+      def load_cache
+        YAML.load_file(VERSION_INFO_FILE) rescue {}
+      end
 
-			rescue Exception => e
-				raise Informative, "有异常错误,请确认是否执行pindo setup 拉取最新配置, 更新配置任然有错误请执行gem install pindo 更新"
-			end
-		end
+      # 保存更新缓存
+      def save_update_cache(latest_version, has_update)
+        cache = {
+          'last_check_at' => Time.now.to_s,
+          'latest_version' => latest_version,
+          'new_version_available' => has_update,
+          'last_shown_at' => has_update ? Time.now.to_s : nil
+        }
+        save_cache(cache)
+      end
 
-		def self.version_greater_than(version_string1: nil, version_string2: nil)
-			return 0 if version_string1.nil? && version_string2.nil?
-			return -1 if version_string1.nil?
-			return 1 if version_string2.nil?
+      # 保存强制更新缓存
+      def save_force_update_cache(latest_version)
+        cache = {
+          'last_check_at' => Time.now.to_s,
+          'latest_version' => latest_version,
+          'new_version_available' => true,
+          'force_update_required' => true
+        }
+        save_cache(cache)
+      end
 
-			version_string1_array = version_string1.split('.') || []
-			version_string2_array = version_string2.split('.') || []
+      # 写入缓存文件
+      def save_cache(data)
+        FileUtils.mkdir_p(File.dirname(VERSION_INFO_FILE))
+        File.write(VERSION_INFO_FILE, data.to_yaml)
+      rescue => e
+        puts "  ⚠️  缓存保存失败: #{e.message}".yellow if ENV['PINDO_DEBUG']
+      end
 
-			array_max_length = [version_string1_array.size, version_string2_array.size].max
+      # 显示更新提示横幅
+      def show_update_banner(latest, current)
+        puts
+        puts "┌─────────────────────────────────────────────────────┐".yellow
+        puts "│ 🎉 新版本可用！                                      │".yellow
+        puts "│                                                     │".yellow
+        puts "│   当前版本: #{current.ljust(39)}│".yellow
+        puts "│   最新版本: #{latest.ljust(39)}│".yellow
+        puts "│                                                     │".yellow
+        puts "│   更新命令: gem install pindo                      │".yellow
+        puts "│                                                     │".yellow
+        puts "│   禁用检查: export PINDO_NO_UPDATE_CHECK=1         │".yellow
+        puts "└─────────────────────────────────────────────────────┘".yellow
+        puts
+      end
 
-			version_string1_array += ['0'] * (array_max_length - version_string1_array.size)
-			version_string2_array += ['0'] * (array_max_length - version_string2_array.size)
+      # 显示强制更新消息
+      def show_force_update_message(latest, current)
+        latest_parts = latest.split('.').map(&:to_i)
+        current_parts = current.split('.').map(&:to_i)
 
-		  	compare_num = 0
-			(0..array_max_length).each do |i|
-			  if version_string1_array[i] == version_string2_array[i]
-				compare_num = 0
-			  elsif version_string1_array[i].to_i > version_string2_array[i].to_i
-				compare_num = 1
-				break
-			  else
-				compare_num = -1
-				break
-			  end
-			end
+        is_major_update = latest_parts[0] > current_parts[0]
+        update_type = is_major_update ? "主版本" : "次版本"
 
-			compare_num
-		  end
-
-	end
-
-
-end
+        puts "\n"
+        puts "╔═══════════════════════════════════════════════════════════╗".red
+        puts "║                    ⚠️  强制更新要求 ⚠️                      ║".red
+        puts "╠═══════════════════════════════════════════════════════════╣".red
+        puts "║                                                           ║".red
+        puts "║  检测到#{update_type}更新，必须升级后才能继续使用：              ║".red
+        puts "║                                                           ║".red
+        puts "║    当前版本: #{current.ljust(44)}║".red
+        puts "║    最新版本: #{latest.ljust(44)}║".red
+        puts "║                                                           ║".red
+        puts "║  此更新包含重要变更，为确保功能正常，请立即更新：         ║".red
+        puts "║                                                           ║".red
+        puts "║    $ gem install pindo                                   ║".red
+        puts "║                                                           ║".red
+        puts "║  如遇紧急情况需要临时跳过（不推荐）：                     ║".red
+        puts "║    $ export PINDO_SKIP_FORCE_UPDATE=1                    ║".red
+        puts "║                                                           ║".red
+        puts "╚═══════════════════════════════════════════════════════════╝".red
+        puts "\n"
+        puts "程序将退出，请更新后重试。".red
+      end
+    end
+  end
+end

data/lib/pindo.rb

@@ -9,7 +9,7 @@ module Pindo
   	autoload :Command,                   'pindo/command'
   	autoload :Executable,                'pindo/base/executable'
   	autoload :Plistbuddyexecutable,      'pindo/base/plistbuddyexecutable'
-  
+
 	require 'pindo/command'
 	require 'pindo/version'
 
@@ -17,10 +17,79 @@ module Pindo
 	class PindoApp
 
 		def run(argv)
+			begin
+				# 解析参数以确定是否是 help 或 version 命令
+				coerced_argv = CLAide::ARGV.coerce(argv)
+
+				# 显示欢迎界面（除了 help/version 命令和特定情况）
+				show_welcome_banner(argv, coerced_argv)
+
+				# 跳过 help/version 命令的版本检查
+				unless coerced_argv.flag?('help') || coerced_argv.flag?('version')
+					# 执行版本检查
+					begin
+						# 1. 强制更新检查（可能会退出程序）
+						Pindo::VersionCheck.check_force_update!
+
+						# 2. 常规版本检查
+						Pindo::VersionCheck.check_pindo_new_version
+					rescue => e
+						puts "⚠️  版本检查出错: #{e.message}".yellow if ENV['PINDO_DEBUG']
+						# 版本检查失败不影响正常命令执行
+					end
+				end
+
+			rescue => e
+				# 参数解析失败，继续执行原有逻辑
+				puts "⚠️  参数解析失败: #{e.message}".yellow if ENV['PINDO_DEBUG']
+			end
+
+			# 运行命令
+			Pindo::Command.run(argv)
+		end
+
+		private
+
+		# 显示欢迎横幅
+		def show_welcome_banner(argv, coerced_argv)
+			require 'colored2'
+
+			# 不显示横幅的情况
+			return if ENV['PINDO_NO_BANNER'] == '1'  # 环境变量禁用
+			return if coerced_argv.flag?('help')     # help 命令
+			return if coerced_argv.flag?('version')  # version 命令
+			return if argv.empty?                    # 无参数时（会显示帮助）
+
+			# 某些命令不显示横幅（可根据需要调整）
+			first_arg = argv.first.to_s.downcase
+			return if ['setup', 'env'].include?(first_arg)
+
+			# 显示欢迎界面
+			box_width = 62
+			title = "Pindo v#{Pindo::VERSION}"
+			subtitle = "Welcome to pindo, pindo make it easy!"
+
+			puts
+			puts "╔#{'═' * box_width}╗".cyan
+			puts "║#{title.center(box_width).green}║".cyan
+			puts "║#{' ' * box_width}║".cyan
+			puts "║#{subtitle.center(box_width).italic}║".cyan
+			puts "╚#{'═' * box_width}╝".cyan
+			puts
+		end
+
+		# 显示简单横幅（旧版本，保留备用）
+		def show_simple_banner
+			require 'colored2'
 
-		    Pindo::VersionCheck::check_pindo_new_version()
-		  	Pindo::Command.run(argv)
+			title = "Pindo v#{Pindo::VERSION}"
+			box_width = 60
 
+			puts
+			puts "╔#{'═' * box_width}╗".cyan
+			puts "║#{title.center(box_width).green}║".cyan
+			puts "╚#{'═' * box_width}╝".cyan
+			puts
 		end
 
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.3.7
 platform: ruby
 authors:
 - wade
@@ -279,6 +279,7 @@ files:
 - lib/pindo/base/funlog.rb
 - lib/pindo/base/githelper.rb
 - lib/pindo/base/hashhelper.rb
+- lib/pindo/base/pindocontext.rb
 - lib/pindo/base/plaininformative.rb
 - lib/pindo/base/plistbuddyexecutable.rb
 - lib/pindo/base/standarderror.rb
@@ -398,9 +399,11 @@ files:
 - lib/pindo/command/web/run.rb
 - lib/pindo/config/pindoconfig.rb
 - lib/pindo/config/pindouserlocalconfig.rb
+- lib/pindo/module/android/android_build_config_helper.rb
 - lib/pindo/module/android/apk_helper.rb
 - lib/pindo/module/android/base_helper.rb
 - lib/pindo/module/android/build_helper.rb
+- lib/pindo/module/android/gp_compliance_helper.rb
 - lib/pindo/module/android/gradle_helper.rb
 - lib/pindo/module/android/so_helper.rb
 - lib/pindo/module/appselect.rb
@@ -412,6 +415,7 @@ files:
 - lib/pindo/module/build/commonconfuseproj.rb
 - lib/pindo/module/build/swarkhelper.rb
 - lib/pindo/module/build/unityhelper.rb
+- lib/pindo/module/build/versionhelper.rb
 - lib/pindo/module/cert/certhelper.rb
 - lib/pindo/module/cert/keychainhelper.rb
 - lib/pindo/module/cert/pemhelper.rb