firespring_dev_commands 2.3.3 → 2.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/firespring_dev_commands/docker/compose.rb +2 -1
  3. data/lib/firespring_dev_commands/version.rb +1 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3044b2af81e32989b91958b6c70e6400dd4ce693e7b39772bcaa30b853376653
4
- data.tar.gz: 50ef8f0565608cfccdb9c9f671d15b8834ff4ce9df33e05e6c40b561aee33dee
3
+ metadata.gz: 4df81e3de5330b0b6265d91e6cd93ddd9091c0c3580d88bf4b9441ffe9bc54fd
4
+ data.tar.gz: 58c65ff1b82e00133b97ce1190f40a0b3a468102d01460af754d381c2832d2f5
5
5
  SHA512:
6
- metadata.gz: b9ccd994401c073976cd8f77a640fbf21c80db10f0f9ed8ec880784e725b8ce1606fa00362b81fcb2485fc8e1d786e17003f03b08289b0e9e9502e9f9bf52e9a
7
- data.tar.gz: f459531afa644f865a53f406e809cae6d4f707b09ae76e3ccfda12d2c21b375fe1249b6f4274f4fd71d867421dca46a683b915d1bc7f5d5dd3ae0b08d03d558c
6
+ metadata.gz: 6c9ab0653755eb182f3fdd9eb385fdbe3b4708e76d6e823f832ebcac1a9f4f60153f85b2200c5e51c61b540b4172e6fac1c098731dc64008cd3c490d1c368a11
7
+ data.tar.gz: fbf305d9f5dbb569edc662299d225527e8d4bffce26917100b1e4f7ef517dffae338ee206c54b2f77d3a0833e359f3aa172991af1c72e956913db952f685c348
data/lib/firespring_dev_commands/docker/compose.rb CHANGED
@@ -233,7 +233,8 @@ module Dev
233
233
 
234
234
  # Merges two arrays removing nested structure and duplicate keys
235
235
  private def merge_options(*opts)
236
- @options = (@options + Array(opts)).flatten.uniq
236
+ puts 'WARNING: merging options disabled' if @options.any? { |it| it.include?('--build-arg') }
237
+ @options = (@options + Array(opts)).flatten.uniq unless @options.any? { |it| it.include?('--build-arg') }
237
238
  end
238
239
 
239
240
  # Build the compose command with the given inputs
data/lib/firespring_dev_commands/version.rb CHANGED
@@ -6,6 +6,6 @@ module Dev
6
6
  # Use 'v.v.v.pre.alpha.v' for pre-release vesions
7
7
  # Use 'v.v.v.beta.v for beta versions
8
8
  # Use semantic versioning for any releases (https://semver.org/)
9
- VERSION = '2.3.3'.freeze
9
+ VERSION = '2.3.4'.freeze
10
10
  end
11
11
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: firespring_dev_commands
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.3
4
+ version: 2.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Firespring
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-01-08 00:00:00.000000000 Z
11
+ date: 2025-05-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport