kube_queue 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1511d8cfdd1b8fb8375d4162e389750b4372bc19
-  data.tar.gz: 963ace432f1420c863d94d491e81611fa7141279
+SHA256:
+  metadata.gz: 1c864d0acb58ed1b538edeebcdec417d6284b9a4df1d151a9c008eb190e9b9f3
+  data.tar.gz: 49d9aff0aca53a00836f9358149741694173b19df4ea1e16aef40ff0a23441df
 SHA512:
-  metadata.gz: 92c9790d5954b947e494e408556ba5cf5ddac75c2f5c4dc70b094833f2afdd24d4e565bcb3da86951c070283df1451d73d14dc672b74103cddfea40639b557b9
-  data.tar.gz: 3932e801e465f3d5b7427dfd027af5b0680c8fffc338ab7f8abd151ca86010617386f00b35941a604436c94fc638e0b1aa4192f5f7198758cbe30caae7959170
+  metadata.gz: af4c1d02900ac0e864e59ee4fa81dcb43771ddafcdd50bf2dfc4956f2e37b04f121ca6bf13c7be185d2876f74ab582425022fe687f7ca9993e4261fd6b65bedb
+  data.tar.gz: 314585e098b2578c124ce28b3accf08e6f51c05058a0b2590ee5ca47c65ef0b58cabe6c5e105372693c986d6c2dc1ec51a8c3fb5a4052323f11ce4897419528d

data/.gcloudignore

@@ -1 +1,4 @@
 !.git
+secrets
+examples/myapp/tmp/*
+examples/myapp/log/*

data/.rubocop.yml

@@ -63,3 +63,6 @@ Metrics/BlockLength:
 Style/MixinUsage:
   Exclude:
     - 'spec/**/*.rb'
+
+Layout/AlignArguments:
+  Enabled: false

data/Dockerfile

@@ -5,13 +5,13 @@ WORKDIR /app
 RUN apt-get update -y && apt-get install git --no-install-recommends && rm -r /var/cache/apt /var/lib/apt/lists
 
 RUN gem install bundler:2.0.2
-COPY docker/Gemfile Gemfile
+COPY examples/docker/Gemfile Gemfile
 COPY Gemfile kube_queue.gemspec .git  /vendor/kube_queue/
 COPY exe/kube_queue /vendor/kube_queue/exe/kube_queue
 COPY lib/kube_queue/version.rb /vendor/kube_queue/lib/kube_queue/version.rb
 RUN bundle install -j4
 
-COPY docker/test_worker.rb .
+COPY examples/docker/test_worker.rb .
 COPY . /vendor/kube_queue
 
 CMD ["bundle", "exec", "kube_queue", "TestWorker", "-r", "./test_worker.rb"]

data/Dockerfile.myapp

@@ -0,0 +1,22 @@
+FROM ruby
+
+RUN apt-get update -y && apt-get install git --no-install-recommends && rm -r /var/cache/apt /var/lib/apt/lists
+
+RUN gem install bundler:2.0.2
+
+ENV KUBE_QUEUE_PATH /vendor/kube_queue
+ENV WORKDIR /app
+
+WORKDIR $WORKDIR
+
+COPY .git $KUBE_QUEUE_PATH/.git
+COPY Gemfile kube_queue.gemspec $KUBE_QUEUE_PATH/
+COPY exe/kube_queue $KUBE_QUEUE_PATH/exe/kube_queue
+COPY lib/kube_queue/version.rb $KUBE_QUEUE_PATH/lib/kube_queue/version.rb
+COPY examples/myapp/Gemfile examples/myapp/Gemfile.lock $WORKDIR/
+RUN bundle install -j4
+
+COPY lib $KUBE_QUEUE_PATH/lib
+COPY examples/myapp/ $WORKDIR
+
+CMD ["bundle", "exec", "rails", "console"]

data/README.md

@@ -1,13 +1,5 @@
 # KubeQueue
 
-## Features
-
-- ActiveJob integration
-- Support multiple kubernetes client configuration.
-- Support templating and customization for kubernetes job manifest.
-- Job dosen't returns id. Can not track job details from code.
-- Logging
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -44,29 +36,86 @@ class TestWorker
 end
 ```
 
-Setting kubernetes configuration and run:
+Setting kubernetes configuration.
 
-```
+```ruby
 KubeQueue.kubernetes_configure do |client|
   client.url = ENV['K8S_URL']
   client.ssl_ca_file = ENV['K8S_CA_CERT_FILE']
   client.auth_token = File.read(ENV['K8S_TOKEN'])
 end
+```
+
+and run:
 
+```ruby
 TestWorker.perform(message: 'hello')
 ```
 
-## Development
+### ActiveJob Support
+
+Write to `application.rb`:
+
+```ruby
+Rails.application.config.active_job.adapter = :kube_queue
+```
+
+Just put your job into `app/jobs` . Example:
+
+```ruby
+# app/jobs/print_message_job.rb
+class PrintMessageJob < ApplicationJob
+  include KubeQueue::Worker
+
+  worker_name 'print-message-job'
+  image "your-registry/your-image"
+  container_name 'your-container-name'
+
+  def perform(payload)
+    logger.info payload[:message]
+  end
+end
+```
+
+and run:
+
+```ruby
+irb(main):001:0> job = PrintMessageJob.perform_later(message: 'hello, kubernetes!')
+Enqueued PrintMessageJob (Job ID: 0bf15b35-62d8-4380-9173-99839ce735ff) to KubeQueue(default) with arguments: {:message=>"hello, kubernetes!"}
+=> #<PrintMessageJob:0x00007fbfd00c7848 @arguments=[{:message=>"hello, kubernetes!"}], @job_id="0bf15b35-62d8-4380-9173-99839ce735ff", @queue_name="default", @priority=nil, @executions=0>
+irb(main):002:0> job.status
+=> #<K8s::Resource startTime="2019-08-12T15:56:37Z", active=1>
+irb(main):003:0> job.status
+=> #<K8s::Resource conditions=[{:type=>"Complete", :status=>"True", :lastProbeTime=>"2019-08-12T15:57:03Z", :lastTransitionTime=>"2019-08-12T15:57:03Z"}], startTime="2019-08-12T15:56:37Z", completionTime="2019-08-12T15:57:03Z", succeeded=1>
+```
+
+See more examples in [here](examples).
+
+### Run job on locally
+
+```
+bundle exec kube_queue runner JOB_NAME [PAYLOAD]
+```
+
+See more information by `kube_queue help` or [here](exe/kube_queue).
+
+## Features
+
+- Add tests.
+- Support multiple kubernetes client configuration.
+- Logging informations.
+
+## Development(on GCP/GKE)
 
 setup:
 
 ```
 # create service account and cluster role.
-kubectl apply -f k8s/service-account.yaml
+kubectl apply -f examples/k8s/service-account.yaml
 
 # get ca.crt and token
-< k get secret -n kube-system kube-queue-test-token-xxx -o jsonpath="{['data']['token']}" | base64 -d > secrets/token
-< k get secret -n kube-system kube-queue-test-token-xxx -o jsonpath="{['data']['ca\.crt']}" | base64 -d > secrets/ca.crt
+kubectl get secret -n kube-system kube-queue-test-token-xxx -o jsonpath="{['data']['token']}" | base64 -d > secrets/token
+kubectl get secret -n kube-system kube-queue-test-token-xxx -o jsonpath="{['data']['ca\.crt']}" | base64 -d > secrets/ca.crt
 
 # build image
 gcloud builds submit --config cloudbuild.yaml .
@@ -77,5 +126,5 @@ run:
 ```
 K8S_URL=https://xx.xxx.xxx.xxx K8S_CA_CERT_FILE=$(pwd)/secrets/ca.crt K8S_TOKEN=$(pwd)/secrets/token IMAGE_NAME=gcr.io/your-project/kube-queue bin/console
 
-irb(main):001:0> TestWorker.perform_async(message: 'hello kubernetes')
+irb(main):001:0> TestWorker.perform_async(message: 'hello, kubernetes!')
 ```

data/bin/console

@@ -16,7 +16,7 @@ require "irb"
 KubeQueue.kubernetes_configure do |client|
   client.url = ENV['K8S_URL']
   client.ssl_ca_file = ENV['K8S_CA_CERT_FILE']
-  client.auth_token = File.read(ENV['K8S_TOKEN'])
+  client.auth_token = ENV['K8S_TOKEN']
 end
 
 IRB.start(__FILE__)

data/cloudbuild.yaml

@@ -1,5 +1,9 @@
-images: ['gcr.io/$PROJECT_ID/kube-queue:latest']
+images: ['gcr.io/$PROJECT_ID/kube-queue:latest', 'gcr.io/$PROJECT_ID/kube-queue-test-app:latest']
 
 steps:
 - name: 'gcr.io/cloud-builders/docker'
   args: ['build', '-f', '/workspace/Dockerfile', '/workspace', '-t', 'gcr.io/$PROJECT_ID/kube-queue:latest']
+
+- name: 'gcr.io/cloud-builders/docker'
+  args: ['build', '-f', '/workspace/Dockerfile.myapp', '/workspace', '-t', 'gcr.io/$PROJECT_ID/kube-queue-test-app:latest']
+  waitFor: ['-']

data/exe/kube_queue

@@ -1,14 +1,63 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/kube_queue/cli'
+require 'rubygems'
+require 'thor'
+require 'kube_queue'
 
-begin
-  cli = KubeQueue::CLI.new(ARGV)
-  cli.run
-rescue StandardError => e
-  raise e if $DEBUG
+module KubeQueue
+  class CLI < Thor
+    default_task :version
 
-  STDERR.puts e.message
-  STDERR.puts e.backtrace.join("\n")
-  exit 1
+    desc 'runner JOB_NAME [PAYLOAD]', 'run worker'
+    method_option :require, aliases: '-r', type: :string, desc: 'Location of Rails application with workers or file to require'
+    method_option :rails, aliases: '-R', type: :boolean, desc: 'Location of Rails application with workers or file to require'
+    def runner(job_name, payload = nil)
+      load_files!
+
+      # Infer application work on rails if require option does not specified.
+      load_rails! if !options[:require] || options[:rails]
+
+      payload ||= ENV['KUBE_QUEUE_MESSAGE_PAYLOAD']
+      payload = JSON.parse(payload) if payload
+      # Compatibility for ActiveJob serialized payload
+      payload = [payload] unless payload.is_a?(Array)
+      payload = ActiveJob::Arguments.deserialize(payload) if defined?(ActiveJob::Arguments)
+
+      job = KubeQueue.fetch_worker(job_name).new(*payload)
+
+      job.perform_now
+    end
+
+    desc 'version', 'Prints version'
+    def version
+      say "KubeQueue version #{KubeQueue::VERSION}"
+    end
+
+    private
+
+    def load_files!
+      return unless options[:require]
+
+      raise "#{options[:require]} dosent exist." unless File.exist?(options[:require])
+
+      files = File.directory?(options[:require]) ? Dir.glob(File.join(options[:require], '**/*.rb')) : [options[:require]]
+
+      files.each do |file|
+        require file
+      end
+    end
+
+    def load_rails!
+      require "rails"
+
+      raise "KubeQueue does not supports this version of Rails" if ::Rails::VERSION::MAJOR < 5
+
+      require 'rails'
+      require 'kube_queue/railties'
+      require File.expand_path('config/environment.rb')
+      Rails.application.eager_load!
+    end
+  end
 end
+
+KubeQueue::CLI.start

data/kube_queue.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.metadata["changelog_uri"] = "https://github.com/yuemori/kube_queue/CHANGELOG.md"
 
   spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|examples|cloudbuild.yaml)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "k8s-client"
+  spec.add_dependency "thor"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/active_job/adapters/kube_queue_adapter.rb

@@ -0,0 +1,31 @@
+require 'kube_queue'
+
+module ActiveJob
+  module QueueAdapters
+    # == KubeQueue adapter for ActiveJob ==
+    #
+    # To use KubeQueue set the queue_adapter config to +:kube_queue+.
+    #   Rails.application.config.active_job.queue_adapter = :kube_queue
+    class KubeQueueAdapter
+      class << self
+        # Interface for ActiveJob 4.2
+        def enqueue(job)
+          KubeQueue.executor.enqueue(job, ActiveJob::Arguments.serialize(job.arguments))
+        end
+
+        def enqueue_at(_job, _timestamp)
+          raise NotImplementedError
+        end
+      end
+
+      # Interface for ActiveJob 5.0
+      def enqueue(job)
+        KubeQueueAdapter.enqueue(job)
+      end
+
+      def enqueue_at(job, timestamp)
+        KubeQueueAdapter.enqueue_at(job, timestamp)
+      end
+    end
+  end
+end

data/lib/kube_queue/client.rb

@@ -5,8 +5,17 @@ module KubeQueue
   class Client
     def create_job(manifest)
       job = K8s::Resource.new(manifest)
-      job.metadata.namespace = 'default'
-      client.api('batch/v1').resource('jobs').create_resource(job)
+      job.metadata.namespace ||= 'default'
+      client.resource('jobs').create_resource(job)
+    end
+
+    def get_job(namespace, name)
+      client.resource('jobs', namespace: namespace).get(name)
+    end
+
+    def list_job(namespace = nil)
+      selector = { 'kube-queue-job': 'true' }
+      client.resource('jobs', namespace: namespace).list(labelSelector: selector)
     end
 
     attr_accessor :url, :ssl_ca_file, :auth_token
@@ -14,7 +23,7 @@ module KubeQueue
     private
 
     def client
-      @client ||= K8s.client(url, ssl_ca_file: ssl_ca_file, auth_token: auth_token)
+      @client ||= K8s.client(url, ssl_ca_file: ssl_ca_file, auth_token: auth_token).api('batch/v1')
     end
   end
 end

data/lib/kube_queue/executor.rb

@@ -1,10 +1,9 @@
-require 'erb'
-require 'json'
+require 'kube_queue/manifest_builder'
 
 module KubeQueue
   class Executor
-    def perform_async(job, body)
-      manifest = job.build_manifest(body)
+    def enqueue(job, payload)
+      manifest = ManifestBuilder.new(job, payload).build
       KubeQueue.client.create_job(manifest)
     end
   end

data/lib/kube_queue/job_specification.rb

@@ -0,0 +1,64 @@
+require 'erb'
+require 'yaml'
+
+module KubeQueue
+  class JobSpecification
+    class MissingParameterError < StandardError; end
+
+
+    attr_reader :job_class
+
+    attr_accessor :payload, :name, :active_deadline_seconds, :backoff_limit
+
+    attr_writer :image, :namespace, :worker_name, :command,
+      :container_name, :restart_policy, :job_labels, :pod_labels
+
+    def initialize(job_class)
+      @job_class = job_class
+    end
+
+    def job_name(job_id)
+      "#{worker_name}-#{job_id}"
+    end
+
+    def image
+      @image || raise_not_found_required_parameter('image')
+    end
+
+    def namespace
+      @namespace || 'default'
+    end
+
+    def worker_name
+      @worker_name || raise_not_found_required_parameter('worker_name')
+    end
+
+    def container_name
+      @container_name || worker_name
+    end
+
+    def command
+      @command || ['bundle', 'exec', 'kube_queue', 'runner', job_class.name]
+    end
+
+    def restart_policy
+      @restart_policy || 'Never'
+    end
+
+    def job_labels
+      @job_labels || {}
+    end
+
+    def pod_labels
+      @pod_labels || {}
+    end
+
+    def env
+      KubeQueue.default_env.merge(@env || {})
+    end
+
+    def raise_not_found_required_parameter(field)
+      raise MissingParameterError, "#{field} is required"
+    end
+  end
+end

data/lib/kube_queue/manifest_builder.rb

@@ -0,0 +1,25 @@
+require 'erb'
+require 'json'
+
+module KubeQueue
+  class ManifestBuilder
+    attr_reader :job
+
+    def initialize(job, payload = nil)
+      @job = job
+      @payload = payload
+    end
+
+    def spec
+      job.job_spec
+    end
+
+    def payload
+      @payload ? JSON.generate(@payload, quirks_mode: true) : nil
+    end
+
+    def build
+      YAML.safe_load(ERB.new(job.template, nil, "-").result(binding))
+    end
+  end
+end

data/lib/kube_queue/railties.rb

@@ -0,0 +1,3 @@
+ActiveSupport.on_load(:active_job) do
+  require "active_job/adapters/kube_queue_adapter"
+end

data/lib/kube_queue/version.rb

@@ -1,3 +1,3 @@
 module KubeQueue
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

data/lib/kube_queue/worker/dsl.rb

@@ -0,0 +1,49 @@
+module KubeQueue
+  module Worker
+    module DSL
+      def job_spec
+        @job_spec ||= JobSpecification.new(self)
+      end
+
+      def worker_name(name)
+        job_spec.worker_name = name
+      end
+
+      def container_name(container_name)
+        job_spec.container_name = container_name
+      end
+
+      def image(image)
+        job_spec.image = image
+      end
+
+      def namespace(namespace)
+        job_spec.namespace = namespace
+      end
+
+      def command(*command)
+        job_spec.command = command
+      end
+
+      def restart_policy(policy)
+        job_spec.restart_policy = policy
+      end
+
+      def active_deadline_seconds(seconds)
+        job_spec.active_deadline_seconds = seconds
+      end
+
+      def backoff_limit(limit)
+        job_spec.backoff_limit = limit
+      end
+
+      def env(env)
+        job_spec.env = env
+      end
+
+      def labels(labels)
+        job_spec.labels = labels
+      end
+    end
+  end
+end

data/lib/kube_queue/worker.rb

@@ -1,6 +1,5 @@
-require 'erb'
-require 'yaml'
-require 'kube_queue/job_configuration'
+require 'kube_queue/worker/dsl'
+require 'kube_queue/job_specification'
 
 module KubeQueue
   module Worker
@@ -11,57 +10,55 @@ module KubeQueue
     end
 
     module ClassMethods
-      def job_name(name)
-        @job_name = name
-      end
+      include DSL
 
-      def container_name(container_name)
-        @container_name = container_name
+      def enqueue(body = nil)
+        KubeQueue.executor.enqueue(new, body)
       end
+      alias_method :perform_async, :enqueue
 
-      def image(image)
-        @image = image
+      def enqueue_at(body = nil)
+        KubeQueue.executor.enqueue(new, body)
       end
 
-      def command(*command)
-        @command = command
+      def read_template
+        File.read(@template || File.expand_path('../../../template/job.yaml', __FILE__))
       end
+    end
 
-      def template(template)
-        @template = template
-      end
+    def template
+      self.class.read_template
+    end
 
-      def restart_policy(policy)
-        @restart_policy = policy
-      end
+    def job_spec
+      self.class.job_spec
+    end
 
-      def backoff_limit(limit)
-        @backoff_limit = limit
-      end
+    attr_accessor :job_id, :arguments
 
-      def build_manifest(body)
-        spec = JobSpecification.new.configure do |s|
-          s.id = SecureRandom.uuid
-          s.image = @image
-          s.name = name
-          s.command = @command
-          s.job_name = @job_name
-          s.container_name = @job_name
-          s.template = @template
-          s.backoff_limit = @backoff_limit
-          s.payload = JSON.generate(body, quirks_mode: true)
-        end
+    def initialize(*arguments)
+      # Compatibility for ActiveJob interface
+      super
 
-        spec.to_manifest
-      end
+      @arguments = arguments
+      @job_id    = SecureRandom.uuid
+    end
 
-      def perform_sync(body)
-        new.perform(body)
-      end
+    def perform_now
+      # Compatibility for ActiveJob interface
+      return super if defined?(super)
 
-      def perform_async(body)
-        KubeQueue.executor.perform_async(self, body)
-      end
+      perform(*arguments)
+    end
+
+    def perform(*)
+      raise NotImplementedError
+    end
+
+    # FIXME: improve performance
+    def status
+      res = KubeQueue.client.get_job(job_spec.namespace, job_spec.job_name(job_id))
+      res.status
     end
   end
 end

data/lib/kube_queue.rb

@@ -3,9 +3,10 @@ require "kube_queue/executor"
 require "kube_queue/configuration"
 require "kube_queue/worker"
 require "kube_queue/client"
+require "active_job/adapters/kube_queue_adapter" if defined?(Rails)
 
 module KubeQueue
-  class Error < StandardError; end
+  class JobNotFound < StandardError; end
 
   class << self
     attr_writer :executor
@@ -34,6 +35,31 @@ module KubeQueue
       @configuration ||= Configuration.new
     end
 
+    def list(namespace = nil)
+      client.list_job(namespace).map do |job|
+        worker = fetch_worker(job.metadata.annotations['kube-queue-job-class'])
+        job_id = job.metadata.annotations['kube-queue-job-id']
+        payload = deserialize(job.metadata.annotations['kube-queue-message-payload'])
+
+        job = worker.new(*payload)
+        job.job_id = job_id
+        job
+      end
+    end
+
+    attr_writer :default_env
+
+    def default_env
+      return @default_env if @default_env
+
+      return {} unless defined?(Rails)
+
+      {
+        RAILS_LOG_TO_STDOUT: ENV['RAILS_LOG_TO_STDOUT'],
+        RAILS_ENV: ENV['RAILS_ENV']
+      }
+    end
+
     def fetch_worker(name)
       worker_registry.fetch(name)
     end
@@ -45,5 +71,29 @@ module KubeQueue
     def worker_registry
       @worker_registry ||= {}
     end
+
+    private
+
+    def deserialize(payload)
+      return payload if payload.blank?
+
+      payload = JSON.parse(payload)
+      # Compatibility for ActiveJob serialized payload
+      payload = [payload] unless payload.is_a?(Array)
+
+      if defined?(ActiveJob::Arguments)
+        begin
+          payload = ActiveJob::Arguments.deserialize(payload)
+        rescue ActiveJob::DeserializationError => e
+          logger.warn e.message
+          logger.warn "#{payload} can not deserialized"
+        end
+      end
+
+      payload
+    rescue JSON::ParseError => e
+      logger.warn e.message
+      logger.warn "#{payload} can not deserialized"
+    end
   end
 end

data/template/job.yaml

@@ -1,16 +1,44 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: "<%= job_name %>-<%= id %>"
+  annotations:
+    kube-queue-message-payload: '<%= payload %>'
+    kube-queue-job-class: "<%= spec.job_class %>"
+    kube-queue-job-id: "<%= job.job_id %>"
+  name: "<%= spec.job_name(job.job_id) %>"
+  namespace: <%= spec.namespace %>
+  labels:
+    kube-queue-job: "true"
+    kube-queue-worker-name: "<%= spec.worker_name %>"
+    kube-queue-job-class: "<%= spec.job_class %>"
+    kube-queue-job-id: "<%= job.job_id %>"
 spec:
   template:
+    metadata:
+      annotations:
+        kube-queue-message-payload: '<%= payload %>'
+        kube-queue-job-class: "<%= spec.job_class %>"
+        kube-queue-job-id: "<%= job.job_id %>"
+      labels:
+        kube-queue-job: "true"
+        kube-queue-worker-name: "<%= spec.worker_name %>"
+        kube-queue-job-class: "<%= spec.job_class %>"
+        kube-queue-job-id: "<%= job.job_id %>"
+<%- spec.job_labels.each do |key, value| %>
+        <%= key %>: "<%= value %>"
+<%- end %>
     spec:
       containers:
-      - name: "<%= container_name %>"
-        image: "<%= image %>"
-        command: <%= command %>
+      - name: "<%= spec.container_name %>"
+        image: "<%= spec.image %>"
+        command: <%= spec.command %>
         env:
         - name: "KUBE_QUEUE_MESSAGE_PAYLOAD"
           value: '<%= payload %>'
-      restartPolicy: "<%= restart_policy %>"
-  backoffLimit: <%= backoff_limit %>
+<%- spec.env.each do |key, value| %>
+        - name: "<%= key %>"
+          value: "<%= value %>"
+<%- end %>
+      restartPolicy: "<%= spec.restart_policy %>"
+  backoffLimit: <%= spec.backoff_limit %>
+  activeDeadlineSeconds: <%= spec.active_deadline_seconds %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kube_queue
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k8s-client
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Dockerfile
+- Dockerfile.myapp
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,20 +174,19 @@ files:
 - bin/console
 - bin/setup
 - cloudbuild.yaml
-- docker/Gemfile
-- docker/test_worker.rb
 - exe/kube_queue
-- k8s/service-account.yaml
 - kube_queue.gemspec
+- lib/active_job/adapters/kube_queue_adapter.rb
 - lib/kube_queue.rb
-- lib/kube_queue/cli.rb
 - lib/kube_queue/client.rb
 - lib/kube_queue/configuration.rb
 - lib/kube_queue/executor.rb
-- lib/kube_queue/job_configuration.rb
-- lib/kube_queue/runner.rb
+- lib/kube_queue/job_specification.rb
+- lib/kube_queue/manifest_builder.rb
+- lib/kube_queue/railties.rb
 - lib/kube_queue/version.rb
 - lib/kube_queue/worker.rb
+- lib/kube_queue/worker/dsl.rb
 - template/job.yaml
 homepage: https://github.com/yuemori/kube_queue
 licenses:
@@ -196,8 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A background job processing with Kubernetes job for Ruby

data/docker/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem 'kube_queue', path: '/vendor/kube_queue'

data/docker/test_worker.rb

@@ -1,14 +0,0 @@
-require 'kube_queue'
-
-class TestWorker
-  include KubeQueue::Worker
-
-  job_name 'kube-queue-test'
-  image ENV['IMAGE_NAME']
-  container_name 'kube-queue-test'
-  command 'bundle', 'exec', 'kube_queue', 'TestWorker', '-r', './test_worker.rb'
-
-  def perform(payload)
-    puts payload['message']
-  end
-end

data/k8s/service-account.yaml

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: kube-queue-test
-  namespace: kube-system
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kube-queue-test
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-- kind: ServiceAccount
-  name: kube-queue-test
-  namespace: kube-system

data/lib/kube_queue/cli.rb

@@ -1,56 +0,0 @@
-require 'logger'
-require 'json'
-require 'optparse'
-require 'kube_queue/runner'
-
-module KubeQueue
-  class CLI
-    attr_reader :argv
-
-    def initialize(argv = ARGV)
-      parse_options(argv)
-
-      @argv = argv
-    end
-
-    def run
-      load_files!
-
-      runner = Runner.new(job_name)
-
-      runner.run(payload)
-    end
-
-    private
-
-    def job_name
-      argv[0]
-    end
-
-    def payload
-      payload = ENV['KUBE_QUEUE_MESSAGE_PAYLOAD']
-
-      return payload if payload
-
-      raise 'Payload is missing. Please set payload to KUBE_QUEUE_MESSAGE_PAYLOAD environment variable'
-    end
-
-    def load_files!
-      require options[:require] if options[:require]
-    end
-
-    def options
-      @options ||= {}
-    end
-
-    def parse_options(argv)
-      parser = OptionParser.new do |o|
-        o.on '-r', '--require [PATH|DIR]', 'Location of Rails application with workers or file to require' do |arg|
-          options[:require] = arg
-        end
-      end
-
-      parser.parse!(argv)
-    end
-  end
-end

data/lib/kube_queue/job_configuration.rb

@@ -1,54 +0,0 @@
-require 'forwardable'
-
-module KubeQueue
-  class JobSpecification
-    extend Forwardable
-
-    attr_accessor :payload, :id, :name
-
-    attr_writer :image, :job_name, :command, :container_name, :template, :backoff_limit, :restart_policy
-
-    def configure
-      yield self
-      self
-    end
-
-    def backoff_limit
-      @backoff_limit || 0
-    end
-
-    def restart_policy
-      @restart_policy || 'Never'
-    end
-
-    def command
-      @command || ['bundle', 'exec', 'kube_queue', name]
-    end
-
-    def image
-      @image || raise
-    end
-
-    def job_name
-      @job_name || raise
-    end
-
-    def container_name
-      @container_name || raise
-    end
-
-    def template
-      @template || File.read(File.expand_path('../../../template/job.yaml', __FILE__))
-    end
-
-    def to_manifest
-      YAML.safe_load(ERB.new(template, nil, "%").result(binding))
-    end
-
-    private
-
-    def binding
-      super
-    end
-  end
-end

data/lib/kube_queue/runner.rb

@@ -1,17 +0,0 @@
-require 'logger'
-require 'json'
-
-module KubeQueue
-  class Runner
-    def initialize(job_name)
-      @job_name = job_name
-    end
-
-    def run(payload)
-      payload = JSON.parse(payload)
-
-      worker = KubeQueue.fetch_worker(@job_name)
-      worker.new.perform(payload)
-    end
-  end
-end