rukawa 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a389842b98a975ff2ed0ee853e8ffff2bd4e4a70
-  data.tar.gz: c9771aba374409856f6970c9facc5a6c2fcc168e
+  metadata.gz: 0345bf03c443cf5a22b3cde1e5397ccb86aa16ee
+  data.tar.gz: 317a36ce8f9664ef86fee7b8928e05f3cc101664
 SHA512:
-  metadata.gz: 7121c4dab817fcdd3c08e669a03336eb34ba6bd6f1550a7c1a3c37f91133b5af6143a513cec690ef0149f2aea871ab7157c56dbe7de551a5a2c55c90ce8b2a30
-  data.tar.gz: b011617ab7508d79e5db4bb62fe65691301434b33894f4b5fb8fcc8ae105853b24ac20ac793ce774f8a377948545362cac7b81adfd16880d7b688cf71482c54f
+  metadata.gz: 8a0bda03e6575c683811947f1427390408125c0e397bd33c13325c0678a317219686e5d45110f24df666da96db3efca48737c66e6835f217b55c9e9af2857444
+  data.tar.gz: f68ec7053149239557a6f3dea6e4c3d0f72f75620a79a3f7d77dbe69c1ea9d83bba9c4490dd477db0ebc4cfdcc4325f20dd00b5ab03be73d905f961b5484288e

data/lib/rukawa/cli.rb

@@ -7,14 +7,17 @@ module Rukawa
     map "run" => "_run"
     method_option :concurrency, aliases: "-c", type: :numeric, default: nil, desc: "Default: cpu count"
     method_option :variables, type: :hash, default: {}
+    method_option :config, type: :string, default: nil, desc: "If this options is not set, try to load ./rukawa.rb"
     method_option :job_dirs, type: :array, default: [], desc: "Load job directories"
     method_option :batch, aliases: "-b", type: :boolean, default: false, desc: "If batch mode, not display running status"
     method_option :log, aliases: "-l", type: :string, default: "./rukawa.log"
+    method_option :stdout, type: :boolean, default: false, desc: "Output log to stdout"
     method_option :dot, aliases: "-d", type: :string, default: nil, desc: "Output job status by dot format"
     method_option :refresh_interval, aliases: "-r", type: :numeric, default: 3, desc: "Refresh interval for running status information"
     def _run(job_net_name)
+      load_config
       Rukawa.configure do |c|
-        c.log_file = options[:log]
+        c.log_file = options[:stdout] ? $stdout : options[:log]
         c.concurrency = options[:concurrency] if options[:concurrency]
       end
       load_job_definitions
@@ -31,9 +34,11 @@ module Rukawa
     end
 
     desc "graph JOB_NET_NAME", "Output jobnet graph"
+    method_option :config, type: :string, default: nil, desc: "If this options is not set, try to load ./rukawa.rb"
     method_option :job_dirs, type: :array, default: []
     method_option :output, aliases: "-o", type: :string, required: true
     def graph(job_net_name)
+      load_config
       load_job_definitions
 
       job_net_class = Object.const_get(job_net_name)
@@ -43,6 +48,18 @@ module Rukawa
 
     private
 
+    def load_config
+      if options[:config]
+        load File.expand_path(options[:config], Dir.pwd)
+      else
+        load default_config_file if File.exists?(default_config_file)
+      end
+    end
+
+    def default_config_file
+      "./rukawa.rb"
+    end
+
     def default_job_dirs
       [File.join(Dir.pwd, "job_nets"), File.join(Dir.pwd, "jobs")]
     end

data/lib/rukawa/configuration.rb

@@ -9,10 +9,43 @@ module Rukawa
 
     def initialize
       @config = OpenStruct.new(log_file: "./rukawa.log", concurrency: Concurrent.processor_count)
+      @config.graph = GraphConfig.new.tap { |c| c.rankdir = "LR" }
     end
 
     def __getobj__
       @config
     end
+
+    def graph_attrs
+      if @config.graph.rankdir || @config.graph.size || @config.graph
+      end
+    end
+  end
+
+  GraphConfig = Struct.new(:rankdir, :size, :rotate, :ranksep, :nodesep, :concentrate, :node) do
+    def initialize(*args)
+      super
+      self.node = GraphNodeConfig.new
+    end
+
+    def attrs
+      if rankdir || size || rotate || ranksep || nodesep || concentrate
+        values = to_h.map { |k, v| "#{k} = #{v}" if k != :node && v }.compact
+        "graph [#{values.join(",")}];\n"
+      else
+        ""
+      end
+    end
+  end
+
+  GraphNodeConfig = Struct.new(:shape, :style) do
+    def attrs
+      if shape || style
+        values = to_h.map { |k, v| "#{k} = #{v}" if v }.compact
+        "node [#{values.join(",")}];\n"
+      else
+        ""
+      end
+    end
   end
 end

data/lib/rukawa/job.rb

@@ -60,7 +60,7 @@ module Rukawa
       if state == Rukawa::State::Waiting
         "#{name};\n"
       else
-        "#{name} [color = #{state.color}];\n"
+        "#{name} [style = filled,fillcolor = #{state.color}];\n"
       end
     end
 

data/lib/rukawa/job_net.rb

@@ -48,6 +48,8 @@ module Rukawa
       graphdef = subgraph ? "subgraph" : "digraph"
       buf = %Q|#{graphdef} "#{subgraph ? "cluster_" : ""}#{name}" {\n|
       buf += %Q{label = "#{name}";\n}
+      buf += Rukawa.config.graph.attrs
+      buf += Rukawa.config.graph.node.attrs
       buf += "color = blue;\n" if subgraph
       dag.each do |j|
         buf += j.to_dot_def

data/lib/rukawa/version.rb

@@ -1,3 +1,3 @@
 module Rukawa
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/sample/rukawa.rb

@@ -0,0 +1,4 @@
+Rukawa.configure do |c|
+  c.graph.concentrate = true
+  c.graph.nodesep = 0.8
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rukawa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -141,6 +141,7 @@ files:
 - sample/jobnet.png
 - sample/jobs/sample_job.rb
 - sample/result.png
+- sample/rukawa.rb
 homepage: https://github.com/joker1007/rukawa
 licenses: []
 metadata: {}