egg 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2329fcef558e7404fd20582870b5ee4ffe7601ea
-  data.tar.gz: 2cee907b6a7657cac5559012433e4054e2818bb3
+  metadata.gz: 6537dd12342b2469b062c681875a6048849584d0
+  data.tar.gz: 7cdb22c0856264963f77894ac850101f3d687dbb
 SHA512:
-  metadata.gz: c6866ee5948c69de27b010a343dc2c3cdb708cbf00cc550602d431bdccb03f898b59f03ffcc120088c3743b06177ab83ab86c77dec95d1525b89d97d09238d29
-  data.tar.gz: 109a3af6b131fae7df954d79b4dd781a8d1fc353d01a3375234f1f205ee59fcc5479caaa84844bd2a0415e03a5d4b66f40d860854ff505cbe5228b67535a3944
+  metadata.gz: 193ec0da7471c0dcadc163a3649ceb841037f0f3d757f73b48b3cae65d16f1cffbb37850a8b9f59d7016b94e118f28de97f8ea977e1da6c25d9e18e0d0ee90a1
+  data.tar.gz: b54dbf63a476199020b8f33e27a41df25ef3a8dfeb849e42a12779a284a28f82c5d3702cdb677e6e241853c0bf4478529b184f6898c767f15dacbb36d704a5ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    egg (0.5.2)
+    egg (0.6.0)
       thor (~> 0.19.0)
 
 GEM

data/lib/egg/dockerfile/base.rb

@@ -2,6 +2,13 @@ module Egg
   module Dockerfile
     # Provides shared behavior for dockerfile template classes.
     class Base
+      # Raise when before and after are both used at the same time.
+      class QuantumStateError < RuntimeError
+        def message
+          "Directives cannot happen both before and after a given directive"
+        end
+      end
+
       attr_reader :template
       attr_accessor :command
 
@@ -23,22 +30,38 @@ module Egg
         ERB.new(unrendered_output).result(binding)
       end
 
-      def run(command, before: [:cmd])
-        template.insert(do_before(before), [:run, command])
+      def run(command, before: [:cmd], after: nil)
+        insert_with_before_after([:run, command], before: before, after: after)
       end
 
-      def env(env_hash)
+      def env(env_hash, **before_after)
         env_string = env_hash.reduce("") do |out, (key, value)|
           out << key.to_s.upcase << '="' << value.to_s << '" '
         end
-        template << [:env, env_string]
+        insert_with_before_after([:env, env_string], before_after)
+      end
+
+      def add(localpath, containerpath, **before_after)
+        directive = [:add, localpath + " " + containerpath]
+        insert_with_before_after(directive, before_after)
       end
 
       private
 
-      def do_before(before)
-        template.index(before) ||
-          template.index { |tc| tc[0] == before[0] } ||
+      def insert_with_before_after(directive, before: nil, after: nil)
+        raise(QuantumStateError) if before && after
+        if before
+          template.insert(find_directive_in_template(before), directive)
+        elsif after
+          template.insert(find_directive_in_template(after) + 1, directive)
+        else
+          template << directive
+        end
+      end
+
+      def find_directive_in_template(directive)
+        template.index(directive) ||
+          template.index { |tc| tc[0] == directive[0] } ||
           -1
       end
 

data/lib/egg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Egg
-  VERSION = "0.5.2".freeze
+  VERSION = "0.6.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egg
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Carl Thuringer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor