dockerfilemerge 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63c76356146aaf73dba1e0c93aca46ee2560c001
-  data.tar.gz: 651507190dc257065f1709d46d8df7a839091195
+SHA256:
+  metadata.gz: ba02da0dcfd5851c24454cc8ac42dba746fb21a26d7c50d034df9b8f71aec990
+  data.tar.gz: 6c1c0a06b24f33be70c6ab21a89f1b1a335080f063419b24f29349e9b2e4f5f6
 SHA512:
-  metadata.gz: 32f4f7a3cc4c18d08a092c49b41c889535dcd6fad6008c9a250fc999e132b58ff5153aa1d0e6708d064b0a56857212686cce3dd53d7ce878ac9e8f01c0d22e3e
-  data.tar.gz: c0f419523dd3829bc00e7ee253c7501cef65f192b1f6768ea72459bbc5dfe7abbbbb7bb99e4fe568af23d59e58eda9f5e182d50e5287de9b537e081dc4ee4565
+  metadata.gz: 7e44b601db031e44d620a160abc8dbfeb847da73e9af61c5cfd977cc2eba780b1eb3694f31a03c8ee47c562ff6f8959e5d8e474be377faf0defd1d1a65d53eb6
+  data.tar.gz: 2529519b5920e59cb9631738b762554855f1611a958932766f8b5438f97fa16256b249f9fd49a26c473881a3018a0c9b30bb46bbee4a88be5d794d6549db226e

data/lib/dockerfilemerge.rb

@@ -5,184 +5,231 @@
 require 'lineparser'
 require 'rxfhelper'
 
-class DockerfileMerge
+module Dockerfile
+  
+  class Merge
 
-  attr_reader :to_s
+    attr_reader :to_s
 
-  def initialize(raw_s)
+    def initialize(raw_s)
 
-    s, type = RXFHelper.read(raw_s)
+      s, type = RXFHelper.read(raw_s)
 
-    patterns = [
-      [:root, /^\s*ADD\s+(?<add>.*)/, :add],
-      [:root, /^\s*COPY\s+(?<copy>.*)/, :copy],
-      [:root, /FROM\s+(?<from>.*)/, :from],
-      [:root, /INCLUDE\s*(?<path>.*)?/, :include],
-        [:include, /(?<path>.*)/, :dockerfile],
-      [:root, /MAINTAINER (?<name>.*)/, :maintainer],
-      [:root, /RUN (?<command>.*)/, :run],
-      [:root, /-\/[^\/]+\/(?:\[[^\]]+\])?/, :del],
-      [:all, /#/, :comment]
-    ]
+      patterns = [
+        [:root, /^\s*ADD\s+(?<add>.*)/, :add],
+        [:root, /^\s*COPY\s+(?<copy>.*)/, :copy],
+        [:root, /FROM\s+(?<from>.*)/, :from],
+        [:root, /INCLUDE\s*(?<path>.*)?/, :include],
+          [:include, /(?<path>.*)/, :dockerfile],
+        [:root, /MAINTAINER (?<name>.*)/, :maintainer],
+        [:root, /RUN (?<command>.*)/, :run],
+        [:root, /-\/[^\/]+\/(?:\[[^\]]+\])?/, :del],
+        [:all, /#/, :comment]
+      ]
 
-    s.sub!(/\A# Dockermergefile/,'# Dockerfile')
-    a = LineParser.new(patterns, ignore_blank_lines: false).parse s
-    maintainer = a.grep /MAINTAINER/
-    
-    if maintainer.empty? then      
+      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
+        from = a.assoc :include      
+        a.insert(a.index(from) + 1, [:maintainer, {},['MAINTAINER unknown']])
+      end
 
-    lines = []
-  
-    if type == :url then
-      lines << '# Generated ' + Time.now.strftime("%a %d-%b-%Y %-I:%M%P")
-      lines << '# source: ' + raw_s
-    end
+      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
-      
-      line = r.first
-      
-      case label
+      a.each do |label, h, r, c| # h=hash, r=remaining, c=children
         
+        line = r.first
         
-      when :add
+        case label
+          
+          
+        when :add
 
-        lines << line
-        lines << '  ' + r[1..-1].join("\n  ").rstrip if r.length > 1
-        
-      when :comment
+          lines << line
+          lines << '  ' + r[1..-1].join("\n  ").rstrip if r.length > 1
+          
+        when :comment
 
-        lines << line
-        lines << '' if r.length > 1
-        
-        
-      when :copy
+          lines << line
+          lines << '' if r.length > 1
+          
+          
+        when :copy
 
-        lines << line
-        lines << '  ' + r[1..-1].join("\n  ").rstrip if r.length > 1        
-        
-      when :from
+          lines << line
+          lines << '  ' + r[1..-1].join("\n  ").rstrip if r.length > 1        
+          
+        when :from
 
-        lines << line
-        lines << '' if r.length > 1        
-        
+          lines << line
+          lines << '' if r.length > 1        
+          
 
-      when :include
+        when :include
 
-        h[:path].length > 0 ? merge_file(lines, h[:path]) :
-                  c.each {|source| merge_file lines, source[1][:path] }
-        lines << '' if r.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
+        when :maintainer
 
-        maintainers = lines.grep(/MAINTAINER/)
+          maintainers = lines.grep(/MAINTAINER/)
 
-        if maintainers.length > 0 then
-    
-          while maintainers.length > 1 do
-            i = lines.rindex maintainers.pop
-            lines.delete_at i
-            maintainers = lines.grep(/MAINTAINER/)
-          end
+          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]
+            i = lines.index maintainers[0]
 
-          lines[i] = line unless line[/MAINTAINER unknown/]
-        elsif maintainers.empty?
+            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/]
+            from = lines.grep /^ *FROM\b/
+            i = lines.index from[0]
+            lines.insert(i+1, line) unless line[/MAINTAINER unknown/]
 
-        end        
-        
+          end        
+          
 
-        
-      when :run
+          
+        when :run
 
-        lines << line
-        lines << '  ' + r[1..-1].join("\n  ").rstrip if r.length > 1
-        
-        
-      when :del
+          lines << line
+          lines << '  ' + r[1..-1].join("\n  ").rstrip if r.length > 1
+          
+          
+        when :del
 
-        exp, filter = line.match(/-\/([^\/]+)\/(\[[^\]]+\])?/).captures
+          exp, filter = line.match(/-\/([^\/]+)\/(\[[^\]]+\])?/).captures
 
-        name = if filter then
+          name = if filter then
 
-          case filter[1..-2]
-          when'0..-2'
-            :singlify_last
-          when '1..-1'
-            :singlify_first
+            case filter[1..-2]
+            when'0..-2'
+              :singlify_last
+            when '1..-1'
+              :singlify_first
+            else
+              puts 'unrecognised selector'
+            end
           else
-            puts 'unrecognised selector'
-          end
-        else
-          :delete_all
-        end        
-        
-        method(name).call(lines, exp) if name.is_a? Symbol
+            :delete_all
+          end        
+          
+          method(name).call(lines, exp) if name.is_a? Symbol
+          
+        end      
         
-      end      
+      end
+      
+      singlify_first lines, /^\s*FROM /
+      singlify_last lines, /^\s*CMD /
+      s = lines.join("\n")
+
+      rm_sources = /rm -rf \/var\/lib\/apt\/lists\/\*/
+      rm_sources_count = s.scan(rm_sources).length
       
+      if rm_sources_count > 1 then
+        (rm_sources_count - 1).times { remove_command(rm_sources,s) }
+      end
+      
+      @to_s = s
     end
     
-    singlify_first lines, /^\s*FROM /
-    singlify_last lines, /^\s*CMD /
-    s = lines.join("\n")
+    private
+    
+    def delete_all(lines, regex)
+      lines.reject! {|x| x[regex]}
+    end
+      
+    def merge_file(lines, path)
 
-    rm_sources = /rm -rf \/var\/lib\/apt\/lists\/\*/
-    rm_sources_count = s.scan(rm_sources).length
+      raw_buffer, type = RXFHelper.read(path)
+      buffer = raw_buffer[/^\bINCLUDE\b/] ? \
+            DockerfileMerge.new(raw_buffer).to_s : raw_buffer
+      
+      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
     
-    if rm_sources_count > 1 then
-      (rm_sources_count - 1).times { remove_command(rm_sources,s) }
+    def remove_command(regex, s)    
+      s.sub!(/(?:\\?\s*&&\s+)#{regex}\s*$|(?:RUN\s+|\s*&&\s+||&&\s*\\\s*)?#{regex}(?:\s+\\)? */,'')
     end
     
-    @to_s = s
-  end
-  
-  private
-  
-  def delete_all(lines, regex)
-    lines.reject! {|x| x[regex]}
-  end
+    # removes any matching lines after the 1st matching line
+    #
+    def singlify_first(lines, raw_regex)
+      
+      regex = raw_regex.is_a?(Regexp) ? raw_regex : Regexp.new(raw_regex)
+      i = 0
+      lines.reject! {|x| found = x[regex]; i += 1 if found;  i > 1 and found }
+    end
     
-  def merge_file(lines, path)
+    # removes any matching lines before the last matching line
+    #
+    def singlify_last(lines, raw_regex)
+      
+      regex = raw_regex.is_a?(Regexp) ? raw_regex : Regexp.new(raw_regex)
+      lines.grep(regex)[0..-2].each {|x| lines.delete x}
+    end  
+  end
 
-    raw_buffer, type = RXFHelper.read(path)
-    buffer = raw_buffer[/^\bINCLUDE\b/] ? \
-          DockerfileMerge.new(raw_buffer).to_s : raw_buffer
+  class Split
     
-    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 remove_command(regex, s)    
-    s.sub!(/(?:\\?\s*&&\s+)#{regex}\s*$|(?:RUN\s+|\s*&&\s+||&&\s*\\\s*)?#{regex}(?:\s+\\)? */,'')
-  end
-  
-  # removes any matching lines after the 1st matching line
-  #
-  def singlify_first(lines, raw_regex)
+    def initialize(xmlfile='dockerfiles.xml', repository: 'myrepo', 
+                   filepath: '.' , base_image: nil)
+      
+      @repository, @filepath, @xmlfile = repository, filepath, xmlfile
+      @base_image = base_image
+      
+    end
     
-    regex = raw_regex.is_a?(Regexp) ? raw_regex : Regexp.new(raw_regex)
-    i = 0
-    lines.reject! {|x| found = x[regex]; i += 1 if found;  i > 1 and found }
+    def make()
+
+      s = File.read(@xmlfile)
+      doc = Rexle.new(s)
+
+      a = doc.root.xpath('//dockerfile')
+      a.each.with_index do |entry, i|
+
+        filename = entry.attributes[:id]
+        path2 = File.join(@filepath, filename)
+        FileUtils.mkdir path2
+        File.write File.join(path2, 'Dockerfile'), entry.texts.join.strip\
+            .sub(/<base_image>/, @base_image)
+
+        s = "sudo docker build -t %s/%s ." % [@repository, filename]
+        File.write build_path=File.join(path2, 'build.sh'), s
+        FileUtils.chmod_R 0755, build_path
+
+        if i == 0 then
+
+          builds = "sudo build.sh && " + a[1..-1].map \
+            {|x| "cd ../%s && sudo build.sh" % x.attributes[:id] }.join(" && ")
+
+          File.write buildall_path=File.join(path2, 'buildall.sh'), builds
+          FileUtils.chmod_R 0755, buildall_path
+        end
+
+      end
+
+      
+    end
   end
-  
-  # removes any matching lines before the last matching line
-  #
-  def singlify_last(lines, raw_regex)
-    
-    regex = raw_regex.is_a?(Regexp) ? raw_regex : Regexp.new(raw_regex)
-    lines.grep(regex)[0..-2].each {|x| lines.delete x}
-  end  
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerfilemerge
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDcwOTIyMjYxOVoXDTE2MDcwODIyMjYxOVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANN2xruCRBJcjqpnwZhgNr9xh5r+fEnHRRN9cVT7gSjF1QKUptpVILDXBjmo
-  VRC2WyhB2ct0RiKaBMjtvh2k6sDkjkKzSu+2nsFrULhF7CmQ6KGZQ+xGmWK0rDnJ
-  7RgxYyE16APlhiFboYKg4DuIYbvHUvYkVJJc4d0cpm33QDLYV/qzM8tikHv1b3Z5
-  1x0w9YaCYY0qcwPkyT5iBNIOYETGu3QhO1qxSnMfchqPT3qSHEMURCqMd+YqUIqA
-  reKHiU4/vtnnfblJoUkLHu5ncrTMzFOSMIx6sz9IkOoxUSIn5iQJ+BsJmL2ro83B
-  t6aC1T35QveE9Cw8ollOk+/wwgECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUUTTdbNjncxfVI4lCFCMDsGhs8WswJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAfKIf6WI6
-  wRrUjXB8O0M+NPxyn6xIFlFNwEr6hW6baJ03Qg6Gx61oRMhYpncK11bVAelmrd+t
-  zR2hNqO0JNPxj8nreNO7bCQhv/jZBddarI01JxLAOqYqkdL/SNmXAkbyinQeHi/G
-  CqIpCHhDwm1OyWM5LMXL/keJyYhV6zWsKss77mgs2eI7ngJIRumY61D0omp1mkkO
-  plFRlsPmYWHR38dUWIcgORaoBvaxdTP4cJqq/+AElHvbeAJG/rLBGd9jF6tG8YZk
-  WHpJ21HYl4KWG8TISerrdwpQAZ5dhV2Yy/4q0MWSnDcMRSYdRAixOcdYW+U+R8cz
-  pf2JrQZNdYZXIg==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNDA2MjEwMjM3WhcN
+  MjAwNDA1MjEwMjM3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCaooNV
+  fX7aN+ifLKHmeFeuIJ+nd/sVFa2jGcyKtJWaBYu+aaVm75siS6paZEdAo7zw3NKt
+  CmQwK9nS7TCrbNa0VY07G0RwTM5JJPN6MIBVhZiO+sDG7i19ylqoBzLRjH8Xk62e
+  s+9gfbXgUj2STnoHpyjICyxWeRSdzNL+ZOtRFMJIPqqErGHVtS4IKbWN8uCL1mk1
+  piPC14lGHCAsP7fsXffneE93ibNvUFdv4tYw7SrMOIUFiqaKoVwP7tzktwGp7ofN
+  l6xm0/Gkd/ZM4Zt11qbSryUL2TU0TdpsOpmpxF90pQRziTX7ketBTvHX7LFm9tJj
+  /CQxcjTM33AvowEmX/DCFNoMXpeGjcdMeo1DC+4d+R1OzNs5pLU4957CJCkSpRb0
+  pUL0RziaJgLeRuZ0Irgd1nNGOenhdMe//6peaUBULsw352MdFQpnVssjUnxbYIjH
+  /EvzQBNWgu+eqcRIn//U/BRKzNvuEGF70sxIjIHxjOY1QNIMclZ3thS8aHECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUWunxNo4/
+  S4gA294O8BGCrhYZjxAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAjI1vZ69Uf8vEOjRRhHKTWTQDjnnOONl6J27qelmw
+  qGHlphuZ6zPMyAlPe5rpk67A8/+tliTs1SQ+V17O0TZqLNDQKKNTXlgjt7INe360
+  V0IsdKnuI8p+gYikGm5PrrkARp0eNQfieZhSW3NTbhR5uVKkqpBzYKZtOgEeAVYT
+  XpuifxUTozSUr4wuwMEBnf795L9+eogB8a+at6pVhTGEfgomgGNv+h5W2RX4aRai
+  bjddYdB0MU6KGn2J6Z7w8RzqAqw5c59I+5O/A68fSGh2jRgJPxDW0qzrBj9djbL6
+  qv+dgXzEJc6iQIN7IdJyKs2kRroolKSVru/ACB6ppsUxfASud20OyrJRudMJzRQH
+  Rwfa6N2cxBitxIs+cca9gMgAMZtQvbWg4LgwqOjio8cKbW6HKc63PXEkIP7/sC5i
+  zfrmvNAOB2nUhx8eE6ES7atIe0Fq1AFX8hX3guVTzqPW9J71heSwNzc7oxQW8u93
+  nByUcsaYHMsVhsqOgbKoqjA5
   -----END CERTIFICATE-----
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2019-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lineparser
@@ -42,7 +46,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,29 +56,29 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.9.4
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,9 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: Merge 2 or more Dockerfiles into 1 Dockerfile
+summary: Merge 2 or more Dockerfiles into 1 Dockerfile, or split Dockerfiles apart
+  from an XML file
 test_files: []