kubes 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd8b3dbc7ee3cbefbfe9f649c00ec37c7eaefb3ea281f056b3cf720e85f68cf
-  data.tar.gz: 1f9c1ba6f9a6626343239ac267a8f8ccd3c385a09f49f48e471821db084a5ade
+  metadata.gz: c14d045b8c029e76e1c001f26a0b77c97ecdabc45ddc964660372f2170f95690
+  data.tar.gz: 36a0b622a75cc18e74d78537a2a3f421e15de150cb89978434a58d31c37b799b
 SHA512:
-  metadata.gz: 9b5bc20d0bd43ee19f204a4dc692b9e4c71c69a3b490575eb397583187ff2e4a401456a943ceae2c3523a8ba42f2f9456809ed538b65dd0d319c0d48fa4318db
-  data.tar.gz: 1a3b59c9a047f75acbf79be98a104c3109f6da3a6c57bed29511fe77ba537e2ceb044f3fcae800e29bbdaed171ae8653c0c0554c2b90039135d1bc93f021d94e
+  metadata.gz: cd0f40a09c2909be4820c0575d6a8ef850b1977e21cd5d040cb82cb11411500a136608035635f743cb1a967116913856fc5e7997f3fef511b5c07d94d5fe4458
+  data.tar.gz: 9f29e9bf7a4615bb2a9864b9acdc9aa83b70583b5743decd5e8c6bac1b85b49bfc90a724403765afe2a86fa1cd1819cccedc53b7b91d6e858a20ececf2630f6a

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.3.4]
+- #24 fix namespace newline and logs for single container
+- #23 init namespace option
+
 ## [0.3.3]
 - #22 logs -c option. fix kubes logs for pods with multiple containers
 

data/lib/kubes/cli/init.rb

@@ -6,6 +6,7 @@ class Kubes::CLI
         [:force, type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
         [:type, aliases: ["t"], default: "yaml", desc: "Type: dsl or yaml"],
         [:repo, required: true, desc: "Docker repo name. Example: user/repo. Configures .kubes/config.rb"],
+        [:namespace, aliases: ["n"], desc: "Namespace to use, defaults to the app option"],
       ]
     end
 
@@ -17,6 +18,37 @@ class Kubes::CLI
       @options[:app]
     end
 
+    def namespace
+      @options[:namespace] || @options[:app]
+    end
+
+    def excludes
+      if namespace == "default"
+        case options[:type]
+        when "dsl"
+          %w[
+            namespace.rb.tt
+          ]
+        else
+          %w[
+            all.yaml.tt
+            namespace.yaml.tt
+          ]
+        end
+      else
+        []
+      end
+    end
+
+    def directory_options
+      if excludes.empty?
+        {}
+      else
+        pattern = Regexp.new(excludes.join('|'))
+        {exclude_pattern: pattern }
+      end
+    end
+
   public
     def create_dockefile
       return if File.exist?("Dockerfile")
@@ -32,13 +64,13 @@ class Kubes::CLI
     def create_dsl_files
       return unless @options[:type] == "dsl"
       set_source("dsl")
-      directory ".", "."
+      directory ".", ".", directory_options
     end
 
     def create_yaml_files
       return if @options[:type] == "dsl"
       set_source("yaml")
-      directory ".", "."
+      directory ".", ".", directory_options
     end
 
     def message

data/lib/kubes/cli/logs.rb

@@ -10,8 +10,9 @@ class Kubes::CLI
       ns = metadata['namespace']
 
       follow = " -f" if @options[:follow]
-      c = container(deployment)
-      sh("kubectl logs deployment/#{name}#{follow} -n #{ns} -c #{c}")
+      container = container(deployment)
+      c = " -c #{container}" if container
+      sh("kubectl logs deployment/#{name}#{follow} -n #{ns}#{c}")
     end
 
   private

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/templates/dsl/.kubes/resources/base/all.rb.tt

@@ -1,2 +1,7 @@
-namespace "<%= app %>"
+<%
+unless namespace == "default"
+  namespace_line = %Q|namespace "#{namespace}"\n|
+end
+-%>
+<%= namespace_line if namespace_line -%>
 labels(app: "<%= app %>")

data/lib/templates/dsl/.kubes/resources/shared/namespace.rb.tt

@@ -1,2 +1,2 @@
-name "<%= app %>"
+name "<%= namespace %>"
 labels(app: "<%= app %>")

data/lib/templates/yaml/.kubes/resources/base/all.yaml.tt

@@ -1,2 +1,2 @@
 metadata:
-  namespace: <%= app %>
+  namespace: <%= namespace %>

data/lib/templates/yaml/.kubes/resources/shared/namespace.yaml.tt

@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: <%= app %>
+  name: <%= namespace %>
   labels:
     app: <%= app %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Tung Nguyen