chagall 0.0.1.beta7 → 0.0.1.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f8df566c5608a68224f0cda8ee7ec4dc2ad6b9c3657476052271c033104ccc5
-  data.tar.gz: fc9fdbd3a3c2035459d7239a9f245a030df45994bd7b1346dbed62a735014493
+  metadata.gz: 3b71d4dc675330a21d335828083d5df59f2185c162da6ff7f148cf892d5e1c02
+  data.tar.gz: e36708f4106e520c05b012ad217e730af13e641e6cbd60fab27dcd325ed2a05e
 SHA512:
-  metadata.gz: 1cb86c45fe1af47f7c8791ed73025903ae5338ecfaee7b6b287c96b4959fa21670f5677cbc228715e4949603329601d0a8fe4fe2584d15090206830b526908ca
-  data.tar.gz: 5b9cd2bb23766a47c6f1727dcd4a04d4c068fdbdeec942115adfa11aac01ac739b131c1314156f201db2a5868d24ae0ae396b1f9b41fa720f1e52f0691c6ddb4
+  metadata.gz: 29e65ddb06d27576d2783ec7ab77e580e15e55198cf57dced7df01e573b6c0280ed81017382708d68cfb32028aa1947dc6d7b752bc81917d3f0cdb9d835c62f8
+  data.tar.gz: 6ae10fbadb652749a53493cd42d3f997c446f5bcfdab8b8ac59c3df76cdc4b1b58f4de03d4b7577093e561840ff495902f712eb5cdb37cd2824d54000160682c

data/lib/chagall/base.rb

@@ -1,5 +1,6 @@
 require "logger"
 require_relative "ssh"
+require_relative "settings"
 
 module Chagall
   class Base < Clamp::Command
@@ -14,6 +15,7 @@ module Chagall
 
     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,13 +23,11 @@ module Chagall
             "#{msg}\n"
           end
         end
-
-        l.level = LOG_LEVELS[ENV.fetch("LOG_LEVEL", "info")]
       end
     end
 
     def ssh
-      @ssh ||= SSH.new(logger: logger)
+      @ssh ||= Chagall::Ssh.new(logger: logger)
     end
   end
 end

data/lib/chagall/compose.rb

@@ -5,8 +5,6 @@ module Chagall
   class Compose < Base
     attr_reader :command, :arguments
 
-
-    # Override parse method to handle all arguments after the subcommand
     def parse(arguments)
       if arguments.empty?
         puts "ERROR: Missing required arguments"
@@ -14,13 +12,10 @@ module Chagall
         exit(1)
       end
 
-      # Extract the first argument as command
       @command = arguments.shift
 
-      # Store the rest as raw args
       @raw_args = arguments
 
-      # Validate required arguments
       if @command.nil? || @command.empty?
         puts "ERROR: Command is required"
         puts "Usage: chagall compose COMMAND [OPTIONS]"
@@ -32,7 +27,6 @@ module Chagall
       cmd = "cd #{Settings.instance.project_folder_path} && #{build_docker_compose_command} #{@command}"
       cmd << " #{@raw_args.join(" ")}" unless @raw_args.empty?
 
-      logger.debug "Executing: #{cmd}"
       ssh.execute(cmd, tty: true)
     end
 

data/lib/chagall/deploy.rb

@@ -13,14 +13,15 @@ module Chagall
       @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
@@ -78,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)
@@ -171,9 +181,9 @@ module Chagall
       args.push(Settings[:docker_context])
 
       args = args.map { |arg| "    #{arg}" }
-                  .join(" \\\n")
+                 .join(" \\\n")
 
-      cmd =  "docker build \\\n#{args}"
+      cmd =  "docker buildx build \\\n#{args}"
       if Settings[:remote]
         ssh.command(cmd)
       else
@@ -194,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
@@ -216,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)
@@ -249,9 +256,5 @@ module Chagall
 
       result
     end
-
-    def ssh
-      @ssh ||= SSH.new
-    end
   end
 end

data/lib/chagall/settings.rb

@@ -9,16 +9,15 @@ module Chagall
 
     attr_accessor :options, :missing_options, :missing_compose_files
     CHAGALL_PROJECTS_FOLDER = "~/projects"
-    TMP_CACHE_FOLDER = "tmp"
 
     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,
@@ -105,7 +104,7 @@ module Chagall
       {
         key: :cache_from,
         type: :string,
-        default: "#{TMP_CACHE_FOLDER}/.buildx-cache",
+        default: "tmp/.buildx-cache",
         flags: [ "--cache-from" ],
         environment_variable: "CHAGALL_CACHE_FROM",
         description: "Cache from"
@@ -113,7 +112,7 @@ module Chagall
       {
         key: :cache_to,
         type: :string,
-        default: "#{TMP_CACHE_FOLDER}/.buildx-cache-new",
+        default: "tmp/.buildx-cache-new",
         flags: [ "--cache-to" ],
         environment_variable: "CHAGALL_CACHE_TO",
         description: "Cache to"
@@ -201,23 +200,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

@@ -1,12 +1,12 @@
 require "English"
 
 module Chagall
-  class SSH
+  class Ssh
     attr_reader :server, :ssh_args, :logger
 
     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.beta7"
+  VERSION = "0.0.1.beta9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chagall
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta7
+  version: 0.0.1.beta9
 platform: ruby
 authors:
 - Roman Klevtsov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 2025-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp