excadg 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18dc7316830116ac440841ff222fcd662b50307167b27962ea99003678f1bdf
-  data.tar.gz: 6719109dd9d4fa114c5265da537bc104d12b1ee1c5e7b72ff0bd68f1525fa2cd
+  metadata.gz: 5bccdde832f42e296103812d1a60fa0adf8534d102c697d08b97697d5524dd37
+  data.tar.gz: a1da774573729eac556f4dfa3ff2c46bb21f1029db30cebeb172e00c9f3f9460
 SHA512:
-  metadata.gz: 7d39543a7ebeea6c23ac1dd2d2f8bee42c7cff9a65028c1029996248cbf9a6bb2f7a79793dd5f3533c981d9e7c3ea01ab4358c2d3321e88768b05e87f14c49d4
-  data.tar.gz: 2a558a66f53d2dc2da7a0af4df066f1122c96997bcf654f088426e88cd2691e79ca329d34a36029596761b78f13f5711934f138e44156f2d4782a5604fccc80e
+  metadata.gz: 29923112c768f2bb6a3ca99109c5d2a7bd48b6b0b45b9df7c9715ab29f557414fce338da3dd7ff6cbda5922d10bfd04d57316204c2279b8f402dba08687306f3
+  data.tar.gz: 496d09bc1390c268800976e6aa238f153671c9548d40be92e82e6d12b5a949537070317b65973ddbbfe62e6783b9643cf19280ea72a333ff577e0e6dc89cd67f

data/README.md

@@ -9,7 +9,10 @@ Another feature is that the graph is dynamic and any vertex could produce anothe
 ## Tool
 
 There is a tool script in `bin` folder called `excadg`. Run `./bin/excadg --help` for available options.  
-It allows to make and run basic payload graphs specified by a YAML config. See [config/](config/) folder for sample configs.
+It allows to run basic payload graphs specified by a YAML config. See [config/](config/) folder for sample configs.
+
+Another tool is `bin/adgen`, it has `--help` as well. It's suitable to generate relatively complex random graphs.  
+Try `./bin/adgen --range 1:5 --file mygraph.yaml --count 30` then `./bin/excadg --graph mygraph.yaml -l mygraph.log -d mygraph.yaml --gdump mygraph.jpg`.
 
 ## Framework
 
@@ -188,3 +191,6 @@ Logging is disabled by default, but it could be useful to debug tests. Add `ExcA
   - check for loops in the config
   - check for unreachable islands - graph connectivity
   - check that there are nodes to start from
+
+
+- check MAX_CPU ...

data/bin/adgen

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require 'logger'
+require 'optparse'
+require 'rgl/adjacency'
+require 'rgl/dot'
+require 'yaml'
+
+log = Logger.new $stdout
+
+options = {
+  count: 20,
+  delay: (1..5),
+  file: 'graph.yaml',
+  connectivity: 0.5
+}
+
+OptParse.new { |opts|
+  opts.banner = <<~EOD
+    sample config generator for excadg
+    makes a graph of randomly connected vertices
+    each vertex sleeps random # of seconds in range set
+    usage: #{$PROGRAM_NAME} [args]
+  EOD
+  opts.on('-c', '--count NUMBER', 'number of vertices to generate', "default: #{options[:count]}") { |o|
+    raise "Vertices count should be positive, got #{o.to_i}" unless o.to_i.positive?
+
+    options[:count] = o.to_i
+  }
+  opts.on('-f', '--file FILENAME', 'file name to dump config to', "default: #{options[:file]}") { |o|
+    options[:file] = o
+  }
+  opts.on('-r', '--range MIN:MAX', 'time range in seconds for vertives to sleep', "default: #{options[:delay]}") { |o|
+    min, max = o.split(':').collect(&:to_i)
+    raise "Min should be > 0, got #{min}" unless min.positive?
+    raise "Max should be >= #{min}, got #{max}" unless max >= min
+
+    options[:delay] = (min..max)
+  }
+  opts.on('--connectivity NUMBER',
+          'graph connectivity, should be in (0...1)',
+          'it sets a percentage of existing nodes are connected to new one',
+          'the tool makes nodes iteratively, so there is a guarantee that result is a tree',
+          "default: #{options[:connectivity]}") { |o|
+    options[:connectivity] = o.to_f
+    raise 'Connectivity should be in 0...1' unless (0...1).include? options[:connectivity]
+  }
+  opts.on('--gdump FILENAME', 'dump initial execution graph to the file specified') { |o|
+    options[:gdump] = o
+  }
+}.parse!
+
+log.info 'generating graph'
+graph = RGL::DirectedAdjacencyGraph.new
+created_vertices = {}
+options[:count].times { |i|
+  name = "v#{i}"
+  deps_count = rand(0..(created_vertices.size * options[:connectivity]))
+  deps = created_vertices.keys.sample(deps_count || 0)
+  created_vertices[name] = {
+    'sleep' => rand(options[:delay]),
+    'dependencies' => deps
+  }
+  deps.each { |dep|
+    graph.add_edge name, dep
+  }
+  print '.'
+}
+puts ''
+
+log.info "saving graph to #{options[:file]}"
+File.open(options[:file], 'w+') { |f|
+  f.write YAML.dump created_vertices
+}
+
+unless options[:gdump].nil?
+  log.info "dumping graph's image to #{options[:gdump]}"
+  graph.write_to_graphic_file(options[:gdump].split('.').last, options[:gdump].split('.')[...-1].join('.'))
+end
+
+log.info "graph config is saved to #{options[:file]}"

data/bin/excadg

@@ -68,9 +68,9 @@ end
 raise "'#{options[:graph]}' config file is not readable" unless File.readable? options[:graph]
 
 ExcADG::Log.info 'reading config'
-config = YAML.safe_load_file options[:graph]
+config = YAML.safe_load_file options[:graph], permitted_classes: [Symbol]
 
-runnable_vertices = config.select { |k, v| v&.dig('dependencies').nil? }.keys
+runnable_vertices = config.select { |k, v| (v&.dig('dependencies') || []).empty? }.keys
 raise ArgumentError, 'at least one vertex should be ready to start' if runnable_vertices.empty?
 
 ExcADG::Log.info 'collect execution graph from config'

data/lib/excadg/broker.rb

@@ -55,7 +55,7 @@ module ExcADG
       # @param period time between vertices state check
       def wait_all timeout: 60, period: 1
         Thread.new {
-          Log.info "timeout is #{timeout} seconds"
+          Log.info "timeout is #{timeout || '∞'} seconds"
           Timeout.timeout(timeout) {
             loop {
               sleep period

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excadg
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - skorobogatydmitry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
@@ -31,10 +31,12 @@ description: "\n\nThat's a library (framework) to execute a graph of dependent t
 email: skorobogaty.dmitry@gmail.com
 executables:
 - excadg
+- adgen
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/adgen
 - bin/excadg
 - lib/excadg.rb
 - lib/excadg/assertions.rb