ctpl 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: cce01d15081a519188eb07941e900875aca6c0b54009e1edadf9e9d2f112a972
-  data.tar.gz: a1a6b508eba2bf20723b98aa8628033325972b10982c73b22182701727f0ae2f
+SHA1:
+  metadata.gz: 310e68e2ad2eb3420fad89c919676ce09eee04fc
+  data.tar.gz: a2be68184e06bbf74349603bff7b9709a20419c8
 SHA512:
-  metadata.gz: 27551a1db41da95b837c0b43cce721983b5dde160abf0d5fcc864bdcb53b6210a6e4c17a000cf434f59f72fd43f483b7c466b80a551869b74767a4610fd823d8
-  data.tar.gz: 25392432a9b37a70a73d1926a45ef946640e37b57a7a53f773cd600aceebc0a28f1629fc7414d576f9663013abd432cb1703ae9b297bc080af28f9e7ee09aeba
+  metadata.gz: 2526b626c99d35562843692367ee53875443eff0bcd0a67cdb0c1005924222260be1fab9a260ff6a5cb01a0e87b8125b0381fbe50452d7f12249f097f220d711
+  data.tar.gz: f14a4259fbf045c369582e62cbf1b92fb9e30046ab880fd412e0bc0ec489cc026baa5f8dc62267e0b65b6da4964172cc9aa671a1342a8d655b99dd05196ec016

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/ctpl/compiler.rb

@@ -3,22 +3,27 @@ require 'yaml'
 class PipelineCompiler
   include Thor::Shell
 
-  def initialize(mainPipelinePath, globalAliasesPath, partialsFolder)
+  def initialize(mainPipelinePath, globalAliasesPath, partialsFolder, verbose = false)
     loadGlobalAliases(globalAliasesPath)
     loadMainPipeline(mainPipelinePath)
     loadPartials(partialsFolder)
+    @verbose = verbose
   end
 
   def merge
     pipeline = {}
+    say_status 'ok', "Parsing main/global pipeline file", :white if @verbose
+
     pipeline = parseToYaml(@mainPipeline) unless @mainPipeline == ""
 
     # that is our one level merger for the special keys we support
     @partials.each do |filename, partialContent|
-      say_status 'ok', "merging partial #{filename}", :white
+      say_status 'ok', "starting to handle partial: #{filename}", :white
       partialAsHashmap = parseToYaml(partialContent)
 
+      say_status 'step', File.basename(filename, '.yaml') + ": merging hashmaps jobs, resources, types and groups", :white if @verbose
       %w(jobs resources resource_types groups).each do |mergeKey|
+        say_status 'step', File.basename(filename, '.yaml') + ": merging #{mergeKey}", :white if @verbose
         if partialAsHashmap.key?(mergeKey)
           pipeline[mergeKey] = [] unless pipeline.key?(mergeKey)
           pipeline[mergeKey].concat partialAsHashmap[mergeKey]
@@ -28,6 +33,7 @@ class PipelineCompiler
 
       # now put all the others which should not be conflicting. We might do this manually per key to inform
       # when we have conflicts .. since this will override existing keys
+      say_status 'step', File.basename(filename, '.yaml') + ": merging all the rest of the partial", :white if @verbose
       pipeline.merge(partialAsHashmap)
     end
 

data/thor/compile.thor

@@ -10,7 +10,7 @@ module Ctpl
     method_option :output, :aliases => 'o', :required => false, :type => :string, :default => './pipeline.yaml', :desc => "Optional, defaults to pipeline.yaml. Output path to save the merged yaml in"
     def compile
       baseFolder = options[:basefolder]
-      merger = PipelineCompiler.new("#{baseFolder}/pipeline-template.yaml", "#{baseFolder}/aliases.yaml", baseFolder)
+      merger = PipelineCompiler.new("#{baseFolder}/pipeline-template.yaml", "#{baseFolder}/aliases.yaml", baseFolder, options[:verbose])
       p = merger.merge
       say_status 'ok', "Transforming back to yaml ", :white
       yaml = "# DO NOT CHANGE THIS FILE\n# Generated by ctp (https://github.com/EugenMayer/concourse-pipeline-templateer)\n# See '#{baseFolder}' for the source files\n" + p.to_yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ctpl
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Eugen Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Implements an opinionated tool to template / split concourse pipeline files