kdeploy 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14af235c838f2eedcd245709e574da869a894aeb8a56546ad3e91a3ca539b81
-  data.tar.gz: eb26703e45873b1f531436ec824cc4b5d24dc9e08a1719aede9b67946208ad9c
+  metadata.gz: 49d961844c07920b802b76ae12a6f45d49be63955e3d5c78ab68cc0e2c2b4f3e
+  data.tar.gz: 7eb0c1863c4874c481f71af6f7c4b0f523984349200c8eb8592c1b9fe20025cd
 SHA512:
-  metadata.gz: aba8d30f09879f60a61362bb2e36276bf648efac29c81a1c9f69958813465124ccd7463c1e3811936f9194bef95d1bc6a6c3cf4cfc713829122c6f80ec86d4d6
-  data.tar.gz: '09eb4d286a72d68e382a6453114de89f58e9f2d9c7e455e84f6fbe474fcf46537aff910bb2002d03ddca2ec05708d4c2fc67bd3617f84d80b4efcec38f20d5b3'
+  metadata.gz: 18ad6647967c2388bd76d4d1d3b81b890116e236d8059bf9d653009cebe09989341b1573c957f5eb3a8ab81f24c8ad5ea1dcd6351d7d58886e62d57bf898cde2
+  data.tar.gz: 795c2c40e0614ac08e535b5ec16613fe1370c2f0513498da454a7a660af425b768bfe8c1694db95a1926bb3633e2cc9549c0ef927b0fd2223ead3010a72ab908

data/lib/kdeploy/completions/kdeploy.zsh

@@ -1,8 +1,10 @@
 #compdef kdeploy
 
 _kdeploy() {
-    local -a commands options
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
 
+    local -a commands
     commands=(
         'init:Initialize a new deployment project'
         'execute:Execute deployment tasks from file'
@@ -10,24 +12,25 @@ _kdeploy() {
         'version:Show version information'
     )
 
+    local -a options
     options=(
         '--dry-run[Show what would be done without executing]'
         '--limit[Limit to specific hosts (comma-separated)]'
         '--parallel[Number of parallel executions (default: 5)]'
     )
 
-    _arguments -C \
-        '1: :->cmds' \
-        '*:: :->args'
+    _arguments \
+        '1: :->command' \
+        '*: :->args'
 
-    case "$state" in
-        cmds)
+    case $state in
+        command)
             _describe -t commands 'kdeploy commands' commands
             ;;
         args)
-            case $words[1] in
+            case $words[2] in
                 execute)
-                    if (( CURRENT == 2 )); then
+                    if [[ $CURRENT -eq 3 ]]; then
                         _files -g "*.rb"
                     else
                         _values 'options' $options
@@ -44,4 +47,4 @@ _kdeploy() {
     esac
 }
 
-_kdeploy "$@"
+compdef _kdeploy kdeploy

data/lib/kdeploy/post_install.rb

@@ -23,12 +23,17 @@ module Kdeploy
         source_line = "source \"#{completion_path}\""
 
         # 检查是否已经配置
-        return if File.read(bashrc_path).include?(source_line)
-
-        # 添加配置
-        File.open(bashrc_path, 'a') do |f|
-          f.puts "\n# Kdeploy completion"
-          f.puts source_line
+        content = File.read(bashrc_path)
+        if content.match?(/source.*kdeploy\.bash/)
+          # 更新现有的配置
+          new_content = content.gsub(/source.*kdeploy\.bash.*$/, source_line)
+          File.write(bashrc_path, new_content)
+        else
+          # 添加新配置
+          File.open(bashrc_path, 'a') do |f|
+            f.puts "\n# Kdeploy completion"
+            f.puts source_line
+          end
         end
         puts "✅ Bash completion configured in #{bashrc_path}"
       rescue StandardError => e
@@ -49,12 +54,16 @@ module Kdeploy
         content = File.read(zshrc_path)
 
         # 检查是否已经配置
-        return if source_lines.all? { |line| content.include?(line) }
-
-        # 添加配置
-        File.open(zshrc_path, 'a') do |f|
-          f.puts "\n# Kdeploy completion"
-          source_lines.each { |line| f.puts line unless content.include?(line) }
+        if content.match?(/source.*kdeploy\.zsh/)
+          # 更新现有的配置
+          new_content = content.gsub(/source.*kdeploy\.zsh.*$/, source_lines[0])
+          File.write(zshrc_path, new_content)
+        else
+          # 添加新配置
+          File.open(zshrc_path, 'a') do |f|
+            f.puts "\n# Kdeploy completion"
+            source_lines.each { |line| f.puts line unless content.include?(line) }
+          end
         end
         puts "✅ Zsh completion configured in #{zshrc_path}"
       rescue StandardError => e
@@ -62,17 +71,30 @@ module Kdeploy
       end
 
       def find_completion_file(filename)
-        # 在开发环境中使用相对路径
-        dev_path = File.expand_path("../completions/#{filename}", __FILE__)
-        return dev_path if File.exist?(dev_path)
-
-        # 在安装环境中使用 GEM_HOME
-        if ENV['GEM_HOME']
-          installed_path = File.join(ENV['GEM_HOME'], 'gems/kdeploy-*/lib/kdeploy/completions', filename)
-          completion_files = Dir.glob(installed_path)
-          return completion_files.first if completion_files.any?
+        # 尝试所有可能的路径
+        paths = [
+          # 开发环境路径
+          File.expand_path("../completions/#{filename}", __FILE__),
+          # RubyGems 安装路径
+          *Gem.path.map { |path| File.join(path, "gems/kdeploy-*/lib/kdeploy/completions/#{filename}") },
+          # 系统路径
+          "/usr/local/share/kdeploy/completions/#{filename}",
+          "/usr/share/kdeploy/completions/#{filename}"
+        ]
+
+        # 使用 Dir.glob 处理通配符路径
+        paths.each do |path|
+          if path.include?('*')
+            matches = Dir.glob(path)
+            return matches.first if matches.any?
+          elsif File.exist?(path)
+            return path
+          end
         end
 
+        puts "⚠️  Could not find completion file: #{filename}"
+        puts 'Searched paths:'
+        paths.each { |path| puts "  - #{path}" }
         nil
       end
 

data/lib/kdeploy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kdeploy
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Norton