ev_job_gen 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085cb7ea8fc4dfe21cb99b4554be51ba8792748fbb431fe72932d86e6358fdff'
-  data.tar.gz: 68a29a3f53fb69dcd85a248cad860c3a53e60656596b6f8f7781b6074afc0a6d
+  metadata.gz: 911c2e6a913212af70db4fc8c75426db37895ee916b8e1b0e82b1dd3c8ce6e2f
+  data.tar.gz: 29519dd22e5f9069d4c64644cb97bc14f74969fa83793d3cf23727942f812def
 SHA512:
-  metadata.gz: 28df46930e6a1346de9ccf168cd77fc15a11b74e183d12f97fd59bed79cd142ca77c26b929fd2e76f5cedf9cc0b73df3b2d62f525e6d744b295448b2563ed784
-  data.tar.gz: 1fdc9edc312ba226e98f0e7ab21acca3729e0a5c60d078ca54560d2f8d309d3edd92961fd55f5c864db824e0b282936eac6a727c3bf2fefb8b4f071c7452dfb4
+  metadata.gz: 570463b577ccbc222de9409d4380fe550d8b5641e2d2c2da720fa0ea141e34fffad3665fd3f513b47b1357c2a0e7b0e66c6490bd9016f02699eac7b02b0da500
+  data.tar.gz: 81070a6e5e947949f222fca3492d4a58879edfcf92866399e0e662c9fec5055528f228b56f4f7eab7f770f50e99bf402e48cf772be3337fa8bed1a8d1635aac6

data/.travis.yml

@@ -3,3 +3,4 @@ language: ruby
 rvm:
   - 2.5.1
 before_install: gem install bundler -v 1.16.2
+script: bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ev_job_gen (0.1.2)
+    ev_job_gen (0.2.1)
       dotenv (~> 2.5.0)
 
 GEM

data/README.md

@@ -52,6 +52,7 @@ metadata:
     app: ev-job
     role: job
 spec:
+  backoffLimit: 0
   schedule: "5 17 * * *"
   concurrencyPolicy: "Replace"
   suspend: false
@@ -74,10 +75,11 @@ spec:
             app: ev-job
             role: job
         spec:
+
           restartPolicy: Never
           containers:
           - name: ev-job
-            image: some-docker-registory/wantedly/ml-project-1:latest
+            image: some-docker-registory/ml-project-1:latest
             imagePullPolicy: Always
             command:
               - "/bin/bash"
@@ -89,6 +91,7 @@ spec:
                 export AWS_SECRET_ACCESS_KEY=xxx;
                 export AWS_REGION=xxx;
 
+                apt install -y wget;
                 wget https://github.com/wantedly/ev-cli/releases/download/v1.2.3/ev-v1.2.3-linux-amd64.tar.gz;
                 tar xvzf ev-v1.2.3-linux-amd64.tar.gz;
                 cp linux-amd64/ev ev;

data/kubernetes/tmpl/oneshot_job_template.yml.erb

@@ -9,6 +9,7 @@ metadata:
     app: ev-job
     role: job
 spec:
+  backoffLimit: 0
   template:
     metadata:
       name: ev-job-<%= job.suffix %>

data/lib/ev_job_gen/manifest_gen.rb

@@ -20,7 +20,7 @@ module EvJobGen
       else
         raise "invalid target: #{target}"
       end
-      @renderer = YmlRenderer.new(
+      @renderer = Renderer.new(
         template:   template,
         specoffset: specoffset,
         jobfile:    jobfile,

data/lib/ev_job_gen/renderer/manifest_renderer.rb

@@ -0,0 +1,18 @@
+require 'erb'
+
+module EvJobGen
+  class Renderer
+    class ManifestRenderer
+      def initialize(template:, job:, spec:)
+        @renderer = ERB.new(File.read(template))
+        @job      = job
+        @spec     = spec
+      end
+      attr_reader :job, :spec
+
+      def render
+        @renderer.result(binding)  # Only use `job` and `spec`
+      end
+    end
+  end
+end

data/lib/ev_job_gen/renderer/spec_renderer.rb

@@ -0,0 +1,27 @@
+require 'erb'
+
+module EvJobGen
+  class Renderer
+    class SpecRenderer
+      class << self
+        def spec_template_path
+          File.expand_path(
+            File.join('kubernetes', 'tmpl', 'spec_template.yml.erb'),
+            EvJobGen.root,
+          )
+        end
+      end
+
+      def initialize(job:, config:)
+        @job        = job
+        @config     = config
+        @renderer   = ERB.new(File.read(SpecRenderer.spec_template_path))
+      end
+      attr_reader :job, :config
+
+      def render
+        @renderer.result(binding)  # Only use `job` and `config`
+      end
+    end
+  end
+end

data/lib/ev_job_gen/renderer.rb

@@ -0,0 +1,38 @@
+require 'ev_job_gen/renderer/manifest_renderer'
+require 'ev_job_gen/renderer/spec_renderer'
+
+module EvJobGen
+  class Renderer
+    def initialize(template:, specoffset:, jobfile:, configfile:)
+      @template      = template
+      @specoffset    = specoffset
+      @job           = EvJobGen::Job.new(jobfile)
+      @config        = EvJobGen::Config.new(configfile)
+    end
+
+    def render
+      spec = SpecRenderer.new(
+        job:    @job,
+        config: @config,
+      ).render
+
+      r = ManifestRenderer.new(
+        template: @template,
+        job:      @job,
+        spec:     offset(spec, off: @specoffset + 2)
+      ).render
+
+      normalize(r)
+    end
+
+  private
+
+    def normalize(text)
+      text.split("\n").map { |l| l.rstrip }.map { |l| "#{l}\n" }.join
+    end
+
+    def offset(text, off:)
+      "\n" + text.split("\n").map { |l| "#{' ' * off}#{l}\n" }.join
+    end
+  end
+end

data/lib/ev_job_gen/version.rb

@@ -1,3 +1,3 @@
 module EvJobGen
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

data/lib/ev_job_gen.rb

@@ -3,8 +3,8 @@ require 'dotenv/load'
 require 'ev_job_gen/cli'
 require 'ev_job_gen/config'
 require 'ev_job_gen/job'
-require 'ev_job_gen/yml_renderer'
 require 'ev_job_gen/manifest_gen'
+require 'ev_job_gen/renderer'
 
 module EvJobGen
   class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ev_job_gen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -125,8 +125,10 @@ files:
 - lib/ev_job_gen/config.rb
 - lib/ev_job_gen/job.rb
 - lib/ev_job_gen/manifest_gen.rb
+- lib/ev_job_gen/renderer.rb
+- lib/ev_job_gen/renderer/manifest_renderer.rb
+- lib/ev_job_gen/renderer/spec_renderer.rb
 - lib/ev_job_gen/version.rb
-- lib/ev_job_gen/yml_renderer.rb
 homepage: https://github.com/wantedly/ev-job-gen
 licenses:
 - MIT

data/lib/ev_job_gen/yml_renderer.rb

@@ -1,38 +0,0 @@
-require 'erb'
-require 'fileutils'
-
-module EvJobGen
-  class YmlRenderer
-    class << self
-      def spec_template_path
-        File.expand_path(
-          File.join('kubernetes', 'tmpl', 'spec_template.yml.erb'),
-          EvJobGen.root,
-        )
-      end
-    end
-
-    def initialize(template:, specoffset:, jobfile:, configfile:)
-      @spec_renderer = ERB.new(File.read(YmlRenderer.spec_template_path))
-      @specoffset    = specoffset
-      @renderer      = ERB.new(File.read(template))
-      @job           = EvJobGen::Job.new(jobfile)
-      @config        = EvJobGen::Config.new(configfile)
-    end
-
-    attr_reader :job, :config
-
-    def render
-      spec = render_spec
-      @renderer.result(binding)
-    end
-
-  private
-
-    def render_spec
-      r = @spec_renderer.result(binding)
-      offset = @specoffset + 2
-      "\n" + r.split("\n").map { |l| "#{' ' * offset}#{l}\n" }.join
-    end
-  end
-end