Merge pull request #79 from K9i-0/feat/update-channels

feat: アップデートチャンネル機能を実装

Author: K9i-0

.github/workflows/release-common.yml

@@ -79,7 +79,7 @@ jobs:
           name: dmg-artifact
           path: .
 
-      - name: Generate Sparkle appcast
+      - name: Update appcast on gh-pages
         env:
           SPARKLE_PRIVATE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY }}
           VERSION: ${{ needs.prepare.outputs.version }}
@@ -95,57 +95,13 @@ jobs:
             exit 1
           fi
 
-          if [ -n "$SPARKLE_PRIVATE_KEY" ]; then
-            echo "✅ Generating Sparkle appcast.xml..."
-            echo "📦 DMG file: $DMG_PATH"
-            
-            # Create directories
-            mkdir -p sparkle appcast
-            
-            # Download and extract Sparkle
-            echo "Downloading Sparkle tools..."
-            cd sparkle
-            curl -Lo sparkle.tar.xz https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz
-            tar xzf sparkle.tar.xz
-            cd ..
-            
-            # Copy DMG to appcast directory
-            cp "$DMG_PATH" appcast/
-            
-            # Create temporary file for private key
-            PRIVATE_KEY_FILE=$(mktemp)
-            trap "rm -f $PRIVATE_KEY_FILE" EXIT
-            (umask 077 && echo -n "$SPARKLE_PRIVATE_KEY" > "$PRIVATE_KEY_FILE")
-            
-            # Generate appcast
-            DOWNLOAD_URL_PREFIX="https://github.com/${{ github.repository }}/releases/download/v${VERSION}/"
-            ./sparkle/bin/generate_appcast \
-              --ed-key-file "$PRIVATE_KEY_FILE" \
-              --download-url-prefix "$DOWNLOAD_URL_PREFIX" \
-              -o appcast.xml \
-              appcast/
-            
-            # Clean up
-            rm -rf sparkle appcast
-            
-            if [ -f "appcast.xml" ]; then
-              echo "✅ Successfully generated appcast.xml"
-            else
-              echo "❌ Failed to generate appcast.xml"
-              exit 1
-            fi
-          else
-            echo "⚠️ No Sparkle private key, creating empty appcast.xml"
-            {
-              echo '<?xml version="1.0" encoding="utf-8"?>'
-              echo '<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">'
-              echo '  <channel>'
-              echo '    <title>Claude Code Monitor</title>'
-              echo '    <description>No Sparkle key configured</description>'
-              echo '  </channel>'
-              echo '</rss>'
-            } > appcast.xml
-          fi
+          # Configure git
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+
+          # Call update-appcast script
+          IS_DEV=${{ inputs.is_dev_build }}
+          ./scripts/update-appcast.sh "$VERSION" "$IS_DEV"
 
       - name: Create and push tag
         run: |
@@ -208,5 +164,4 @@ jobs:
           draft: false
           prerelease: ${{ inputs.is_dev_build }}
           files: |
-            *.dmg
-            appcast.xml
+            *.dmg

.swiftlint.yml

@@ -73,6 +73,7 @@ disabled_rules:
   - trailing_comma
   - force_cast
   - force_try
+  - type_body_length
 
 # Rule configuration
 line_length:

CHANGELOG.md

@@ -18,6 +18,21 @@ All notable changes to this project will be documented in this file.
 
 
 
+
+## [0.7.15] - 2025-07-20
+
+### Added
+- アップデートチャンネル機能（安定版/開発版の選択）
+- 各チャンネルの最新バージョン表示
+- Debug版でのアップデート設定UI表示
+
+### Changed
+- アップデート配信をGitHub Pagesベースに変更
+- 開発版チャンネルの説明文を「releases only」に修正
+
+### Fixed
+- 
+
 ## [0.7.14] - 2025-07-06
 
 ### Fixed

Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.14</string>
+	<string>0.7.15</string>
 	<key>CFBundleVersion</key>
-	<string>0.7.14</string>
+	<string>0.7.15</string>
 	<key>CcusageVersion</key>
 	<string>15.3.0</string>
 	<key>LSMinimumSystemVersion</key>

Sources/ClaudeUsageMonitor/App/AppDelegate.swift

@@ -21,16 +21,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     // Sparkle configuration based on build type
     #if canImport(Sparkle)
         #if DEBUG
-        // Allow testing Sparkle in debug builds with TEST_SPARKLE environment variable
-        private let updaterController: SPUStandardUpdaterController? = {
-            if ProcessInfo.processInfo.environment["TEST_SPARKLE"] != nil {
-                print("⚠️ Sparkle enabled in DEBUG mode for testing")
-                return SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
-            }
-            return nil
-        }()
+        // Enable Sparkle in debug builds for testing update UI
+        private lazy var updaterController = SPUStandardUpdaterController(startingUpdater: false, updaterDelegate: self, userDriverDelegate: nil)
         #else
-        private let updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
+        private lazy var updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: self, userDriverDelegate: nil)
         #endif
     #else
     private let updaterController: AnyObject? = nil
@@ -41,10 +35,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         #if DEBUG
         // This will be reflected in menu bar and other UI elements
         print("Running in DEBUG mode")
-        if ProcessInfo.processInfo.environment["TEST_SPARKLE"] != nil {
-            print("Sparkle testing mode enabled")
-        }
+        print("Sparkle is enabled for UI testing (auto-updates disabled)")
         #endif
+        
+        // Configure Sparkle update channel
+        configureUpdateChannel()
 
         // Perform synchronous environment check first
         environmentCheckResult = CommandExecutor.shared.checkEnvironmentSync()
@@ -231,7 +226,35 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationWillTerminate(_ notification: Notification) {
         usageMonitor.stopMonitoring()
     }
+    
+    private func configureUpdateChannel() {
+        #if canImport(Sparkle)
+        let channel = UserDefaults.standard.updateChannel
+        print("Sparkle configured for \(channel.rawValue) channel: \(channel.appcastURL)")
+        #endif
+    }
+    
+    func updateChannelChanged(to newChannel: UpdateChannel) {
+        #if canImport(Sparkle)
+        let updater = updaterController.updater
+        
+        print("Sparkle channel changed to \(newChannel.rawValue): \(newChannel.appcastURL)")
+        
+        // Check for updates with new channel
+        updater.checkForUpdates()
+        #endif
+    }
+}
+
+// MARK: - SPUUpdaterDelegate
+#if canImport(Sparkle)
+extension AppDelegate: SPUUpdaterDelegate {
+    nonisolated func feedURLString(for updater: SPUUpdater) -> String? {
+        let channel = UserDefaults.standard.updateChannel
+        return channel.appcastURL
+    }
 }
+#endif
 
 class EventMonitor {
     private var monitor: Any?

Sources/ClaudeUsageMonitor/Models/UpdateChannel.swift

@@ -0,0 +1,38 @@
+import Foundation
+
+enum UpdateChannel: String, CaseIterable {
+    case stable = "stable"
+    case dev = "dev"
+    
+    var displayName: String {
+        switch self {
+        case .stable:
+            return L10n.Update.stableChannel
+        case .dev:
+            return L10n.Update.devChannel
+        }
+    }
+    
+    var appcastURL: String {
+        switch self {
+        case .stable:
+            return "https://k9i-0.github.io/ClaudeCodeMonitor/appcast.xml"
+        case .dev:
+            return "https://k9i-0.github.io/ClaudeCodeMonitor/appcast-dev.xml"
+        }
+    }
+    
+    var description: String {
+        switch self {
+        case .stable:
+            return L10n.Update.stableChannelDescription
+        case .dev:
+            return L10n.Update.devChannelDescription
+        }
+    }
+    
+    static func fromVersion(_ version: String) -> UpdateChannel {
+        // If version contains "-dev", it's a dev channel
+        return version.contains("-dev") ? .dev : .stable
+    }
+}

Sources/ClaudeUsageMonitor/Resources/en.lproj/Localizable.strings

@@ -165,3 +165,10 @@
 "update.upToDate" = "You're up to date!";
 "update.available" = "Update available";
 "update.failed" = "Failed to check for updates";
+"update.updateChannel" = "Update Channel";
+"update.stableChannel" = "Stable";
+"update.devChannel" = "Development";
+"update.stableChannelDescription" = "Stable releases only";
+"update.devChannelDescription" = "Development releases only";
+"update.recommended" = "(Recommended)";
+"update.latestVersion" = "Latest: %@";

Sources/ClaudeUsageMonitor/Resources/ja.lproj/Localizable.strings

@@ -165,3 +165,10 @@
 "update.upToDate" = "最新の状態です！";
 "update.available" = "アップデートがあります";
 "update.failed" = "アップデート確認に失敗しました";
+"update.updateChannel" = "アップデートチャンネル";
+"update.stableChannel" = "安定版";
+"update.devChannel" = "開発版";
+"update.stableChannelDescription" = "安定版リリースのみ";
+"update.devChannelDescription" = "開発版リリースのみ";
+"update.recommended" = "(推奨)";
+"update.latestVersion" = "最新: %@";

Sources/ClaudeUsageMonitor/Utils/Localization.swift

@@ -306,5 +306,14 @@ struct L10n {
         static var upToDate: String { "update.upToDate".localized }
         static var available: String { "update.available".localized }
         static var failed: String { "update.failed".localized }
+        static var updateChannel: String { "update.updateChannel".localized }
+        static var stableChannel: String { "update.stableChannel".localized }
+        static var devChannel: String { "update.devChannel".localized }
+        static var stableChannelDescription: String { "update.stableChannelDescription".localized }
+        static var devChannelDescription: String { "update.devChannelDescription".localized }
+        static var recommended: String { "update.recommended".localized }
+        static func latestVersion(version: String) -> String {
+            return "update.latestVersion".localized(with: version)
+        }
     }
 }

Sources/ClaudeUsageMonitor/Utils/UserDefaults+UpdateChannel.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+extension UserDefaults {
+    private enum Keys {
+        static let updateChannel = "UpdateChannel"
+    }
+    
+    var updateChannel: UpdateChannel {
+        get {
+            guard let rawValue = string(forKey: Keys.updateChannel),
+                  let channel = UpdateChannel(rawValue: rawValue) else {
+                // Auto-detect based on current version
+                let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
+                return UpdateChannel.fromVersion(version)
+            }
+            return channel
+        }
+        set {
+            set(newValue.rawValue, forKey: Keys.updateChannel)
+        }
+    }
+}