pfab 0.8.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9142702e1374afa5c1ffa15b7f0185147726f7e3fb923421dbf5f8ce78c698
-  data.tar.gz: 36b623b88a071ace578571e0e8741e9f486db643f29c7d642271f42965c4c737
+  metadata.gz: 2bbc17afd25c1aa631080d916b9c19528916b81d6c57d360f524b56d53e53849
+  data.tar.gz: b2df229562760fc8879aedf8f55dc2e1ef36e956195d5bc2b03454caa173dde0
 SHA512:
-  metadata.gz: 99d26e436619378829efd2a44e495b6367312c332a77a89dab3c5a9b821dc4cdfbf2372a31a9476e41b860e2f9f31bbdb5b594e9c905fbbc4a709c8dc99b9f59
-  data.tar.gz: 0d1a8ba2a7c34166cb6d3ede58b79624babf39b248c56793da798bdf3abaef880494cc1df437fca03b82b107fad4561e914bd8f74a0f2a2ec8f4c4b46dd73d82
+  metadata.gz: 47c99495b251f2c33b15dc56d261857fad0bc9defb9b2fb7498e4511a35c4a36fcd9c6d562254f732e03ba76e260bdea09b5619cc918bbea8ff78748dfc92127
+  data.tar.gz: 7da4ba60ee697c0f0979828086d17fc1c9b18f82dc1192dcafa969a747204667e33f6040b8dd4981a73f36fb9c800c7bcc8a5f0c0247eaa21b43868c5a5ffc9e

data/Gemfile

@@ -12,7 +12,7 @@ gem "pry-byebug"
 group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "juwelier", "~> 2.1.0"
+  gem "juwelier", "~> 2.4.9"
   gem "simplecov", ">= 0"
   gem "test-unit", ">= 0"
 end

data/Gemfile.lock

@@ -6,9 +6,9 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    builder (3.2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
     byebug (10.0.2)
     coderay (1.1.2)
     commander (4.4.6)
@@ -17,42 +17,51 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.1)
-    faraday (0.12.2)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
-    git (1.3.0)
-    github_api (0.18.2)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.19.0)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
+      faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashie (3.5.7)
+    hashie (3.6.0)
     highline (1.7.10)
     i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
-    juwelier (2.1.3)
+    juwelier (2.4.9)
       builder
-      bundler (>= 1.13)
-      git (>= 1.2.5)
+      bundler
+      git
       github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      highline
+      kamelcase (~> 0)
+      nokogiri
+      psych
       rake
       rdoc
-      semver
-    jwt (1.5.6)
+      semver2
+    jwt (2.2.2)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
     method_source (0.9.2)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.5.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    multipart-post (2.1.1)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
@@ -63,12 +72,16 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    public_suffix (3.0.2)
-    rack (2.0.5)
-    rake (12.3.1)
+    psych (3.3.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
+    rake (13.0.3)
+    rchardet (1.8.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    semver (1.0.1)
+    ruby2_keywords (0.0.4)
+    semver2 (3.4.2)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -87,7 +100,7 @@ DEPENDENCIES
   activesupport
   bundler (~> 1.0)
   commander
-  juwelier (~> 2.1.0)
+  juwelier (~> 2.4.9)
   pry-byebug
   rdoc (~> 3.12)
   simplecov

data/lib/pfab/cli.rb

@@ -10,7 +10,7 @@ module Pfab
 
     def run
       program :name, "pfab"
-      program :version,Pfab::Version::STRING
+      program :version, Pfab::Version::STRING
       program :description, "k8s helper"
 
       if File.exist? "application.yaml"
@@ -128,7 +128,7 @@ module Pfab
           elsif $verbose
             puts_and_system "kubectl describe pods -l #{selector}"
           else
-            puts_and_system "kubectl get ingresses,jobs,services,cronjobs,deployments,pods --include-uninitialized=true -l #{selector}"
+            puts_and_system "kubectl get ingresses,jobs,services,cronjobs,deployments,pods -l #{selector}"
           end
         end
       end
@@ -156,14 +156,41 @@ module Pfab
       end
       alias_command :rl, :run_local
 
+      command :clean do |c|
+        c.syntax = "pfab clean"
+        c.summary = "clean up pods"
+        c.description = "clean up old pods"
+        c.example "clean up",
+                  "pfab clean"
+        c.action do |_args, options|
+          set_kube_context
+          puts "THIS APPLIES TO THE ENTIRE NAMESPACE"
+          types = %w(Failed Pending Succeeded)
+          types.each do |type|
+            system("kubectl get pods --field-selector status.phase=#{type}")
+            if agree("Delete those?")
+              `kubectl delete pods --field-selector status.phase=#{type}`
+              puts "Deleted"
+            end
+          end
+        end
+      end
+      alias_command :rl, :run_local
+
       default_command :help
 
       run!
     end
 
+
     def cmd_apply
       set_kube_context
       get_apps.each do |app_name|
+        app = @apps[app_name]
+        if app[:deployable_type] == "cron"
+          deployed_name = deployed_name(app)
+          puts_and_system("kubectl delete cronjob -l deployed-name=#{deployed_name}")
+        end
         puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
         puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
       end
@@ -234,6 +261,10 @@ module Pfab
       puts "Generated #{wrote}"
     end
 
+    def deployed_name(app)
+      [app[:application], app[:deployable_type], app[:deployable]].join("-")
+    end
+
     def get_current_sha
       `git rev-parse --short --verify HEAD`.chomp
     end

data/lib/pfab/templates/daemon.rb

@@ -8,7 +8,7 @@ module Pfab
       def deployment
         {
           kind: "Deployment",
-          apiVersion: "extensions/v1beta1",
+          apiVersion: "apps/v1",
           metadata: {
             name: @data['deployed_name'],
             namespace: @data['env'],

data/lib/pfab/templates/web.rb

@@ -109,7 +109,7 @@ module Pfab
       def deployment
         {
           kind: "Deployment",
-          apiVersion: "extensions/v1beta1",
+          apiVersion: "apps/v1",
           metadata: {
             name: @data['deployed_name'],
             namespace: @data['env'],

data/lib/pfab/version.rb

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

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.8.2 ruby lib
+# stub: pfab 0.10.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.8.2"
+  s.version = "0.10.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 = "2019-01-23"
+  s.date = "2021-10-31"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
       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.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
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
       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.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
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
     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.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Jeff Dwyer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.9
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ homepage: http://github.com/prefab-cloud/pfab
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,9 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: helper gem
 test_files: []