firespring_dev_commands 2.0.1.pre.alpha.1 → 2.0.1.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74827accfb664c9f4170d5e6f0daa426963d0ae1aed9ebccae0b2d971c34923a
-  data.tar.gz: 4dc09342dd87e31c76b68675b910787f6f4a23752a0a9546d15b80e67befdee3
+  metadata.gz: 7ab3da39b3b9d7336453745fafa4a50563e03a90e785c29d3bf7cd17543322da
+  data.tar.gz: 79b31dec877f099d7ef6d7444ce44563828bd305a790bd943da3d55ca29f2044
 SHA512:
-  metadata.gz: ae83b7b87ab131bca8958bd6c2e84e5a14bda7b0588f107d8199d93684fe47146683c3097f6d5add843db1caa1c7f511d321916dac9142528fd22a7326962f5d
-  data.tar.gz: da782857eb8a4a06b0468e66bf3565a908961bd18fe7e9d3b12779feab97d2f5b4fa53997d3fad169c9c99e46a777707619616c188353d77888517906107befc
+  metadata.gz: 79c3ddcc441e1a943b2fe9ca412e1b3a00eb85d49e7469b67720fc910dfdab492b40d6f9148e76c265922458734e382ffb8b45d38993e1661b95e2dd81dbebdc
+  data.tar.gz: bf74bb5fc32c3841c6c41562aac41ecc6d2f145f615f8759fe18a79b3bbeb6da9bb77eefa84bd6a638fa4529b436627a70c802cbc08a31c3edc74f0603508698

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/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.2'.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.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport