pfab 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 589356fb8374a27bf709147331e7f7a7106906b9f65f2f8bb78baf8baab8664d
-  data.tar.gz: cccaf81ec5b065111cd88c22be0d704ffc3050908a15cbdb21e3cda4b46d7cd0
+  metadata.gz: a53ce6280e22d0792b71639b4b591ee8521778d42ffb300ba68878849ab2b248
+  data.tar.gz: 6bbaa9903e186b835137679e8a7b2fe4d5d333c112488b12fce777453cbf9857
 SHA512:
-  metadata.gz: 2bc8c48d7d2ae782d43c78d50570cf906c4eabeeee0d2d7d20379d6460ab7e8de458d526ddd711389c369d9ade90866134f1f2551b1a9303a172476f00068518
-  data.tar.gz: eac9d21bf4893e11041b9c3d7a98eae5ff457085128e935605f7e86d25397c5ade4cf6ce5e8fcc9177b98b13bf2f002159750d6ac5220667b03c8d08686227d4
+  metadata.gz: 0f24d62c35b317c5d5b452a25f7dbafca3b696efc8ce6d669a579eb2765d1a71c3ae45dbb782053ffaa5e807892e00f906553c7f9247baedfe5fa4007cd32bcd
+  data.tar.gz: '029d7e10ba71749f79f8bedac4310dc8d8934ef1c16683c63988c7e3fabd780242828004a14668de5bc4c525bc0fd48c018b9eb8ef06abe27118b4175f270b2b'

data/lib/pfab/cli.rb

@@ -27,8 +27,6 @@ module Pfab
         $app_name = app_name
       end
 
-      @apps = apps
-
       command :build do |c|
         c.syntax = "pfab build"
         c.summary = "build image"
@@ -142,14 +140,14 @@ module Pfab
         c.option "-c", "--command COMMAND", "Run a command with the ENV vars of the selected app"
         c.action do |_args, options|
           $env = :development
-          app_name = get_app_name
+          app_name = get_app_name(include_run_locals: true)
           puts "RUNNING THE FOLLOWING LOCALLY"
 
           env_vars = yy.env_vars(app_name).
             reject { |v| v.has_key? :valueFrom }
 
           env_var_string = env_vars.map { |item| "#{item[:name]}=\"#{item[:value]}\"" }.join(" ")
-          options.default command: @apps[app_name][:command]
+          options.default command: all_runnables[app_name][:command]
 
           puts_and_system "#{env_var_string} #{options.command}"
         end
@@ -182,11 +180,10 @@ module Pfab
       run!
     end
 
-
     def cmd_apply
       set_kube_context
       get_apps.each do |app_name|
-        app = @apps[app_name]
+        app = deployables[app_name]
         if app[:deployable_type] == "cron"
           deployed_name = deployed_name(app)
           puts_and_system("kubectl delete cronjob -l deployed-name=#{deployed_name}")
@@ -247,7 +244,7 @@ module Pfab
     end
 
     def yy
-      Pfab::Yamls.new(apps: @apps,
+      Pfab::Yamls.new(apps: all_runnables,
                       application_yaml: @application_yaml,
                       env: $env,
                       sha: get_current_sha,
@@ -257,7 +254,7 @@ module Pfab
     end
 
     def cmd_generate_yaml
-      wrote = yy.generate_all
+      wrote = yy.generate(deployables.keys)
       puts "Generated #{wrote}"
     end
 
@@ -295,14 +292,22 @@ module Pfab
       end
     end
 
-    def apps
-      @_apps ||= calculate_apps
+    def deployables
+      @_deployables ||= calculate_runnables("deployables")
+    end
+
+    def run_locals
+      @_rl ||= calculate_runnables("run_locals")
+    end
+
+    def all_runnables
+      deployables.merge(run_locals)
     end
 
-    def calculate_apps
+    def calculate_runnables(runnable_type)
       application = @application_yaml["name"]
       apps = {}
-      @application_yaml["deployables"].each do |deployable, dep|
+      @application_yaml[runnable_type].each do |deployable, dep|
         deployable_type = dep["type"]
         app_name = [application, deployable_type, deployable].join("-")
         apps[app_name] = {
@@ -329,16 +334,17 @@ module Pfab
       JSON.parse(pods_str)
     end
 
-    def get_app_name(all: false)
+    def get_app_name(all: false, include_run_locals: false)
       return $app_name unless $app_name.nil?
-      apps = @apps.keys
+      apps = deployables.keys
+      apps.concat(run_locals.keys) if include_run_locals
       apps << "all" if all
       $app_name = choose("which app?", *apps)
     end
 
     def get_apps
       name = get_app_name(all: true)
-      (name == "all") ? @apps.keys : [name]
+      (name == "all") ? deployables.keys : [name]
     end
   end
 end

data/lib/pfab/templates/web.rb

@@ -2,9 +2,13 @@ module Pfab
   module Templates
     class Web < Base
       def write_to(f)
-        f << YAML.dump(service.deep_stringify_keys)
-        f << YAML.dump(ingress.deep_stringify_keys)
-        f << YAML.dump(deployment.deep_stringify_keys)
+        if get("host").nil?
+          puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
+        else
+          f << YAML.dump(service.deep_stringify_keys)
+          f << YAML.dump(ingress.deep_stringify_keys)
+          f << YAML.dump(deployment.deep_stringify_keys)
+        end
       end
 
       def service

data/lib/pfab/version.rb

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

data/lib/pfab/yamls.rb

@@ -27,13 +27,13 @@ module Pfab
       data
     end
 
-    def generate_all
+    def generate(keys)
 
-      @apps.map do |app, props|
+      keys.each do |key|
+        props = @apps[key]
+        data = data_for(key, props)
 
-        data = data_for(app, props)
-
-        filename = ".application-k8s-#{data["env"]}-#{app}.yaml"
+        filename = ".application-k8s-#{data["env"]}-#{key}.yaml"
         File.open(filename, "w") do |f|
           case props[:deployable_type]
           when "web" then

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.13.0 ruby lib
+# stub: pfab 0.14.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.13.0"
+  s.version = "0.14.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 = "2021-12-06"
+  s.date = "2022-01-15"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -44,31 +44,22 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.3.1".freeze
+  s.rubygems_version = "3.2.32".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      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"])
-    else
-      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<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    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_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    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"])
   else
     s.add_dependency(%q<commander>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander