kdeploy 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14af235c838f2eedcd245709e574da869a894aeb8a56546ad3e91a3ca539b81
-  data.tar.gz: eb26703e45873b1f531436ec824cc4b5d24dc9e08a1719aede9b67946208ad9c
+  metadata.gz: 8ae2bd2f567f7b160a845830a1f3ffd63a5f46037018ab2ca42aec65f65e5c3c
+  data.tar.gz: 3865ed7280339e8a225a12709982a9570d116fc7cd5f0adbc648673123976fb5
 SHA512:
-  metadata.gz: aba8d30f09879f60a61362bb2e36276bf648efac29c81a1c9f69958813465124ccd7463c1e3811936f9194bef95d1bc6a6c3cf4cfc713829122c6f80ec86d4d6
-  data.tar.gz: '09eb4d286a72d68e382a6453114de89f58e9f2d9c7e455e84f6fbe474fcf46537aff910bb2002d03ddca2ec05708d4c2fc67bd3617f84d80b4efcec38f20d5b3'
+  metadata.gz: d58d7a011c9b57e318a97e74ce394b8862f3f4025708008be4eb5b4d4b2970d1087e0a7255d2970091aee8f2bb813b31353cd8aab0e9605bc6eba8cb8da83e8f
+  data.tar.gz: d69468308df5ef175023159cd5ee4860d3b65187374928a6aacd3bbcd38095d701d6a303465e20079a5355f39d8a5ffcc7322cf3628930ab2d012080adf87bc1

data/README.md

@@ -15,6 +15,9 @@
 
 A lightweight agentless deployment automation tool written in Ruby.
 
+[![Gem Version](https://badge.fury.io/rb/kdeploy.svg)](https://badge.fury.io/rb/kdeploy)
+[![Ruby](https://github.com/kevin197011/kdeploy/actions/workflows/gem-push.yml/badge.svg)](https://github.com/kevin197011/kdeploy/actions/workflows/gem-push.yml)
+
 ## 🌟 Features
 
 - 🔑 **Agentless Remote Deployment**: Uses SSH for secure remote execution
@@ -38,13 +41,13 @@ gem 'kdeploy'
 And then execute:
 
 ```bash
-$ bundle install
+bundle install
 ```
 
 Or install it yourself as:
 
 ```bash
-$ gem install kdeploy
+gem install kdeploy
 ```
 
 ### Shell Completion
@@ -76,7 +79,7 @@ Now you can use Tab completion for:
 1. Initialize a new project:
 
 ```bash
-$ kdeploy init my-deployment
+kdeploy init my-deployment
 ```
 
 2. Edit the deployment configuration:
@@ -104,11 +107,7 @@ end
 3. Run the deployment:
 
 ```bash
-# Execute all tasks in deploy.rb
-$ kdeploy execute deploy.rb
-
-# Execute a specific task
-$ kdeploy execute deploy.rb deploy_web
+kdeploy execute deploy.rb
 ```
 
 ## 📖 Usage Guide

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/initializer.rb

@@ -156,19 +156,6 @@ module Kdeploy
     def create_readme
       File.write(File.join(@target_dir, 'README.md'), <<~MD)
         # Deployment Project
-        ```
-                  _            _
-          /\ /\__| | ___ _ __ | | ___  _   _
-         / //_/ _` |/ _ \ '_ \| |/ _ \| | | |
-        / __ \ (_| |  __/ |_) | | (_) | |_| |
-        \/  \/\__,_|\___| .__/|_|\___/ \__, |
-                        |_|            |___/
-
-
-        ⚡ Lightweight Agentless Deployment Tool
-        🚀 Deploy with confidence, scale with ease
-
-        ```
 
         This is a deployment project created with Kdeploy.
 
@@ -226,9 +213,9 @@ module Kdeploy
         2. Run tasks in the order they were defined
         3. Show task name before each task execution
         4. Display color-coded output for better readability:
-           - 🟢 Green: Normal output and success messages
-           - 🔴 Red: Errors and failure messages
-           - 🟡 Yellow: Warnings and notices
+            - 🟢 Green: Normal output and success messages
+            - 🔴 Red: Errors and failure messages
+            - 🟡 Yellow: Warnings and notices
 
         ### Available Tasks
 

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.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kdeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Norton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-30 00:00:00.000000000 Z
+date: 2025-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -177,7 +177,6 @@ files:
 - README.md
 - exe/kdeploy
 - ext/mkrf_conf.rb
-- k.md
 - lib/kdeploy.rb
 - lib/kdeploy/banner.rb
 - lib/kdeploy/cli.rb

data/k.md

@@ -1,149 +0,0 @@
-以下是将 Kdeploy 项目的开发需求整理成的标准 Markdown 格式文档，可保存为 `dev_requirements.md`：
-
----
-
-```markdown
-# 📦 Kdeploy 开发需求文档
-
-> **项目名称**：Kdeploy
-> **项目类型**：Ruby Gem
-> **定位**：轻量级 agentless 运维部署工具
-> **灵感来源**：Ansible、Chef、Puppet
-> **目标用户**：DevOps、SRE、系统运维工程师
-
----
-
-## 🧭 项目目标
-
-- 提供 **无 agent** 的远程部署解决方案
-- 使用 **优雅的 Ruby DSL** 编写部署任务
-- 支持任务的 **并发执行**
-- 能够进行任务 **状态统计与结果输出**
-- 管理 **完整的部署生命周期**（准备、执行、清理、回滚等）
-- 简洁、轻量、便于嵌入其他工具链
-- 可支持 **多主机、多环境配置管理**
-
----
-
-## 📁 项目结构
-
-```
-
-kdeploy/
-├── bin/
-│   └── kdeploy             # 主执行文件
-├── lib/
-│   ├── kdeploy/
-│   │   ├── dsl.rb          # DSL 定义
-│   │   ├── executor.rb     # 并发执行器
-│   │   ├── inventory.rb    # 主机清单管理
-│   │   ├── lifecycle.rb    # 生命周期管理
-│   │   ├── logger.rb       # 日志与输出
-│   │   └── version.rb
-│   └── kdeploy.rb          # 主入口
-├── tasks/
-│   └── deploy.rb           # 示例任务（用户自定义）
-├── spec/
-│   └── kdeploy\_spec.rb     # RSpec 测试
-├── kdeploy.gemspec
-└── README.md
-
-````
-
----
-
-## 🔧 功能模块设计
-
-### 1. DSL 任务定义
-
-```ruby
-host 'web01', user: 'ubuntu', ip: '10.0.0.1'
-
-task :deploy_web do
-  run 'sudo systemctl stop nginx'
-  upload './nginx.conf', '/etc/nginx/nginx.conf'
-  run 'sudo systemctl start nginx'
-end
-````
-
-### 2. 并发执行器
-
-* 线程池并发执行远程任务
-* 自动记录成功/失败状态
-* 支持最大并发数限制
-
-### 3. 生命周期管理
-
-* `prepare`：初始化（如环境检查）
-* `run`：主要任务执行
-* `cleanup`：清理临时文件或状态
-* `rollback`：失败回滚（可选）
-
-### 4. 主机清单
-
-支持静态或动态清单，如：
-
-```ruby
-inventory do
-  host 'web01', user: 'ubuntu', ip: '10.0.0.1'
-  host 'db01', user: 'root', ip: '10.0.0.2'
-end
-```
-
-### 5. 输出日志与状态统计
-
-* 控制台美化输出（使用 `pastel`、`tty-table` 等）
-* 最终报告：执行成功/失败主机、任务耗时、回滚信息等
-
----
-
-## 🖥️ 命令行工具设计
-
-执行文件：`bin/kdeploy`
-
-```bash
-kdeploy run tasks/deploy.rb --limit web01,web02 --parallel 5 --dry-run
-```
-
-| 参数            | 说明            |
-| ------------- | ------------- |
-| `run`         | 执行某个 DSL 任务文件 |
-| `--limit`     | 限定主机          |
-| `--parallel`  | 设置并发线程数       |
-| `--dry-run`   | 预览任务，不真正执行    |
-| `--rollback`  | 启动回滚          |
-| `--inventory` | 使用特定主机清单文件    |
-
----
-
-## 🧩 可扩展性设计
-
-* 支持插件机制：可注册自定义任务类型
-* 可支持其他协议（如 WinRM、Docker、Kubernetes 等）
-* 日后可支持多环境配置（dev/stage/prod）
-* 支持本地/远程日志聚合
-
----
-
-## 📦 开发计划建议
-
-| 阶段         | 内容                                        |
-| ---------- | ----------------------------------------- |
-| 1️⃣ 初始化    | 使用 `bundle gem .` 生成项目骨架，添加执行文件     |
-| 2️⃣ DSL 实现 | 定义基本任务语法（`host`, `task`, `run`, `upload`） |
-| 3️⃣ SSH 执行 | 实现基础 SSH 执行器（使用 `net-ssh`）                |
-| 4️⃣ 并发执行   | 引入线程池或 `concurrent-ruby`                  |
-| 5️⃣ 生命周期   | 支持 prepare/run/cleanup/rollback 阶段        |
-| 6️⃣ 状态统计   | 记录执行状态并输出汇总表                              |
-| 7️⃣ CLI 工具 | 实现 `bin/kdeploy` 命令入口                     |
-| 8️⃣ 测试与发布  | 使用 RSpec 添加测试，推送到 RubyGems                |
-
----
-
-## 📝 初始化命令
-
-```bash
-bundle gem . --test=rspec --mit --coc --no-ext
-```
-
-