chagall 0.0.1.beta6 → 0.0.1.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3cbd29143d65c6c6713ea03e0e26a29d7bb520139638cec49467fa932a1915d
-  data.tar.gz: 3c758792a4a406ff7981de63eae1512602b2b41184ce1c68ea00c1aa369dfcd3
+  metadata.gz: 39a3ec571dfa82c816310a2001d8272f3287651defad0695b9d3141392a73182
+  data.tar.gz: 2bc8ea9a4a7cfbc95abf74a3b0fa6f11dde77c73cd8531f8030589e2b089a342
 SHA512:
-  metadata.gz: 53637eb5f31edfd125b9a14c844e888f316e8914a5bfd817eea97e60ae9e5cd5d5b3619f7f1cee2af1421b6ccf4c2e903845bb95cd70a7eaf9d7537312ef0447
-  data.tar.gz: 51b246cc1a5e21171552f56bae8e1b9b4f179468369613de76d7c0e45cf37e8a67b048f63d61248f0deaeb0cc9316ace2d46ad506ff2f516dfd5206ad777b227
+  metadata.gz: 9d17e12ed9746b9cc15614aed4fb666c47779565a279a46cba8589af6ee5e1ca48f66c564838f04b5d49826e13388dc4949449c193fd2582c7ae0e01c40d0ad8
+  data.tar.gz: 828c9ca246db41df0bfc8a8cc9d3c76fb2e8e18d98483bde7d7410a5aaeda1ffdb246e56afe333316e78fdf8d442a96850b2ec843042c52da5005a687e3abd71

data/lib/chagall/base.rb

@@ -1,5 +1,6 @@
 require "logger"
 require_relative "ssh"
+require_relative "settings"
 
 module Chagall
   class Base < Clamp::Command
@@ -9,11 +10,12 @@ module Chagall
       "info" => Logger::INFO,
       "debug" => Logger::DEBUG,
       "warn" => Logger::WARN,
-      "error" => Logger::ERROR,
+      "error" => Logger::ERROR
     }
- 
+
     def logger
       @logger ||= Logger.new($stdout).tap do |l|
+        l.level = LOG_LEVELS[Chagall::Settings[:log_level]]
         l.formatter = proc do |severity, _, _, msg|
           if severity == "DEBUG"
             "[#{severity}] #{msg}\n"
@@ -21,8 +23,6 @@ module Chagall
             "#{msg}\n"
           end
         end
-
-        l.level = LOG_LEVELS[ENV.fetch("LOG_LEVEL", "info")]
       end
     end
 

data/lib/chagall/cli.rb

@@ -10,13 +10,12 @@ Clamp.allow_options_after_parameters = true
 
 module Chagall
   class Cli < Clamp::Command
-
     def run(arguments)
       parse(arguments)
       Chagall::Settings.configure(collect_options_hash)
       execute
     end
- 
+
     def self.options_from_config_file
       @options_from_config_file ||= begin
         config_path = File.join(Dir.pwd, "chagall.yml") || File.join(Dir.pwd, "chagall.yaml")

data/lib/chagall/deploy.rb

@@ -7,21 +7,21 @@ require "yaml"
 
 module Chagall
   class Deploy < Base
-
     attr_reader :total_time
 
     def execute
       @interrupted = false
       @total_time = 0.0
       setup_signal_handlers
-      Time.now
+
+      # binding.irb
 
       t("Checking uncommitted changes") { check_uncommit_changes } unless Settings[:skip_uncommit]
       t("Check image or build") { check_image_or_build }
-      t("tag as production") { tag_as_production }
-      t("update compose files") { update_compose_files }
-      t("deploy compose files") { deploy_compose_files }
-      t("rotate release") { rotate_releases }
+      t("Tag as production") { tag_as_production }
+      t("Update compose files") { update_compose_files }
+      t("Deploy compose files") { deploy_compose_files }
+      t("Rotate release") { rotate_releases }
 
       print_total_time
     rescue Interrupt
@@ -79,8 +79,17 @@ module Chagall
 
     private
 
+    def format_time(seconds)
+      minutes, secs = seconds.abs.divmod(60)
+      hours, mins = minutes.divmod(60)
+      [[hours, 'h'], [mins, 'm'], [secs.round(2), 's']]
+        .reject { |n, _| n.zero? && !(_=='s') }
+        .map { |n, u| "#{n}#{u}" }
+        .join(' ')
+    end
+
     def print_total_time
-      logger.info "Total execution time: #{format('%.2f', @total_time)}s"
+      logger.info "Total execution time: #{format_time(@total_time)}"
     end
 
     def t(title)
@@ -195,7 +204,6 @@ module Chagall
       logger.debug "Updating compose services..."
       deploy_command = [ "docker compose" ]
 
-      # Use the remote file paths for docker compose command
       Settings[:compose_files].each do |file|
         deploy_command << "-f #{File.basename(file)}"
       end
@@ -217,10 +225,8 @@ module Chagall
       release_folder = "#{Settings.instance.project_folder_path}/releases"
       release_file = "#{release_folder}/#{Settings[:release]}"
 
-      # Create releases directory if it doesn't exist
       ssh.execute("mkdir -p #{release_folder}")
 
-      # Save current release
       ssh.execute("touch #{release_file}")
 
       # Get list of releases sorted by modification time (newest first)
@@ -250,9 +256,5 @@ module Chagall
 
       result
     end
-
-    def ssh
-      @ssh ||= SSH.new
-    end  
   end
 end

data/lib/chagall/settings.rb

@@ -13,12 +13,12 @@ module Chagall
 
     OPTIONS = [
       {
-        key: :debug,
-        flags: [ "--debug" ],
-        description: "Debug mode with pry attaching",
-        type: :boolean,
-        default: false,
-        environment_variable: "CHAGALL_DEBUG"
+        key: :log_level,
+        flags: [ "--log-level" ],
+        description: "Log level",
+        type: :string,
+        default: "info",
+        environment_variable: "CHAGALL_LOG_LEVEL"
       },
       {
         key: :skip_uncommit,
@@ -201,23 +201,6 @@ module Chagall
       raise Chagall::SettingsError, error_message_string unless @options[:dry_run]
     end
 
-    def options_from_config_file
-      @options_from_config_file ||= begin
-        config_path = File.join(Dir.pwd, "chagall.yml") || File.join(Dir.pwd, "chagall.yaml")
-        return {} unless File.exist?(config_path)
-
-        config = YAML.load_file(config_path)
-        config.transform_keys(&:to_sym)
-      rescue StandardError => e
-        puts "Warning: Error loading chagall.yml: #{e.message}"
-        {}
-      end
-    end
-
-    def true?(value)
-      value.to_s.strip.downcase == "true"
-    end
-
     def image_tag
       @image_tag ||= "#{options[:name]}:#{options[:release]}"
     end

data/lib/chagall/setup.rb

@@ -34,7 +34,6 @@ module Chagall
     end
 
     def unable_to_access_docker_deamon?
-      return true
       docker_result = ssh.command("docker ps")
       docker_output = `#{docker_result} 2>&1`.strip
       logger.debug "Docker output: #{docker_output}"
@@ -72,8 +71,11 @@ module Chagall
       compose_output = `#{ssh.command("docker compose version")} 2>&1`.strip
       logger.debug "Docker Compose output: '#{compose_output}'"
 
-      return true if docker_output.include?("Docker version") &&
-                      compose_output.include?("Docker Compose version")
+      if docker_output.downcase.include?("docker version") &&
+                      compose_output.downcase.include?("docker compose version")
+        logger.info "Docker and Docker Compose installed"
+        return true
+      end
 
       logger.warn "Docker check failed:"
       logger.warn "Docker output: #{docker_output}"

data/lib/chagall/ssh.rb

@@ -6,7 +6,7 @@ module Chagall
 
     DEFAULT_SSH_ARGS = "-o StrictHostKeyChecking=no -o ServerAliveInterval=60".freeze
 
-    def initialize(server: Settings.instance.options[:server], ssh_args: DEFAULT_SSH_ARGS, logger: Logger.new($stdout))
+    def initialize(server: Settings.instance.options[:server], ssh_args: DEFAULT_SSH_ARGS, logger:)
       @server = server
       @ssh_args = ssh_args
       @logger = logger
@@ -14,7 +14,7 @@ module Chagall
 
     def execute(command, directory: nil, tty: false)
       cmd = build_command(command, directory, tty)
-      logger.debug "SSH: #{cmd}"
+      logger.debug "SSH: #{cmd}" if logger.debug?
       system(cmd)
       $CHILD_STATUS.success?
     end

data/lib/chagall/version.rb

@@ -1,3 +1,3 @@
 module Chagall
-  VERSION = "0.0.1.beta6"
+  VERSION = "0.0.1.beta8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chagall
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta6
+  version: 0.0.1.beta8
 platform: ruby
 authors:
 - Roman Klevtsov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -94,7 +94,6 @@ files:
 - lib/chagall/base.rb
 - lib/chagall/cli.rb
 - lib/chagall/compose.rb
-- lib/chagall/compose/main.rb
 - lib/chagall/deploy.rb
 - lib/chagall/install/main.rb
 - lib/chagall/install/templates/template.Dockerfile

data/lib/chagall/compose/main.rb

@@ -1,52 +0,0 @@
-require_relative "../base"
-
-module Chagall
-  module Compose
-    class Main < Base
-      attr_reader :command, :service, :args
-
-      def initialize(command, *args)
-        @command = command
-        @service = args.first if args.first && !args.first.start_with?('-')
-        @args = @service ? args[1..-1] : args
-
-        raise Chagall::Error, "Command is required" if @command.nil? || @command.empty?
-
-        run_command
-      end
-
-      private
-
-      def run_command
-        cmd = build_command
-        logger.debug "Executing: #{cmd}"
-        
-        result = ssh.execute(cmd, tty: true)
-        raise Chagall::Error, "Command failed: #{cmd}" unless result
-      end
-
-      def build_command
-        cmd = [ "cd #{Settings.instance.project_folder_path}" ]
-        cmd << build_docker_compose_command
-        cmd << @command
-        cmd << @service if @service
-        cmd << @args.join(" ") if @args && @args.any?
-
-        cmd.join(" && ")
-      end
-
-      def build_docker_compose_command
-        compose_files = Settings[:compose_files]
-        compose_cmd = [ "docker compose" ]
-
-        if compose_files && !compose_files.empty?
-          compose_files.each do |file|
-            compose_cmd << "-f #{File.basename(file)}"
-          end
-        end
-
-        compose_cmd.join(" ")
-      end
-    end
-  end
-end