chefrepo-manifest-builder 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3c16765552633333e05c472744b277346ab802
-  data.tar.gz: 7997a73e0848b39c34427132b6aab7bc503629bb
+  metadata.gz: a455e3bc70be92556fb253128ad744fb40a88cf2
+  data.tar.gz: 6d2ff018739679612b997f2292d3e0d44405ddf4
 SHA512:
-  metadata.gz: b2b4a7b98813e08e45721c2c4225e1fa8a3a3736912d80f048bf6b3e15a8ed1055d7a78e7a7ec4032e197b998e7c42c99bf5a5ff6179a147115c61fe2e264b86
-  data.tar.gz: e3484d6a2005d32cdb79c330e29b78eaa0988a157bd39da745aaa77c7b1eec26cfd00f747e3bb571e418bdf9f84f212c9499350d32166f989ce3b24d045e07e0
+  metadata.gz: 6e24943165cdb4487ba49b7a7cbaf612abe688e5343c5239c8495b841bb35c2751b434ffe53d3a40db944d95bae82477c9d954ef580a21cfbbadd1b406234d76
+  data.tar.gz: ade7210e3d2209c5954dc9eb182300378b1f5a8e6eab410d8fb05f143e6bd637cebc904a429a438d49c2bdd5dee51e83c267e5f039a28e57101b24e204718716

data/.rakeTasks

@@ -4,4 +4,4 @@ You are allowed to:
 1. Remove rake task
 2. Add existing rake tasks
 To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Builds all packages" fullCmd="build" taksId="build" /><RakeTask description="Spawns an Interactive Ruby Console" fullCmd="console" taksId="console" /><RakeTask description="Run Cucumber features" fullCmd="cucumber" taksId="cucumber" /><RakeTask description="Installs all built gem packages" fullCmd="install" taksId="install" /><RakeTask description="Performs a release" fullCmd="release" taksId="release" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeGroup description="" fullCmd="" taksId="build"><RakeTask description="" fullCmd="build:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /><RakeTask description="" fullCmd="build:gem" taksId="gem" /><RakeGroup description="" fullCmd="" taksId="gem"><RakeTask description="" fullCmd="build:gem:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="console"><RakeTask description="" fullCmd="console:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="gem" taksId="gem" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="" fullCmd="install:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup><RakeTask description="" fullCmd="install_gem" taksId="install_gem" /><RakeTask description="" fullCmd="package" taksId="package" /><RakeTask description="" fullCmd="pkg" taksId="pkg" /><RakeTask description="" fullCmd="pkg/chefrepo-manifest-builder-0.1.0.gem" taksId="pkg/chefrepo-manifest-builder-0.1.0.gem" /><RakeTask description="" fullCmd="publish" taksId="publish" /><RakeTask description="" fullCmd="push" taksId="push" /><RakeGroup description="" fullCmd="" taksId="push"><RakeTask description="" fullCmd="push:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="scm"><RakeTask description="" fullCmd="scm:push" taksId="push" /><RakeTask description="" fullCmd="scm:status" taksId="status" /><RakeTask description="" fullCmd="scm:tag" taksId="tag" /></RakeGroup><RakeTask description="" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="validate" taksId="validate" /></RakeGroup></Settings>
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Builds all packages" fullCmd="build" taksId="build" /><RakeTask description="Spawns an Interactive Ruby Console" fullCmd="console" taksId="console" /><RakeTask description="Run Cucumber features" fullCmd="cucumber" taksId="cucumber" /><RakeTask description="Installs all built gem packages" fullCmd="install" taksId="install" /><RakeTask description="Performs a release" fullCmd="release" taksId="release" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeGroup description="" fullCmd="" taksId="build"><RakeTask description="" fullCmd="build:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /><RakeTask description="" fullCmd="build:gem" taksId="gem" /><RakeGroup description="" fullCmd="" taksId="gem"><RakeTask description="" fullCmd="build:gem:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="console"><RakeTask description="" fullCmd="console:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="gem" taksId="gem" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="" fullCmd="install:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup><RakeTask description="" fullCmd="install_gem" taksId="install_gem" /><RakeTask description="" fullCmd="package" taksId="package" /><RakeTask description="" fullCmd="pkg" taksId="pkg" /><RakeTask description="" fullCmd="pkg/chefrepo-manifest-builder-0.1.3.gem" taksId="pkg/chefrepo-manifest-builder-0.1.3.gem" /><RakeTask description="" fullCmd="publish" taksId="publish" /><RakeTask description="" fullCmd="push" taksId="push" /><RakeGroup description="" fullCmd="" taksId="push"><RakeTask description="" fullCmd="push:chefrepo-manifest-builder" taksId="chefrepo-manifest-builder" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="scm"><RakeTask description="" fullCmd="scm:push" taksId="push" /><RakeTask description="" fullCmd="scm:status" taksId="status" /><RakeTask description="" fullCmd="scm:tag" taksId="tag" /></RakeGroup><RakeTask description="" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="validate" taksId="validate" /></RakeGroup></Settings>

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    chefrepo-manifest-builder (0.1.3)
+    chefrepo-manifest-builder (0.1.4)
       archive-tar-minitar (= 0.5.2)
       json (>= 1.8.1, < 1.9)
-      manifest-builder (>= 0.6.2, < 1.1)
+      manifest-builder (>= 0.6.4, < 1.1)
       s3etag (>= 0.0.1, < 0.1.0)
 
 PATH
   remote: ../chefrepo-builder
   specs:
-    chefrepo-builder (0.9.32)
-      cicd-builder (>= 0.9.47, < 1.1)
+    chefrepo-builder (0.9.34)
+      cicd-builder (>= 0.9.50, < 1.1)
       json (= 1.8.1)
 
 PATH
   remote: ../cicd-builder
   specs:
-    cicd-builder (0.9.48)
+    cicd-builder (0.9.50)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)
@@ -26,15 +26,17 @@ PATH
       inifile (>= 3.0.0, < 3.1)
       json (>= 1.8.1, < 1.9)
       logging (>= 1.8.2, < 1.9)
+      parallel (>= 1.4.1, < 1.5)
+      ruby-progressbar (>= 1.7.5, < 2)
       semverse (>= 1.2.1, < 1.3)
       yajl-ruby (>= 1.2.1, < 1.3)
 
 PATH
   remote: ../manifest-builder
   specs:
-    manifest-builder (0.6.2)
+    manifest-builder (0.6.4)
       archive-tar-minitar (= 0.5.2)
-      chefrepo-builder (>= 0.9.32, < 1.1)
+      chefrepo-builder (>= 0.9.34, < 1.1)
       json (>= 1.8.1, < 1.9)
       s3etag (>= 0.0.1, < 0.1.0)
 
@@ -44,14 +46,14 @@ GEM
     archive-tar-minitar (0.5.2)
     artifactory (2.2.1)
     awesome_print (1.6.1)
-    aws-sdk (2.0.39)
-      aws-sdk-resources (= 2.0.39)
-    aws-sdk-core (2.0.39)
+    aws-sdk (2.0.41)
+      aws-sdk-resources (= 2.0.41)
+    aws-sdk-core (2.0.41)
       builder (~> 3.0)
       jmespath (~> 1.0)
       multi_json (~> 1.0)
-    aws-sdk-resources (2.0.39)
-      aws-sdk-core (= 2.0.39)
+    aws-sdk-resources (2.0.41)
+      aws-sdk-core (= 2.0.41)
     builder (3.2.2)
     chef (12.0.3)
       chef-zero (~> 3.2)
@@ -104,7 +106,7 @@ GEM
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
@@ -118,7 +120,7 @@ GEM
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (8.2.0)
+    ohai (8.3.0)
       ffi (~> 1.9)
       ffi-yajl (>= 1.1, < 3.0)
       ipaddress
@@ -130,6 +132,7 @@ GEM
       rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    parallel (1.4.1)
     plist (3.1.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -145,6 +148,7 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.3)
+    ruby-progressbar (1.7.5)
     rubygems-tasks (0.2.4)
     s3etag (0.0.1)
     semverse (1.2.1)

data/chefrepo-manifest-builder.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'manifest-builder', '>= 0.6.2', '< 1.1'
+  gem.add_dependency 'manifest-builder', '>= 0.6.4', '< 1.1'
   # gem.add_dependency 'cicd-builder', '>= 0.9.48', '< 1.1'
-  # gem.add_dependency 'chefrepo-builder', '>= 0.9.31', '< 1.1'
+  # gem.add_dependency 'chefrepo-builder', '>= 0.9.34', '< 1.1'
   gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
   gem.add_dependency 's3etag', '>= 0.0.1', '< 0.1.0'
   gem.add_dependency 'archive-tar-minitar', '= 0.5.2'

data/lib/cicd/builder/chefrepo-manifest.rb

@@ -9,10 +9,15 @@ module CiCd
 
     module ChefRepoManifest
       class Runner < Manifest::Runner
+        require 'cicd/builder/chefrepo-manifest/mixlib/build'
+        include CiCd::Builder::ChefRepoManifest::Build
+        require 'cicd/builder/chefrepo-manifest/mixlib/repo'
+        include CiCd::Builder::ChefRepoManifest::Repo
 
         # ---------------------------------------------------------------------------------------------------------------
         def initialize()
           super
+          @klass = 'CiCd::Builder::ChefRepoManifest'
           @default_options[:builder] = VERSION
         end
 
@@ -29,6 +34,9 @@ module CiCd
         # ---------------------------------------------------------------------------------------------------------------
         def setup()
           $stdout.write("ChefRepoManifestBuilder v#{CiCd::Builder::ChefRepoManifest::VERSION}\n")
+          @default_options[:env_keys].select{|key| key !~ /^CLASSES/} << %w(
+                                            REPO_PRODUCTS
+                                           )
           super
         end
 

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

@@ -3,54 +3,177 @@ module CiCd
   module Builder
     # noinspection RubySuperCallWithoutSuperclassInspection
     module ChefRepoManifest
+      CLASS = 'CiCd::Builder::ChefRepoManifest'
       module Build
 
         # ---------------------------------------------------------------------------------------------------------------
         # noinspection RubyHashKeysTypesInspection
         def prepareBuild()
+          @logger.step CLASS+'::'+__method__.to_s
           super
-          if @vars[:return_code] == 0
-          end
-          @vars[:return_code]
-        end
+          if 0 == @vars[:return_code]
+            # We throw away the Manifest builder's hard work on components because they don't apply to us]
+            # We still call super because the grandparent does useful things we don't want to duplicate ... ;)
+            @vars[:components] = {}
+            # Now we need to dig the URL for the latest build of this BRANCH out of the INVENTORY for each of the set of products ... :(
+            # Get the repo a little earlier than the typical build which uses it as a write target iso a read source
+            getRepoInstance('S3')
+            ENV['REPO_PRODUCTS'].split(/,\s+/).each do |product|
+              if 0 == @vars[:return_code]
+                key,json,over = @repo.pullInventory(product)
+                if json.nil?
+                  @logger.error "Bad repo/inventory specified. s3://#{ENV['AWS_S3_BUCKET']}/#{key}"
+                  @vars[:return_code] = Errors::PRUNE_BAD_REPO
+                else
+                  if json['container'] and json['container']['variants']
+                    # but does not have our variant ...
+                    variants = json['container']['variants']
+                    @logger.info "\tVariants: #{variants.keys.size} \n#{variants.keys.ai}"
+                    variants.each do |variant,varianth|
+                      # If the inventory 'latest' format is up to date ...
+                      bmax, bmin, releases, versions, versrels = @repo.getVariantVersionsAndReleases(varianth)
+                      s = "Variant: #{variant}
+                      \t#{varianth['builds'].size} builds
+                      \t#{varianth['branches'].size} branches:\n#{varianth['branches'].ai}
+                      \tBuild numbers: #{bmin}-#{bmax}
+                      \tVersions: #{versions.ai}
+                      \tReleases: #{releases.ai}
+                      \tVersions per Release: #{versrels.ai}
+                      "
+                      @logger.info s.gsub(/\n\s+/, "\n\t")
+                    end
+                    if variants[@vars[:variant]]
+                      varianth = variants[@vars[:variant]]
+                      if varianth['latest'] and varianth['latest'].is_a?(Hash)
+                        latest    = varianth['latest']['build']
+                        builds    = varianth['builds']
+                        branches  = varianth['branches']
+                        versions  = varianth['versions']
 
-        # ---------------------------------------------------------------------------------------------------------------
-        def packageBuild()
-          @logger.step __method__.to_s
-          if isSameDirectory(Dir.pwd, ENV['WORKSPACE'])
-            if @vars.has_key?(:components) and not @vars[:components].empty?
-              @vars[:return_code] = 0
+                        drawer = if builds.size > latest
+                                   builds[latest]
+                                 else
+                                   nil
+                                 end
+                        if drawer
+                          ver = @repo._getVersion(@vars, drawer)
+                          rel = @repo._getRelease(@vars, drawer)
+                          bra = @repo._getBranch(@vars, drawer)
+                          name = drawer['build_name'] rescue drawer['build']
+                          var = @repo._getMatches(@vars, name, :variant)
+                          num = @repo._getMatches(@vars, name, :build)
+                          unless  var == @vars[:variant] &&
+                                  ver == @vars[:version] &&
+                                  rel == @vars[:release] &&
+                                  bra == @vars[:branch]
+                            drawer = nil
+                          end
+                        end
+                        unless drawer
+                          if branches.include?(@vars[:branch])
+                            survivors = builds.select{ |drawer|
+                              bra = @repo._getBranch(@vars, drawer)
+                              bra == @vars[:branch]
+                            }
+                            builds = survivors
+                            if versions.include?(@vars[:version])
+                              survivors = builds.select{ |drawer|
+                                ver = @repo._getVersion(@vars, drawer)
+                                ver == @vars[:version]
+                              }
+                              builds = survivors
+                              if versrels.include?("#{@vars[:version]}-#{@vars[:release]}")
+                                survivors = builds.select{ |drawer|
+                                  rel = @repo._getRelease(@vars, drawer)
+                                  rel == @vars[:release]
+                                }
+                                builds = survivors
+                                drawer = builds[-1]
+                              else
+                                @logger.error "Cannot manifest the version '#{@vars[:version]}' from variant '#{@vars[:variant]}'"
+                                @vars[:return_code] = Errors::REPO_BAD_VERSION
+                              end
+                            else
+                              @logger.error "Cannot manifest the version '#{@vars[:version]}' from variant '#{@vars[:variant]}'"
+                              @vars[:return_code] = Errors::REPO_BAD_VERSION
+                            end
+                          else
+                            @logger.error "Cannot manifest the branch '#{@vars[:branch]}' from variant '#{@vars[:variant]}'"
+                            @vars[:return_code] = Errors::REPO_BAD_BRANCH
+                          end
+                        end
+                        if drawer
+                          # Get the artifacts ...
+                          assembly = drawer['assembly'] || json['container']['assembly']
+                          artifacts = drawer['artifacts'].select{|art|
+                            art =~ /\.#{assembly['extension']}$/
+                          }
+                          if artifacts.size > 0
+                            @logger.info "Found these artifacts: #{artifacts.ai}"
+                            key = "#{product}/#{@vars[:variant]}/#{drawer['drawer']}/#{artifacts[0]}"
+                            obj = @repo.maybeS3Object(key)
+                            if obj
+                              ver = @repo._getVersion(@vars, drawer)
+                              rel = @repo._getRelease(@vars, drawer)
+                              bra = @repo._getBranch(@vars, drawer)
+                              name = drawer['build_name'] rescue drawer['build']
+                              var = @repo._getMatches(@vars, name, :variant)
+                              num = @repo._getMatches(@vars, name, :build)
 
-              clazz = getRepoClass('S3')
-              @logger.debug "Repo class == '#{clazz}'"
-              if clazz.is_a?(Class) and not clazz.nil?
-                @repo = clazz.new(self)
+                              @vars[:components][product] = {
+                                  name: product,
+                                  url: obj.public_url,
+                                  version: ver,
+                                  release: rel,
+                                  branch: bra,
+                                  variant: var,
+                                  build: num,
+                                  s3_bucket: ENV['AWS_S3_BUCKET'],
+                                  s3_key: key,
+                                  file_name: product,
+                                  file_ext: assembly['extension'],
+                              }
 
-                if @vars[:return_code] == 0
-                  lines             = []
-                  @vars[:artifacts] = []
-                  # Deal with all artifacts of each component
-                  @vars[:components].each { |comp|
-                    processComponent(comp, lines)
-                  }
-                  if @vars[:return_code] == 0
-                    cleanupAfterPackaging(lines)
+                              chksms = drawer['artifacts'].select{|art|
+                                art =~ /\.checksum$/
+                              }
+                              if chksms.size > 0
+                                chk = "#{product}/#{@vars[:variant]}/#{drawer['drawer']}/#{chksms[0]}"
+                                chk_obj = @repo.maybeS3Object(chk)
+                                if chk_obj
+                                  out = chk_obj.get()
+                                  @vars[:components][product][:sha256] = (out[:body].is_a?(String) ? out[:body] : out[:body].read) if out
+                                end
+                              end
+                            else
+                              @logger.error "Cannot manifest for #{key} ???"
+                              @vars[:return_code] = Errors::REPO_NO_BUILD
+                            end
+                          else
+                            @logger.error "No artifacts to manifest for #{key} ???"
+                            @vars[:return_code] = Errors::REPO_NO_BUILD
+                          end
+                        else
+                          @logger.error "Cannot find a build to manifest for #{product}-#{@vars[:version]}-release-#{@vars[:release]}-#{@vars[:branch]}-#{@vars[:variant]}"
+                          @vars[:return_code] = Errors::REPO_NO_BUILD
+                        end
+                      else
+                        # Start over ... too old/ incompatible
+                        @logger.error 'Repo too old or incompatible to manifest. No [container][variants][VARIANT][latest].'
+                        @vars[:return_code] = Errors::PRUNE_TOO_OLD
+                      end
+                    else
+                      @logger.error 'Our variant has not been built!?'
+                      @vars[:return_code] = Errors::REPO_NO_VARIANT
+                    end
+                  else
+                    # Start over ... too old/ incompatible
+                    @logger.error 'Repo too old or incompatible to manifest. No [container][variants].'
+                    @vars[:return_code] = Errors::PRUNE_TOO_OLD
                   end
-
-                else
-                  @logger.fatal "S3 repo error: Bucket #{ENV['AWS_S3_BUCKET']}"
                 end
-              else
-                @logger.error "CiCd::Builder::Repo::#{type} is not a valid repo class"
-                @vars[:return_code] = Errors::BUILDER_REPO_TYPE
               end
-            else
-              @logger.error 'No components found during preparation?'
-              @vars[:return_code] = Errors::NO_COMPONENTS
             end
-          else
-            @logger.error "Not in WORKSPACE? '#{pwd}' does not match WORKSPACE='#{workspace}'"
-            @vars[:return_code] = Errors::WORKSPACE_DIR
           end
 
           @vars[:return_code]

data/lib/cicd/builder/chefrepo-manifest/mixlib/repo.rb

@@ -0,0 +1,49 @@
+require 'json'
+
+module CiCd
+	module Builder
+    # noinspection RubySuperCallWithoutSuperclassInspection
+    module ChefRepoManifest
+      module Repo
+        require 'cicd/builder/mixlib/repo/base'
+        require 'cicd/builder/mixlib/repo/S3'
+        # noinspection RubyResolve
+        if ENV.has_key?('REPO_TYPE') and (not ENV['REPO_TYPE'].capitalize.eql?('S3'))
+          require "cicd/builder/chefrepo-manifest/mixlib/repo/#{ENV['REPO_TYPE'].downcase}"
+        end
+
+        # ---------------------------------------------------------------------------------------------------------------
+        def getRepoClass(type = nil)
+          @logger.step CLASS+'::'+__method__.to_s
+          if type.nil?
+            type ||= 'S3'
+            if ENV.has_key?('REPO_TYPE')
+              type = ENV['REPO_TYPE']
+            end
+          end
+
+          @logger.info "#{type} repo interface"
+          clazz = begin
+                    Object.const_get("#{self.class.name.gsub(%r'::\w+$', '')}::Repo::#{type}")
+                  rescue NameError => e
+                    begin
+                      # Object.const_get("#{self.class.name.gsub(%r'::\w+$', '')}::Repo::#{type}")
+                      Object.const_get("CiCd::Builder::Manifest::Repo::#{type}")
+                    rescue NameError #=> e
+                      Object.const_get("CiCd::Builder::Repo::#{type}")
+                    end
+                  end
+
+          if block_given?
+            if clazz.is_a?(Class) and not clazz.nil?
+              yield
+            end
+          end
+
+          clazz
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,323 +1,28 @@
 require 'artifactory'
 require 'tmpdir'
+require "cicd/builder/manifest/mixlib/repo/artifactory"
 
 module CiCd
   module Builder
     # noinspection RubySuperCallWithoutSuperclassInspection
-    module Manifest
+    module ChefRepoManifest
       module Repo
-        class Artifactory < CiCd::Builder::Repo::Artifactory
-          # include ::Artifactory::Resource
+        class Artifactory < CiCd::Builder::Manifest::Repo::Artifactory
+
+          # # ---------------------------------------------------------------------------------------------------------------
+          # def handleManifests()
+          #   if @vars[:return_code] == 0
+          #     # Preserve the manifest (maybeUploadArtifactoryObject will add everything we upload to the instance var)
+          #     manifest = @manifest.dup
+          #     # Create a manifest for each product and store it.
+          #     createProductManifests(manifest)
+          #     @manifest = manifest
+          #   end
+          #   @vars[:return_code]
+          # end
 
-          # ---------------------------------------------------------------------------------------------------------------
-          def initialize(builder)
-            super
-          end
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def uploadToRepo(artifacts)
-            @manifest = {}
-            super
-            if @vars[:return_code] == 0
-              # Preserve the manifest (maybeUploadArtifactoryObject will add everything we upload to the instance var)
-              manifest = @manifest.dup
-              # Create a manifest for each product and store it.
-              createProductManifests(manifest)
-              # Get a super manifest of all products and store as learning-manifest
-              createSuperManifest(manifest) # -#{@vars[:variant]}
-              @manifest = manifest
-            end
-            # If we are asked to produce a PROJECTS_FILE then we do that from the manifest and components.
-            unless ENV['PROJECTS_FILE'].nil?
-              if @vars[:return_code] == 0
-                if File.directory?(File.realdirpath(File.dirname(ENV['PROJECTS_FILE'])))
-                  createProjectsFile
-                else
-                  @logger.error "The path to the PROJECTS_FILE (#{File.dirname(ENV['PROJECTS_FILE'])}) does not exist!"
-                  @vars[:return_code] = Errors::NO_PROJECTS_PATH
-                end
-              end
-            end
-            @vars[:artifacts].each do |art|
-              if art[:data][:temp].is_a?(FalseClass)
-                if File.exists?(art[:data][:file])
-                  File.unlink(art[:data][:file]) if File.exists?(art[:data][:file])
-                  art[:data].delete(:file)
-                  art[:data].delete(:temp)
-                else
-                  @logger.warn "Temporary file disappeared: #{data.ai}"
-                  @vars[:return_code] = Errors::TEMP_FILE_MISSING
-                end
-              end
-            end
-            @vars[:return_code]
-          end
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def createProjectsFile
-            @logger.info __method__.to_s
-            projects = {}
-            project_names = loadProjectNames()
-            exts = {}
-            exts = Hash[@vars[:artifacts].map { |a| [a[:data][:name], File.basename(a[:data][:file]).match(CiCd::Builder::Manifest::Build::EXT_RGX)[1]] }]
-
-            createClassesFile()
-
-            @vars[:artifacts].each do |art|
-              prod = art[:data][:name]
-              mod  = art[:data][:module]
-              projects[prod] = {
-                                         name: project_names[prod] || prod,
-                                       module: mod,
-                                          ext: exts[prod],
-                                 class_filter: @vars[:filters][prod] || @vars[:filters][prod.gsub(/-manifest$/, '')],
-                               }
-            end
-
-            require 'chef/mash'
-            require 'chef/mixin/deep_merge'
-
-            projects_hash = File.exists?(ENV['PROJECTS_FILE']) ? loadConfigFile(ENV['PROJECTS_FILE']) : {}
-            old_projects = ::Chef::Mash.new(projects_hash)
-            projects = ::Chef::Mash.new(projects)
-            projects = ::Chef::Mash.new(::Chef::Mixin::DeepMerge.deep_merge(projects, old_projects))
-            saveConfigFile(ENV['PROJECTS_FILE'], projects)
-            data = {
-                          name: 'projects-file',
-                        module: 'projects-file',
-                          file: ENV['PROJECTS_FILE'],
-                       version: @vars[:build_ver],
-                         build: @vars[:build_num],
-                    properties: @properties_matrix,
-                          temp: false,
-                          sha1: Digest::SHA1.file(ENV['PROJECTS_FILE']).hexdigest,
-                           md5: Digest::MD5.file(ENV['PROJECTS_FILE']).hexdigest,
-                   }
-
-            maybeUploadArtifactoryObject(
-                                                     data: data,
-                                          artifact_module: data[:name],
-                                         artifact_version: data[:version] || @vars[:version],
-                                                file_name: '',
-                                                 file_ext: (ENV['PROJECTS_FILE'] and ENV['PROJECTS_FILE'].downcase.match(/\.ya?ml$/)) ? 'yaml' : 'json'
-                                        )
-          end
-
-          # ---------------------------------------------------------------------------------------------------------------
-          # noinspection RubyHashKeysTypesInspection
-          def createClassesFile()
-            @logger.info __method__.to_s
-            project_names = loadProjectNames()
-
-            @vars[:classes] = YAML.load(IO.read(ENV['CLASSES_MANIFEST_FILE']))
-            # keys = Hash[classes.keys.map.with_index.to_a].keys.sort
-
-            @vars[:filters] = {}
-            filters = {}
-            @vars[:classes].each do |role,apps|
-              apps.map{ |app|
-                filters[app] ||= []
-                filters[app] << role
-              }
-            end
-            filters.each do |app,roles|
-              @vars[:filters][app] = Hash[roles.map.with_index.to_a].keys.join('|')
-            end
-
-            saveConfigFile(ENV['CLASSES_FILE'],@vars[:classes])
-            data = {
-                              name: 'classes-file',
-                            module: 'classes-file',
-                              file: ENV['CLASSES_FILE'],
-                           version: @vars[:build_ver],
-                             build: @vars[:build_num],
-                        properties: @properties_matrix,
-                              temp: false,
-                              sha1: Digest::SHA1.file(ENV['CLASSES_FILE']).hexdigest,
-                               md5: Digest::MD5.file(ENV['CLASSES_FILE']).hexdigest,
-                    }
-
-            maybeUploadArtifactoryObject(
-                                                     data: data,
-                                          artifact_module: data[:name],
-                                         artifact_version: data[:version] || @vars[:version],
-                                                file_name: '',
-                                                 file_ext: 'yaml'
-                                        )
-          end
-
-          def saveConfigFile(file, projects)
-            @logger.info "Save config file: #{file}"
-            ext = file.gsub(/\.(\w+)$/, '\1')
-            IO.write(file, case ext.downcase
-                           when /ya?ml/
-                             projects.to_hash.to_yaml line_width: 1024, indentation: 4, canonical: false
-                           when /json|js/
-                             JSON.pretty_generate(projects.to_hash, {indent: "\t", space: ' '})
-                           else
-                             raise "Unsupported extension: #{ext}"
-                           end)
-          end
-
-          def loadConfigFile(file)
-            ext = file.gsub(/\.(\w+)$/, '\1')
-            hash = case ext.downcase
-                   when /ya?ml/
-                     YAML.load_file(ENV['PROJECTS_FILE'])
-                   when /json|js/
-                     JSON.load(IO.read(ENV['PROJECTS_FILE']))
-                   else
-                     raise "Unsupported extension: #{ext}"
-                   end
-          end
-
-          def loadProjectNames(fresh=false)
-            if fresh
-              @project_names = nil
-            end
-            unless @project_names
-              @project_names = {}
-              unless ENV['PROJECT_NAMES'].nil?
-                if File.exists?(ENV['PROJECT_NAMES'])
-                  @logger.info "Load PROJECT_NAMES: #{ENV['PROJECT_NAMES']}"
-                  @project_names = JSON.load(IO.read(ENV['PROJECT_NAMES'])) || {}
-                else
-                  @logger.error "The PROJECT_NAMES file (#{ENV['PROJECT_NAMES']}) does not exist!"
-                  @vars[:return_code] = Errors::NO_PROJECT_NAMES
-                end
-              end
-            end
-            @project_names
-          end
-
-          def createSuperManifest(manifest)
-            manifest_data = ''
-            manifest.each do |mod, man|
-              man.each do |k, v|
-                manifest_data += "#{k}=#{v}\n"
-              end
-            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)
-
-            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[:temp] = false
-            data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
-            data[:md5]  = Digest::MD5.file(data[:file]).hexdigest
-            data[:name] = amn
-            @vars[:artifacts] << {
-                                    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
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def createProductManifests(manifest)
-            manifest.dup.each do |mod, man|
-              manifest_data = ''
-              man.each do |k, v|
-                manifest_data += "#{k}=#{v}\n"
-              end
-              data = {
-                            name: "#{mod}-manifest",
-                          module: "#{mod}-manifest",
-                       component: mod,
-                            data: manifest_data,
-                         version: @vars[:build_ver],
-                           build: @vars[:build_num],
-                      properties: @properties_matrix
-              }
-              # tempArtifactFile("#{mod}-manifest", data)
-
-              data[:file] = Dir::Tmpname.create("#{mod}-manifest") do |tmpnam, n, opts|
-                mode = File::RDWR|File::CREAT|File::EXCL
-                perm = 0600
-                opts = perm
-              end + '.properties'
-              IO.write(data[:file], data[:data])
-              data[:temp] = false
-              data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
-              data[:md5]  = Digest::MD5.file(data[:file]).hexdigest
-              @vars[:artifacts] << {
-                                       key: "#{mod}-manifest",
-                                      data: data.dup,
-                                   }
-              # noinspection RubyStringKeysInHashInspection
-              # manifest["#{mod}-manifest"]={ "#{mod}-manifest" => "#{@vars[:build_ver]}-#{@vars[:build_num]}" }
-
-              maybeUploadArtifactoryObject(data: data, artifact_module: data[:name], artifact_version: data[:version] || @vars[:version], file_name: '', file_ext: 'properties') # -#{@vars[:variant]}
-            end
-          end
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def maybeUploadArtifactoryObject(args)
-            super
-            if @vars[:return_code] == 0
-              data             = args[:data]
-              artifact_module  = args[:artifact_module]
-              artifact_version = args[:artifact_version]
-              # file_ext         = args[:file_ext]
-              # file_name        = args[:file_name]
-              if @manifest[artifact_module].nil?
-                @manifest[artifact_module] = {}
-                file_name = artifact_module
-              else
-                file_name, _ = get_artifact_file_name_ext(data)
-                if file_name.empty?
-                  file_name = artifact_module
-                else
-                  file_name = "#{artifact_module}#{file_name}"
-                end
-              end
-              @manifest[artifact_module][file_name] = artifact_version
-            end
-
-            @vars[:return_code]
-          end
-
-          private :createProductManifests, :createProjectsFile, :createSuperManifest
         end
       end
     end
   end
 end
-
-=begin
-
-                {
-                    "test-project": {
-                        "name": "test-project",
-                        "module": "test-server",
-                        "ext": "war",
-                        "class_filter": "role.role-1"
-                    },
-                    "test-project-2": {
-                        "name": "test-project-2",
-                        "module": "test-server2",
-                        "ext": "zip",
-                        "class_filter": "role.role-2"
-                    },
-                    "test-manifest": {
-                        "name": "test-manifest",
-                        "module": "test-manifest",
-                        "ext": "properties",
-                        "class_filter": ""
-                    },
-                    "test-manifest2": {
-                        "name": "test-manifest2",
-                        "module": "test-manifest2",
-                        "ext": "properties",
-                        "class_filter": ""
-                    }
-                }
-
-=end

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

@@ -2,7 +2,7 @@ module CiCd
   module Builder
     module ChefRepoManifest
       # chefrepo-manifest-builder version
-      VERSION = '0.1.3'
+      VERSION = '0.1.4'
       MAJOR, MINOR, TINY = VERSION.split('.')
       PATCH = TINY
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chefrepo-manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manifest-builder
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -210,6 +210,7 @@ files:
 - features/step_definitions/manifestrepo-builder_steps.rb
 - lib/cicd/builder/chefrepo-manifest.rb
 - lib/cicd/builder/chefrepo-manifest/mixlib/build.rb
+- lib/cicd/builder/chefrepo-manifest/mixlib/repo.rb
 - lib/cicd/builder/chefrepo-manifest/mixlib/repo/artifactory.rb
 - lib/cicd/builder/chefrepo-manifest/version.rb
 - openssl