dynflow 1.8.1 → 1.8.3

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
@@ -13,8 +14,8 @@ group :pry do
 end
 
 group :sidekiq do
-  gem 'sidekiq'
   gem 'gitlab-sidekiq-fetcher', :require => 'sidekiq-reliable-fetch'
+  gem 'sidekiq'
 end
 
 group :postgresql do
@@ -26,7 +27,7 @@ group :mysql do
 end
 
 group :lint do
-  gem 'rubocop', '0.39.0'
+  gem 'theforeman-rubocop', '~> 0.0.4'
 end
 
 group :memory_watcher do
@@ -35,8 +36,8 @@ end
 
 group :rails do
   gem 'daemons'
-  gem 'rails', '>= 4.2.9', '< 7'
   gem 'logging'
+  gem 'rails', '>= 4.2.9', '< 7'
 end
 
 group :telemetry do

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rake/testtask'
 require 'fileutils'
 

data/doc/pages/Gemfile

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem 'rake'
 gem 'jekyll'
 gem 'pry'
+gem 'pygments.rb'
+gem 'rake'
+gem 'redcarpet'
 gem 'ruby-nuggets' # require by tags plugin
 gem 'therubyracer'
-gem 'redcarpet'
-gem 'pygments.rb'

data/doc/pages/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
 

data/doc/pages/plugins/alert_block.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'div_tag'
 
 module Jekyll

data/doc/pages/plugins/div_tag.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Jekyll
   class DivTag < Liquid::Block
     def render(context)

data/doc/pages/plugins/graphviz.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 # taken from https://raw.githubusercontent.com/kui/octopress-graphviz/master/graphviz_block.rb
 
 require 'open3'
 
 module Jekyll
   class GraphvizBlock < Liquid::Block
-
     DIV_CLASS_ATTR     = 'graphviz-wrapper'
     DEFAULT_GRAPH_NAME = 'Graphviz'
     DOT_OPTS           = '-Tsvg'
@@ -13,9 +13,9 @@ module Jekyll
     DOT_EXTS           = (ENV['PATHEXT'] || '.exe;.bat;.com').split(";")
     DOT_EXTS.unshift ''
     DOT_PATH = ENV['PATH'].split(File::PATH_SEPARATOR)
-                   .map { |a| File.join a, DOT_EXEC }
-                   .map { |a| DOT_EXTS.map { |ex| a+ex } }.flatten
-                   .find { |c| File.executable_real? c }
+                          .map { |a| File.join a, DOT_EXEC }
+                          .map { |a| DOT_EXTS.map { |ex| a + ex } }.flatten
+                          .find { |c| File.executable_real? c }
     raise "not found a executable file: #{DOT_EXEC}" if DOT_PATH.nil?
     DOT_CMD = "#{DOT_PATH} #{DOT_OPTS}"
 
@@ -61,7 +61,7 @@ module Jekyll
       code = add_desc_attrs code
       code = insert_desc_elements code
       code = wrap_with_div code
-      code = code.gsub /<polygon fill="white" stroke="none"/, '<polygon fill="transparent" stroke="none"'
+      code = code.gsub(/<polygon fill="white" stroke="none"/, '<polygon fill="transparent" stroke="none"')
       code
     end
 
@@ -89,7 +89,7 @@ module Jekyll
 
     def remove_xmlns_attrs(svg)
       svg.sub(%[xmlns="http://www.w3.org/2000/svg"], '')
-          .sub(%[xmlns:xlink="http://www.w3.org/1999/xlink"], '')
+         .sub(%[xmlns:xlink="http://www.w3.org/1999/xlink"], '')
     end
 
     def add_desc_attrs(svg)

data/doc/pages/plugins/plantuml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Title: PlantUML Code Blocks for Jekyll
 # Author: YJ Park (yjpark@gmail.com)
 # https://github.com/yjpark/jekyll-plantuml
@@ -13,7 +14,6 @@ require 'open3'
 require 'fileutils'
 
 module Jekyll
-
   class PlantUMLBlock < Liquid::Block
     attr_reader :config
 
@@ -31,7 +31,7 @@ module Jekyll
       if !File.exist?(filepath)
         plantuml_jar = File.expand_path(plantuml_jar_path)
         cmd = "java -Djava.awt.headless=true -jar " + plantuml_jar + dot_cmd + " -pipe > " + filepath
-        result, status = Open3.capture2e(cmd, :stdin_data=>code)
+        result, status = Open3.capture2e(cmd, :stdin_data => code)
         Jekyll.logger.debug(filepath + " -->\t" + status.inspect() + "\t" + result)
       end
 
@@ -79,7 +79,6 @@ module Jekyll
         Jekyll.logger.info("Create PlantUML image folder: " + folderpath)
       end
     end
-
   end # PlantUMLBlock
 end
 

data/doc/pages/plugins/play.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
+
 require 'pp'
 require 'pry'
 
 module Jekyll
-
   class Play < Generator
     def generate(site)
       # pp site
       # binding.pry
     end
-
   end
 end

data/doc/pages/plugins/tags.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
+
 require 'nuggets/range/quantile'
 require 'erb'
 
 module Jekyll
-
   class Tagger < Generator
-
     safe true
 
     attr_accessor :site
@@ -44,7 +43,7 @@ module Jekyll
           page_name = "#{pretty? ? 'index' : name}#{site.layouts[data['layout']].ext}"
 
           site.pages << TagPage.new(
-              site, site.source, tag_dir, page_name, data
+            site, site.source, tag_dir, page_name, data
           )
         end
       }
@@ -79,11 +78,9 @@ module Jekyll
     def pretty?
       @pretty ||= (site.permalink_style == :pretty || site.config['tag_permalink_style'] == 'pretty')
     end
-
   end
 
   class TagPage < Page
-
     def initialize(site, base, dir, name, data = {})
       self.content = data.delete('content') || ''
       self.data    = data
@@ -94,11 +91,9 @@ module Jekyll
     def read_yaml(*)
       # Do nothing
     end
-
   end
 
   module Filters
-
     def tag_cloud(site)
       active_tag_data.map { |tag, set|
         tag_link(tag, tag_url(tag), :class => "set-#{set} label label-default")
@@ -134,5 +129,4 @@ module Jekyll
       site.config["tag_data"].reject { |tag, set| site.config["ignored_tags"].include? tag }
     end
   end
-
 end

data/doc/pages/plugins/toc.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Jekyll
   module FancyToCFilter
     def fancytoc(input)
-
       converter     = @context.registers[:site].converters.find { |c| c.is_a? Jekyll::Converters::Markdown }
       extensions    = converter.instance_variable_get(:@parser).instance_variable_get(:@redcarpet_extensions)
       toc_generator = Redcarpet::Markdown.new(Redcarpet::Render::HTML_TOC, extensions)

data/dynflow.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 require "dynflow/version"
 
@@ -17,24 +18,24 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.7.0'
 
-  s.add_dependency "multi_json"
-  s.add_dependency "msgpack", '~> 1.3', '>= 1.3.3'
-  s.add_dependency "apipie-params"
   s.add_dependency "algebrick", '~> 0.7.0'
+  s.add_dependency "apipie-params"
   s.add_dependency "concurrent-ruby", '~> 1.1.3'
   s.add_dependency "concurrent-ruby-edge", '~> 0.6.0'
+  s.add_dependency "msgpack", '~> 1.3', '>= 1.3.3'
+  s.add_dependency "multi_json"
   s.add_dependency "sequel", '>= 4.0.0'
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rack-test"
+  s.add_development_dependency 'activejob'
+  s.add_development_dependency "activerecord"
   s.add_development_dependency "minitest", "< 5.19"
   s.add_development_dependency "minitest-reporters"
   s.add_development_dependency "minitest-stub-const"
-  s.add_development_dependency "activerecord"
-  s.add_development_dependency 'activejob'
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "sinatra"
   s.add_development_dependency 'mocha'
+  s.add_development_dependency "rack-test"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "sinatra"
+  s.add_development_dependency "sqlite3"
 end

data/examples/clock_benchmark.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'dynflow'
 require 'benchmark'
 

data/examples/example_helper.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 $:.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'dynflow'
 
 class ExampleHelper
-  CONSOLE_URL='http://localhost:4567'
-  DYNFLOW_URL="#{CONSOLE_URL}/dynflow"
-  SIDEKIQ_URL="#{CONSOLE_URL}/sidekiq"
+  CONSOLE_URL = 'http://localhost:4567'
+  DYNFLOW_URL = "#{CONSOLE_URL}/dynflow"
+  SIDEKIQ_URL = "#{CONSOLE_URL}/sidekiq"
 
   class << self
     def world

data/examples/future_execution.rb

@@ -25,7 +25,6 @@ class CustomPassedObjectSerializer < ::Dynflow::Serializers::Abstract
 end
 
 class DelayedAction < Dynflow::Action
-
   def delay(delay_options, *args)
     CustomPassedObjectSerializer.new(args)
   end
@@ -36,7 +35,6 @@ class DelayedAction < Dynflow::Action
 
   def run
   end
-
 end
 
 if $0 == __FILE__

data/examples/memory_limit_watcher.rb

@@ -3,14 +3,14 @@
 
 require_relative 'example_helper'
 
-example_description = <<DESC
-  Memory limit watcher Example
-  ===========================
-
-In this example we are setting a watcher that will terminate our world object
-when process memory consumption exceeds a limit that will be set.
-
-
+example_description = <<~DESC
+    Memory limit watcher Example
+    ===========================
+  
+  In this example we are setting a watcher that will terminate our world object
+  when process memory consumption exceeds a limit that will be set.
+  
+  
 DESC
 
 module MemorylimiterExample

data/examples/orchestrate.rb

@@ -24,9 +24,7 @@ DESC
 require_relative 'example_helper'
 
 module Orchestrate
-
   class CreateInfrastructure < Dynflow::Action
-
     def plan
       sequence do
         concurrence do
@@ -34,26 +32,25 @@ module Orchestrate
           plan_action(CreateMachine, 'host2', 'storage')
         end
         plan_action(CreateMachine,
-                    'host3',
-                    'web_server',
-                    :db_machine => 'host1',
-                    :storage_machine => 'host2')
+          'host3',
+          'web_server',
+          :db_machine => 'host1',
+          :storage_machine => 'host2')
       end
     end
   end
 
   class CreateMachine < Dynflow::Action
-
     def plan(name, profile, config_options = {})
       prepare_disk = plan_action(PrepareDisk, 'name' => name)
       create_vm    = plan_action(CreateVM,
-                                 :name => name,
-                                 :disk => prepare_disk.output['path'])
+        :name => name,
+        :disk => prepare_disk.output['path'])
       plan_action(AddIPtoHosts, :name => name, :ip => create_vm.output[:ip])
       plan_action(ConfigureMachine,
-                  :ip => create_vm.output[:ip],
-                  :profile => profile,
-                  :config_options => config_options)
+        :ip => create_vm.output[:ip],
+        :profile => profile,
+        :config_options => config_options)
       plan_self(:name => name)
     end
 
@@ -61,7 +58,6 @@ module Orchestrate
       # this is called after run methods of the actions in the
       # execution plan were finished
     end
-
   end
 
   class Base < Dynflow::Action
@@ -71,7 +67,6 @@ module Orchestrate
   end
 
   class PrepareDisk < Base
-
     def queue
       :slow
     end
@@ -88,11 +83,9 @@ module Orchestrate
       sleep!
       output[:path] = "/var/images/#{input[:name]}.img"
     end
-
   end
 
   class CreateVM < Base
-
     input_format do
       param :name
       param :disk
@@ -106,11 +99,9 @@ module Orchestrate
       sleep!
       output[:ip] = "192.168.100.#{rand(256)}"
     end
-
   end
 
   class AddIPtoHosts < Base
-
     input_format do
       param :ip
     end
@@ -118,11 +109,9 @@ module Orchestrate
     def run
       sleep!
     end
-
   end
 
   class ConfigureMachine < Base
-
     input_format do
       param :ip
       param :profile
@@ -144,7 +133,6 @@ module Orchestrate
 
       sleep!
     end
-
   end
 end
 

data/examples/orchestrate_evented.rb

@@ -24,9 +24,7 @@ example_description = <<DESC
 DESC
 
 module OrchestrateEvented
-
   class CreateInfrastructure < Dynflow::Action
-
     def plan(get_stuck = false)
       sequence do
         concurrence do
@@ -34,59 +32,54 @@ module OrchestrateEvented
           plan_action(CreateMachine, 'host2', 'storage')
         end
         plan_action(CreateMachine,
-                    'host3',
-                    'web_server',
-                    :db_machine => 'host1',
-                    :storage_machine => 'host2')
+          'host3',
+          'web_server',
+          :db_machine => 'host1',
+          :storage_machine => 'host2')
       end
     end
   end
 
   class CreateMachine < Dynflow::Action
-
     def plan(name, profile, config_options = {})
       prepare_disk = plan_action(PrepareDisk, 'name' => name)
       create_vm    = plan_action(CreateVM,
-                                 :name => name,
-                                 :disk => prepare_disk.output['path'])
+        :name => name,
+        :disk => prepare_disk.output['path'])
       plan_action(AddIPtoHosts, :name => name, :ip => create_vm.output[:ip])
       plan_action(ConfigureMachine,
-                  :ip => create_vm.output[:ip],
-                  :profile => profile,
-                  :config_options => config_options)
+        :ip => create_vm.output[:ip],
+        :profile => profile,
+        :config_options => config_options)
       plan_self(:name => name)
     end
 
     def finalize
     end
-
   end
 
   class Base < Dynflow::Action
-
     Finished = Algebrick.atom
 
     def run(event = nil)
       match(event,
-            (on Finished do
-               on_finish
-             end),
-            (on Dynflow::Action::Skip do
-               # do nothing
-             end),
-            (on nil do
-               suspend { |suspended_action| world.clock.ping suspended_action, rand(1), Finished }
-             end))
+        (on Finished do
+           on_finish
+         end),
+        (on Dynflow::Action::Skip do
+           # do nothing
+         end),
+        (on nil do
+           suspend { |suspended_action| world.clock.ping suspended_action, rand(1), Finished }
+         end))
     end
 
     def on_finish
       raise NotImplementedError
     end
-
   end
 
   class PrepareDisk < Base
-
     input_format do
       param :name
     end
@@ -98,11 +91,9 @@ module OrchestrateEvented
     def on_finish
       output[:path] = "/var/images/#{input[:name]}.img"
     end
-
   end
 
   class CreateVM < Base
-
     input_format do
       param :name
       param :disk
@@ -115,22 +106,18 @@ module OrchestrateEvented
     def on_finish
       output[:ip] = "192.168.100.#{rand(256)}"
     end
-
   end
 
   class AddIPtoHosts < Base
-
     input_format do
       param :ip
     end
 
     def on_finish
     end
-
   end
 
   class ConfigureMachine < Base
-
     # thanks to this Dynflow knows this action can be politely
     # asked to get canceled
     include ::Dynflow::Action::Cancellable
@@ -163,9 +150,7 @@ module OrchestrateEvented
         suspend
       end
     end
-
   end
-
 end
 
 if $0 == __FILE__

data/examples/remote_executor.rb

@@ -45,7 +45,6 @@ end
 
 class RemoteExecutorExample
   class << self
-
     def run_observer
       world = ExampleHelper.create_world do |config|
         config.persistence_adapter = persistence_adapter
@@ -136,7 +135,6 @@ class RemoteExecutorExample
         sleep 0.5
       end
     end
-
   end
 end
 
@@ -145,17 +143,17 @@ command = ARGV.first || 'server'
 if $0 == __FILE__
   case command
   when 'observer'
-    puts <<MSG
-The observer starting…. You can see what's going on there
-MSG
+    puts <<~MSG
+      The observer starting…. You can see what's going on there
+    MSG
     RemoteExecutorExample.run_observer
   when 'server'
-    puts <<MSG
-The server is starting…. You can send the work to it by running:
-
-   #{$0} client
-
-MSG
+    puts <<~MSG
+      The server is starting…. You can send the work to it by running:
+      
+         #{$0} client
+      
+    MSG
     RemoteExecutorExample.run_server
   when 'client'
     RemoteExecutorExample.run_client
@@ -168,10 +166,11 @@ elsif defined?(Sidekiq)
   Sidekiq.default_worker_options = { :retry => 0, 'backtrace' => true }
   # assuming the remote executor was required as part of initialization
   # of the ActiveJob worker
-  world = if Sidekiq.options[:queues].include?("dynflow_orchestrator")
+  queues = Sidekiq.configure_server { |c| c.options[:queues] }
+  world = if queues.include?("dynflow_orchestrator")
             RemoteExecutorExample.initialize_sidekiq_orchestrator
-          elsif (Sidekiq.options[:queues] - ['dynflow_orchestrator']).any?
+          elsif (queues - ['dynflow_orchestrator']).any?
             RemoteExecutorExample.initialize_sidekiq_worker
           end
-  Sidekiq.options[:dynflow_world] = world
+  Sidekiq.configure_server { |c| c.options[:dynflow_world] = world }
 end

data/examples/singletons.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 example_description = <<DESC
 
   Sub Plans Example

data/examples/sub_plan_concurrency_control.rb

@@ -16,7 +16,6 @@ DESC
 require_relative 'example_helper'
 
 class CostyAction < Dynflow::Action
-
   SleepTime = 10
 
   def plan(number)

data/examples/sub_plans.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 example_description = <<DESC
   Sub Plans Example
   ===================

data/examples/sub_plans_v2.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 example_description = <<DESC
   Sub Plans Example
   ===================

data/lib/dynflow/action/cancellable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dynflow
   module Action::Cancellable
     Cancel = Algebrick.atom