dockerfilemerge 0.4.1 → 0.4.3

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 (6) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/lib/dockerfilemerge.rb +2 -2
  4. data.tar.gz.sig +0 -0
  5. metadata +2 -2
  6. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8474a3015f025764310d703e159bdcc2d4b7b539
4
- data.tar.gz: f67fbda4f8f08ccbc19bdacf7e291fd89b134be9
3
+ metadata.gz: f5f8d388e325262e4165c49616c127b0ec5057f7
4
+ data.tar.gz: 68ac5a4aa44bc0c78a431dbfdf6f19876fb63da8
5
5
  SHA512:
6
- metadata.gz: 091494c67bb938bee16fbcb79200361a05d6613e11b744b91022ee9d9b85c378a4475e3a7d38ef0be84d6f525e19eecc3cc4143fcf9c4da0d6161ea25202608a
7
- data.tar.gz: 8fd281a8f9165c7b19268a5c0534da0c96dd7c9474ce71be1e077b9b5b5bab921bbe92e06de91e0c50346bb4f76f0ec9bd2d10b94b3a122aec2de1df92290c65
6
+ metadata.gz: f87b4e7cfc0f87413d0e57fe22e39156a7c0be812c61c97944725ea0d4c471ad35589e0981535ecd5ff134ae58dd1a4c5c8e9ddbbfe359079acc75b82a0a432f
7
+ data.tar.gz: e61c3a757af33991ec977e144f116f9859ee54734edba0ae4919eca9201004e6f12c04082dcb528947305de8424ca6fd4ed2b2018f2139a79e7fd4426e0a1211
checksums.yaml.gz.sig CHANGED
Binary file
data/lib/dockerfilemerge.rb CHANGED
@@ -129,8 +129,8 @@ class DockerfileMerge
129
129
  lines.concat rows
130
130
  end
131
131
 
132
- def remove_command(regex, s)
133
- s.sub!(/(?:RUN\s+|\\?\s*&&\s+||&&\s*\\\s*)?#{regex}(?:\s+\\)? */,'')
132
+ def remove_command(regex, s)
133
+ s.sub!(/(?:\\?\s*&&\s+)#{regex}\s*$|(?:RUN\s+|\s*&&\s+||&&\s*\\\s*)?#{regex}(?:\s+\\)? */,'')
134
134
  end
135
135
 
136
136
  # removes any matching lines after the 1st matching line
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dockerfilemerge
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
31
31
  WHpJ21HYl4KWG8TISerrdwpQAZ5dhV2Yy/4q0MWSnDcMRSYdRAixOcdYW+U+R8cz
32
32
  pf2JrQZNdYZXIg==
33
33
  -----END CERTIFICATE-----
34
- date: 2015-08-02 00:00:00.000000000 Z
34
+ date: 2015-08-03 00:00:00.000000000 Z
35
35
  dependencies:
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: lineparser
metadata.gz.sig CHANGED
Binary file