kdeploy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3be52250612f3eb627a5044db454c87f7258396f9a0c066be85df9ff8f33b9d
-  data.tar.gz: c802622e109e4e5d0620456a732e2b8b870b77ec0e422fe461ff1edf6993cd7e
+  metadata.gz: 13ad6844e1610898cc64413ee752b17e5b0c83e75b3f503abe73681c79be3bc4
+  data.tar.gz: 2fda0c6eb62f2a2ac9a592cce564769d950a7b2f88510f1c251f0dcaceccca86
 SHA512:
-  metadata.gz: cc0fba2a35c4bff14238ef9c4f088d1f2fc52f1625e3c7e38394d5100d57db3556fc634af21afcb4b991b1f24e6339c1649c8cc52a58a20a29eb0b8e24d8e956
-  data.tar.gz: 52cb3084e8bf51f50e92556b13e241451dd6c6bfa6df7ed9041a042ea96eb4f1fe5c8d310af9e706a3e2396eea963f0bc552e6c72efb5aa29eead6da014f553b
+  metadata.gz: 3bb78e52644c736b6d9f6a18e506de11e2c331e464a19f9d09c7f4da334d7efb464a8875bac9375717b9cec7a3ed5a42fe68e968d68fb30c2c40ceea9a4aa20e
+  data.tar.gz: 6654fae1a9d1eb08b45a790bb12d08050350148069080a848e48cdb921f7b593a5d77d5f5cb50e8605c9a55417aaacc596eb21f3a96ec1369167bcb00aed2af5

data/exe/kdeploy

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "kdeploy"
+require 'kdeploy'
 
-Kdeploy::CLI.start(ARGV)
+Kdeploy::CLI.start(ARGV)

data/lib/kdeploy/cli.rb

@@ -103,7 +103,7 @@ module Kdeploy
 
         runner = Runner.new(hosts, self.class.kdeploy_tasks, parallel: options[:parallel])
         results = runner.run(task)
-        print_results(results)
+        print_results(results, task)
       end
     rescue StandardError => e
       puts Kdeploy::Banner.show_error(e.message)
@@ -122,11 +122,11 @@ module Kdeploy
     end
 
     def filter_hosts(limit, task_hosts)
-      hosts = self.class.kdeploy_hosts.select { |name, _| task_hosts.include?(name) }
+      hosts = self.class.kdeploy_hosts.slice(*task_hosts)
       return hosts unless limit
 
       host_names = limit.split(',').map(&:strip)
-      hosts.select { |name, _| host_names.include?(name) }
+      hosts.slice(*host_names)
     end
 
     def print_dry_run(hosts, task_name)
@@ -167,10 +167,13 @@ module Kdeploy
       end
     end
 
-    def print_results(results)
+    def print_results(results, task_name)
       puts Kdeploy::Banner.show
       pastel = Pastel.new
 
+      puts "#{pastel.bright_cyan('Task:')} #{pastel.bright_white(task_name)}"
+      puts
+
       results.each do |host, result|
         status = if result[:status] == :success
                    pastel.green('✓ Success')
@@ -184,10 +187,42 @@ module Kdeploy
           result[:output].each do |cmd|
             puts "  #{pastel.bright_yellow('$')} #{cmd[:command]}"
             if cmd[:output].is_a?(Hash)
-              puts "  #{cmd[:output][:stdout]}" unless cmd[:output][:stdout].empty?
-              puts "  #{pastel.red(cmd[:output][:stderr])}" unless cmd[:output][:stderr].empty?
+              unless cmd[:output][:stdout].empty?
+                cmd[:output][:stdout].each_line do |line|
+                  line = line.strip
+                  next if line.empty?
+
+                  # 根据输出内容的特征来决定颜色
+                  colored_line = if line.match?(/error|fail|fatal|critical/i)
+                                   pastel.red(line)
+                                 elsif line.match?(/warn|deprecat|notice/i)
+                                   pastel.yellow(line)
+                                 else
+                                   pastel.green(line)
+                                 end
+                  puts "    #{colored_line}"
+                end
+              end
+              unless cmd[:output][:stderr].empty?
+                cmd[:output][:stderr].each_line do |line|
+                  puts "    #{pastel.red(line)}" unless line.strip.empty?
+                end
+              end
             elsif cmd[:output]
-              puts "  #{cmd[:output]}"
+              cmd[:output].each_line do |line|
+                line = line.strip
+                next if line.empty?
+
+                # 根据输出内容的特征来决定颜色
+                colored_line = if line.match?(/error|fail|fatal|critical/i)
+                                 pastel.red(line)
+                               elsif line.match?(/warn|deprecat|notice/i)
+                                 pastel.yellow(line)
+                               else
+                                 pastel.green(line)
+                               end
+                puts "    #{colored_line}"
+              end
             end
             puts
           end

data/lib/kdeploy/dsl.rb

@@ -79,20 +79,16 @@ module Kdeploy
       hosts = Set.new
 
       # 添加指定的主机
-      if task[:hosts]
-        task[:hosts].each do |host|
-          hosts.add(host) if kdeploy_hosts.key?(host)
-        end
+      task[:hosts]&.each do |host|
+        hosts.add(host) if kdeploy_hosts.key?(host)
       end
 
       # 添加角色中的主机
-      if task[:roles]
-        task[:roles].each do |role|
-          next unless role_hosts = kdeploy_roles[role]
+      task[:roles]&.each do |role|
+        next unless (role_hosts = kdeploy_roles[role])
 
-          role_hosts.each do |host|
-            hosts.add(host) if kdeploy_hosts.key?(host)
-          end
+        role_hosts.each do |host|
+          hosts.add(host) if kdeploy_hosts.key?(host)
         end
       end
 

data/lib/kdeploy/initializer.rb

@@ -28,8 +28,8 @@ module Kdeploy
         # frozen_string_literal: true
 
         # Define hosts
-        host "web01", user: "ubuntu", ip: "10.0.0.1", key: "~/.ssh/id_rsa"
-        host "web02", user: "ubuntu", ip: "10.0.0.2", key: "~/.ssh/id_rsa"
+        host 'web01', user: 'ubuntu', ip: '10.0.0.1', key: '~/.ssh/id_rsa'
+        host 'web02', user: 'ubuntu', ip: '10.0.0.2', key: '~/.ssh/id_rsa'
 
         # Define roles
         role :web, %w[web01 web02]
@@ -37,48 +37,48 @@ module Kdeploy
 
         # Define inventory
         inventory do
-          host "db01", user: "root", ip: "10.0.0.3", key: "~/.ssh/id_rsa"
+          host 'db01', user: 'root', ip: '10.0.0.3', key: '~/.ssh/id_rsa'
         end
 
         # Define deployment task for web servers
         task :deploy_web, roles: :web do
           # Stop service
-          run "sudo systemctl stop nginx"
+          run 'sudo systemctl stop nginx'
 
           # Upload configuration using ERB template
-          upload_template "./config/nginx.conf.erb", "/etc/nginx/nginx.conf",
-            domain_name: "example.com",
+          upload_template './config/nginx.conf.erb', '/etc/nginx/nginx.conf',
+            domain_name: 'example.com',
             port: 3000,
             worker_processes: 4,
             worker_connections: 2048
 
           # Upload static configuration
-          upload "./config/app.conf", "/etc/nginx/conf.d/app.conf"
+          upload './config/app.conf', '/etc/nginx/conf.d/app.conf'
 
           # Restart service
-          run "sudo systemctl start nginx"
+          run 'sudo systemctl start nginx'
 
           # Check status
-          run "sudo systemctl status nginx"
+          run 'sudo systemctl status nginx'
         end
 
         # Define backup task for database servers
         task :backup_db, roles: :db do
-          run "tar -czf /tmp/backup.tar.gz /var/lib/postgresql/data"
-          run "aws s3 cp /tmp/backup.tar.gz s3://my-backups/"
-          run "rm /tmp/backup.tar.gz"
+          run 'tar -czf /tmp/backup.tar.gz /var/lib/postgresql/data'
+          run 'aws s3 cp /tmp/backup.tar.gz s3://my-backups/'
+          run 'rm /tmp/backup.tar.gz'
         end
 
         # Define task for specific hosts
         task :maintenance, on: %w[web01] do
-          run "sudo systemctl stop nginx"
-          run "sudo apt-get update && sudo apt-get upgrade -y"
-          run "sudo systemctl start nginx"
+          run 'sudo systemctl stop nginx'
+          run 'sudo apt-get update && sudo apt-get upgrade -y'
+          run 'sudo systemctl start nginx'
         end
 
         # Define task for all hosts
         task :update do
-          run "sudo apt-get update && sudo apt-get upgrade -y"
+          run 'sudo apt-get update && sudo apt-get upgrade -y'
         end
       RUBY
     end

data/lib/kdeploy/template.rb

@@ -2,6 +2,7 @@
 
 require 'erb'
 require 'ostruct'
+require 'tempfile'
 
 module Kdeploy
   class Template

data/lib/kdeploy/version.rb

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

metadata

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