easyai 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eaaa20803649142336c80f3c56d85e3047588f02cc81266d666147122c43200
-  data.tar.gz: fd5ae3775b3baef860d237ea61d59ec14bd4e292cdb2abe477b8dd624ee7533c
+  metadata.gz: e62a795c1d9f823731c5efa0fdd2ccccece744164374c222cf42039eeab1d394
+  data.tar.gz: 8a937a49e3b619094a9af1beae643b9ede84f82e0f5cd38777e74e9f369711ee
 SHA512:
-  metadata.gz: 7bd32be0384e8e411b7d0984b3a754fba62cc586ab967a7556058d958fbe47492c3445b7e985f7e2cfb4333b1fe001b31db33750c1ffa51cff04612d1368ccff
-  data.tar.gz: 1a92f0937530b9cadf52699a884bc2dbd21b11e940b215ca7858f48ab0235eb4c640b3cf3925d57a28683ceed38d6da81e5dfdb347226fff639c9e47fc195fbe
+  metadata.gz: 32ac98c88d9cf7ae7045a461d49d40f187c050f6d83c484c7a00c605b38ae94527f95ffc82229f70afd50e9ca3a8f6c79c6359eabad5173dbf0c2134d7e1a5c9
+  data.tar.gz: 2d0e460bdd981bd8b411557657b25ea7c2a62fb5f270be3af0fb20922245a4e063dff7afd8099bca1e9cf3ce6fbc440b1775081ac94b836254c52736b269ca06

data/lib/easyai/base/update_notifier.rb

@@ -5,7 +5,7 @@ require 'colored2'
 module EasyAI
   module Base
     class UpdateNotifier
-      NOTIFICATION_FILE = File.expand_path('~/.easyai/update_notification.yml')
+      VERSION_INFO_FILE = File.expand_path('~/.easyai/version_info.yml')
       
       class << self
         # 智能决定是否显示更新通知
@@ -14,7 +14,7 @@ module EasyAI
           return unless should_show_notification?
           
           notification = load_notification
-          return unless notification && notification['available']
+          return unless notification && notification['new_version_available']
           
           # 使用简洁的单行提醒
           show_brief_notification(notification)
@@ -26,7 +26,7 @@ module EasyAI
           return if ENV['EASYAI_NO_UPDATE_CHECK']
           
           notification = load_notification
-          return unless notification && notification['available']
+          return unless notification && notification['new_version_available']
           return if notification['shown_today']
           
           # 退出时显示稍微详细的信息
@@ -41,7 +41,7 @@ module EasyAI
           return false unless notification
           
           # 只要当前版本低于最新版本就提醒
-          current = notification['current_version'] || EasyAI::VERSION
+          current = EasyAI::VERSION  # 始终使用实际运行的版本
           latest = notification['latest_version']
           
           # 使用版本比较逻辑
@@ -71,26 +71,26 @@ module EasyAI
         end
         
         def major_update?(notification)
-          return false unless notification['latest_version'] && notification['current_version']
+          return false unless notification['latest_version']
           
           latest_major = notification['latest_version'].split('.')[0].to_i
-          current_major = notification['current_version'].split('.')[0].to_i
+          current_major = EasyAI::VERSION.split('.')[0].to_i
           
           latest_major > current_major
         end
         
         def minor_update?(notification)
-          return false unless notification['latest_version'] && notification['current_version']
+          return false unless notification['latest_version']
           
           latest_parts = notification['latest_version'].split('.').map(&:to_i)
-          current_parts = notification['current_version'].split('.').map(&:to_i)
+          current_parts = EasyAI::VERSION.split('.').map(&:to_i)
           
           latest_parts[0] == current_parts[0] && latest_parts[1] > current_parts[1]
         end
         
         def show_brief_notification(notification)
           latest = notification['latest_version']
-          current = notification['current_version']
+          current = EasyAI::VERSION
           
           # 醒目的框形提醒
           if major_update?(notification)
@@ -113,7 +113,7 @@ module EasyAI
         
         def show_exit_notification(notification)
           latest = notification['latest_version']
-          current = notification['current_version']
+          current = EasyAI::VERSION
           
           puts "\n" + "─" * 50
           puts "📦 EasyAI 更新提醒".yellow
@@ -125,14 +125,15 @@ module EasyAI
         end
         
         def load_notification
-          return nil unless File.exist?(NOTIFICATION_FILE)
-          YAML.load_file(NOTIFICATION_FILE) rescue nil
+          return nil unless File.exist?(VERSION_INFO_FILE)
+          YAML.load_file(VERSION_INFO_FILE) rescue nil
         end
         
         def update_shown_time
-          notification = load_notification || {}
-          notification['last_shown_at'] = Time.now.to_s
-          save_notification(notification)
+          # 读取完整的版本信息，只更新显示时间
+          data = load_notification || {}
+          data['last_shown_at'] = Time.now.to_s
+          save_notification(data)
         end
         
         def mark_as_shown_today
@@ -142,8 +143,8 @@ module EasyAI
         end
         
         def save_notification(data)
-          FileUtils.mkdir_p(File.dirname(NOTIFICATION_FILE))
-          File.write(NOTIFICATION_FILE, data.to_yaml)
+          FileUtils.mkdir_p(File.dirname(VERSION_INFO_FILE))
+          File.write(VERSION_INFO_FILE, data.to_yaml)
         rescue
           nil
         end

data/lib/easyai/base/version_checker.rb

@@ -9,7 +9,7 @@ module EasyAI
   module Base
     class VersionChecker
       RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/easyai.json'
-      CACHE_FILE = File.expand_path('~/.easyai/version_cache.yml')
+      VERSION_INFO_FILE = File.expand_path('~/.easyai/version_info.yml')
       CHECK_INTERVAL = 5 * 60 * 60   # 5小时检查一次
       
       class << self
@@ -58,10 +58,10 @@ module EasyAI
           return false if ENV['EASYAI_SKIP_FORCE_UPDATE']  # 紧急跳过选项
           
           # 检查缓存
-          if File.exist?(CACHE_FILE)
-            cache = YAML.load_file(CACHE_FILE) rescue {}
+          if File.exist?(VERSION_INFO_FILE)
+            cache = YAML.load_file(VERSION_INFO_FILE) rescue {}
             latest = cache['latest_version']
-            current = cache['current_version'] || EasyAI::VERSION
+            current = EasyAI::VERSION  # 直接使用实际版本
             
             return needs_major_or_minor_update?(latest, current)
           end
@@ -77,7 +77,7 @@ module EasyAI
           
           # 如果缓存中已有需要强制更新的信息，直接使用
           if require_force_update?
-            cache = YAML.load_file(CACHE_FILE) rescue {}
+            cache = YAML.load_file(VERSION_INFO_FILE) rescue {}
             show_force_update_message(cache['latest_version'], EasyAI::VERSION)
             exit(1)
           end
@@ -96,8 +96,8 @@ module EasyAI
           else
             puts "  💾 使用缓存（未过期）".cyan if ENV['EASYAI_DEBUG']
             # 从缓存中获取版本信息
-            if File.exist?(CACHE_FILE)
-              cache = YAML.load_file(CACHE_FILE) rescue {}
+            if File.exist?(VERSION_INFO_FILE)
+              cache = YAML.load_file(VERSION_INFO_FILE) rescue {}
               return cache['latest_version']
             end
           end
@@ -124,9 +124,9 @@ module EasyAI
         
         # 显示缓存的更新提醒（如果有）
         def show_cached_reminder
-          return unless File.exist?(CACHE_FILE)
+          return unless File.exist?(VERSION_INFO_FILE)
           
-          cache = YAML.load_file(CACHE_FILE) rescue {}
+          cache = YAML.load_file(VERSION_INFO_FILE) rescue {}
           return unless cache['new_version_available']
           return if cache['reminder_shown_at'] && 
                    Time.now - Time.parse(cache['reminder_shown_at']) < 3600  # 1小时内不重复提醒
@@ -149,8 +149,8 @@ module EasyAI
           return false if ENV['EASYAI_NO_UPDATE_CHECK']  # 允许用户禁用
           
           # 检查缓存文件
-          if File.exist?(CACHE_FILE)
-            cache = YAML.load_file(CACHE_FILE) rescue {}
+          if File.exist?(VERSION_INFO_FILE)
+            cache = YAML.load_file(VERSION_INFO_FILE) rescue {}
             last_check = cache['last_check_at']
             if last_check
               time_since_check = Time.now - Time.parse(last_check)
@@ -175,48 +175,30 @@ module EasyAI
         def check_and_cache_with_version(latest)
           return unless latest
           
+          # 不记录 current_version，运行时直接使用 EasyAI::VERSION 比较
           current = EasyAI::VERSION
           is_new = newer_version?(latest, current)
           
+          # 读取现有文件以保留提醒显示时间
+          existing_data = {}
+          if File.exist?(VERSION_INFO_FILE)
+            existing_data = YAML.load_file(VERSION_INFO_FILE) rescue {}
+          end
+          
           cache = {
             'last_check_at' => Time.now.to_s,
             'latest_version' => latest,
-            'current_version' => current,
-            'new_version_available' => is_new
+            'new_version_available' => is_new,
+            'last_shown_at' => existing_data['last_shown_at'],  # 保留上次显示时间
+            'shown_today' => existing_data['shown_today']       # 保留今日显示标记
           }
           
           save_cache(cache)
-          
-          # 同时更新通知文件
-          if is_new
-            update_notification(latest, current)
-          end
         rescue => e
           # 静默失败，不影响主程序
           nil
         end
         
-        def update_notification(latest, current)
-          notification_file = File.expand_path('~/.easyai/update_notification.yml')
-          notification = {
-            'available' => true,
-            'latest_version' => latest,
-            'current_version' => current,
-            'checked_at' => Time.now.to_s
-          }
-          
-          # 保留上次显示时间
-          if File.exist?(notification_file)
-            old_data = YAML.load_file(notification_file) rescue {}
-            notification['last_shown_at'] = old_data['last_shown_at']
-            notification['shown_today'] = old_data['shown_today']
-          end
-          
-          FileUtils.mkdir_p(File.dirname(notification_file))
-          File.write(notification_file, notification.to_yaml)
-        rescue
-          nil
-        end
         
         def fetch_latest_version
           uri = URI(RUBYGEMS_API)
@@ -283,9 +265,9 @@ module EasyAI
         
         # 是否应该立即检查
         def should_check_immediately?
-          return true unless File.exist?(CACHE_FILE)
+          return true unless File.exist?(VERSION_INFO_FILE)
           
-          cache = YAML.load_file(CACHE_FILE) rescue {}
+          cache = YAML.load_file(VERSION_INFO_FILE) rescue {}
           last_check = cache['last_check_at']
           
           # 如果没有检查记录或缓存超过指定时间间隔，立即检查
@@ -300,7 +282,6 @@ module EasyAI
           cache = {
             'last_check_at' => Time.now.to_s,
             'latest_version' => latest,
-            'current_version' => current,
             'new_version_available' => true,
             'force_update_required' => true
           }
@@ -308,8 +289,8 @@ module EasyAI
         end
         
         def save_cache(data)
-          FileUtils.mkdir_p(File.dirname(CACHE_FILE))
-          File.write(CACHE_FILE, data.to_yaml)
+          FileUtils.mkdir_p(File.dirname(VERSION_INFO_FILE))
+          File.write(VERSION_INFO_FILE, data.to_yaml)
         rescue => e
           # 静默失败
           nil

data/lib/easyai/version.rb

@@ -1,3 +1,3 @@
 module EasyAI
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyai
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Wade