pfab 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe810bee0f29455479ef9ec1099a193f593560acad7e4e689e23ccc831aecc31
-  data.tar.gz: a6fec60c3245b54ae25b0ebd404f8569e6a1fb810b9465c721675d8e274a1df4
+  metadata.gz: 96b769d61b9ae509f7daec59b57a0925851635e0e5b7f8693d0c476bda283506
+  data.tar.gz: 9b86749ba6031a208ef3c63a0ffcab8692df8dc9c77fd51602428499f4d2f6f3
 SHA512:
-  metadata.gz: 5752604311d05c5c92020d7a3fbe665b64b726ac965ce2cabbc37b0de5ff4f32bfdd848a485005fbf3a92cee124a175b56dcf045f9a0a4006fc3c46a16b9ea16
-  data.tar.gz: 927a761dbf04b92adaa52cd28ed0428dcb733f924abb8a44d46748c92d52aa9b572fbb958d8ed8758c4662a995ff12f476451dad72edbf61ffa56aa7dbb133f7
+  metadata.gz: 80073215c5381aabd0f91d83d6181dd824c8f1c39c83a8159b2ab96ab761169cec454810518962c9caf7348fbf3925b040117e02d64200006c4d5dddd2ed5da2
+  data.tar.gz: aeab2b3c8c1587f91213eea9d6cc96aad580092306cdec0494f4fdbaa23859f0d0f781b155c1d6ce796960c6ff4c976f293c7bf812636568d11f142851f28531

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/Rakefile

@@ -11,6 +11,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 require 'juwelier'
+require './lib/pfab/version.rb'
+
 Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "pfab"
@@ -20,7 +22,7 @@ Juwelier::Tasks.new do |gem|
   gem.description = %Q{k8s helper}
   gem.email = "jdwyer@prefab.cloud"
   gem.authors = ["Jeff Dwyer"]
-
+  gem.version = Pfab::Version::STRING
   # dependencies defined in Gemfile
 end
 Juwelier::RubygemsDotOrgTasks.new

data/lib/pfab.rb

@@ -1,3 +1,4 @@
+require "pfab/version"
 require "pfab/cli"
 require "pfab/yamls"
 require "pfab/templates/base"

data/lib/pfab/cli.rb

@@ -10,7 +10,7 @@ module Pfab
 
     def run
       program :name, "pfab"
-      program :version, "0.0.0"
+      program :version, Pfab::Version::STRING
       program :description, "k8s helper"
 
       if File.exist? "application.yaml"
@@ -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/cron.rb

@@ -20,6 +20,8 @@ module Pfab
           },
           spec: {
             schedule: get("schedule"),
+            successfulJobsHistoryLimit: 1,
+            failedJobsHistoryLimit: 1,
             jobTemplate: {
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",

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

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

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.0 ruby lib
+# stub: pfab 0.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.8.0"
+  s.version = "0.9.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-22"
+  s.date = "2021-03-16"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.markdown",
     "Rakefile",
-    "VERSION",
     "bin/pfab",
     "lib/pfab.rb",
     "lib/pfab/cli.rb",
@@ -36,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/pfab/templates/daemon.rb",
     "lib/pfab/templates/job.rb",
     "lib/pfab/templates/web.rb",
+    "lib/pfab/version.rb",
     "lib/pfab/yamls.rb",
     "pfab.gemspec",
     "test/helper.rb",
@@ -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.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2021-03-16 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
@@ -138,7 +138,6 @@ files:
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
 - bin/pfab
 - lib/pfab.rb
 - lib/pfab/cli.rb
@@ -147,6 +146,7 @@ files:
 - lib/pfab/templates/daemon.rb
 - lib/pfab/templates/job.rb
 - lib/pfab/templates/web.rb
+- lib/pfab/version.rb
 - lib/pfab/yamls.rb
 - pfab.gemspec
 - test/helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.8.0