manifest-builder 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a037fcd4009d953d8bc0102eaad598a36ae025d
-  data.tar.gz: ff1a9a5e19c3a3b5a98a513abfcfc2a99ef7d40f
+  metadata.gz: 25d294dbd696497265d4cbd29c06158d121ae09e
+  data.tar.gz: 6a3b1ec3431326915f54bc3d50adab16872512b4
 SHA512:
-  metadata.gz: c614b63ea69740b5c82f46b1d540ef8f1920f700d5579336fbd3de33a9a7e7c75811515b8d6da02a9d12a23d22d0813c281c3269b38628936a12ab4fb4243458
-  data.tar.gz: f9a36607524d6d7ec9958d5bf89c2c6a587f5bb037a4fffb276f634001638538e8de7ce3efeb62899147293277301a2e86616898e8e200bb85a3cd60ac843836
+  metadata.gz: 5a7425bea022457dd3c2788c4dc83b3b663fc4d37e565945a9d50e41d08adafa681987a0e97f3a0bf7e2a5d32c80b9f2775d2febb2d65ea8622030be4740537d
+  data.tar.gz: e71d7292a1da2612bbad013543de6b79d06381802d4744b306ab7d9b552820d5e2c84583bf798a2686effe5eb6068e19e1dff5f0f57002324e5ee42498147aa8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.3.0)
+    manifest-builder (0.4.0)
       archive-tar-minitar (= 0.5.2)
       chefrepo-builder (>= 0.9.27, < 1.1)
       cicd-builder (>= 0.9.33, < 1.1)

data/lib/cicd/builder/manifest/mixlib/build.rb

@@ -77,40 +77,103 @@ module CiCd
           #   super
           # end
 
+          VER_RGX = %r'^\d+\.\d+(\.?\d)*$'
+          MMP_RGX = %r'^(\d+\.?){2,3}$'
+          # ---------------------------------------------------------------------------------------------------------------
+          def getVersionBuildFromName(artifact)
+            version = artifact.dup
+            version.gsub!(%r'\.*(tar\.gz|tgz|bzip2|bz2|jar|war|[a-z]+)$', '')
+            # if artifact =~ %r'^#{comp[0]}'
+            #   version.gsub!(%r'^#{comp[0]}\.*-*','')
+            # else
+            #   version.gsub!(%r'^[a-zA-Z\-._]+','')
+            # end
+            version.gsub!(%r'^[a-zA-Z\-._]+', '')
+
+            # build = if version.match(VER_RGX)
+            #           if version.match(%r'^(\d+\.?){2,3}$')
+            #             0
+            #           elsif version.match(%r'\-')
+            #             version,build = version.split(/-/)
+            #             build
+            #           else
+            #             0
+            #           end
+            #         else
+            #           0
+            #         end
+            build = ''
+            if version.match(VER_RGX)
+              if version.match(%r'\-')
+                version,build = version.split(/-/)
+              end
+            # else
+            #   match = version.match(%r'^(\d+)-(\d{4}-\d{2}-\d{2}[_]\d{2}-\d{2}-\d{2})\.(release|snapshot)$')
+            #   if match
+            #     build = match[1]
+            #     # version.gsub!(/^#{build}-/, '')
+            #     version = match[2]
+            #   end
+            end
+            [version,build]
+          end
+
+          # ---------------------------------------------------------------------------------------------------------------
           def getVersionBuild(path,artifact,comp)
             version,build  = File.split(path)
-            if build.match(%r'^\d+$') and version.match(%r'/?\d+\.\d+\.?\d*$')
+            if build.match(%r'^\d+$') and version.match(%r'/?\d+\.\d+\.?\d*$') # Hole in one!
               version = File.basename(version)
-              build   = build.to_i
             else
-              build   = comp[1][:build] || 0
-              version = comp[1][:build].nil? ? '' : ( comp[1][:build] > 0 ? build.to_s : '' )
-              build   = comp[1][:build] || 0
-              unless version.match(%r'^[.0-9]+$')
+              if build.match(VER_RGX)
+                version = build
+                build   = ''
+              else
+                version = comp[1][:build].nil? ? '' : ( comp[1][:build] > 0 ? build.to_s : '' )
+              end
+              unless version.match(VER_RGX)
                 version = comp[1][:version] || ''
               end
+              ver,bld = getVersionBuildFromName(artifact)
               if version.empty?
-                version = artifact.dup
-                version.gsub!(%r'\.*(tar\.gz|tgz|bzip2|bz2|jar|war|[a-z]+)$','')
-                if artifact =~ %r'^#{comp[0]}'
-                  version.gsub!(%r'^#{comp[0]}\.*-*','')
-                else
-                  version.gsub!(%r'^[a-zA-Z\-.]+','')
-                end
+                version,build = [ver,bld]
                 if version.empty?
                   version = @vars[:build_ver]
                 else
                   uri,ver  = File.split(path)
-                  if version =~ %r'^#{ver}' and version =~ %r'^(\d+\.){3}'
+                  if version =~ %r'^#{ver}'
+                    if version =~ VER_RGX
+                      if version =~ %r'^#{build}' # prob the major part of version
+                        build   = ''
+                      end
+                    else
+                      unless version.eql?(ver)
+                        build   = version.dup
+                        version = ver
+                        build   = build.gsub(%r'^#{version}(\.|-)*','')
+                      end
+                    end
+                  else
                     build   = version.dup
                     version = ver
                     build   = build.gsub(%r'^#{version}(\.|-)*','')
                   end
                 end
-                if build == 0 or build.empty?
-                  build = @vars[:build_num]
-                end
               else
+                if ver.match(VER_RGX)
+                  if ver.match(MMP_RGX)
+                    if version.length < ver.length
+                      version = ver # Guessing it is the better version
+                    end
+                  else
+                    build = ver.dup
+                    # version.gsub!(/\.d+$/, '')
+                    build.gsub!(/^#{version}\.?/, '')
+                  end
+                end
+              end
+              unless build.match(%r'^[1-9]\d*$')
+                build = comp[1][:build]
+                build = @vars[:build_num] if (build.nil? or build.empty? or build.to_i == 0)
               end
             end
             [version,build]

data/lib/cicd/builder/manifest/version.rb

@@ -2,7 +2,7 @@ module CiCd
   module Builder
     module Manifest
       # manifest-builder version
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
       MAJOR, MINOR, TINY = VERSION.split('.')
       PATCH = TINY
     end

data/manifest-builder.gemspec

@@ -3,7 +3,7 @@
 require File.expand_path('../lib/cicd/builder/manifest/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = "manifest-builder"
+  gem.name          = 'manifest-builder'
   gem.version       = CiCd::Builder::Manifest::VERSION
   gem.summary       = %q{Repo builder for a software manifest}
   gem.description   = %q{Repo builder of the software manifest.yml for Continuous Integration/Continuous Delivery artifact promotion style deployments}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cicd-builder