pfab 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f217c1c2c63af2baff59160c71250a9c6d478c68ab49383ff02782f81fc4ac
-  data.tar.gz: 5e05966091f8f5fd06b3ff37a25942ca77bdb4296223549f2378d8e0b99b8b9d
+  metadata.gz: 4f97f4b3507d44fbd80c2e918993f9ef147977ccf00ff136d17b682ed8b1d25c
+  data.tar.gz: 664d287826bb2b8fa896b4741621b0eaa10ad9d3cd3753447db7770e4a4e103e
 SHA512:
-  metadata.gz: 7405b5827ccbf926bb331f5707982834c815b9ca570ccab02b4a066818e61341546c6df2f68550948ac97de7596f7c138cfdd6835c6eed9a6bdf0503ba6e2ed5
-  data.tar.gz: 6562c155f57c212f8de04233573035e9376d2c23eab78065f78862a4486b231d76da03085325b514734202848fd82a944de9fe8482f2acb5bd36db5aefe0089f
+  metadata.gz: 40a58495cae3d2f458391962a402200ed486f3e00234dd1e54111d6b3d430bbc72b2059b5d920329b07c59afa7c6c6188ba2b28a0c76b308a6a68369912fe5d5
+  data.tar.gz: 3c9595f4ac5d3b11cd389dea2439a6b6c131414ee1e2e2f2beaf720367c9121e72de5560a87d3f7f6d81397895a4fc3727522de665b8eca0bf4327d5b3fd611c

data/Gemfile

@@ -7,11 +7,13 @@ gem "commander"
 
 gem "activesupport"
 gem "pry-byebug"
+gem 'styled_yaml', '~> 0.0.1'
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
+  gem "bundler", "~> 2.3"
   gem "juwelier", "~> 2.4.9", git: "https://github.com/flajann2/juwelier"
   gem "simplecov", ">= 0"
   gem "test-unit", ">= 0"

data/Gemfile.lock

@@ -106,6 +106,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    styled_yaml (0.0.1)
     test-unit (3.2.9)
       power_assert
     thread_safe (0.3.6)
@@ -117,12 +118,13 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  bundler (~> 1.0)
+  bundler (~> 2.3)
   commander
   juwelier (~> 2.4.9)!
   pry-byebug
   rdoc (~> 3.12)
   simplecov
+  styled_yaml (~> 0.0.1)
   test-unit
 
 BUNDLED WITH

data/lib/pfab/cli.rb

@@ -3,6 +3,7 @@ require "net/http"
 require "yaml"
 require "json"
 require 'active_support/core_ext/hash/indifferent_access'
+require 'styled_yaml'
 
 module Pfab
   class CLI

data/lib/pfab/templates/cron.rb

@@ -2,7 +2,7 @@ module Pfab
   module Templates
     class Cron < Base
       def write_to(f)
-        f << YAML.dump(job.deep_stringify_keys)
+        f << StyledYAML.dump(job.deep_stringify_keys)
       end
 
       def application_type
@@ -23,7 +23,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version": "#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
@@ -49,7 +49,7 @@ module Pfab
                       "application-type" => "cron",
                       "tags.datadoghq.com/env": @data['env'],
                       "tags.datadoghq.com/service": @data['deployed_name'],
-                      "tags.datadoghq.com/version": "#{@data['sha']}"
+                      "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                     },
                   },
                   spec: {

data/lib/pfab/templates/daemon.rb

@@ -2,7 +2,7 @@ module Pfab
   module Templates
     class Daemon < Base
       def write_to(f)
-        f << YAML.dump(deployment.deep_stringify_keys)
+        f << StyledYAML.dump(deployment.deep_stringify_keys)
       end
 
       def application_type
@@ -23,7 +23,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
@@ -45,7 +45,7 @@ module Pfab
                   "application-type" => "daemon",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
+                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                 },
               },
               spec: {

data/lib/pfab/templates/job.rb

@@ -2,7 +2,7 @@ module Pfab
   module Templates
     class Job < Base
       def write_to(f)
-        f << YAML.dump(job.deep_stringify_keys)
+        f << StyledYAML.dump(job.deep_stringify_keys)
       end
 
       def application_type
@@ -23,10 +23,13 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
+            ttlSecondsAfterFinished: get('ttlSecondsAfterFinished'),
+            completions: get('completions') || 1,
+            parallelism: get('parallelism') || 1,
             template: {
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",
@@ -37,7 +40,7 @@ module Pfab
                   "application-type" => "job",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
+                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                 },
               },
               spec: {
@@ -55,7 +58,7 @@ module Pfab
               }.compact,
             },
             backoffLimit: 0,
-          },
+          }.compact,
         }
       end
     end

data/lib/pfab/templates/web.rb

@@ -1,3 +1,5 @@
+require "rubygems/safe_yaml"
+
 module Pfab
   module Templates
     class Web < Base
@@ -5,13 +7,13 @@ module Pfab
         if get("host").nil?
           puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
         else
-          f << YAML.dump(service.deep_stringify_keys)
+          f << StyledYAML.dump(service.deep_stringify_keys)
           if not app_vars.has_key?('generateIngressEnabled') || app_vars['generateIngressEnabled']
-            f << YAML.dump(ingress.deep_stringify_keys)
+            f << StyledYAML.dump(ingress.deep_stringify_keys)
           else
             puts "skipping ingress because ingress_disabled = #{@data['generateIngressEnabled']}"
           end
-          f << YAML.dump(deployment.deep_stringify_keys)
+          f << StyledYAML.dump(deployment.deep_stringify_keys)
         end
       end
 
@@ -198,7 +200,7 @@ module Pfab
               "deploy-id" => deploy_id,
               "tags.datadoghq.com/env": @data['env'],
               "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
             }
           },
           spec: {
@@ -225,7 +227,7 @@ module Pfab
                   "application-type" => "web",
                   "tags.datadoghq.com/env": @data['env'],
                   "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
+                  "tags.datadoghq.com/version": StyledYAML.double_quoted(@data['sha'])
                 },
               },
               spec: {

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 37
+    MINOR = 38
     PATCH = 0
     BUILD = nil
 

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.37.0 ruby lib
+# stub: pfab 0.38.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.37.0"
+  s.version = "0.38.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2023-03-15"
+  s.date = "2023-03-27"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -55,8 +55,9 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
     s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.3"])
     s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
@@ -64,8 +65,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<commander>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])
     s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<styled_yaml>.freeze, ["~> 0.0.1"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.3"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<test-unit>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: styled_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement