dockerfilemerge 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a473168ffb22459fec1a66528f549bf62e40fc12
-  data.tar.gz: 1cabcdd721e4ceaf4eea43d9562fdd83eb077552
+  metadata.gz: 5365dc62f83f81f017c85c69e6d8b60f6a97e581
+  data.tar.gz: 6ea1a86e7ac4934c927554d0f64af48d6ba9a510
 SHA512:
-  metadata.gz: e54453818d8eac55c4a22ddc147a81cab71414eca7799624f3b94fc61a9b80d95e9f958c5e3d8c1673c61b31172dcc0dbd9caeeaa37d83fc891e75464bd46e6b
-  data.tar.gz: ff46cf37d4cae95e0c4cd18709c2f7c7230d36425a4f2e291459d76d6127d1232a25402f2e6b800a0da7a3e8783d7a1f27d57a096e03b47a4129629f63619bd6
+  metadata.gz: 7601ee6c67d4494c5ed3482b5dc7b0bf2e056c056c1593b49f59777ddb2bb96ee2231bedc7deb4702b14e99449747eca1a128288d97812dc3507b376b424b672
+  data.tar.gz: f6e5c3c29a625675bbd39204d73a1c658d012ca32fb7e88f7f9607a4aa79d93e725927747a240a25274a8e59356dd9b2488e89e82ec326bc2f8acedce80a946a

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-��È�Q��;;\��+|�������K��GU�c��j�a.����Ўy}$�3��H`
r�'����`�	���m^�⁑�#��v���
n=��lEw�t@�~����oV���jq���a�z�e����'4Yv�G�S�潄�s�F�������^��"hoSENYZ�1���ʖ��2�̘�Qi�{��n30�A�C}:<��$-����<����U�^<�=��Sֳ��l�Vj�2㖈�W�&�2���LY�c�O 
+YM4�P"����qk
+'<3
T=�I�4�r|�D!<�׉e�
+/�����d��A6NU���a	�����c麽7%@H.⸭B^�m�"
���Nt�&E.6k4�)[ǟB�������$czI��?՛6޽�cRӳ��
��,W�vxv���T�9�Y����[��&��Q���B��7p2��U���>��{�R�;�B$:���SN�E�4�	_ȗ�	�md�6JMa��V�b1eQ�-3�\��	�

data/lib/dockerfilemerge.rb

@@ -19,6 +19,7 @@ class DockerfileMerge
         [:include, /(?<path>.*)/, :dockerfile],
       [:root, /MAINTAINER (?<name>.*)/, :maintainer],
       [:root, /RUN (?<command>.*)/, :run],
+      [:root, /-\/[^\/]+\/(?:\[[^\]]+\])?/, :del],
       [:all, /#/, :comment]
     ]
 
@@ -69,18 +70,42 @@ class DockerfileMerge
         lines.insert(i+1, line)
         lines.insert(i+2, '  ' + r[1..-1].join("\n  ").rstrip) if r.length > 1
 
-      end
+      when :del
+
+        exp, filter = line.match(/-\/([^\/]+)\/(\[[^\]]+\])?/).captures
+
+        name = if filter then
+
+          case filter[1..-2]
+          when'0..-2'
+            :singlify_last
+          when '1..-1'
+            :singlify_first
+          else
+            puts 'unrecognised selector'
+          end
+        else
+          :delete_all
+        end        
+        
+        method(name).call(lines, exp) if name.is_a? Symbol
+        
+      end      
       
     end
     
-    singlify lines, /^\s*FROM /
-    lines.grep(/^\s*CMD /)[0..-2].each {|x| lines.delete x}
+    singlify_first lines, /^\s*FROM /
+    singlify_last lines, /^\s*CMD /
 
     @to_s = lines.join("\n")
   end
   
   private
   
+  def delete_all(lines, regex)
+    lines.reject! {|x| x[regex]}
+  end
+    
   def merge_file(lines, path)
 
     raw_buffer, type = RXFHelper.read(path)
@@ -94,8 +119,20 @@ class DockerfileMerge
     lines.concat rows
   end  
   
-  def singlify(lines, regex)
+  # 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
+  
+  # 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

metadata

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