pfab 0.54.1 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76cf1e72c2d80c355fdcd4d6a1d4029966302d885106239d4f440b02cd1ecec0
-  data.tar.gz: a89e2b49a230499c16dfacd205b9a025529a72f99bd9d89d0e143d7d90fdbce8
+  metadata.gz: e4e570424c14765d734c759cd70fb07bf192cf7eb9aa23df4009d79db22ead61
+  data.tar.gz: 3aa1fb2f697b3d83c32cedb45b0714bb11f88831a62aecb081b845d256543763
 SHA512:
-  metadata.gz: f8250a9a5c42ebdfb55d22c076c4a6be32a1c2596b720b2e77e60b35c86e92879116df789cdda86571e26ce2a0f2e9c1b3da7f4c4bc1edfa60ee81bb8115bc1e
-  data.tar.gz: c1517c24b3d9cde49f77a65b02084b3e200869d529c4c08753378761cb5466ef7ceda829438d65d29cd30718183d7bd4a3fd8fc73684e238167286dc0e88e0f2
+  metadata.gz: 625f06742f7996deb0640d74b95c4507bebac36bd95a1e1511c807db959257cc3ab04c7e6f5b36d0182bca0d5616fb3c55273c0eb8bd3893ea5bce7ef54e8d1d
+  data.tar.gz: 232d06bb3f3855d4f8cc109dd819be7d1f03a9e742a2087795c784608c4d07be9d50ebac2617dc85df604c1b66b6f9c257c0970f1ebb7fe632adec8352d429dd

data/Gemfile

@@ -12,7 +12,7 @@ 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 "rdoc", "~> 6.1"
   gem "bundler", "~> 2.3"
   gem "juwelier", "~> 2.4.9", git: "https://github.com/flajann2/juwelier"
   gem "simplecov", ">= 0"

data/Gemfile.lock

@@ -67,7 +67,7 @@ GEM
     highline (1.7.10)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (1.8.6)
+    json (2.6.3)
     jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
@@ -99,8 +99,7 @@ GEM
     rack (3.0.11)
     rake (13.0.6)
     rchardet (1.8.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rdoc (6.1.2.1)
     ruby2_keywords (0.0.5)
     semver2 (3.4.2)
     simplecov (0.16.1)
@@ -125,7 +124,7 @@ DEPENDENCIES
   commander
   juwelier (~> 2.4.9)!
   pry-byebug
-  rdoc (~> 3.12)
+  rdoc (~> 6.1)
   simplecov
   styled_yaml (~> 0.0.1)
   test-unit

data/README.markdown

@@ -243,7 +243,7 @@ Releasing
 - ```bundle exec rake gemspec```
 - ```git commit ```
 - ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake git:release```
-- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake build```
+- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake clean build```
 - ```gem push pkg/pfab-0.45.0.gem```
 
 Copyright

data/launch.rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# this file can be used to run CLI locally for debugging etc
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require "pfab"
+
+Pfab::CLI.new.run

data/lib/pfab/templates/base.rb

@@ -62,7 +62,7 @@ module Pfab
       end
 
       def deploy_id
-        "#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
+        @data['deployed_name']
       end
 
       def deploy_unique_id

data/lib/pfab/templates/web.rb

@@ -5,22 +5,30 @@ module Pfab
   module Templates
     class Web < Base
       def write_to(f)
-        if get("host").nil?
-          puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
+        if ingres_enabled? && get("host").nil?
+          puts "No host to configure ingress for #{@data['deployed_name']}. Skipping deployment. add a host or generateIngressEnabled:false"
         else
           f << StyledYAML.dump(service.deep_stringify_keys)
-          if not app_vars.has_key?('generateIngressEnabled') || app_vars['generateIngressEnabled']
+          if ingres_enabled?
             f << StyledYAML.dump(ingress.deep_stringify_keys)
           else
             puts "skipping ingress because ingress_disabled = #{@data['generateIngressEnabled']}"
           end
           f << StyledYAML.dump(deployment.deep_stringify_keys)
-          if get("replicas") || 1 > 1
+          replica_count = get("replicas") ||1
+          if (replica_count > 1)
             f << StyledYAML.dump(pod_disruption_budget.deep_stringify_keys)
           end
         end
       end
 
+      def ingres_enabled?
+        if not app_vars.has_key?('generateIngressEnabled') || app_vars['generateIngressEnabled']
+          return true
+        end
+        return false
+      end
+
       def service
         {
           apiVersion: "v1",
@@ -41,7 +49,7 @@ module Pfab
             ports: [
               {
                 name: "http",
-                port: 80,
+                port: app_vars["service_listen_port"] || 80,
                 targetPort: app_vars["port"],
                 appProtocol: app_vars["appProtocol"]
               }.compact

data/lib/pfab/version.rb

@@ -1,8 +1,8 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 54
-    PATCH = 1
+    MINOR = 55
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/pfab/yamls.rb

@@ -24,6 +24,11 @@ module Pfab
       template.env_vars
     end
 
+    def env_from(app)
+      template = Pfab::Templates::Base.new(data_for(app, @apps[app]))
+      template.env_from
+    end
+
     def data_for(app, props)
       data = @base_data.clone
       data['props'] = props

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.54.1 ruby lib
+# stub: pfab 0.55.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.54.1"
+  s.version = "0.55.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 = "2024-05-15"
+  s.date = "2024-05-22"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "bin/pfab",
+    "launch.rb",
     "lib/pfab.rb",
     "lib/pfab/cli.rb",
     "lib/pfab/templates/base.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.54.1
+  version: 0.55.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,7 @@ files:
 - README.markdown
 - Rakefile
 - bin/pfab
+- launch.rb
 - lib/pfab.rb
 - lib/pfab/cli.rb
 - lib/pfab/templates/base.rb