barbeque 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4510b6adf348a1bda1e6c35d02826cfa019f0ab3
-  data.tar.gz: 8718974eaadf54ed119d8ef3b7e107117919bc59
+  metadata.gz: 2e9cf425229aa453c69b0b10724cd42f16d3d5a9
+  data.tar.gz: d8434e65e0d541f19b5424ffe906fa1519999f83
 SHA512:
-  metadata.gz: a9c7801de72f8bd392b19c70adaa9b087638e434b66d75e565a3b7e2db3772545d3e95359d816801dc577e76b771649c1d2bf020648a698cd89a191ed68b8781
-  data.tar.gz: 49d35f54929f3e5906d7b5e673205cb2bdd3f64b8a3e4017a4cd2f43a74305c0b7874e257c0b745cd124350779a5eac3d2bde7e7f471b9c01024987ae091ad69
+  metadata.gz: a751d7a94159f26dab6a2b434af7dc47a4e826657d7c3d7ebb33b67174eddf9104bd7b1f80d6fd5397ce82b7a5905c7c55a4424d3e7e14da63f7fe12aa7d356e
+  data.tar.gz: e18f9585c6a98e66c4b0285912c6ad8a7079f39d5a8dc3b4fab066652d29b9a4aecec0a70ee71ccfa2eb8d1372641e01670792feebcffee6ac690bfc873d4d52

data/lib/barbeque/config.rb

@@ -0,0 +1,37 @@
+require 'erb'
+require 'yaml'
+
+module Barbeque
+  class Config
+    attr_accessor :exception_handler, :runner, :runner_options
+
+    def initialize(options = {})
+      options.each do |key, value|
+        if respond_to?("#{key}=")
+          public_send("#{key}=", value)
+        else
+          raise KeyError.new("Unexpected option '#{key}' was specified.")
+        end
+      end
+      runner_options.symbolize_keys!
+    end
+  end
+
+  module ConfigBuilder
+    DEFAULT_CONFIG = {
+      'exception_handler' => 'RailsLogger',
+      'runner'            => 'Docker',
+      'runner_options'    => {},
+    }
+
+    def config
+      @config ||= build_config
+    end
+
+    def build_config(config_name = 'barbeque')
+      Config.new(DEFAULT_CONFIG.merge(Rails.application.config_for(config_name)))
+    end
+  end
+
+  extend ConfigBuilder
+end

data/lib/barbeque/exception_handler.rb

@@ -1,4 +1,4 @@
-require 'barbeque/configuration'
+require 'barbeque/config'
 
 module Barbeque
   module ExceptionHandler

data/lib/barbeque/runner.rb

@@ -1,12 +1,13 @@
-require 'barbeque/configuration'
+require 'barbeque/config'
 require 'barbeque/runner/docker'
+require 'barbeque/runner/hako'
 
 module Barbeque
   module Runner
     # @param [Barbeque::DockerImage] docker_image
     def self.create(docker_image:)
       klass = const_get(Barbeque.config.runner, false)
-      klass.new(docker_image: docker_image)
+      klass.new(Barbeque.config.runner_options.merge(docker_image: docker_image))
     end
   end
 end

data/lib/barbeque/runner/hako.rb

@@ -0,0 +1,46 @@
+require 'open3'
+
+module Barbeque
+  module Runner
+    class Hako
+      # @param [Barbeque::DockerImage] docker_image
+      # @param [String] hako_dir
+      # @param [Hash] hako_env
+      # @param [String] yaml_dir
+      def initialize(docker_image:, hako_dir:, hako_env: {}, yaml_dir:)
+        @app_name = docker_image.repository
+        @tag      = docker_image.tag
+        @hako_dir = hako_dir
+        @hako_env = hako_env
+        @yaml_dir = yaml_dir
+      end
+
+      # @param [Array<String>] command
+      # @param [Hash] envs
+      # @return [String] stdout
+      # @return [String] stderr
+      # @return [Process::Status] status
+      def run(command, envs)
+        cmd = build_hako_oneshot_command(command, envs)
+        Bundler.with_clean_env do
+          Open3.capture3(@hako_env, *cmd, chdir: @hako_dir)
+        end
+      end
+
+      private
+
+      def build_hako_oneshot_command(command, envs)
+        [
+          'bundle', 'exec', 'hako', 'oneshot', '--tag', @tag,
+          *env_options(envs), File.join(@yaml_dir, "#{@app_name}.yml"), '--', *command,
+        ]
+      end
+
+      def env_options(envs)
+        envs.map do |key, value|
+          "--env=#{key}=#{value}"
+        end
+      end
+    end
+  end
+end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  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: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +345,7 @@ files:
 - db/migrate/20160516041710_create_job_retries.rb
 - db/migrate/20160829023237_prefix_barbeque_to_tables.rb
 - lib/barbeque.rb
-- lib/barbeque/configuration.rb
+- lib/barbeque/config.rb
 - lib/barbeque/docker_image.rb
 - lib/barbeque/engine.rb
 - lib/barbeque/exception_handler.rb
@@ -375,6 +361,7 @@ files:
 - lib/barbeque/message_queue.rb
 - lib/barbeque/runner.rb
 - lib/barbeque/runner/docker.rb
+- lib/barbeque/runner/hako.rb
 - lib/barbeque/slack_client.rb
 - lib/barbeque/version.rb
 - lib/barbeque/worker.rb
@@ -400,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Job queue system to run job with Docker

data/lib/barbeque/configuration.rb

@@ -1,24 +0,0 @@
-require 'erb'
-require 'yaml'
-require 'hashie'
-
-module Barbeque
-  module Configuration
-    DEFAULT_CONFIG = {
-      'exception_handler' => 'RailsLogger',
-      'runner'            => 'Docker',
-    }
-
-    def config
-      @config ||= build_config
-    end
-
-    def build_config
-      filename = Rails.root.join('config', 'barbeque.yml').to_s
-      hash = YAML.load(ERB.new(File.read(filename)).result)
-      Hashie::Mash.new(DEFAULT_CONFIG.merge(hash[Rails.env]))
-    end
-  end
-
-  extend Configuration
-end