barbeque 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e9cf425229aa453c69b0b10724cd42f16d3d5a9
-  data.tar.gz: d8434e65e0d541f19b5424ffe906fa1519999f83
+  metadata.gz: a43082ae404cbe883e4ba07cbd59e6704c928ab3
+  data.tar.gz: a2f5fabeb566ac7c2345c5b77f7e4093d43243f9
 SHA512:
-  metadata.gz: a751d7a94159f26dab6a2b434af7dc47a4e826657d7c3d7ebb33b67174eddf9104bd7b1f80d6fd5397ce82b7a5905c7c55a4424d3e7e14da63f7fe12aa7d356e
-  data.tar.gz: e18f9585c6a98e66c4b0285912c6ad8a7079f39d5a8dc3b4fab066652d29b9a4aecec0a70ee71ccfa2eb8d1372641e01670792feebcffee6ac690bfc873d4d52
+  metadata.gz: cb8b997431c6661bd6c5fd03dfcc17a1c86146b8e88db452aa43b1d668ea1473375c6dd42ce6c54057c965cc6a6fab7181818e01a9aab337f6acf1cee2149e5d
+  data.tar.gz: 833426bd91b0901351f491b4962ebc7f15460cb181b66f2d9242358279e9ae288a49a13563c96a4d705ffffe512c26d7bfa5268072717b977fc7af90053f62f6

data/README.md

@@ -8,7 +8,7 @@ Job queue system to run job with Docker
 ## Project Status
 
 Barbeque is under development but already used on production at Cookpad.  
-Documentation and open-sourcing plugins are work in progress.
+Documentation is work in progress.
 
 ## What's Barbeque?
 
@@ -24,8 +24,8 @@ In Barbeque worker, they are done on Docker container.
 
 ## Why Barbeque?
 
-- You can achieve job-level auto scaling using tools like [Amazon ECS](https://aws.amazon.com/ecs/) and [EC2 Auto Scaling group](https://aws.amazon.com/autoscaling/)
-  - It requires a plugin to run job with ECS, but it's not open-sourced for now
+- You can achieve job-level auto scaling using tools like [Amazon ECS](https://aws.amazon.com/ecs/) [EC2 Auto Scaling group](https://aws.amazon.com/autoscaling/)
+  - For Amazon ECS, Barbeque has Hako runner
 - You don't have to manage infrastructure for each application like Resque or Sidekiq
 
 For details, see [Scalable Job Queue System Built with Docker // Speaker Deck](https://speakerdeck.com/k0kubun/scalable-job-queue-system-built-with-docker).

data/app/models/barbeque/job_definition.rb

@@ -15,12 +15,19 @@ class Barbeque::JobDefinition < Barbeque::ApplicationRecord
   DATE_HOUR_SQL = 'date_format(created_at, "%Y-%m-%d %H:00:00")'
 
   def execution_stats(from, to)
-    job_executions.where(created_at: from .. to).group(DATE_HOUR_SQL).order(DATE_HOUR_SQL).pluck("#{DATE_HOUR_SQL}, count(1), avg(timestampdiff(second, created_at, finished_at))").map do |date_hour, count, avg_time|
-      {
-        date_hour: Time.zone.parse("#{date_hour} UTC"),
+    from = from.beginning_of_hour
+    to = to.beginning_of_hour
+    stats = Hash.new { |h, k| h[k] = { count: 0, avg_time: 0 } }
+    job_executions.where(created_at: from .. to).group(DATE_HOUR_SQL).order(DATE_HOUR_SQL).pluck("#{DATE_HOUR_SQL}, count(1), avg(timestampdiff(second, created_at, finished_at))").each do |date_hour, count, avg_time|
+      time = Time.zone.parse("#{date_hour} UTC")
+      stats[time] = {
         count: count,
         avg_time: avg_time,
       }
     end
+    (from.to_i ... to.to_i).step(1.hour).map do |t|
+      time = Time.at(t)
+      stats[time].merge(date_hour: time)
+    end
   end
 end

data/lib/barbeque/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -387,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Job queue system to run job with Docker