rbld 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6e6b6c83de186b90268b6fa03871fd6c59e69a
-  data.tar.gz: b4523b349fb7b8fb87ab6c13b6f5c010b601c06c
+  metadata.gz: 59a5ab4410529f2d2b3482b9d732b08044f5f3de
+  data.tar.gz: ba25955d34d8888761ebd233728ada0cfcca0178
 SHA512:
-  metadata.gz: 45a8047ed0fc8fbc2c139de6a3e27d0e5cb26da6946376614baf9563d030c9d6aea346ec7ea24ec2157f8b2b78686d1d05fadfcca81c2f313ba422cd905c258a
-  data.tar.gz: 30a6141855472dbe47b8612457a2fe7a1bc9328e4b51d3fb856a660e2ff3807eba00114d71e8df77a7bc33e939df140e3100aa249fdf8ebd1f155919189a5c11
+  metadata.gz: 26cd599a7e8003b475b7a209cac0bccc61ce35e6307e735db5eaa0c6ce47d950105f21fc1ca9a02a15f300db239c12bf0fab8df956ffa1442b0b08df9bef57a2
+  data.tar.gz: e9d7a83df474d789a99a9498e79a44f0575899e4cc0a3246a232f763182e1239534db0f79adf1229b5f4cb018321dbb9a62fc658dd52270335bb25b98e4b1b56

data/cli/lib/commands/rbld_commit.rb

@@ -20,7 +20,7 @@ module Rebuild::CLI
         end
 
         raise "New tag not specified" unless tag
-        Environment.validate_component( 'new tag', tag )
+        Environment.validate_tag_name( 'new tag', tag )
         return tag, ARGV
       end
     end

data/cli/lib/data/version

@@ -1 +1 @@
-1.3.6
+1.3.7

data/cli/lib/rbld_commands.rb

@@ -7,10 +7,13 @@ require_relative 'rbld_plugins'
 module Rebuild::CLI
   extend Rebuild::Utils::Errors
 
+  name_error = "Invalid %s, it may contain lowercase and uppercase letters, digits, underscores, periods and dashes"
+
   rebuild_errors \
     EnvironmentNameEmpty: 'Environment name not specified',
     EnvironmentNameWithoutTagExpected: 'Environment tag must not be specified',
-    EnvironmentNameError: 'Invalid %s, it may contain a-z, A-Z, 0-9, - and _ characters only',
+    TagNameError: "#{name_error} and may not start with a period or a dash.",
+    EnvironmentNameError: "#{name_error} and may not start or end with a dash, period or underscore.",
     HandlerClassNameError: '%s'
 
   class Environment
@@ -24,9 +27,17 @@ module Rebuild::CLI
       @full = "#{@name}:#{@tag}"
     end
 
-    def self.validate_component( name, value )
+    def self.validate_environment_name( name, value )
       raise EnvironmentNameError, "#{name} (#{value})" \
-        unless value.match( /^[[:alnum:]\_\-]*$/ )
+        unless value.match(/^[[:alnum:]\.\-\_]*$/) and \
+          !value.start_with?('_','-','.') and \
+          !value.end_with?('_','-','.')
+    end
+
+    def self.validate_tag_name( name, value )
+      raise TagNameError, "#{name} (#{value})" \
+        unless value.match(/^[[:alnum:]\.\-\_]*$/) and \
+          !value.start_with?('-','.')
     end
 
     def to_s
@@ -59,8 +70,8 @@ module Rebuild::CLI
 
     def validate_name_tag(opts)
       raise EnvironmentNameEmpty if @name.empty? && !opts[:allow_empty]
-      self.class.validate_component( "environment name", @name ) unless @name.empty?
-      self.class.validate_component( "environment tag", @tag ) unless @tag.empty?
+      self.class.validate_environment_name( "environment name", @name ) unless @name.empty?
+      self.class.validate_tag_name( "environment tag", @tag ) unless @tag.empty?
     end
   end
 

data/cli/lib/rbld_print.rb

@@ -33,7 +33,7 @@ module Rebuild
       end
 
       def self.raw_trace(msg)
-        STDOUT.write( "#{msg}".light_black )
+        STDOUT.write( "#{msg}".cyan )
         STDOUT.flush
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbld
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Dmitry Fleytman
 autorequire: 
 bindir: cli/bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -486,5 +486,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: rbld-1.3.6
+summary: rbld-1.3.7
 test_files: []