firespring_dev_commands 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b0b0b93719ba8c6b8ddb34f39777bf1f2e4ee5eb95e85c1a1eb0f45e78a9441
-  data.tar.gz: '08d558e6e2b846d266b158ebf8b6b8eba3e620e3e2002ab77a7876dec65189ec'
+  metadata.gz: b97b8fe818682f14cecce80fc27d89db4ba7f72b0ca0d89eb642b2484dc8ab67
+  data.tar.gz: be5348cbf8241cb5fc35001adb4847acb5f0da5869a3bbb94ec2780bc1cdf28b
 SHA512:
-  metadata.gz: 5065bf94f9f4f0492794b4b944a01c017f31eab27d659827fa82c1512bec2c91b9da331e3fa114a49ba9afab75bcce94375955a55d4f00d0066a6149b960beb5
-  data.tar.gz: 3accee26e593d454a1c87f2cdcb865a723ab5cd12be8b3da1960b86fc5aa12eff6303f2fcc1f8f69e280e14487be132f2b2b27c879d33699ed92e193900a38e9
+  metadata.gz: df84349976775661f229060bb7a45450b956c4122553f56d16ff60978ad1ee3b8258155ef61422515dbc6c32bef97160e4d66abeb0bb0d14550c6af7c569a128
+  data.tar.gz: f81d3319f36fdc423aabf89083a6811b355b30ea815ee9ac85d36702e5c99496898bbe1313822e57ffba709d1d918993a61649626e7d90ec681add431a9494c1

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/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.pre.alpha.1'.freeze
+    VERSION = '2.0.0.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Firespring