squared 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba613d7ba02a664fb4581573f6ee04d705f6bb2d1cb165c30c49d97eb259cbec
-  data.tar.gz: 764888100c6a6560478e99ed1451f1593a86e120799e25400708d81be934102c
+  metadata.gz: fa16edc572cc39bb0bef0b2b5ba04419f2994e824923b354182f9e60b6aee1b2
+  data.tar.gz: 75a6b805d236d45f09b331bf62cbfcc5f9b043632d194474511763c7fc7fbf64
 SHA512:
-  metadata.gz: 1cf6f1f10babf7bfbbe665fe5fc97527cf1df4093a3e6b8b906a4bf8cf87f538c601faee86f40decb79455de340e1d8f510fb45d0acc17694cd97a4051010539
-  data.tar.gz: 2b537c2c6a30a17191f32eb1012b225bc29fff9e9102b663a6dcf3ffd05465f4e8a0790f4cbdd6c63b21bd64c762e85dff1d22b4eb35053702a6692e92c994cc
+  metadata.gz: 510b7807e4e2be74dfe8ba5202115e3b5cefbd27d94cb14af169007bcdedde7f8c8516679c1bc614cb633eb1a904a6309403346f7c0c8490ad13fa208f2bd1f0
+  data.tar.gz: 3a124f06b78467a4eda6a1f34c2a80f6bb9f78867c5daefbcb0f628d9eb6a4bfbf0193e0d5509f38000e7e6ce6c8c3f4d112f0c0146260d30664692cda495186

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.4.11] - 2025-05-09
+
+### Added
+
+- Docker command build action bake is interactive.
+
+### Fixed
+
+- Docker build command was not functional.
+
 ## [0.4.10] - 2025-05-08
 
 ### Added
@@ -655,6 +665,7 @@
 
 - Changelog was created.
 
+[0.4.11]: https://github.com/anpham6/squared/releases/tag/v0.4.11-ruby
 [0.4.10]: https://github.com/anpham6/squared/releases/tag/v0.4.10-ruby
 [0.4.9]: https://github.com/anpham6/squared/releases/tag/v0.4.9-ruby
 [0.4.8]: https://github.com/anpham6/squared/releases/tag/v0.4.8-ruby

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

data/lib/squared/workspace/application.rb

@@ -602,6 +602,7 @@ module Squared
       end
 
       def powershell?
+        return true if ENV['SHELL']&.end_with?(File.join('', 'pwsh'))
         return false unless windows?
 
         case ENV['TERM_PROGRAM']

data/lib/squared/workspace/project/docker.rb

@@ -138,10 +138,14 @@ module Squared
                         buildx(:build, args.extras, "#{flag}": param)
                       end
                     when :bake
-                      format_desc action, flag, 'opts*,target*,context?'
+                      format_desc action, flag, ':?,opts*,target*,context?'
                       task flag do |_, args|
-                        args = param_guard(action, flag, args: args.to_a)
-                        buildx flag, args
+                        args = args.to_a
+                        if args.first == ':'
+                          choice_command :bake
+                        else
+                          buildx flag, args
+                        end
                       end
                     end
                   when 'compose'
@@ -226,11 +230,11 @@ module Squared
           image(:rm, sync: sync)
         end
 
-        def compose(opts, flags = nil, script: false, args: nil, from: :build, **)
+        def compose(opts, flags = nil, script: false, args: nil, from: :run, **)
           return opts if script == false
 
           ret = docker_session
-          if from == :build
+          if from == :run
             case (n = filetype)
             when 1, 2
               ret << 'buildx' << 'bake'
@@ -254,14 +258,16 @@ module Squared
           when Enumerable
             ret.merge(opts.to_a)
           end
-          [args, flags].each_with_index do |target, index|
-            next unless target
 
-            target = append_any(target, target: []) unless target.is_a?(Array)
-            ret.merge(target.map { |arg| index == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
+          [args, flags].each_with_index do |target, index|
+            if target.is_a?(String)
+              ret << target
+            elsif (target = append_any(target, target: []))
+              ret.merge(target.map { |arg| index == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
+            end
           end
           case from
-          when :build
+          when :run
             case @secrets
             when String
               ret << quote_option('secret', @secrets, double: true)
@@ -683,6 +689,8 @@ module Squared
                               ['Choose an image', 'images -a', 2]
                             when :exec
                               ['Choose a container', 'ps -a', 0]
+                            when :bake
+                              ['Choose a target', 'buildx bake --list=type=targets', 0]
                             else
                               ['Choose a network', 'network ls', 0]
                             end
@@ -698,10 +706,10 @@ module Squared
             when :run, :exec
               values = [['Options', flag == :run], ['Arguments', flag == :exec]]
               cmd = flag.to_s
-            when :rm
+            when :rm, :bake
               values = ['Options']
               multiple = true
-              cmd = "image #{flag}"
+              cmd = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
             else
               values = ['Options', ['Container', true]]
               cmd = "network #{flag}"

data/lib/squared/workspace/project/git.rb

@@ -288,17 +288,20 @@ module Squared
             namespace(name = ws.task_name('git')) do
               all = ws.task_join(name, 'all')
 
-              ws.format_desc(all, %w[stash|rebase depend])
+              ws.format_desc(all, 'stash|rebase|autostash?,depend?')
               task 'all' do |_, args|
-                opts = args.to_a
-                cmd = if opts.include?('stash')
-                        [ws.task_sync('stash'), ws.task_sync('pull')]
-                      elsif opts.include?('rebase')
-                        [ws.task_sync('rebase')]
+                args = args.to_a
+                cmd = if args.include?('stash')
+                        ['stash', 'pull']
+                      elsif args.include?('rebase')
+                        ['rebase']
+                      elsif args.include?('autostash')
+                        ['autostash']
                       else
-                        [ws.task_sync('pull')]
+                        ['pull']
                       end
-                cmd << ws.task_sync('depend') if opts.include?('depend') && !ws.series[:depend].empty?
+                cmd.map! { |val| ws.task_sync(val) }
+                cmd << ws.task_sync('depend') if args.include?('depend') && !ws.series.exclude?(:depend, true)
                 cmd << ws.task_sync('build')
                 Common::Utils.task_invoke(*cmd, **ws.invokeargs)
               end

data/lib/squared/workspace/project/python.rb

@@ -184,12 +184,12 @@ module Squared
                       task flag, [:strategy] do |_, args|
                         case (strategy = args.strategy)
                         when 'eager', 'only-if-needed'
-                          opts = args.extras
+                          args = args.extras
                         else
-                          opts = args.to_a
+                          args = args.to_a
                           strategy = nil
                         end
-                        install(flag, opts, strategy: strategy)
+                        install(flag, args, strategy: strategy)
                       end
                     when :target
                       task flag, [:dir] do |_, args|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors:
 - An Pham