firespring_dev_commands 2.0.0 → 2.0.1.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52fab6ead6110ad2641d13003b16757be66c3928545d8185c4db3eed806d2443
-  data.tar.gz: '0892d45189fef73d8b20364d696bbd853c635096848e04c8ade75e46f6ba8d2b'
+  metadata.gz: 7ab3da39b3b9d7336453745fafa4a50563e03a90e785c29d3bf7cd17543322da
+  data.tar.gz: 79b31dec877f099d7ef6d7444ce44563828bd305a790bd943da3d55ca29f2044
 SHA512:
-  metadata.gz: c8e557565fd8478b0a8d55d3415290871c00201aed6030bbc95ccccddc36d399b47ec58933a8cc915e350ebf3fcfaa7c7066551509bd17705d33aa36b4dd1fb9
-  data.tar.gz: a3449ac14b161ff2dc385f1b68ab0a6362a8bfab21b4c964b2a04db90740b5c866f22b3fda1e4b8e3f1ce9b89711f1c5e759405dcd411851a9a31de42fc549ad
+  metadata.gz: 79c3ddcc441e1a943b2fe9ca412e1b3a00eb85d49e7469b67720fc910dfdab492b40d6f9148e76c265922458734e382ffb8b45d38993e1661b95e2dd81dbebdc
+  data.tar.gz: bf74bb5fc32c3841c6c41562aac41ecc6d2f145f615f8759fe18a79b3bbeb6da9bb77eefa84bd6a638fa4529b436627a70c802cbc08a31c3edc74f0603508698

data/lib/firespring_dev_commands/docker/compose.rb

@@ -7,13 +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(:project_dir, :project_name, :compose_files, :min_version, :max_version) do
         def initialize
           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
@@ -33,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(
@@ -69,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
-        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)
+        version_too_low = min_version && !Dev::Common.new.version_greater_than(min_version, self.class.version)
+        raise "requires docker compose version >= #{min_version} (found #{self.class.version})" if version_too_low
 
         max_version = self.class.config.max_version
-        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)
+        version_too_high = max_version && Dev::Common.new.version_greater_than(max_version, self.class.version)
+        raise "requires docker compose version < #{max_version} (found #{self.class.version})" if version_too_high
       end
 
       # Pull in supported env settings and call build
@@ -83,6 +83,7 @@ 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
@@ -181,6 +182,13 @@ 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') }
@@ -230,7 +238,7 @@ module Dev
 
       # Build the compose command with the given inputs
       private def build_command(action, *cmd)
-        command = [EXECUTABLE_NAME]
+        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.0'.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.0
+  version: 2.0.1.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -313,9 +313,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: