pfab 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bbc17afd25c1aa631080d916b9c19528916b81d6c57d360f524b56d53e53849
-  data.tar.gz: b2df229562760fc8879aedf8f55dc2e1ef36e956195d5bc2b03454caa173dde0
+  metadata.gz: 86a0173094dded1e5b572b11593274b17abcfa2f29e7aac04977918af2d5674c
+  data.tar.gz: 3e189a70dc5126e40f8e81e13f84872964e35b06561251c6e260efa42a517de2
 SHA512:
-  metadata.gz: 47c99495b251f2c33b15dc56d261857fad0bc9defb9b2fb7498e4511a35c4a36fcd9c6d562254f732e03ba76e260bdea09b5619cc918bbea8ff78748dfc92127
-  data.tar.gz: 7da4ba60ee697c0f0979828086d17fc1c9b18f82dc1192dcafa969a747204667e33f6040b8dd4981a73f36fb9c800c7bcc8a5f0c0247eaa21b43868c5a5ffc9e
+  metadata.gz: '09b0ce9accab6e86643d1dff636a84c0b6aa077d1309ff82867fa3e7125255bdb60fa2639a74766d2575b239ea8cb8933ec7ac94f6659d0ce55336aca59704d0'
+  data.tar.gz: 67427d6c7818d428945a36736cb45ac024967ccacd189087a3146f2458f85e12316e2e9e7497c1801d65bbae70055480c8e7a22a30f9aeb2d190f3a998456446

data/README.markdown

@@ -100,6 +100,13 @@ Contributing to pfab
     is fine, but please isolate to its own commit so I can cherry-pick
     around it.
 
+Releasing
+-----------------------------------------
+
+- modify version.rb
+- ```rake gemspec:release```
+- ```rake gemcutter:release```
+
 Copyright
 ---------
 

data/lib/pfab/cli.rb

@@ -148,7 +148,7 @@ module Pfab
           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(" ")
+          env_var_string = env_vars.map { |item| "#{item[:name]}=\"#{item[:value]}\"" }.join(" ")
           options.default command: @apps[app_name][:command]
 
           puts_and_system "#{env_var_string} #{options.command}"

data/lib/pfab/templates/base.rb

@@ -17,7 +17,6 @@ module Pfab
         app_vars.dig(@data["env"], key) || app_vars[key]
       end
 
-
       def cpu(req_type)
         default_cpu_string = @data["config"]["default_cpu_string"] || "50m/250m"
         (request, limit) = (get("cpu") || default_cpu_string).split("/")
@@ -44,44 +43,44 @@ module Pfab
       end
 
       def env_vars
+        env_vars = { "DEPLOYED_NAME": { value: @data['deployed_name'] } }
 
-        env_vars = [
-          { name: "DEPLOYED_NAME", value: @data['deployed_name'] },
-        ]
-
+        # load defaults
         load_env_vars(env_vars, @data.dig("application_yaml", :environment))
-        load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
-
         load_secrets(env_vars, @data.dig("application_yaml", :env_secrets))
+
+        # load env overrides
+        load_env_vars(env_vars, @data.dig("application_yaml", @data["env"], :environment))
         load_secrets(env_vars, @data.dig("application_yaml", @data["env"], :env_secrets))
 
-        env_vars
+        env_vars.map do |k, v|
+          { name: k }.merge(v)
+        end
       end
 
       def load_env_vars(env_vars, hash)
         (hash || {}).each do |env_var_name, v|
           if v.to_s.start_with? "field/"
             (_, field_name) = v.split("/")
-            env_vars << { name: env_var_name, valueFrom: {
+            env_vars[env_var_name] = { valueFrom: {
               fieldRef: { fieldPath: field_name }
             } }
           else
-            env_vars << { name: env_var_name, value: v }
+            env_vars[env_var_name] = { value: v }
           end
-
         end
       end
 
       def load_secrets(env_vars, hash)
         (hash || {}).each do |env_var_name, v|
           (ref, key) = v.split("/")
-          env_vars << { name: env_var_name,
-                        valueFrom: {
-                          secretKeyRef: {
-                            name: ref,
-                            key: key
-                          }
-                        } }
+          env_vars[env_var_name] = {
+            valueFrom: {
+              secretKeyRef: {
+                name: ref,
+                key: key
+              }
+            } }
         end
       end
     end

data/lib/pfab/templates/web.rb

@@ -36,7 +36,7 @@ module Pfab
 
       def ingress
         {
-          apiVersion: "extensions/v1beta1",
+          apiVersion: "networking.k8s.io/v1",
           kind: "Ingress",
           metadata: {
             name: "ingress-#{@data['deployed_name']}",

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 10
+    MINOR = 11
     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.10.0 ruby lib
+# stub: pfab 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.10.0"
+  s.version = "0.11.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-10-31"
+  s.date = "2021-11-30"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-31 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander