dockerfilemerge 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d40e04f3b48e80d1462a9d19b897705f9592a27
-  data.tar.gz: ba2590f77eb7bda5a6a92e5d91174972cc38432f
+  metadata.gz: 0d599ded6bbbf1ead3a4579de11f1e238a506f8b
+  data.tar.gz: 711775e96daeb5264fb2177d1ca6056d7e055545
 SHA512:
-  metadata.gz: 2d17a85a94fffebb4e826e99974745cb5e889f50bb652d6922569fbf6b57aaddffe82ac3f7077e7057c7fc4c71615b09ccd6ef49f43d5fcb930f0d727454530d
-  data.tar.gz: 4b482dc7df40d34b1ad97494d2bf2cb5229ec8cc2c7c0acabd391d00ece6e6f7a48c92f4bbbd052221daf9f4a4316fbe0b800d22581623b620ebaf44fb4b43e8
+  metadata.gz: 5ba0cd5909454789d330506239b7dd61157a7419ba3d1cccef0061dfca1def2b2e0f6491f0f0c55c7f50a6fc0f4645455c48aabcb7c71a4d26ba95a30bd32997
+  data.tar.gz: 9a2de95dfa4e9ddc0d582f38b13b4b7fb31b8157838212fccf304d43ae2ed10f805b7feab67148df70a601eb074d7a8ee479d5a475eeb7e6a7fab7ccf9297615

data/lib/dockerfilemerge.rb

@@ -9,8 +9,10 @@ class DockerfileMerge
 
   attr_reader :to_s
 
-  def initialize(s)
+  def initialize(raw_s)
 
+    s, type = RXFHelper.read(raw_s)
+    
     patterns = [
       [:root, /INCLUDE\s*(?<path>.*)?/, :include],
         [:include, /(?<path>.*)/, :dockerfile],
@@ -19,9 +21,16 @@ class DockerfileMerge
       [:all, /#/, :comment]
     ]
 
+    s.sub!(/\A# Dockermergefile/,'# Dockerfile')
     a = LineParser.new(patterns, ignore_blank_lines: false).parse s
 
     lines = []
+  
+    if type == :url then
+      lines << '# Generated ' + Time.now.strftime("%a %d-%b-%Y %-I:%M%P")
+      lines << '# source: ' + raw_s
+    end
+
 
     a.each do |label, h, r, c| # h=hash, r=remaining, c=children
       
@@ -57,7 +66,7 @@ class DockerfileMerge
     end
     
     singlify lines, /^FROM /
-    singlify lines, /^CMD /
+    singlify lines, /^CMD /    
 
     @to_s = lines.join("\n")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfilemerge
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson