manifest-builder 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60db236a806378564e531600878a0f8b04c7364c
-  data.tar.gz: 08cc016081a8f04a9a2fca6c0034aabe9591f0e9
+  metadata.gz: f64453fb19e30cbd7065f1b958724c4ba5ae1ba6
+  data.tar.gz: 6c5e2f18acbffd7f46b3b1cae785ce172c0422db
 SHA512:
-  metadata.gz: 86e83f836a183772433dd1c63323fd0e4fdaa0465f0c4115929170815c7b4228ea1964c48bc491db0312f7b18a4f5e50b233c8adceadeb2eb563bca51b9f3956
-  data.tar.gz: 36731d0cc6942426305adee38cfadaddb23228f8ed004d6bd8adcccfb20d0ab60bea70f8cedf006e963c045f2ca8abb70117e689d70757a113feffa47ce7637d
+  metadata.gz: 742e68dcdf78eaac4efda5e1616d9702f99857bd8075b0366951d14f2ca7fa47cc85f24e8059d925064aab04052bd23d1cdadb7ef6d71d3deb31381b40753168
+  data.tar.gz: 89c2af981a892260f5126e64b9bd31e286cbe35c7414b06d719b4f7c3ac091c947a70e188b967a9c483625e5061d8a081b312c062e3b28ac0ad7a982a7c42453

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.5.4)
+    manifest-builder (0.5.5)
       archive-tar-minitar (= 0.5.2)
       chefrepo-builder (>= 0.9.27, < 1.1)
-      cicd-builder (>= 0.9.37, < 1.1)
+      cicd-builder (>= 0.9.38, < 1.1)
       json (>= 1.8.1, < 1.9)
       s3etag (>= 0.0.1, < 0.1.0)
 
@@ -18,7 +18,7 @@ PATH
 PATH
   remote: ../cicd-builder
   specs:
-    cicd-builder (0.9.37)
+    cicd-builder (0.9.38)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)

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

@@ -119,10 +119,17 @@ module CiCd
                       build   = build.gsub(%r'^#{version}(\.|-)*','')
                     end
                   end
-                else
+                else # The whacky cases
                   build   = version.dup
-                  version = ver
-                  build   = build.gsub(%r'^#{version}(\.|-)*','')
+                  if ver =~ %r/\d+\.(\d+\.)*/
+                    version = ver
+                    build   = build.gsub(%r'^#{version}(\.|-)*','')
+                  else
+                    vra = version.gsub!(%r'^((\d+\.?)+)', '\1').split(/\./)
+                    version = vra[0..2].join('.')
+                    build   = vra[-1]
+                    #build   = @vars[:build_num]
+                  end
                 end
               end
             else

data/lib/cicd/builder/manifest/mixlib/repo/artifactory.rb

@@ -1,4 +1,5 @@
 require 'artifactory'
+require 'tmpdir'
 
 module CiCd
   module Builder
@@ -78,10 +79,26 @@ module CiCd
             end
             amn = artifactory_manifest_name # Just using a local iso invoking method_missing repeatedly ... ;)
             data = {module: amn, data: manifest_data, version: @vars[:build_ver], build: @vars[:build_num], properties: @properties_matrix}
-            tempArtifactFile(amn, data)
+            # tempArtifactFile(amn, data)
+
+            data[:file] = Dir::Tmpname.create(amn) do |tmpnam, n, opts|
+              mode = File::RDWR|File::CREAT|File::EXCL
+              perm = 0600
+              opts = perm
+            end + '.properties'
+            IO.write(data[:file], data[:data])
+
             data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
             data[:md5] = Digest::MD5.file(data[:file]).hexdigest
             data[:name] = amn
+            # data[:temp] = false
+            # @builder.addArtifact(@vars[:artifacts], local, local_dir, {module: comp[0], name: comp[0], build: build, version: version, file: local})
+            @vars[:artifacts].unshift({
+                                        key: amn,
+                                       data: data.dup,
+                                      })
+            manifest[amn]={ amn => "#{@vars[:build_ver]}-#{@vars[:build_num]}" }
+
             maybeUploadArtifactoryObject(data: data, artifact_module: amn, artifact_version: data[:version] || @vars[:version], file_name: '', file_ext: 'properties')
           end
 

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

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

data/manifest-builder.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'cicd-builder', '>= 0.9.37', '< 1.1'
+  gem.add_dependency 'cicd-builder', '>= 0.9.38', '< 1.1'
   gem.add_dependency 'chefrepo-builder', '>= 0.9.27', '< 1.1'
   # gem.add_dependency 'ansiblerepo-builder', '>= 0.3.7', '< 0.5'
   gem.add_dependency 'json', '>= 1.8.1', '< 1.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cicd-builder
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.37
+        version: 0.9.38
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.37
+        version: 0.9.38
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'