dockerfilemerge 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f8d388e325262e4165c49616c127b0ec5057f7
-  data.tar.gz: 68ac5a4aa44bc0c78a431dbfdf6f19876fb63da8
+  metadata.gz: addff649510fd6d00e9a4d4a0bf0b349d332cc01
+  data.tar.gz: 5e6cd57b8d85ea072fae24f3f7dd6feb1b8dd9be
 SHA512:
-  metadata.gz: f87b4e7cfc0f87413d0e57fe22e39156a7c0be812c61c97944725ea0d4c471ad35589e0981535ecd5ff134ae58dd1a4c5c8e9ddbbfe359079acc75b82a0a432f
-  data.tar.gz: e61c3a757af33991ec977e144f116f9859ee54734edba0ae4919eca9201004e6f12c04082dcb528947305de8424ca6fd4ed2b2018f2139a79e7fd4426e0a1211
+  metadata.gz: cb4e1a26b19207a7329d77c5e2c8f3ae6b1f58c7d65a4b3a9204aaba42b7357c18ce6feed37cd73c310087c3bce2395b1fbcb602d396bbd3a9599417fca1d4c9
+  data.tar.gz: e078b0c7b60737f2e5e6dccfdd78200cbcccb235e568f2d6ccd219aec068c4028b73faa3e095d9ae31b172ff8589dd864b7abcc61b6c870cffe9a6d19d57c733

data/lib/dockerfilemerge.rb

@@ -12,7 +12,7 @@ class DockerfileMerge
   def initialize(raw_s)
 
     s, type = RXFHelper.read(raw_s)
-    
+
     patterns = [
       [:root, /FROM\s+(?<from>.*)/, :from],
       [:root, /INCLUDE\s*(?<path>.*)?/, :include],
@@ -25,6 +25,13 @@ class DockerfileMerge
 
     s.sub!(/\A# Dockermergefile/,'# Dockerfile')
     a = LineParser.new(patterns, ignore_blank_lines: false).parse s
+    maintainer = a.grep /MAINTAINER/
+    
+    if maintainer.empty? then      
+
+      from = a.assoc :include      
+      a.insert(a.index(from) + 1, [:maintainer, {},['MAINTAINER unknown']])
+    end
 
     lines = []
   
@@ -33,19 +40,18 @@ class DockerfileMerge
       lines << '# source: ' + raw_s
     end
 
-
     a.each do |label, h, r, c| # h=hash, r=remaining, c=children
       
       line = r.first
       
       case label
       when :from
-        
+
         lines << line
         lines << '' if r.length > 1        
         
       when :comment
-        
+
         lines << line
         lines << '' if r.length > 1
 
@@ -58,10 +64,27 @@ class DockerfileMerge
       when :maintainer
 
         maintainers = lines.grep(/MAINTAINER/)
-        i = lines.index maintainers.shift
-        lines[i] = line
+
+        if maintainers.length > 0 then
+    
+          while maintainers.length > 1 do
+            i = lines.rindex maintainers.pop
+            lines.delete_at i
+            maintainers = lines.grep(/MAINTAINER/)
+          end
+
+          i = lines.index maintainers[0]
+
+          lines[i] = line unless line[/MAINTAINER unknown/]
+        elsif maintainers.empty?
+
+          from = lines.grep /^ *FROM\b/
+          i = lines.index from[0]
+          lines.insert(i+1, line) unless line[/MAINTAINER unknown/]
+
+        end        
         
-        maintainers.each {|x| lines.delete x}
+
         
       when :run
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfilemerge
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WHpJ21HYl4KWG8TISerrdwpQAZ5dhV2Yy/4q0MWSnDcMRSYdRAixOcdYW+U+R8cz
   pf2JrQZNdYZXIg==
   -----END CERTIFICATE-----
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lineparser