firespring_dev_commands 1.5.3.pre.alpha.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f703243393c3aeb663185817f26c14f1fd4eda7cdb671f5e8c0ee0d5ea2168b2
-  data.tar.gz: a0d3b4685a4890ee5be25c917031430c46a09cf972ccd127439691871b471a8a
+  metadata.gz: 060f037868598436e3f670ca01a2fdbd3f6bc42148695c7f2b26d1570884d52d
+  data.tar.gz: 7deeb476f01d1e2dcb1a730c15ebecc529f6d568bbfafaf6e9e7e5333ed14ef9
 SHA512:
-  metadata.gz: 7ae4a74026fc432fb85eb442db2200a8ba066c85a84b64758b889e3cea0f13402fc4a00d68d7a4df7a95498dba195cb411d252c3893447b3af7f8878b47efa6b
-  data.tar.gz: 45e922ae773aafb01b318e006936780e3239ff345e7d32d515e9b6f47cfa05dccb6fedd89745ce71c0b7bc48c7fb1909c647d6c09b23327cf442d44b471d1c09
+  metadata.gz: a30f757615b686dca3c7c6fca8b2f5b034a2591c4fd6ce86f149a75351c473fa09da301fc10cb5fba014f332e6aacc22170cd6be768e0101095293865fd226fe
+  data.tar.gz: 939a251e7bfd47ee62af90838ba8e6eaa4d334ca05b2462ba4605c9314e1e6d29fc176f8d7e978923a3ca6385d4571cf5ab8ce431075f23973784b401ae6563f

data/lib/firespring_dev_commands/docker/compose.rb

@@ -8,9 +8,8 @@ module Dev
     # Class containing methods for interfacing with the docker compose cli
     class Compose
       # 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"]
@@ -70,12 +69,12 @@ module Dev
       # Checks the min and max version against the current docker version if they have been configured
       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 #{EXECUTABLE_NAME} version >= #{min_version} (found #{self.class.version})" if min_version &&
+                                                                                                       !Dev::Common.new.version_greater_than(min_version, self.class.version)
 
         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 #{EXECUTABLE_NAME} version < #{max_version} (found #{self.class.version})" if max_version &&
+                                                                                                      Dev::Common.new.version_greater_than(max_version, self.class.version)
       end
 
       # Pull in supported env settings and call build
@@ -84,7 +83,6 @@ module Dev
       def build
         merge_options('--parallel')
         merge_env_pull_option
-        merge_env_push_option
         merge_env_cache_option
         execute_command(build_command('build'))
       end
@@ -183,13 +181,6 @@ module Dev
         merge_options('--pull') if ENV['PULL'].to_s.strip == 'true'
       end
 
-      # Merge --push option if PUSH is set to true and no existing push options are present
-      private def merge_env_push_option
-        return if @options.any? { |it| it.include?('push') }
-
-        merge_options('--push') if ENV['PUSH'].to_s.strip == 'true'
-      end
-
       # Merge --no-build option unless BUILD is set to true and no existing build options are present
       private def merge_env_build_option
         return if @options.any? { |it| it.include?('build') }
@@ -239,7 +230,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]
         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 = '1.5.3.pre.alpha.1'.freeze
+    VERSION = '1.5.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.5.3.pre.alpha.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -453,9 +453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: