kuroko2 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d47289d5f0680a4d3c54a63d23aa4e81034dfa6f
-  data.tar.gz: 3c83db1643fda5ff3be5dab4773ea9b65e881020
+  metadata.gz: ee9ce17462b9270fa8f45c122123f20175131a84
+  data.tar.gz: 2914136d1c86da76c97b0739fa26ab7560c13e52
 SHA512:
-  metadata.gz: 0b02fc72c9714dc75228d144975a11660b04e878ebd0cdf7d04a8c8eb0766d015ce1d6e9a3b2ec51af6b035093b906fef7eda9cfbebb48ea01a928683a0c2dd3
-  data.tar.gz: a25b917a958bdda761f2ae093f951bfb4e095f0573ee46b47dee2cf5c145a44a3a175ec54f12345d866fb5245bb0be73eda9ce8bbe0f16379152c8f6ab6278e2
+  metadata.gz: 60988ce35420ffef7b77a3862b518b5b3adff3c15f8d5137acb474d1f8aed098a145d6944d81b920cf7e5bb5cdd39db9bcdf2269f3cf89dfa7696fcfd9339c7a
+  data.tar.gz: e59d33a39735b8bb0064e44a5f24882afd809ad62c519d00e9421c51a46a45d3b5fd62d3f564b94292b9933a9d237a2675d0b36b97080cbaa0ee9f0656ae88a4

data/README.md

@@ -13,6 +13,10 @@ $ rails new your_kuroko2_application --database=mysql --skip-turbolinks --skip-j
 
 And edits "config/kuroko2.yml"
 
+## Documentation
+
+Documentation is available at [docs/index.md](docs/index.md).
+
 ## Authors
 
 - Naoto Takai

data/app/assets/stylesheets/kuroko2/job_definitions.scss

@@ -17,3 +17,9 @@
 .script-input {
   font-family: 'Inconsolata';
 }
+
+.kuroko-script {
+  span.note {
+    color: #888;
+  }
+}

data/app/helpers/kuroko2/job_definitions_helper.rb

@@ -34,5 +34,54 @@ module Kuroko2
         )
       end
     end
+
+    def format_kuroko_script(script_text)
+      script_text.each_line.map { |line|
+        matched = Kuroko2::Workflow::ScriptParser::LINE_REGEXP.match(line.chomp)
+        case matched && matched[:type]
+        when 'wait'
+          format_wait_task(line, matched)
+        when 'sub_process'
+          format_sub_process_task(line, matched)
+        else
+          ERB::Util.html_escape(line)
+        end
+      }.join('').html_safe
+    end
+
+    private
+
+    def format_wait_task(line, matched)
+      definition_names = []
+      formatted_line = line.gsub(Kuroko2::Workflow::Task::Wait::OPTION_REGEXP) { |option|
+        definition = Kuroko2::JobDefinition.find_by(id: $1.to_i)
+        if definition.present?
+          definition_names << definition.name
+          link_to(option, job_definition_path(definition.id))
+        else
+          ERB::Util.html_escape(option)
+        end
+      }.chomp
+
+      formatted_line << " "
+      formatted_line << content_tag(:span, "# #{definition_names.join(', ')}", class: 'note')
+      formatted_line << "\n"
+    end
+
+    def format_sub_process_task(line, matched)
+      definition = Kuroko2::JobDefinition.find_by(id: matched[:option].to_i)
+      if definition.present?
+        formatted_line = link_to(
+          line.chomp,
+          job_definition_path(definition.id),
+        )
+
+        formatted_line << " "
+        formatted_line << content_tag(:span, "# #{definition.name}", class: 'note')
+        formatted_line << "\n"
+      else
+        ERB::Util.html_escape(line)
+      end
+    end
   end
 end

data/app/models/kuroko2/job_schedule.rb

@@ -71,7 +71,7 @@ class Kuroko2::JobSchedule < Kuroko2::ApplicationRecord
   end
 
   def self.launch_scheduled_jobs!(time_from, time_to)
-    find_each do |schedule|
+    includes(job_definition: :job_suspend_schedules).find_each do |schedule|
       definition = schedule.job_definition
       suspend_times = schedule.suspend_times(time_from, time_to)
 

data/app/views/kuroko2/dashboard/index.html.slim

@@ -1,5 +1,6 @@
-- @title = 'Dashboard'
-- @content_title = '<i class="fa fa-dashboard"></i> Dashboard'
+- content_for :title, 'Dashboard'
+- content_for :content_title do
+  <i class="fa fa-dashboard"></i> Dashboard
 
 .row
   .col-md-7

data/app/views/kuroko2/executions/index.html.slim

@@ -1,5 +1,6 @@
-- @title = 'Executions'
-- @content_title = '<i class="fa fa-tasks"></i> Executions'
+- content_for :title, 'Executions'
+- content_for :content_title do
+  <i class="fa fa-tasks"></i> Executions
 
 .box
   .box-header

data/app/views/kuroko2/job_definition_stats/index.html.slim

@@ -1,5 +1,6 @@
-- @title = 'Job Definition Stats'
-- @content_title = '<i class="fa fa-bar-chart"></i> Job Definition Stats'
+- content_for :title, 'Job Definition Stats'
+- content_for :content_title do
+  <i class="fa fa-bar-chart"></i> Job Definition Stats
 
 - content_for :breadcrumb do
   ol.breadcrumb

data/app/views/kuroko2/job_definitions/edit.html.slim

@@ -1,5 +1,5 @@
-- @title = "##{@definition.id} #{@definition.name} « Job Definitions"
-- @content_title = "##{@definition.id} #{@definition.name}"
+- content_for :title, "##{@definition.id} #{@definition.name} « Job Definitions"
+- content_for :content_title, "##{@definition.id} #{@definition.name}"
 
 - content_for :breadcrumb do
   ol.breadcrumb

data/app/views/kuroko2/job_definitions/index.html.slim

@@ -1,5 +1,6 @@
-- @title = 'Job Definitions'
-- @content_title = '<i class="fa fa-database"></i> Job Definitions'
+- content_for :title, 'Job Definitions'
+- content_for :content_title do
+  <i class="fa fa-database"></i> Job Definitions
 
 .row
   .col-md-9

data/app/views/kuroko2/job_definitions/new.html.slim

@@ -1,5 +1,6 @@
-- @title = 'New Job Definition'
-- @content_title = '<i class="fa fa-database"></i> New Job Definition'
+- content_for :title, 'New Job Definition'
+- content_for :content_title do
+  <i class="fa fa-database"></i> New Job Definition
 
 - content_for :breadcrumb do
   ol.breadcrumb

data/app/views/kuroko2/job_definitions/show.html.slim

@@ -1,5 +1,5 @@
-- @title = "##{@definition.id} #{@definition.name} « Job Definitions"
-- @content_title = "Job Definition Details"
+- content_for :title, "##{@definition.id} #{@definition.name} « Job Definitions"
+- content_for :content_title, "Job Definition Details"
 
 - content_for :breadcrumb do
   ol.breadcrumb
@@ -29,7 +29,7 @@
                 img.img-rounded src="#{admin.image}" height='20' width='20'
               .media-body.no-decorate= link_to admin.name, user_path(admin)
         h3 Script
-        pre.kuroko-script #{@definition.script}
+        pre.kuroko-script= format_kuroko_script(@definition.script)
 
         'API execution allowed: #{@definition.api_allowed ? 'Yes' : 'No'}
 

data/app/views/kuroko2/job_instances/_instance.html.slim

@@ -33,10 +33,10 @@
         th Error at
         td= @instance.error_at || '-'
     h4 Script
-    pre.kuroko-script= @instance.script
+    pre.kuroko-script= format_kuroko_script(@instance.script)
   .box-footer
     .row
       #cancel-button.col-md-4.col-md-offset-8
-        = link_to 'Cancel', job_definition_job_instance_path(@definition, @instance), class: 'btn btn-default btn-block', role: 'button', method: :delete, disabled: !@instance.cancelable?
+        = link_to 'Cancel', job_definition_job_instance_path(@definition, @instance), class: 'btn btn-default btn-block', role: 'button', method: :delete, disabled: !@instance.cancelable?, data: { confirm: 'Are you sure?' }
       #force-cancel-button.col-md-4.col-md-offset-8.display-none
         = link_to 'Force Cancel', force_destroy_job_definition_job_instance_path(@definition, @instance), class: 'btn btn-danger btn-block', role: 'button', method: :delete, disabled: !@instance.working?

data/app/views/kuroko2/job_instances/show.html.slim

@@ -1,5 +1,5 @@
-- @title = "##{@definition.id} #{@definition.name} « Jobs"
-- @content_title = "Job Instance Details"
+- content_for :title, "##{@definition.id} #{@definition.name} « Jobs"
+- content_for :content_title, "Job Instance Details"
 
 - content_for :breadcrumb do
   ol.breadcrumb

data/app/views/kuroko2/job_instances/working.html.slim

@@ -1,5 +1,6 @@
-- @title = "Working Jobs"
-- @content_title = '<i class="fa fa-spinner"></i> Working Jobs'
+- content_for :title, "Working Jobs"
+- content_for :content_title do
+  <i class="fa fa-spinner"></i> Working Jobs
 
 .box
   .box-header

data/app/views/kuroko2/job_timelines/index.html.slim

@@ -1,6 +1,9 @@
-- @title = "Job Timelines"
-- @content_title = "<i class=\"fa fa-clock-o\"></i> #{@user.name}'s Job Timelines"
-- @content_title << " tagged by #{params[:tag].join(',')}" if params[:tag].present?
+- content_for :title, "Job Timelines"
+- content_for :content_title do
+  - if params[:tag].present?
+    <i class="fa fa-clock-o"></i> #{@user.name}'s Job Timelines tagged by #{params[:tag].join(', ')}
+  - else
+    <i class="fa fa-clock-o"></i> #{@user.name}'s Job Timelines
 
 .row
   .col-md-12

data/app/views/kuroko2/layouts/application.html.slim

@@ -1,11 +1,11 @@
 doctype html
 html
   head
-    title #{@title} « Kuroko 2
+    title #{yield(:title)} « Kuroko 2
     meta charset='UTF-8'
     meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'
     link rel='icon' href='/favicon.ico'
-    link type='application/opensearchdescription+xml' rel='search' href='#{osd_path(format: 'xml')}' title='Kuroko2' 
+    link type='application/opensearchdescription+xml' rel='search' href='#{osd_path(format: 'xml')}' title='Kuroko2'
     = csrf_meta_tag
     = stylesheet_link_tag 'application'
     = javascript_include_tag 'application'
@@ -59,7 +59,7 @@ html
 
       aside.right-side
         section.content-header
-          h1= raw(@content_title || @title)
+          h1= yield(:content_title).presence || yield(:title)
           = yield :breadcrumb
         section.content
           .container-fluid

data/app/views/kuroko2/sessions/invalid_hd.html.slim

@@ -1,9 +1,9 @@
-- @title = 'Sign in failure'
+- content_for :title, 'Sign in failure'
 
 doctype html
 html.bg-black
   head
-    title #{@title} « Kuroko 2
+    title #{yield(:title)} « Kuroko 2
     meta charset='UTF-8'
     meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'
     = stylesheet_link_tag 'kuroko2/application'

data/app/views/kuroko2/sessions/new.html.slim

@@ -1,9 +1,9 @@
-- @title = 'Sign in'
+- content_for :title, 'Sign in'
 
 doctype html
 html.bg-black
   head
-    title #{@title} « Kuroko 2
+    title #{yield(:title)} « Kuroko 2
     meta charset='UTF-8'
     meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'
     = stylesheet_link_tag 'kuroko2/application'

data/app/views/kuroko2/users/edit.html.slim

@@ -1,5 +1,5 @@
-- @title = "#{@user.name_was} « Users"
-- @content_title = "Edit User"
+- content_for :title, "#{@user.name_was} « Users"
+- content_for :content_title, 'Edit User'
 
 - content_for :breadcrumb do
   ol.breadcrumb

data/app/views/kuroko2/users/index.html.slim

@@ -1,5 +1,6 @@
-- @title = 'Users' + (params[:target] == 'group' ? ' > Groups' : '')
-- @content_title = "<i class=\"fa fa-users\"></i> Users#{params[:target] == 'group' ? ' <i class="fa fa-angle-double-right"></i> Groups' : ''}"
+- content_for :title, 'Users' + (params[:target] == 'group' ? ' > Groups' : '')
+- content_for :content_title do
+  <i class="fa fa-users"></i> Users#{params[:target] == 'group' ? ' <i class="fa fa-angle-double-right"></i> Groups' : ''}
 - @scope = @users
 
 - if @user.errors.any?

data/app/views/kuroko2/users/show.html.slim

@@ -1,5 +1,6 @@
-- @title = "#{@user.name} « Users"
-- @content_title = "<i class='fa fa-user'></i> User Details"
+- content_for :title, "#{@user.name} « Users"
+- content_for :content_title do
+  <i class="fa fa-user"></i> User Details
 
 - content_for :breadcrumb do
   ol.breadcrumb

data/app/views/kuroko2/workers/index.html.slim

@@ -1,5 +1,6 @@
-- @title = 'Kuroko Workers'
-- @content_title = '<i class="fa fa-rocket"></i> Kuroko Workers'
+- content_for :title, 'Kuroko Workers'
+- content_for :content_title do
+  <i class="fa fa-rocket"></i> Kuroko Workers
 
 .box#workers
   .box-header

data/app/views/layouts/kuroko2/application.html.slim

@@ -1,7 +1,7 @@
 doctype html
 html
   head
-    title #{@title} « Kuroko 2
+    title #{yield(:title)} « Kuroko 2
     meta charset='UTF-8'
     meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'
     link rel='icon' href='/favicon.ico'
@@ -63,7 +63,7 @@ html
 
       aside.right-side
         section.content-header
-          h1= raw(@content_title || @title)
+          h1= yield(:content_title).presence || yield(:title)
           = yield :breadcrumb
         section.content
           .container-fluid

data/lib/autoload/kuroko2/workflow/notifier/slack.rb

@@ -105,8 +105,7 @@ module Kuroko2
             link_names: 1,
             attachments: [
               {
-                pretext: "[#{level}] #{text}",
-                title: "##{@definition.id} #{@definition.name}",
+                title: "[#{level}] #{text}",
                 title_link: message_builder.job_instance_path,
                 text: body,
                 fallback: "[#{level}] #{text} #{message_builder.job_instance_path}",

data/lib/autoload/kuroko2/workflow/task/queue.rb

@@ -13,8 +13,8 @@ module Kuroko2
         end
 
         def validate
-          unless /\A\@?[\w_-]{1,180}\z/ === option
-            raise Workflow::AssertionError, "Queue name must be match with /\A\@?[\w_-]{1,255}\z/: #{option}"
+          unless /\A\@?[\w-]{1,180}\z/ === option
+            raise Workflow::AssertionError, "Queue name must be match with /\A\@?[\w-]{1,255}\z/: #{option}"
           end
 
           unless Worker.where(queue: option, working: true).exists?

data/lib/autoload/kuroko2/workflow/task/wait.rb

@@ -3,6 +3,7 @@ module Kuroko2
     module Task
       class Wait < Base
         PERIODS = %w(hourly daily weekly monthly)
+        OPTION_REGEXP = %r!(\d+)\s*/\s*(#{PERIODS.join('|')})!
 
         def execute
           if token.context['WAIT'].present?
@@ -67,7 +68,7 @@ module Kuroko2
           wait_option = { "jobs" => [], "timeout" => 60.minutes.to_i / 1.minute }
           scanner = StringScanner.new(option)
           until scanner.eos?
-            if scanner.scan(%r!(\d+)\s*/\s*(#{PERIODS.join('|')})!)
+            if scanner.scan(OPTION_REGEXP)
               start_from, start_to = period_to_time(scanner[2], at: start_at)
               wait_option["jobs"] << {
                 "job_definition_id" => parse_definition_id(scanner[1]),

data/lib/kuroko2/configuration.rb

@@ -9,10 +9,10 @@ module Kuroko2
         @config ||= build_config
       end
 
+      private
+
       def build_config
-        filename = Rails.root.join('config', 'kuroko2.yml')
-        yaml = YAML::load(ERB.new(File.read(filename)).result)
-        Hashie::Mash.new(DEFAULT_CONFIG.merge(yaml[Rails.env]))
+        Hashie::Mash.new(DEFAULT_CONFIG.merge(Rails.application.config_for('kuroko2')))
       end
     end
   end

data/lib/kuroko2/version.rb

@@ -1,3 +1,3 @@
 module Kuroko2
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end