docker-spec 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afbe68e59763560e7f89ee6d7bd90441e7c2265786005ce59bfa32378e8cc239
-  data.tar.gz: 4e1525bad69b698263dbe539154ca5da2bbb64f2617d0a5c44efbbb1d2b07b2c
+  metadata.gz: ea0d7f3d6a623e089d9987a0adbd2eeff7858379c38fbec0e0dba6f0ea05607f
+  data.tar.gz: 92d294f339f5f9f60f2eabbaa06ecbd5e023cf2ddd4580653565938a78eaf789
 SHA512:
-  metadata.gz: 4c7b5f1a182d4c35c4b1009a97fba76ffa351cb8af0057231d1ad27a3a52ab944c2acd6b019691310bdd9ee1182ea00bd7f965831f478eb250f521ef9e01c982
-  data.tar.gz: ef42245ba03307913c7db918f4d4ff6b735e0c7ee5fba69c84a03035a9e4560491692026dd7fe55f97dd88835670c6599b3318efc8336081fb29f84c6df60230
+  metadata.gz: 43ec2a6a5aebc188876c74fcacdb1b9a6ecf7db0c80226cc52443c113fdf28450223049f727c13517164698aa9a9b5eccf9b03e4ba59dbc90ceeceaf68f353bb
+  data.tar.gz: 00c3c9bb7a291dd14dbdca5e173abd1904e7c200a0c6bb4790fb14f38a4bca8dfbe9995eec090183e687ba442fec68c42fdbec6a8b0fa70be56ea87cf1e1129d

data/lib/docker/spec.rb

@@ -74,9 +74,11 @@ class DockerSpec
       end
 
       # Open key value store and get the current tag for this repo
+      tag_prefix = @config[:tag_prefix]
       store = Moneta.new(:YAML, file: File.expand_path(@config[:tag_db]))
-      current_tag = store.key?(@config[:image_name]) ? store[@config[:image_name]].to_i : 0
-      new_tag = current_tag + 1
+      current_tag = store.key?(@config[:image_name]) ? 
+        store[@config[:image_name]].match(/#{tag_prefix}(.*)/)[1].to_i : 0
+      new_tag = tag_prefix + (current_tag + 1).to_s
 
       image = Docker::Image.all.detect do |i|
         i.info['RepoTags'].include?(@config[:image_name] + ':latest')
@@ -97,7 +99,7 @@ class DockerSpec
       image.push nil, tag: 'latest'
 
       # Store the new tag in the tag_db
-      store[@config[:image_name]] = new_tag
+      store[@config[:image_name]] = new_tag.to_s
       store.close
     end
   end
@@ -117,6 +119,7 @@ class DockerSpec
     @config[:clear_cache] = get_config(:clear_cache, 'DOCKER_SPEC_CLEAR_CACHE',
                                        'Clear docker cache? ') if @config[:build_image]
     @config[:tag_db] = get_config(:tag_db, 'DOCKER_SPEC_TAG_DB', 'tag db?')
+    @config[:tag_prefix] = get_config(:tag_prefix, 'DOCKER_SPEC_TAG_PREFIX', 'tag prefix?', '')
     @config
   end
 
@@ -227,10 +230,14 @@ EOF
     end
   end
 
-  def get_config(key, envvar, question)
-    value = to_boolean(ENV[envvar])
+  def get_config(key, envvar, question, default = nil)
+    value = ENV[envvar]
+    value = true if value.class == String && value.match(/^(true|yes|y)$/i)
+    value = false if value.class == String && value.match(/^(false|no|n)$/i)
     value = @config[key] if value.nil?
-    value = agree(question, 'n') if value.nil?
+    if value.nil?
+      value = default.nil? ? agree(question, 'n') : default
+    end
     value
   end
 

data/lib/docker/spec/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Spec
-    VERSION = "0.19.0"
+    VERSION = "0.20.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-spec
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Juan Breinlinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler