firespring_dev_commands 1.5.2 → 1.5.3.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a83daa9c15548e199bf57ec8cfed9db0ed5d5d0e9ee976eebbbe23b9dd5db9b
-  data.tar.gz: 4ac6c93ae0b63b8a96dfda76983b6dee876b09c2cf38d4a07a612ad81954f841
+  metadata.gz: f703243393c3aeb663185817f26c14f1fd4eda7cdb671f5e8c0ee0d5ea2168b2
+  data.tar.gz: a0d3b4685a4890ee5be25c917031430c46a09cf972ccd127439691871b471a8a
 SHA512:
-  metadata.gz: 318a99c838156a2ab894ff0ab36c48d4a8f23abc6aa8a0d226916ed9cb189a56dd5d76d07d3efe5b38d569e4c09bae6cd1a9d08566c6068d6280bb94c8b3f19f
-  data.tar.gz: e99947b292755ec515504c42a4df4bfc8193c84455433073f4074c1ff25e10258cd03f6f8dec11c3f856c48e373a2c1b83cf2917e55b8231f4414abe6eb3677a
+  metadata.gz: 7ae4a74026fc432fb85eb442db2200a8ba066c85a84b64758b889e3cea0f13402fc4a00d68d7a4df7a95498dba195cb411d252c3893447b3af7f8878b47efa6b
+  data.tar.gz: 45e922ae773aafb01b318e006936780e3239ff345e7d32d515e9b6f47cfa05dccb6fedd89745ce71c0b7bc48c7fb1909c647d6c09b23327cf442d44b471d1c09

data/lib/firespring_dev_commands/docker/compose.rb

@@ -8,8 +8,9 @@ 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(:project_dir, :project_name, :compose_files, :min_version, :max_version) do
+      Config = Struct.new(:executable_name, :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"]
@@ -69,12 +70,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 #{self.class.config.executable_name} 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 #{self.class.config.executable_name} version < #{max_version} (found #{self.class.version})" if version_too_high
       end
 
       # Pull in supported env settings and call build
@@ -83,6 +84,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 +183,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 +239,7 @@ module Dev
 
       # Build the compose command with the given inputs
       private def build_command(action, *cmd)
-        command = [EXECUTABLE_NAME]
+        command = self.class.config.executable_name.split(/\s+/)
         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 = '1.5.2'.freeze
+    VERSION = '1.5.3.pre.alpha.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-05 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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: