dockerfilemerge 0.2.3 → 0.3.0

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 +1 -1
  3. data.tar.gz.sig +0 -0
  4. data/lib/dockerfilemerge.rb +5 -4
  5. metadata +1 -1
  6. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0b93ffa353f3da9c35d90fb99eaaeb5306fdb4d6
4
- data.tar.gz: 2438d2c2eb300fcd4b6e70c00875f70899eaf43a
3
+ metadata.gz: 4b63e0bcfcb59f559285571c5e19848a61caf857
4
+ data.tar.gz: 84451eb6af66352739206c2e491dc82cbff970c5
5
5
  SHA512:
6
- metadata.gz: d1d3e32dcd3106cf1f24ebca0f5acdbc140af8771abe3947d409de8733cb4385ef5a645be0bab69ec30e83bb6696829aabbf2322fba5d388878ccf90c4ddd074
7
- data.tar.gz: cb03b7442734a03031e0f3fddb3da3876886de21d5058415515cac7eb9097b4821163f85be6ef705f4f5c37b1bd954005b5ac3406e6ba6cc68d8aef1698338ff
6
+ metadata.gz: 461e0f16154793598931f7e844ded1b9b9478b0fceae5c7e48a0a8225fd211fbc9f46928358518837e84ce751770cd5a34df117b2a0792bfd430379154429827
7
+ data.tar.gz: 7938eaef56ee5a5880200f113c0ff2ad6b3fb6c60275095833bc0f12b2bc69694054a258ba97fe5ff7e9919bcd5c5c258dcdf3292e67728375a5fa2302499046
checksums.yaml.gz.sig CHANGED
@@ -1 +1 @@
1
- ���F.�w ���j@�꽟]�3cH��T�X��^^��U����� �A��Mw��K@N��~Ӵ%a�1��M&r�>�>$ kv'����m7&%&Dni)T� ����[3�T���i���Y�R�ba�\Q����o/�3Z����d8�9�<6|[�pc�Qd��rݗ�գ�R}�Kжwx,Y�!!䝢ly�Zq��b���U���v�!&��>*�Y�Q��ذ�Ŧ�1��/�2���K:��O£txW �&��._A
1
+ 5�}T��q�&fpd�:��Uڦ���E!�_�힯w?��Oǎ� �8V�*^��fW˶�碏0� )V�s�ف0�pJ�ny�:����O�����Xcb�v�G`��H<�]ݸ��C�ۛ�R� D�(��`~����PH9���<�G���h�?�����>{�p�=�L�x�(�d|��m�{���%�k��ߢ�r4y�Ƀ"�j���ID�B�vY���Yh ],NP_��n,ȕ�2�`Y��W~g����W
data.tar.gz.sig CHANGED
Binary file
data/lib/dockerfilemerge.rb CHANGED
@@ -65,9 +65,8 @@ class DockerfileMerge
65
65
 
66
66
  end
67
67
 
68
- singlify lines, /^FROM /
69
- singlify lines, /^CMD /
70
- lines.grep(/^# Pull /)[0..-2].each {|x| lines.delete x}
68
+ singlify lines, /^\s*FROM /
69
+ lines.grep(/^\s*CMD /)[0..-2].each {|x| lines.delete x}
71
70
 
72
71
  @to_s = lines.join("\n")
73
72
  end
@@ -76,7 +75,9 @@ class DockerfileMerge
76
75
 
77
76
  def merge_file(lines, path)
78
77
 
79
- buffer, type = RXFHelper.read(path)
78
+ raw_buffer, type = RXFHelper.read(path)
79
+ buffer = raw_buffer[/^\bINCLUDE\b/] ? \
80
+ DockerfileMerge.new(raw_buffer).to_s : raw_buffer
80
81
 
81
82
  rows = buffer.lines.map(&:chomp)
82
83
  lines << "\n\n# copied from " + path if type == :url
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.3
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
metadata.gz.sig CHANGED
Binary file