chagall 0.0.1.beta8 → 0.0.1.beta10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/chagall/base.rb +1 -1
- data/lib/chagall/compose.rb +0 -6
- data/lib/chagall/deploy.rb +5 -5
- data/lib/chagall/settings.rb +2 -3
- data/lib/chagall/ssh.rb +1 -1
- data/lib/chagall/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5955b647b3ef2d61b2625d6a0a96b5a31a1187b2b9b813f58cc7109c9fcde188
|
4
|
+
data.tar.gz: a0259e854fbcc1d2841751ba1580b4f79f1b472d21796dd7149a1ede0103ecc9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e95cc021f1a7927bb1adb65fce14d903cce470941fc9866b0638b0ab9bbfe8905a4bfb8c4db746f24fc602dea5e5e3380115090b46b4011136446fc3ec7998e8
|
7
|
+
data.tar.gz: cb6d190e6b55700fff33fd1ca6404dcd540ae54f7ed6c7002efbd8327eba8fbb9ef85aafa7733fba7087aab58c649dbc3a85531cdc94042aeb7031dd3925daac
|
data/lib/chagall/base.rb
CHANGED
data/lib/chagall/compose.rb
CHANGED
@@ -5,8 +5,6 @@ module Chagall
|
|
5
5
|
class Compose < Base
|
6
6
|
attr_reader :command, :arguments
|
7
7
|
|
8
|
-
|
9
|
-
# Override parse method to handle all arguments after the subcommand
|
10
8
|
def parse(arguments)
|
11
9
|
if arguments.empty?
|
12
10
|
puts "ERROR: Missing required arguments"
|
@@ -14,13 +12,10 @@ module Chagall
|
|
14
12
|
exit(1)
|
15
13
|
end
|
16
14
|
|
17
|
-
# Extract the first argument as command
|
18
15
|
@command = arguments.shift
|
19
16
|
|
20
|
-
# Store the rest as raw args
|
21
17
|
@raw_args = arguments
|
22
18
|
|
23
|
-
# Validate required arguments
|
24
19
|
if @command.nil? || @command.empty?
|
25
20
|
puts "ERROR: Command is required"
|
26
21
|
puts "Usage: chagall compose COMMAND [OPTIONS]"
|
@@ -32,7 +27,6 @@ module Chagall
|
|
32
27
|
cmd = "cd #{Settings.instance.project_folder_path} && #{build_docker_compose_command} #{@command}"
|
33
28
|
cmd << " #{@raw_args.join(" ")}" unless @raw_args.empty?
|
34
29
|
|
35
|
-
logger.debug "Executing: #{cmd}"
|
36
30
|
ssh.execute(cmd, tty: true)
|
37
31
|
end
|
38
32
|
|
data/lib/chagall/deploy.rb
CHANGED
@@ -82,10 +82,10 @@ module Chagall
|
|
82
82
|
def format_time(seconds)
|
83
83
|
minutes, secs = seconds.abs.divmod(60)
|
84
84
|
hours, mins = minutes.divmod(60)
|
85
|
-
[[hours,
|
86
|
-
.reject { |n, _| n.zero? && !(_==
|
85
|
+
[ [ hours, "h" ], [ mins, "m" ], [ secs.round(2), "s" ] ]
|
86
|
+
.reject { |n, _| n.zero? && !(_=="s") }
|
87
87
|
.map { |n, u| "#{n}#{u}" }
|
88
|
-
.join(
|
88
|
+
.join(" ")
|
89
89
|
end
|
90
90
|
|
91
91
|
def print_total_time
|
@@ -181,9 +181,9 @@ module Chagall
|
|
181
181
|
args.push(Settings[:docker_context])
|
182
182
|
|
183
183
|
args = args.map { |arg| " #{arg}" }
|
184
|
-
|
184
|
+
.join(" \\\n")
|
185
185
|
|
186
|
-
cmd = "docker build \\\n#{args}"
|
186
|
+
cmd = "docker buildx build \\\n#{args}"
|
187
187
|
if Settings[:remote]
|
188
188
|
ssh.command(cmd)
|
189
189
|
else
|
data/lib/chagall/settings.rb
CHANGED
@@ -9,7 +9,6 @@ module Chagall
|
|
9
9
|
|
10
10
|
attr_accessor :options, :missing_options, :missing_compose_files
|
11
11
|
CHAGALL_PROJECTS_FOLDER = "~/projects"
|
12
|
-
TMP_CACHE_FOLDER = "tmp"
|
13
12
|
|
14
13
|
OPTIONS = [
|
15
14
|
{
|
@@ -105,7 +104,7 @@ module Chagall
|
|
105
104
|
{
|
106
105
|
key: :cache_from,
|
107
106
|
type: :string,
|
108
|
-
default: "
|
107
|
+
default: "tmp/.buildx-cache",
|
109
108
|
flags: [ "--cache-from" ],
|
110
109
|
environment_variable: "CHAGALL_CACHE_FROM",
|
111
110
|
description: "Cache from"
|
@@ -113,7 +112,7 @@ module Chagall
|
|
113
112
|
{
|
114
113
|
key: :cache_to,
|
115
114
|
type: :string,
|
116
|
-
default: "
|
115
|
+
default: "tmp/.buildx-cache-new",
|
117
116
|
flags: [ "--cache-to" ],
|
118
117
|
environment_variable: "CHAGALL_CACHE_TO",
|
119
118
|
description: "Cache to"
|
data/lib/chagall/ssh.rb
CHANGED
data/lib/chagall/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chagall
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.1.
|
4
|
+
version: 0.0.1.beta10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Roman Klevtsov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-
|
11
|
+
date: 2025-05-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: clamp
|