dockerfilemerge 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fef351e34b52670bc2b33ec521d4004358207d4
-  data.tar.gz: 174fcad67e0db8754b0a1ab68e078b4e599c8ab8
+  metadata.gz: 6a99f814ecfdd55129c8b94c428f248151a66bc1
+  data.tar.gz: 1e528f38b25380403559dddc2d4e5cbcc8179aad
 SHA512:
-  metadata.gz: 79b33c82b3540624a16d7da003b1d12acdc29eb3ebbbfb771999ab1ad7d46c40894c65edd0d92d16214eddc4253c01641970ed8a6d6021cf35a3a58e2d9c082b
-  data.tar.gz: 6d0d2c377f6a8045b802281cb22b44347d6d03a363b6029a80980d03008652d86aef3d02a8c46d423802fa623366555f941f9e0fe6a731933b1ab570d651b889
+  metadata.gz: 44ac5460fe56b56a8b3eb87b2e9e790bcfc703763ff14cf619031f2fdb4925c875e60549107702cb8e200121478768dada5381e8296f1f8a0301f18c3d2ab256
+  data.tar.gz: 29b0d1dc7d5da86a58c3a6807e64779d54dfe0c446e234b18b3283e6213d20362b88c5a85881d84c5bce1ff2822b4bba9cb7b5f34849a5d9d5d551b7f5dabb50

data/lib/dockerfilemerge.rb

@@ -19,63 +19,64 @@ class DockerfileMerge
       [:all, /#/, :comment]
     ]
 
-    lp = LineParser.new patterns, ignore_blank_lines: false
-    a = lp.parse s
+    a = LineParser.new(patterns, ignore_blank_lines: false).parse s
 
     lines = []
 
-    a.each do |x|
+    a.each do |label, h, r, c| # h=hash, r=remaining, c=children
       
-      case x.first
+      case label
       when :comment
-        lines << x[2].first
-        lines << '' if x[2].length > 1
+        
+        lines << r.first
+        lines << '' if r.length > 1
 
       when :include
 
-        if x[1][:path].length > 0 then
-          
-          path = x[1][:path]
-          
-          buffer, type = RXFHelper.read(path)
-          rows = buffer.lines.map(&:chomp)
-          lines << "\n\n# copied from " + path if type == :url
-          rows.grep(/^# Pull /).each {|x| rows.delete x}
-          lines.concat rows
-          
-        else
-          
-          x[3].each do |source| 
-            path = source[1][:path]
-            buffer, type = RXFHelper.read(path)
-            rows = buffer.lines.map(&:chomp)
-            lines << "\n\n# copied from " + path if type == :url
-            rows.grep(/^# Pull /).each {|x| rows.delete x}
-            lines.concat rows
-            
-          end
-        end
-
-        lines << '' if x[2].length > 1
+        h[:path].length > 0 ? merge_file(lines, h[:path]) :
+                  c.each {|source| merge_file lines, source[1][:path] }
+        lines << '' if r.length > 1
 
       when :maintainer
 
         maintainers = lines.grep(/MAINTAINER/)
         i = lines.index maintainers.shift
-        lines[i] = x[2].first
+        lines[i] = r.first
+        
         maintainers.each {|x| lines.delete x}
         
       when :run
+        
         i = lines.index lines.grep(/RUN/).last
-        lines.insert(i+1, x[2].first)
-        lines.insert(i+2, '') if x[2].length > 1
+        lines.insert(i+1, r.first)
+        
+        if r.length > 1 then
+          lines.insert(i+2, '  ' + r[1..-1].join("\n  ").rstrip)
+        end
       end
       
     end
     
-    lines.grep(/^FROM /)[1..-1].each {|x| lines.delete x}
-    lines.grep(/^CMD/)[0..-2].each {|x| lines.delete x}
+    singlify lines, /^FROM /
+    singlify lines, /^CMD /
 
     @to_s = lines.join("\n")
   end
+  
+  private
+  
+  def merge_file(lines, path)
+    
+    buffer, type = RXFHelper.read(path)
+    rows = buffer.lines.map(&:chomp)
+    lines << "\n\n# copied from " + path if type == :url
+    rows.grep(/^# Pull /).each {|x| rows.delete x}
+
+    lines.concat rows
+  end  
+  
+  def singlify(lines, regex)
+    i = 0
+    lines.reject! {|x| found = x[regex]; i += 1 if found;  i > 1 and found }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfilemerge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WHpJ21HYl4KWG8TISerrdwpQAZ5dhV2Yy/4q0MWSnDcMRSYdRAixOcdYW+U+R8cz
   pf2JrQZNdYZXIg==
   -----END CERTIFICATE-----
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lineparser
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Merge 2 or more Dockerfiles into 1 Dockerfile