barbeque 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97319e09ca3ea34d2026ad845e4ba1d0552939fd
-  data.tar.gz: d97fe80c057637486eb31506976a17eba29a1532
+SHA256:
+  metadata.gz: 55e5ddccef50d8012d519620dec44f063f85f29b399bc6eb4a9a540b4df31821
+  data.tar.gz: 7a05fba8fd639bd69c6f9dacb95cfe2d4304ff18723f13eda6d6dc7a8f8e09f9
 SHA512:
-  metadata.gz: e43368a6ae848bc2a38256f34789d6b8d04a52fcf1c3cea76f2fe5a785171076065aff168d096edce2fc80cf12af8aaa205d24bdbd5b65613772b06f392fd57e
-  data.tar.gz: e663effa9d01a89915e99bc4002f54722d27bc6bce5677228ca732360b78d12b75d8cbe152e2261d5b53bad80c84ffcdc5934f3d143bfb4eeff87554150ceb64
+  metadata.gz: 826610de1fa826d2478307188ffd96ad7f7a73d039556261cf07998ece853c9b68cd95ed8ed7f3034f519d63d69674b5aa3fbfef65a08cd3d179bb21e0fc8992
+  data.tar.gz: 14aba5a62e4a4150463de75a357641012eddcb964c889b5820eabd42c95f0caec971298473d5b7b1977989c1297898b53b5bc602b9c015a22b217f2220d7e2d5

data/README.md

@@ -7,8 +7,7 @@ Job queue system to run job with Docker
 
 ## Project Status
 
-Barbeque is under development but already used on production at Cookpad.  
-Documentation is work in progress.
+Barbeque is used on production at Cookpad.
 
 ## What's Barbeque?
 

data/lib/barbeque/executor/hako.rb

@@ -14,11 +14,20 @@ module Barbeque
 
       # @param [String] hako_dir
       # @param [Hash] hako_env
-      # @param [String] yaml_dir
-      def initialize(hako_dir:, hako_env: {}, yaml_dir:, oneshot_notification_prefix:)
+      # @param [String] definition_dir
+      # @param [String] yaml_dir (deprecated: renamed to definition_dir)
+      def initialize(hako_dir:, hako_env: {}, yaml_dir: nil, definition_dir: nil, oneshot_notification_prefix:)
         @hako_dir = hako_dir
         @hako_env = hako_env
-        @yaml_dir = yaml_dir
+        @definition_dir =
+          if definition_dir
+            definition_dir
+          elsif yaml_dir
+            warn 'yaml_dir option is renamed to definition_dir. Please update config/barbeque.yml'
+            yaml_dir
+          else
+            raise ArgumentError.new('definition_dir is required')
+          end
         @hako_s3_client = HakoS3Client.new(oneshot_notification_prefix)
       end
 
@@ -104,10 +113,19 @@ module Barbeque
       private
 
       def build_hako_oneshot_command(docker_image, command, envs)
-        [
-          'bundle', 'exec', 'hako', 'oneshot', '--no-wait', '--tag', docker_image.tag,
-          *env_options(envs), File.join(@yaml_dir, "#{docker_image.repository}.yml"), '--', *command,
-        ]
+        jsonnet_path = File.join(@definition_dir, "#{docker_image.repository}.jsonnet")
+        yaml_path = File.join(@definition_dir, "#{docker_image.repository}.yml")
+
+        cmd = ['bundle', 'exec', 'hako', 'oneshot', '--no-wait', '--tag', docker_image.tag, *env_options(envs)]
+        if File.readable?(jsonnet_path)
+          cmd << jsonnet_path
+        elsif File.readable?(yaml_path)
+          cmd << yaml_path
+        else
+          raise HakoCommandError.new("No definition found matching '#{docker_image.repository}' in #{@definition_dir}")
+        end
+        cmd << '--'
+        cmd.concat(command)
       end
 
       def env_options(envs)

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -470,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Job queue system to run job with Docker