firespring_dev_commands 2.0.1.pre.alpha.1 → 2.0.1.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74827accfb664c9f4170d5e6f0daa426963d0ae1aed9ebccae0b2d971c34923a
-  data.tar.gz: 4dc09342dd87e31c76b68675b910787f6f4a23752a0a9546d15b80e67befdee3
+  metadata.gz: b2f20a3e8cf4609a9d757ff0c9ff233406ced80baecd6edcd78e5ed9a4edd0ce
+  data.tar.gz: 1cee96ca926be8b395a9975aabdeae1296f0f64a7072de2372b83d9c5e2f2cc9
 SHA512:
-  metadata.gz: ae83b7b87ab131bca8958bd6c2e84e5a14bda7b0588f107d8199d93684fe47146683c3097f6d5add843db1caa1c7f511d321916dac9142528fd22a7326962f5d
-  data.tar.gz: da782857eb8a4a06b0468e66bf3565a908961bd18fe7e9d3b12779feab97d2f5b4fa53997d3fad169c9c99e46a777707619616c188353d77888517906107befc
+  metadata.gz: f62564f2e7455095a02d747231fc144b5f10ddd154fc7344adc0364e0f2019cc930c17c29a99dd21fa13ed59843ed9891120ec73e41e79de3309c36ca943932c
+  data.tar.gz: d7d55469c2750efa3f61afa18a71e542b5575d71997b15f9ed36173c60b1bb2c8430dc4feb61aea03f0edbeacd2d6635cf407457826dd72a40a5a0cb9fe213fe

data/lib/firespring_dev_commands/docker/compose.rb

@@ -7,14 +7,16 @@ module Dev
   class Docker
     # Class containing methods for interfacing with the docker compose cli
     class Compose
+      # The name of the docker compose executable
+      EXECUTABLE_NAME = %w(docker compose).freeze
+
       # Config object for setting top level docker compose config options
-      Config = Struct.new(:executable_name, :project_dir, :project_name, :compose_files, :min_version, :max_version) do
+      Config = Struct.new(:project_dir, :project_name, :compose_files, :min_version, :max_version) do
         def initialize
-          self.executable_name = EXECUTABLE_NAME
           self.project_dir = DEV_COMMANDS_ROOT_DIR
           self.project_name = DEV_COMMANDS_PROJECT_NAME
           self.compose_files = ["#{DEV_COMMANDS_ROOT_DIR}/docker-compose.yml"]
-          self.min_version = nil
+          self.min_version = '2.0.0'
           self.max_version = nil
         end
       end
@@ -34,14 +36,11 @@ module Dev
 
         # Returns the version of the docker-compose executable on the system
         def version
-          @version ||= `#{EXECUTABLE_NAME} --version`.match(/version v?([0-9.]+)/)[1]
+          version_cmd = EXECUTABLE_NAME.dup << 'version'
+          @version ||= `#{version_cmd.join(' ')}`.match(/version v?([0-9.]+)/)[1]
         end
       end
 
-      # @todo Change this to "docker compose" when everyone is off v1
-      # The name of the docker compose executable
-      EXECUTABLE_NAME = 'docker-compose'.freeze
-
       attr_accessor :capture, :compose_files, :environment, :options, :project_dir, :project_name, :services, :user, :volumes
 
       def initialize(
@@ -71,11 +70,11 @@ module Dev
       def check_version
         min_version = self.class.config.min_version
         version_too_low = min_version && !Dev::Common.new.version_greater_than(min_version, self.class.version)
-        raise "requires #{self.class.config.executable_name} version >= #{min_version} (found #{self.class.version})" if version_too_low
+        raise "requires docker compose version >= #{min_version} (found #{self.class.version})" if version_too_low
 
         max_version = self.class.config.max_version
         version_too_high = max_version && Dev::Common.new.version_greater_than(max_version, self.class.version)
-        raise "requires #{self.class.config.executable_name} version < #{max_version} (found #{self.class.version})" if version_too_high
+        raise "requires docker compose version < #{max_version} (found #{self.class.version})" if version_too_high
       end
 
       # Pull in supported env settings and call build
@@ -239,7 +238,7 @@ module Dev
 
       # Build the compose command with the given inputs
       private def build_command(action, *cmd)
-        command = self.class.config.executable_name.split(/\s+/)
+        command = EXECUTABLE_NAME.dup
         command << '--project-directory' << project_dir
         command << '-p' << project_name if project_name
         Array(compose_files).compact.each { |file| command << '-f' << file }

data/lib/firespring_dev_commands/docker.rb

@@ -201,6 +201,8 @@ module Dev
     private def image_info(image)
       [].tap do |ary|
         arch = image.json&.dig('Architecture')
+        variant = image.json&.dig('Variant')
+        arch = "#{arch}/#{variant}" if variant
         id = image.info&.dig('id')&.split(':')&.last&.slice(0..11)
         created = timesince(Time.at(image.info&.dig('Created')))
         size = filesize(image.info&.dig('Size'))
@@ -253,7 +255,10 @@ module Dev
     private def container_info(container)
       id = container.id&.slice(0..11)
       image = container.info&.dig('Image')
-      arch = ::Docker::Image.get(image).json&.dig('Architecture')
+      image_json = ::Docker::Image.get(image).json
+      arch = image_json&.dig('Architecture')
+      variant = image_json&.dig('Variant')
+      arch = "#{arch}/#{variant}" if variant
       command = container.info&.dig('Command')
       created = timesince(Time.at(container.info&.dig('Created')))
       status = container.info&.dig('Status')

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '2.0.1.pre.alpha.1'.freeze
+    VERSION = '2.0.1.pre.alpha.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.0.1.pre.alpha.1
+  version: 2.0.1.pre.alpha.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport