dockerfilemerge 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/lib/dockerfilemerge.rb +5 -5
- data.tar.gz.sig +0 -0
- metadata +2 -2
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2d40e04f3b48e80d1462a9d19b897705f9592a27
|
|
4
|
+
data.tar.gz: ba2590f77eb7bda5a6a92e5d91174972cc38432f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2d17a85a94fffebb4e826e99974745cb5e889f50bb652d6922569fbf6b57aaddffe82ac3f7077e7057c7fc4c71615b09ccd6ef49f43d5fcb930f0d727454530d
|
|
7
|
+
data.tar.gz: 4b482dc7df40d34b1ad97494d2bf2cb5229ec8cc2c7c0acabd391d00ece6e6f7a48c92f4bbbd052221daf9f4a4316fbe0b800d22581623b620ebaf44fb4b43e8
|
checksums.yaml.gz.sig
CHANGED
|
Binary file
|
data/lib/dockerfilemerge.rb
CHANGED
|
@@ -48,11 +48,10 @@ class DockerfileMerge
|
|
|
48
48
|
when :run
|
|
49
49
|
|
|
50
50
|
i = lines.index lines.grep(/RUN/).last
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if r.length > 1
|
|
54
|
-
|
|
55
|
-
end
|
|
51
|
+
i+=1 while lines[i][/\\\s*$/]
|
|
52
|
+
lines.insert(i+1, r.first)
|
|
53
|
+
lines.insert(i+2, ' ' + r[1..-1].join("\n ").rstrip) if r.length > 1
|
|
54
|
+
|
|
56
55
|
end
|
|
57
56
|
|
|
58
57
|
end
|
|
@@ -68,6 +67,7 @@ class DockerfileMerge
|
|
|
68
67
|
def merge_file(lines, path)
|
|
69
68
|
|
|
70
69
|
buffer, type = RXFHelper.read(path)
|
|
70
|
+
|
|
71
71
|
rows = buffer.lines.map(&:chomp)
|
|
72
72
|
lines << "\n\n# copied from " + path if type == :url
|
|
73
73
|
rows.grep(/^# Pull /).each {|x| rows.delete x}
|
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.2.
|
|
4
|
+
version: 0.2.1
|
|
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-07-
|
|
34
|
+
date: 2015-07-11 00:00:00.000000000 Z
|
|
35
35
|
dependencies:
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: lineparser
|
metadata.gz.sig
CHANGED
|
Binary file
|