dockerb 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98e740f722b398769f026a7b1d8d72628906bb7d
-  data.tar.gz: 184dbafd9fa38d41d0d60fa88878cc32c6c9e4ee
+  metadata.gz: d80b455d4cf60c63db0ae6657945667d3a850e45
+  data.tar.gz: 5e117e36b1db3cf80f6f4175ccb8290442ba4f43
 SHA512:
-  metadata.gz: 2cdc3152ff655e0d907f646aa74d9cdf88f79af77b3725cab48483d0b1205235c60b95a511a54d767dab40a83d73049880cf8634ecc48540a90d0551410a2af7
-  data.tar.gz: 2902d3907b435f2a940bae3ea68ef295103417cae4950903f8acbd82f2f267289c32b7ec938151352d19401f727cdb923ee94264be69dd102b225ab4f8c4abc4
+  metadata.gz: 31e5f388d6fdd409e8556b21b6312ac496ec5b024cd4d905894a4ec53e21bef4d1b3a20b109af1e67a5021592135b7bdebb96dae02fa0c81a8d19f40d68b02e5
+  data.tar.gz: 0277724fc4e8228260edc7a0e41b61a215daf65856db1d9d7e269eb2797f32b4b7c1f0a3a50074fafb228f1936b7643e90ae1a662d1e44e41e31806e22e51c88

data/lib/dockerb/version.rb

@@ -1,3 +1,3 @@
 module Dockerb
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/lib/dockerb.rb

@@ -1,22 +1,38 @@
 require 'erb'
+require 'dockerb/version'
 
 module Dockerb
+  GENERATED = "# Generated by dockerb VERSION, do not modify"
+  SEARCH = /#{Regexp.escape(GENERATED).sub('VERSION', '([\d\.]+)')}/
+
   class << self
-    def compile
-      return (yield if block_given?) unless File.exist?("Dockerfile.erb")
-      begin
-        File.write("Dockerfile", Context.compile(File.read("Dockerfile.erb")))
-        yield if block_given?
-      ensure
-        File.unlink("Dockerfile") if File.exist?("Dockerfile") && block_given?
-      end
+    def compile(&block)
+      return (yield if block) unless File.exist?("Dockerfile.erb")
+      ensure_not_older_than_last
+      compile_dockerfile(&block)
+    end
+
+    private
+
+    def ensure_not_older_than_last
+      return unless File.exist?("Dockerfile")
+      return unless old = File.read("Dockerfile")[SEARCH, 1]
+      return unless Gem::Version.new(old) > Gem::Version.new(VERSION)
+      raise "Previous file was generated by dockerb #{old}, use it or a newer version."
+    end
+
+    def compile_dockerfile(&block)
+      File.write("Dockerfile", Context.compile(File.read("Dockerfile.erb")))
+      yield if block
+    ensure
+      File.unlink("Dockerfile") if File.exist?("Dockerfile") && block
     end
   end
 
   class Context
     class << self
       def compile(code)
-        warn = "# Generated by dockerb, do not modify\n"
+        warn = "#{GENERATED.sub('VERSION', Dockerb::VERSION)}\n"
         warn + ERB.new(code).result(binding).strip + "\n" + warn
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dockerb
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Grosser