rukawa 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b165a0824c474f449b62bd61beed9f96f3e11c39
-  data.tar.gz: bfaf7d5212c500d6084b07e4ca36baf745ab3efb
+  metadata.gz: e9f4f1e22085cbcfcfafc854b03bc5538ee70044
+  data.tar.gz: 1644fab37cea4a2b001306a84641dbfb3a8da9e6
 SHA512:
-  metadata.gz: 0109918d72f5527124754e5ffdffa7c4ae97661a9c4a871e2c2620bc96e1514ee8affd3015a9e25d74134ee547c248eb41488f172333b8aa017ec1654e66cb4c
-  data.tar.gz: 2c662f7a992ae4172e4cb93d2ba5937bb25ef6aee7ddc9e5ef3cd929cc274fb5fec974035225c80a606cfd74d50a1d1138501594420f5e11c862902d6fb3bc1f
+  metadata.gz: 08a3537bb614bec8ccff3e16443c44f72edae4cfa163821fbc7d2e0367081d4c689024be12c67895c59230024cc3ff6fbb44aae1056b3b7831599a6deeb912e2
+  data.tar.gz: bca2d4b61780f68ad08598f5e51d5f472438db4fb6dceb7f0d109242d461bd9bc69d19fdce337d9c6eea662e922d04a1a6b8a770167b590132023aff0ffa3cf8

data/lib/rukawa/cli.rb

@@ -111,6 +111,10 @@ module Rukawa
       else
         load default_config_file if File.exists?(default_config_file)
       end
+
+      Rukawa.configure do |c|
+        c.job_dirs.concat(options[:job_dirs]) unless options[:job_dirs].empty?
+      end
     end
 
     def set_logger
@@ -138,15 +142,8 @@ module Rukawa
       "./rukawa.rb"
     end
 
-    def default_job_dirs
-      [File.join(Dir.pwd, "job_nets"), File.join(Dir.pwd, "jobs")]
-    end
-
     def load_job_definitions
-      job_dirs = (default_job_dirs + options[:job_dirs]).map { |d| File.expand_path(d) }.uniq
-      job_dirs.each do |dir|
-        Dir.glob(File.join(dir, "**/*.rb")) { |f| load f }
-      end
+      Rukawa.load_jobs
     end
 
     def get_class(name)

data/lib/rukawa/configuration.rb

@@ -11,7 +11,8 @@ module Rukawa
     def initialize
       @config = OpenStruct.new(
         concurrency: Concurrent.processor_count,
-        dot_command: "dot"
+        dot_command: "dot",
+        job_dirs: [File.join(Dir.pwd, "job_nets"), File.join(Dir.pwd, "jobs")]
       )
       @config.graph = GraphConfig.new.tap { |c| c.rankdir = "LR" }
     end

data/lib/rukawa/version.rb

@@ -1,3 +1,3 @@
 module Rukawa
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/rukawa.rb

@@ -23,6 +23,13 @@ module Rukawa
     def config
       Configuration.instance
     end
+
+    def load_jobs
+      job_dirs = config.job_dirs.map { |d| File.expand_path(d) }.uniq
+      job_dirs.each do |dir|
+        Dir.glob(File.join(dir, "**/*.rb")) { |f| load f }
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rukawa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - joker1007